diff options
| author | Carl Hetherington <cth@carlh.net> | 2013-12-04 21:55:06 +0000 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2013-12-04 21:55:06 +0000 |
| commit | a3241f40b061480a0907699a5857075388216643 (patch) | |
| tree | 4e1d80bbe66c093d6844024c4ea62e9ff61643d0 /src/tools | |
| parent | 98060a4e6f02b418f30b4b736e5880a357454c40 (diff) | |
Suspend scale / crop / window / subtitle overlay until we decide that a frame is going to be used.
Diffstat (limited to 'src/tools')
| -rw-r--r-- | src/tools/server_test.cc | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/tools/server_test.cc b/src/tools/server_test.cc index 029e62614..f0a44954f 100644 --- a/src/tools/server_test.cc +++ b/src/tools/server_test.cc @@ -47,10 +47,10 @@ static shared_ptr<FileLog> log_ (new FileLog ("servomatictest.log")); static int frame = 0; void -process_video (shared_ptr<const Image> image, Eyes eyes, ColourConversion conversion, Time) +process_video (shared_ptr<PlayerImage> image, Eyes eyes, ColourConversion conversion, Time) { - shared_ptr<DCPVideoFrame> local (new DCPVideoFrame (image, frame, eyes, conversion, film->video_frame_rate(), 250000000, log_)); - shared_ptr<DCPVideoFrame> remote (new DCPVideoFrame (image, frame, eyes, conversion, film->video_frame_rate(), 250000000, log_)); + shared_ptr<DCPVideoFrame> local (new DCPVideoFrame (image->image(), frame, eyes, conversion, film->video_frame_rate(), 250000000, log_)); + shared_ptr<DCPVideoFrame> remote (new DCPVideoFrame (image->image(), frame, eyes, conversion, film->video_frame_rate(), 250000000, log_)); cout << "Frame " << frame << ": "; cout.flush (); |