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/lib/encoder.cc | |
| parent | 98060a4e6f02b418f30b4b736e5880a357454c40 (diff) | |
Suspend scale / crop / window / subtitle overlay until we decide that a frame is going to be used.
Diffstat (limited to 'src/lib/encoder.cc')
| -rw-r--r-- | src/lib/encoder.cc | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/src/lib/encoder.cc b/src/lib/encoder.cc index 059c4014c..f8a597191 100644 --- a/src/lib/encoder.cc +++ b/src/lib/encoder.cc @@ -34,6 +34,7 @@ #include "cross.h" #include "writer.h" #include "server_finder.h" +#include "player.h" #include "i18n.h" @@ -181,7 +182,7 @@ Encoder::frame_done () } void -Encoder::process_video (shared_ptr<const Image> image, Eyes eyes, ColourConversion conversion, bool same) +Encoder::process_video (shared_ptr<PlayerImage> image, Eyes eyes, ColourConversion conversion, bool same) { boost::mutex::scoped_lock lock (_mutex); @@ -215,7 +216,7 @@ Encoder::process_video (shared_ptr<const Image> image, Eyes eyes, ColourConversi TIMING ("adding to queue of %1", _queue.size ()); _queue.push_back (shared_ptr<DCPVideoFrame> ( new DCPVideoFrame ( - image, _video_frames_out, eyes, conversion, _film->video_frame_rate(), + image->image(), _video_frames_out, eyes, conversion, _film->video_frame_rate(), _film->j2k_bandwidth(), _film->log() ) )); |