Just mark image dirty on reset_metadata() rather than working it out from value changes.

[dcpomatic.git] / src / lib / player_video.cc

diff --git a/src/lib/player_video.cc b/src/lib/player_video.cc
index 6c0cf20c1f807b0c3b5fafcc2ff79b6d1874ee55..ec1cfca9c99cecf54e47e2b03541278d30fa179b 100644 (file)
--- a/src/lib/player_video.cc
+++ b/src/lib/player_video.cc
@@ -52,6 +52,7 @@ PlayerVideo::PlayerVideo (
        Eyes eyes,
        Part part,
        optional<ColourConversion> colour_conversion,
+       VideoRange video_range,
        weak_ptr<Content> content,
        optional<Frame> video_frame
        )
@@ -63,6 +64,7 @@ PlayerVideo::PlayerVideo (
        , _eyes (eyes)
        , _part (part)
        , _colour_conversion (colour_conversion)
+       , _video_range (video_range)
        , _content (content)
        , _video_frame (video_frame)
 {
@@ -70,6 +72,7 @@ PlayerVideo::PlayerVideo (
 }
 
 PlayerVideo::PlayerVideo (shared_ptr<cxml::Node> node, shared_ptr<Socket> socket)
+       : _image_dirty (false)
 {
        _crop = Crop (node);
        _fade = node->optional_number_child<double> ("Fade");
@@ -78,6 +81,7 @@ PlayerVideo::PlayerVideo (shared_ptr<cxml::Node> node, shared_ptr<Socket> socket
        _out_size = dcp::Size (node->number_child<int> ("OutWidth"), node->number_child<int> ("OutHeight"));
        _eyes = (Eyes) node->number_child<int> ("Eyes");
        _part = (Part) node->number_child<int> ("Part");
+       _video_range = (VideoRange) node->number_child<int>("VideoRange");
 
        /* Assume that the ColourConversion uses the current state version */
        _colour_conversion = ColourConversion::from_xml (node, Film::current_state_version);
@@ -105,10 +109,10 @@ PlayerVideo::set_text (PositionImage image)
 shared_ptr<Image>
 PlayerVideo::image (function<AVPixelFormat (AVPixelFormat)> pixel_format, bool aligned, bool fast) const
 {
-       /* XXX: this assumes that image() and prepare() are only ever called with the same parameters */
+       /* XXX: this assumes that image() and prepare() are only ever called with the same pixel_format, aligned and fast */
 
        boost::mutex::scoped_lock lm (_mutex);
-       if (!_image) {
+       if (!_image || _image_dirty) {
                make_image (pixel_format, aligned, fast);
        }
        return _image;
@@ -161,7 +165,7 @@ PlayerVideo::make_image (function<AVPixelFormat (AVPixelFormat)> pixel_format, b
        }
 
        _image = im->crop_scale_window (
-               total_crop, _inter_size, _out_size, yuv_to_rgb, pixel_format (im->pixel_format()), aligned, fast
+               total_crop, _inter_size, _out_size, yuv_to_rgb, _video_range, pixel_format (im->pixel_format()), aligned, fast
                );
 
        if (_text) {
@@ -171,6 +175,8 @@ PlayerVideo::make_image (function<AVPixelFormat (AVPixelFormat)> pixel_format, b
        if (_fade) {
                _image->fade (_fade.get ());
        }
+
+       _image_dirty = false;
 }
 
 void
@@ -187,6 +193,7 @@ PlayerVideo::add_metadata (xmlpp::Node* node) const
        node->add_child("OutHeight")->add_child_text (raw_convert<string> (_out_size.height));
        node->add_child("Eyes")->add_child_text (raw_convert<string> (static_cast<int> (_eyes)));
        node->add_child("Part")->add_child_text (raw_convert<string> (static_cast<int> (_part)));
+       node->add_child("VideoRange")->add_child_text(raw_convert<string>(static_cast<int>(_video_range)));
        if (_colour_conversion) {
                _colour_conversion.get().as_xml (node);
        }
@@ -236,15 +243,16 @@ PlayerVideo::inter_position () const
 
 /** @return true if this PlayerVideo is definitely the same as another, false if it is probably not */
 bool
-PlayerVideo::same (shared_ptr<const PlayerVideo> other) const
+PlayerVideo::definitely_equal (shared_ptr<const PlayerVideo> other) const
 {
        if (_crop != other->_crop ||
-           _fade.get_value_or(0) != other->_fade.get_value_or(0) ||
+           _fade != other->_fade ||
            _inter_size != other->_inter_size ||
            _out_size != other->_out_size ||
            _eyes != other->_eyes ||
            _part != other->_part ||
-           _colour_conversion != other->_colour_conversion) {
+           _colour_conversion != other->_colour_conversion ||
+           _video_range != other->_video_range) {
                return false;
        }
 
@@ -253,14 +261,14 @@ PlayerVideo::same (shared_ptr<const PlayerVideo> other) const
                return false;
        }
 
-       if (_text && other->_text && !_text->same (other->_text.get ())) {
+       if (_text && other->_text && !_text->definitely_equal(other->_text.get())) {
                /* They both have texts but they are different */
                return false;
        }
 
        /* Now neither has subtitles */
 
-       return _in->same (other->_in);
+       return _in->definitely_equal (other->_in);
 }
 
 AVPixelFormat
@@ -305,13 +313,14 @@ PlayerVideo::shallow_copy () const
                        _eyes,
                        _part,
                        _colour_conversion,
+                       _video_range,
                        _content,
                        _video_frame
                        )
                );
 }
 
-/** Re-read crop, fade, inter/out size and colour conversion from our content.
+/** Re-read crop, fade, inter/out size, colour conversion and video range from our content.
  *  @return true if this was possible, false if not.
  */
 bool
@@ -322,11 +331,9 @@ PlayerVideo::reset_metadata (shared_ptr<const Film> film, dcp::Size video_contai
                return false;
        }
 
-       _crop = content->video->crop();
-       _fade = content->video->fade(film, _video_frame.get());
-       _inter_size = content->video->scale().size(content->video, video_container_size, film_frame_size);
+       boost::mutex::scoped_lock lm (_mutex);
        _out_size = video_container_size;
-       _colour_conversion = content->video->colour_conversion();
+       _image_dirty = true;
 
        return true;
 }