Don't scale chroma subsampled images to sizes that don't align with the subsampling...

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

diff --git a/src/lib/video_content.cc b/src/lib/video_content.cc
index fed28b5e40b2708b943b8ca7e1f62f501bbbd8ee..9ff35ffdf891c783b9efa2fffc6e332aea04e3cf 100644 (file)
--- a/src/lib/video_content.cc
+++ b/src/lib/video_content.cc
@@ -43,13 +43,13 @@ int const VideoContentProperty::USE               = 0;
 int const VideoContentProperty::SIZE              = 1;
 int const VideoContentProperty::FRAME_TYPE        = 2;
 int const VideoContentProperty::CROP              = 3;
-int const VideoContentProperty::SCALE            = 4;
-int const VideoContentProperty::COLOUR_CONVERSION = 5;
-int const VideoContentProperty::FADE_IN           = 6;
-int const VideoContentProperty::FADE_OUT          = 7;
-int const VideoContentProperty::RANGE             = 8;
-int const VideoContentProperty::CUSTOM_RATIO      = 9;
-int const VideoContentProperty::CUSTOM_SIZE       = 10;
+int const VideoContentProperty::COLOUR_CONVERSION = 4;
+int const VideoContentProperty::FADE_IN           = 5;
+int const VideoContentProperty::FADE_OUT          = 6;
+int const VideoContentProperty::RANGE             = 7;
+int const VideoContentProperty::CUSTOM_RATIO      = 8;
+int const VideoContentProperty::CUSTOM_SIZE       = 9;
+int const VideoContentProperty::BURNT_SUBTITLE_LANGUAGE = 10;
 
 using std::string;
 using std::setprecision;
@@ -183,8 +183,19 @@ VideoContent::VideoContent (Content* parent, cxml::ConstNodePtr node, int versio
        if (node->optional_string_child("Range").get_value_or("full") == "video") {
                _range = VideoRange::VIDEO;
        }
+
+       if (auto pixel_quanta = node->optional_node_child("PixelQuanta")) {
+               _pixel_quanta = PixelQuanta(pixel_quanta);
+       }
+
+       auto burnt = node->optional_string_child("BurntSubtitleLanguage");
+       if (burnt) {
+               _burnt_subtitle_language = dcp::LanguageTag (*burnt);
+       }
+
 }
 
+
 VideoContent::VideoContent (Content* parent, vector<shared_ptr<Content> > c)
        : ContentPart (parent)
        , _length (0)
@@ -207,7 +218,7 @@ VideoContent::VideoContent (Content* parent, vector<shared_ptr<Content> > c)
                        throw JoinError (_("Content to be joined must have the same video frame type."));
                }
 
-               if (c[i]->video->crop() != ref->crop()) {
+               if (c[i]->video->requested_crop() != ref->requested_crop()) {
                        throw JoinError (_("Content to be joined must have the same crop."));
                }
 
@@ -227,24 +238,32 @@ VideoContent::VideoContent (Content* parent, vector<shared_ptr<Content> > c)
                        throw JoinError (_("Content to be joined must have the same fades."));
                }
 
+               if (c[i]->video->burnt_subtitle_language() != ref->burnt_subtitle_language()) {
+                       throw JoinError (_("Content to be joined must have the same burnt subtitle language."));
+               }
+
                _length += c[i]->video->length ();
 
                if (c[i]->video->yuv ()) {
                        _yuv = true;
                }
+
+               _pixel_quanta = max(_pixel_quanta, c[i]->video->_pixel_quanta);
        }
 
        _use = ref->use ();
        _size = ref->size ();
        _frame_type = ref->frame_type ();
-       _crop = ref->crop ();
+       _crop = ref->requested_crop ();
        _custom_ratio = ref->custom_ratio ();
        _colour_conversion = ref->colour_conversion ();
        _fade_in = ref->fade_in ();
        _fade_out = ref->fade_out ();
        _range = ref->range ();
+       _burnt_subtitle_language = ref->burnt_subtitle_language ();
 }
 
+
 void
 VideoContent::as_xml (xmlpp::Node* node) const
 {
@@ -272,6 +291,10 @@ VideoContent::as_xml (xmlpp::Node* node) const
        node->add_child("FadeIn")->add_child_text (raw_convert<string> (_fade_in));
        node->add_child("FadeOut")->add_child_text (raw_convert<string> (_fade_out));
        node->add_child("Range")->add_child_text(_range == VideoRange::FULL ? "full" : "video");
+       _pixel_quanta.as_xml(node->add_child("PixelQuanta"));
+       if (_burnt_subtitle_language) {
+               node->add_child("BurntSubtitleLanguage")->add_child_text(_burnt_subtitle_language->to_string());
+       }
 }
 
 void
