diff options
| author | Carl Hetherington <cth@carlh.net> | 2014-05-19 11:05:10 +0100 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2014-05-19 11:05:10 +0100 |
| commit | 9e758fddfb8bbadb1fc84e393daa815445d5e9d5 (patch) | |
| tree | 291005ebf01a66f07ab05b09e72f634ddd1ac45a /src/tools | |
| parent | 362ed9ee4f73bee21b3ef8d3b449bb8e8877f501 (diff) | |
| parent | 69c08e8bbd5028a65cbddd2aa5f10632bd059191 (diff) | |
Merge delay-decode-take2 branch into master.
Diffstat (limited to 'src/tools')
| -rw-r--r-- | src/tools/server_test.cc | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/src/tools/server_test.cc b/src/tools/server_test.cc index 039088862..896517b27 100644 --- a/src/tools/server_test.cc +++ b/src/tools/server_test.cc @@ -34,6 +34,7 @@ #include "lib/log.h" #include "lib/video_decoder.h" #include "lib/player.h" +#include "lib/player_video_frame.h" using std::cout; using std::cerr; @@ -47,10 +48,10 @@ static shared_ptr<FileLog> log_ (new FileLog ("servomatictest.log")); static int frame = 0; void -process_video (shared_ptr<PlayerImage> image, Eyes eyes, ColourConversion conversion, Time) +process_video (shared_ptr<PlayerVideoFrame> pvf) { - shared_ptr<DCPVideoFrame> local (new DCPVideoFrame (image->image(), frame, eyes, conversion, film->video_frame_rate(), 250000000, RESOLUTION_2K, log_)); - shared_ptr<DCPVideoFrame> remote (new DCPVideoFrame (image->image(), frame, eyes, conversion, film->video_frame_rate(), 250000000, RESOLUTION_2K, log_)); + shared_ptr<DCPVideoFrame> local (new DCPVideoFrame (pvf, frame, film->video_frame_rate(), 250000000, RESOLUTION_2K, log_)); + shared_ptr<DCPVideoFrame> remote (new DCPVideoFrame (pvf, frame, film->video_frame_rate(), 250000000, RESOLUTION_2K, log_)); cout << "Frame " << frame << ": "; cout.flush (); @@ -145,7 +146,7 @@ main (int argc, char* argv[]) shared_ptr<Player> player = film->make_player (); player->disable_audio (); - player->Video.connect (boost::bind (process_video, _1, _2, _3, _5)); + player->Video.connect (boost::bind (process_video, _1)); bool done = false; while (!done) { done = player->pass (); |