diff options
| author | Carl Hetherington <cth@carlh.net> | 2024-02-21 10:47:38 +0100 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2024-02-21 18:48:53 +0100 |
| commit | 3ffd0163026be24e5373e0674c3301ed37546e44 (patch) | |
| tree | 918e6de08fb1efff2098148295fa60a614102c8e /src/lib/video_content.h | |
| parent | a9b1c1cb65e1902a64430977cf698054e131a6f4 (diff) | |
Make DCPExaminer::size() optional and deal with the consequences.v2.16.78
This means we can fix the case of a VF having no known size in a nice way,
in turn fixing problems caused by the fix to #2775.
Diffstat (limited to 'src/lib/video_content.h')
| -rw-r--r-- | src/lib/video_content.h | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/lib/video_content.h b/src/lib/video_content.h index 9f6cc105e..e7e8eb1b3 100644 --- a/src/lib/video_content.h +++ b/src/lib/video_content.h @@ -85,7 +85,7 @@ public: return _length; } - dcp::Size size () const { + boost::optional<dcp::Size> size () const { boost::mutex::scoped_lock lm (_mutex); return _size; } @@ -204,9 +204,9 @@ public: /* XXX: names for these? */ - dcp::Size size_after_3d_split () const; - dcp::Size size_after_crop () const; - dcp::Size scaled_size (dcp::Size container_size); + boost::optional<dcp::Size> size_after_3d_split() const; + boost::optional<dcp::Size> size_after_crop() const; + boost::optional<dcp::Size> scaled_size(dcp::Size container_size); boost::optional<double> fade (std::shared_ptr<const Film> film, Frame) const; @@ -237,7 +237,7 @@ private: bool _use; Frame _length; boost::optional<ColourConversion> _colour_conversion; - dcp::Size _size; + boost::optional<dcp::Size> _size; VideoFrameType _frame_type; Crop _crop; /** ratio to scale cropped image to (or none to guess); i.e. if set, scale to _custom_ratio:1 */ |