Hand-apply 80562fe5dce5fd625da583ca6f7c2833f9db8754 from master (remove default scale...

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

diff --git a/src/lib/video_content.cc b/src/lib/video_content.cc
index 3470e62bfdc9891c5f00d283eddda0a6bf24c833..8e07174e34016b3b7a008d4958a2bbd55046365d 100644 (file)
--- a/src/lib/video_content.cc
+++ b/src/lib/video_content.cc
@@ -66,7 +66,7 @@ VideoContent::VideoContent (shared_ptr<const Film> f)
        , _video_length (0)
        , _video_frame_rate (0)
        , _video_frame_type (VIDEO_FRAME_TYPE_2D)
-       , _scale (Config::instance()->default_scale ())
+       , _scale (VideoContentScale (Ratio::from_id ("178")))
 {
        set_default_colour_conversion (false);
 }
@@ -76,7 +76,7 @@ VideoContent::VideoContent (shared_ptr<const Film> f, DCPTime s, ContentTime len
        , _video_length (len)
        , _video_frame_rate (0)
        , _video_frame_type (VIDEO_FRAME_TYPE_2D)
-       , _scale (Config::instance()->default_scale ())
+       , _scale (VideoContentScale (Ratio::from_id ("178")))
 {
        set_default_colour_conversion (false);
 }
@@ -86,7 +86,7 @@ VideoContent::VideoContent (shared_ptr<const Film> f, boost::filesystem::path p)
        , _video_length (0)
        , _video_frame_rate (0)
        , _video_frame_type (VIDEO_FRAME_TYPE_2D)
-       , _scale (Config::instance()->default_scale ())
+       , _scale (VideoContentScale (Ratio::from_id ("178")))
 {
        set_default_colour_conversion (false);
 }
@@ -106,6 +106,7 @@ VideoContent::VideoContent (shared_ptr<const Film> f, cxml::ConstNodePtr node, i
        }
        
        _video_frame_type = static_cast<VideoFrameType> (node->number_child<int> ("VideoFrameType"));
+       _sample_aspect_ratio = node->optional_number_child<float> ("SampleAspectRatio");
        _crop.left = node->number_child<int> ("LeftCrop");
        _crop.right = node->number_child<int> ("RightCrop");
        _crop.top = node->number_child<int> ("TopCrop");
@@ -190,6 +191,9 @@ VideoContent::as_xml (xmlpp::Node* node) const
        node->add_child("VideoHeight")->add_child_text (raw_convert<string> (_video_size.height));
        node->add_child("VideoFrameRate")->add_child_text (raw_convert<string> (_video_frame_rate));
        node->add_child("VideoFrameType")->add_child_text (raw_convert<string> (static_cast<int> (_video_frame_type)));
+       if (_sample_aspect_ratio) {
+               node->add_child("SampleAspectRatio")->add_child_text (raw_convert<string> (_sample_aspect_ratio.get ()));
+       }
        _crop.as_xml (node);
        _scale.as_xml (node->add_child("Scale"));
        if (_colour_conversion) {
@@ -219,12 +223,19 @@ VideoContent::take_from_video_examiner (shared_ptr<VideoExaminer> d)
        dcp::Size const vs = d->video_size ();
        float const vfr = d->video_frame_rate ();
        ContentTime vl = d->video_length ();
+       optional<float> const ar = d->sample_aspect_ratio ();
 
        {
                boost::mutex::scoped_lock lm (_mutex);
                _video_size = vs;
                _video_frame_rate = vfr;
                _video_length = vl;
+               _sample_aspect_ratio = ar;
+
+               /* Guess correct scale from size and sample aspect ratio */
+               _scale = VideoContentScale (
+                       Ratio::nearest_from_ratio (float (_video_size.width) * ar.get_value_or (1) / _video_size.height)
+                       );
        }
 
        shared_ptr<const Film> film = _film.lock ();
@@ -233,6 +244,7 @@ VideoContent::take_from_video_examiner (shared_ptr<VideoExaminer> d)
        
        signal_changed (VideoContentProperty::VIDEO_SIZE);
        signal_changed (VideoContentProperty::VIDEO_FRAME_RATE);
+       signal_changed (VideoContentProperty::VIDEO_SCALE);
        signal_changed (ContentProperty::LENGTH);
 }
 
@@ -252,6 +264,10 @@ VideoContent::information () const
                video_size().height,
                setprecision (3), video_size().ratio ()
                );
+
+       if (sample_aspect_ratio ()) {
+               s << String::compose (_(" sample aspect ratio %1:1"), sample_aspect_ratio().get ());
+       }
        
        return s.str ();
 }
@@ -365,13 +381,19 @@ VideoContent::set_video_frame_type (VideoFrameType t)
 string
 VideoContent::technical_summary () const
 {
-       return String::compose (
+       string s = String::compose (
                "video: length %1, size %2x%3, rate %4",
                video_length_after_3d_combine().seconds(),
                video_size().width,
                video_size().height,
                video_frame_rate()
                );
+
+       if (sample_aspect_ratio ()) {
+               s += String::compose (_(", sample aspect ratio %1"), (sample_aspect_ratio().get ()));
+       }
+
+       return s;
 }
 
 dcp::Size