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/player.cc | |
| 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/player.cc')
| -rw-r--r-- | src/lib/player.cc | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/src/lib/player.cc b/src/lib/player.cc index 0796fbceb..c03cb97a5 100644 --- a/src/lib/player.cc +++ b/src/lib/player.cc @@ -1094,13 +1094,16 @@ Player::video (weak_ptr<Piece> weak_piece, ContentVideo video) auto const content_video = piece->content->video; + auto scaled_size = content_video->scaled_size(film->frame_size()); + DCPOMATIC_ASSERT(scaled_size); + for (auto eyes: eyes_to_emit) { _last_video[weak_piece] = std::make_shared<PlayerVideo>( video.image, content_video->actual_crop(), content_video->fade(film, video.frame), scale_for_display( - content_video->scaled_size(film->frame_size()), + *scaled_size, _video_container_size, film->frame_size(), content_video->pixel_quanta() |