diff options
| author | Carl Hetherington <cth@carlh.net> | 2015-02-02 22:39:43 +0000 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2015-02-02 22:39:43 +0000 |
| commit | 7a1bd472537fee593a3f088655324861d24e804b (patch) | |
| tree | 42319544a2413d1252c9465f29acbc0b7b5299e9 /src/lib/dcp_video.cc | |
| parent | b255fcca7f57c7068603a104adbb645fe5701c21 (diff) | |
Changes to libdcp API.
Diffstat (limited to 'src/lib/dcp_video.cc')
| -rw-r--r-- | src/lib/dcp_video.cc | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/src/lib/dcp_video.cc b/src/lib/dcp_video.cc index a01a72f6b..a302c43e6 100644 --- a/src/lib/dcp_video.cc +++ b/src/lib/dcp_video.cc @@ -40,7 +40,7 @@ #include "player_video.h" #include "encoded_data.h" #include <libcxml/cxml.h> -#include <dcp/xyz_frame.h> +#include <dcp/xyz_image.h> #include <dcp/rgb_xyz.h> #include <dcp/colour_matrix.h> #include <dcp/raw_convert.h> @@ -109,15 +109,18 @@ DCPVideo::DCPVideo (shared_ptr<const PlayerVideo> frame, shared_ptr<const cxml:: shared_ptr<EncodedData> DCPVideo::encode_locally (dcp::NoteHandler note) { - shared_ptr<dcp::XYZFrame> xyz; + shared_ptr<dcp::XYZImage> xyz; + shared_ptr<Image> image = _frame->image (AV_PIX_FMT_RGB48LE, _burn_subtitles, note); if (_frame->colour_conversion()) { xyz = dcp::rgb_to_xyz ( - _frame->image (AV_PIX_FMT_RGB48LE, _burn_subtitles, note), + image->data()[0], + image->size(), + image->stride()[0], _frame->colour_conversion().get() ); } else { - xyz = dcp::xyz_to_xyz (_frame->image (AV_PIX_FMT_RGB48LE, _burn_subtitles, note)); + xyz = dcp::xyz_to_xyz (image->data()[0], image->size(), image->stride()[0]); } /* Set the max image and component sizes based on frame_rate */ |