diff options
| author | Carl Hetherington <cth@carlh.net> | 2013-05-21 23:19:31 +0100 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2013-05-21 23:19:31 +0100 |
| commit | b9f6e9512017dc1ecd3a42aa1ef3c6058608cef5 (patch) | |
| tree | 0c5ccae6f26d46c270e9287a722b63e397900c57 /src/lib/encoder.cc | |
| parent | 02e4022f540915f8a38f9ab9576ac896fe39a1ab (diff) | |
Give Film a container; move crop into video content; other bits.
Diffstat (limited to 'src/lib/encoder.cc')
| -rw-r--r-- | src/lib/encoder.cc | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/src/lib/encoder.cc b/src/lib/encoder.cc index 95e98ab76..52927c5d3 100644 --- a/src/lib/encoder.cc +++ b/src/lib/encoder.cc @@ -39,6 +39,7 @@ #include "writer.h" #include "player.h" #include "audio_mapping.h" +#include "container.h" #include "i18n.h" @@ -208,9 +209,10 @@ Encoder::process_video (shared_ptr<const Image> image, bool same, shared_ptr<Sub /* Queue this new frame for encoding */ pair<string, string> const s = Filter::ffmpeg_strings (_film->filters()); TIMING ("adding to queue of %1", _queue.size ()); + /* XXX: padding */ _queue.push_back (shared_ptr<DCPVideoFrame> ( new DCPVideoFrame ( - image, sub, _film->format()->dcp_size(), _film->format()->dcp_padding (_film), + image, sub, _film->container()->dcp_size(), 0, _film->subtitle_offset(), _film->subtitle_scale(), _film->scaler(), _video_frames_out, _film->dcp_video_frame_rate(), s.second, _film->colour_lut(), _film->j2k_bandwidth(), |