@@ -283,11 +306,11 @@ VideoContent::take_from_examiner (shared_ptr<VideoExaminer> d)
        auto const ar = d->sample_aspect_ratio ();
        auto const yuv = d->yuv ();
        auto const range = d->range ();
+       auto const pixel_quanta = d->pixel_quanta ();
 
        ContentChangeSignaller cc1 (_parent, VideoContentProperty::SIZE);
-       ContentChangeSignaller cc2 (_parent, VideoContentProperty::SCALE);
-       ContentChangeSignaller cc3 (_parent, ContentProperty::LENGTH);
-       ContentChangeSignaller cc4 (_parent, VideoContentProperty::RANGE);
+       ContentChangeSignaller cc2 (_parent, ContentProperty::LENGTH);
+       ContentChangeSignaller cc3 (_parent, VideoContentProperty::RANGE);
 
        {
                boost::mutex::scoped_lock lm (_mutex);
@@ -296,6 +319,7 @@ VideoContent::take_from_examiner (shared_ptr<VideoExaminer> d)
                _sample_aspect_ratio = ar;
                _yuv = yuv;
                _range = range;
+               _pixel_quanta = pixel_quanta;
        }
 
        LOG_GENERAL ("Video length obtained from header as %1 frames", _length);
@@ -310,13 +334,14 @@ string
 VideoContent::identifier () const
 {
        char buffer[256];
+       auto const crop = actual_crop();
        snprintf (
                buffer, sizeof(buffer), "%d_%d_%d_%d_%d_%f_%d_%d%" PRId64 "_%" PRId64 "_%d",
                (_use ? 1 : 0),
-               crop().left,
-               crop().right,
-               crop().top,
-               crop().bottom,
+               crop.left,
+               crop.right,
+               crop.top,
+               crop.bottom,
                _custom_ratio.get_value_or(0),
                _custom_size ? _custom_size->width : 0,
                _custom_size ? _custom_size->height : 0,
@@ -375,7 +400,7 @@ VideoContent::size_after_3d_split () const
 dcp::Size
 VideoContent::size_after_crop () const
 {
-       return crop().apply (size_after_3d_split ());
+       return actual_crop().apply(size_after_3d_split());
 }
 
 
@@ -428,8 +453,10 @@ VideoContent::processing_description (shared_ptr<const Film> film)
                d += buffer;
        }
 
-       if ((crop().left || crop().right || crop().top || crop().bottom) && size() != dcp::Size (0, 0)) {
-               dcp::Size cropped = size_after_crop ();
+       auto const crop = actual_crop();
+
+       if ((crop.left || crop.right || crop.top || crop.bottom) && size() != dcp::Size(0, 0)) {
+               auto const cropped = size_after_crop ();
                d += String::compose (
                        _("\nCropped to %1x%2"),
                        cropped.width, cropped.height
@@ -556,6 +583,14 @@ VideoContent::set_use (bool u)
        maybe_set (_use, u, VideoContentProperty::USE);
 }
 
+
+void
+VideoContent::set_burnt_subtitle_language (boost::optional<dcp::LanguageTag> language)
+{
+       maybe_set (_burnt_subtitle_language, language, VideoContentProperty::BURNT_SUBTITLE_LANGUAGE);
+}
+
+
 void
 VideoContent::take_settings_from (shared_ptr<const VideoContent> c)
 {
@@ -574,8 +609,10 @@ VideoContent::take_settings_from (shared_ptr<const VideoContent> c)
        set_custom_size (c->_custom_size);
        set_fade_in (c->_fade_in);
        set_fade_out (c->_fade_out);
+       set_burnt_subtitle_language (c->_burnt_subtitle_language);
 }
 
+
 void
 VideoContent::modify_position (shared_ptr<const Film> film, DCPTime& pos) const
 {
@@ -618,7 +655,7 @@ VideoContent::scaled_size (dcp::Size film_container)
                _legacy_ratio = boost::optional<float>();
        }
 
-       return auto_size;
+       return _pixel_quanta.round (auto_size);
 }
 
 
@@ -634,3 +671,16 @@ VideoContent::set_custom_size (optional<dcp::Size> size)
 {
        maybe_set (_custom_size, size, VideoContentProperty::CUSTOM_SIZE);
 }
+
+
+Crop
+VideoContent::actual_crop () const
+{
+       return Crop(
+               _pixel_quanta.round_x(_crop.left),
+               _pixel_quanta.round_x(_crop.right),
+               _pixel_quanta.round_y(_crop.top),
+               _pixel_quanta.round_y(_crop.bottom)
+       );
+}
+