diff options
| author | Carl Hetherington <cth@carlh.net> | 2020-11-30 23:38:39 +0100 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2020-12-01 00:20:39 +0100 |
| commit | d1a57244622f5f4160d0f58af7fe71a829175345 (patch) | |
| tree | 7c6ec62e809e8cbb07a3dc56beb6c0755cfca879 /src/lib | |
| parent | 41daefcf0f0fcabd03e084ab05ee35f823740234 (diff) | |
Change re{set,fresh}_metadata to take a film and a size from the player.
Diffstat (limited to 'src/lib')
| -rw-r--r-- | src/lib/player_video.cc | 9 | ||||
| -rw-r--r-- | src/lib/player_video.h | 2 |
2 files changed, 6 insertions, 5 deletions
diff --git a/src/lib/player_video.cc b/src/lib/player_video.cc index 8c1b95bba..4f8acd5e2 100644 --- a/src/lib/player_video.cc +++ b/src/lib/player_video.cc @@ -1,5 +1,5 @@ /* - Copyright (C) 2013-2018 Carl Hetherington <cth@carlh.net> + Copyright (C) 2013-2020 Carl Hetherington <cth@carlh.net> This file is part of DCP-o-matic. @@ -25,6 +25,7 @@ #include "image_proxy.h" #include "j2k_image_proxy.h" #include "film.h" +#include "player.h" #include <dcp/raw_convert.h> extern "C" { #include <libavutil/pixfmt.h> @@ -330,7 +331,7 @@ PlayerVideo::shallow_copy () const * @return true if this was possible, false if not. */ bool -PlayerVideo::reset_metadata (shared_ptr<const Film> film, dcp::Size video_container_size, dcp::Size film_frame_size) +PlayerVideo::reset_metadata (shared_ptr<const Film> film, dcp::Size player_video_container_size) { shared_ptr<Content> content = _content.lock(); if (!content || !_video_frame) { @@ -339,8 +340,8 @@ PlayerVideo::reset_metadata (shared_ptr<const Film> film, dcp::Size video_contai _crop = content->video->crop(); _fade = content->video->fade(film, _video_frame.get()); - _inter_size = scale_for_display(content->video->scaled_size(film_frame_size), video_container_size, film_frame_size); - _out_size = video_container_size; + _inter_size = scale_for_display(content->video->scaled_size(film->frame_size()), player_video_container_size, film->frame_size()); + _out_size = player_video_container_size; _colour_conversion = content->video->colour_conversion(); _video_range = content->video->range(); diff --git a/src/lib/player_video.h b/src/lib/player_video.h index 56cfbd100..0952eafb9 100644 --- a/src/lib/player_video.h +++ b/src/lib/player_video.h @@ -76,7 +76,7 @@ public: void add_metadata (xmlpp::Node* node) const; void write_to_socket (boost::shared_ptr<Socket> socket) const; - bool reset_metadata (boost::shared_ptr<const Film> film, dcp::Size video_container_size, dcp::Size film_frame_size); + bool reset_metadata (boost::shared_ptr<const Film> film, dcp::Size player_video_container_size); bool has_j2k () const; boost::shared_ptr<const dcp::Data> j2k () const; |