projects
/
dcpomatic.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Changes to libdcp API.
[dcpomatic.git]
/
src
/
lib
/
dcp_video.cc
diff --git
a/src/lib/dcp_video.cc
b/src/lib/dcp_video.cc
index a01a72f6b83aebb0a698a957549ea8a37019cbc7..a302c43e657e79cba5b367be962c4464707473bb 100644
(file)
--- 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 "player_video.h"
#include "encoded_data.h"
#include <libcxml/cxml.h>
-#include <dcp/xyz_
fram
e.h>
+#include <dcp/xyz_
imag
e.h>
#include <dcp/rgb_xyz.h>
#include <dcp/colour_matrix.h>
#include <dcp/raw_convert.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<EncodedData>
DCPVideo::encode_locally (dcp::NoteHandler note)
{
- shared_ptr<dcp::XYZ
Fram
e> xyz;
+ shared_ptr<dcp::XYZ
Imag
e> xyz;
+ shared_ptr<Image> image = _frame->image (AV_PIX_FMT_RGB48LE, _burn_subtitles, note);
if (_frame->colour_conversion()) {
xyz = dcp::rgb_to_xyz (
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 {
_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 */
}
/* Set the max image and component sizes based on frame_rate */