X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Fdcp_video.h;fp=src%2Flib%2Fdcp_video.h;h=0c211909911c56237dce1822e01407d4124e8641;hb=7bd8eecb8ba8535978d58408dc73ce7528034c7e;hp=3bd516ccd4ea676567e80ac70880d39b382568c6;hpb=d6aeaf8dd1b3158689da7b75c7417c1838af9c95;p=dcpomatic.git 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, int index, int dcp_fps, int bandwidth, Resolution r); + DCPVideo (std::shared_ptr, dcp::Size container, int index, int dcp_fps, int bandwidth, Resolution resolution); DCPVideo (std::shared_ptr, cxml::ConstNodePtr); DCPVideo (DCPVideo const&) = default; @@ -59,13 +59,14 @@ public: bool same (std::shared_ptr other) const; - static std::shared_ptr convert_to_xyz (std::shared_ptr frame, dcp::NoteHandler note); + static std::shared_ptr convert_to_xyz(std::shared_ptr frame, dcp::Size container, dcp::NoteHandler note); private: void add_metadata (xmlpp::Element *) const; std::shared_ptr _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