summaryrefslogtreecommitdiff
path: root/src/lib/dcp_video.h
diff options
context:
space:
mode:
authorCarl Hetherington <cth@carlh.net>2022-08-04 23:55:17 +0200
committerCarl Hetherington <cth@carlh.net>2022-08-04 23:55:17 +0200
commit7bd8eecb8ba8535978d58408dc73ce7528034c7e (patch)
treee3019a153415a6becde846fcb6a68f0674341bc1 /src/lib/dcp_video.h
parentd6aeaf8dd1b3158689da7b75c7417c1838af9c95 (diff)
wip: got stuck... because PlayerVideo is related to the render sizeadjust-sizing
because its subtitles are prepared for the _video_container_size that the Player knows about. I think the only way around this would be to store the subs in PlayerVideo in some independent way and to scale/convert to bitmap later.
Diffstat (limited to 'src/lib/dcp_video.h')
-rw-r--r--src/lib/dcp_video.h5
1 files changed, 3 insertions, 2 deletions
diff --git a/src/lib/dcp_video.h b/src/lib/dcp_video.h
index 3bd516ccd..0c2119099 100644
--- a/src/lib/dcp_video.h
+++ b/src/lib/dcp_video.h
@@ -42,7 +42,7 @@ class PlayerVideo;
class DCPVideo
{
public:
- DCPVideo (std::shared_ptr<const PlayerVideo>, int index, int dcp_fps, int bandwidth, Resolution r);
+ DCPVideo (std::shared_ptr<const PlayerVideo>, dcp::Size container, int index, int dcp_fps, int bandwidth, Resolution resolution);
DCPVideo (std::shared_ptr<const PlayerVideo>, cxml::ConstNodePtr);
DCPVideo (DCPVideo const&) = default;
@@ -59,13 +59,14 @@ public:
bool same (std::shared_ptr<const DCPVideo> other) const;
- static std::shared_ptr<dcp::OpenJPEGImage> convert_to_xyz (std::shared_ptr<const PlayerVideo> frame, dcp::NoteHandler note);
+ static std::shared_ptr<dcp::OpenJPEGImage> convert_to_xyz(std::shared_ptr<const PlayerVideo> frame, dcp::Size container, dcp::NoteHandler note);
private:
void add_metadata (xmlpp::Element *) const;
std::shared_ptr<const PlayerVideo> _frame;
+ dcp::Size _container;
int _index; ///< frame index within the DCP's intrinsic duration
int _frames_per_second; ///< Frames per second that we will use for the DCP
int _j2k_bandwidth; ///< J2K bandwidth to use