Forward-port 41b77bee9c9cef485d95e82f16f6365ed1cf2a13 from 1.0; fixes to VideoContent...

diff --git a/src/lib/video_content_scale.cc b/src/lib/video_content_scale.cc
index aebafc8e59bedf90390d8bbbe55d92a5dc8993fa..14db7b02f7dd6bb97c3724fcccb4fa78c9ac3630 100644 (file)
--- a/src/lib/video_content_scale.cc
+++ b/src/lib/video_content_scale.cc
@@ -1,5 +1,5 @@
 /*
-    Copyright (C) 2013-2014 Carl Hetherington <cth@carlh.net>
+    Copyright (C) 2013-2015 Carl Hetherington <cth@carlh.net>
 
     This program is free software; you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by
@@ -30,6 +30,8 @@
 
 using std::vector;
 using std::string;
+using std::min;
+using std::cout;
 using boost::shared_ptr;
 using boost::optional;
 
@@ -127,24 +129,37 @@ VideoContentScale::from_id (string id)
 dcp::Size
 VideoContentScale::size (shared_ptr<const VideoContent> c, dcp::Size display_container, dcp::Size film_container, int round) const
 {
+       /* Work out the size of the content if it were put inside film_container */
+
+       dcp::Size video_size_after_crop = c->video_size_after_crop ();
+       
+       dcp::Size size;
+
        if (_ratio) {
-               return fit_ratio_within (_ratio->ratio (), display_container, round);
+               /* Stretch to fit the requested ratio */
+               size = fit_ratio_within (_ratio->ratio (), film_container, round);
+       } else if (_scale || video_size_after_crop.width > film_container.width || video_size_after_crop.height > film_container.height) {
+               /* Scale, preserving aspect ratio; this is either if we have been asked to scale with no stretch
+                  or if the unscaled content is too big for film_container.
+               */
+               size = fit_ratio_within (video_size_after_crop.ratio(), film_container, round);
+       } else {
+               /* No stretch nor scale */
+               size = video_size_after_crop;
        }
 
-       dcp::Size const ac = c->video_size_after_crop ();
-
-       /* Force scale if the film_container is smaller than the content's image */
-       if (_scale || film_container.width < ac.width || film_container.height < ac.height) {
-               return fit_ratio_within (ac.ratio (), display_container, round);
+       /* Now scale it down if the display container is smaller than the film container */
+       if (display_container != film_container) {
+               float const scale = min (
+                       float (display_container.width) / film_container.width,
+                       float (display_container.height) / film_container.height
+                       );
+               
+               size.width = rint (size.width * scale);
+               size.height = rint (size.height * scale);
        }
 
-       /* Scale the image so that it will be in the right place in film_container, even if display_container is a
-          different size.
-       */
-       return dcp::Size (
-               c->video_size().width  * float(display_container.width)  / film_container.width,
-               c->video_size().height * float(display_container.height) / film_container.height
-               );
+       return size;
 }
 
 void

diff --git a/src/lib/video_content_scale.h b/src/lib/video_content_scale.h
index f5d97fd97e0dbde7a4456e94d67b84e6ba6079f4..3053dda43f854ce444a1fc179631db42cb34a9f0 100644 (file)
--- a/src/lib/video_content_scale.h
+++ b/src/lib/video_content_scale.h
@@ -1,5 +1,5 @@
 /*
-    Copyright (C) 2013-2014 Carl Hetherington <cth@carlh.net>
+    Copyright (C) 2013-2015 Carl Hetherington <cth@carlh.net>
 
     This program is free software; you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by
@@ -43,7 +43,7 @@ public:
        VideoContentScale (bool);
        VideoContentScale (boost::shared_ptr<cxml::Node>);
 
-       dcp::Size size (boost::shared_ptr<const VideoContent>, dcp::Size, dcp::Size, int round) const;
+       dcp::Size size (boost::shared_ptr<const VideoContent>, dcp::Size display_container, dcp::Size film_container, int round) const;
        std::string id () const;
        std::string name () const;
        void as_xml (xmlpp::Node *) const;

diff --git a/test/wscript b/test/wscript
index 479daae65b0f677ea6dd63a1578eed56173c87b4..8831b6391d162840e4dd5e4d4b4c148a15a18e35 100644 (file)
--- a/test/wscript
+++ b/test/wscript
@@ -60,6 +60,7 @@ def build(bld):
                  update_checker_test.cc
                  upmixer_a_test.cc
                  util_test.cc
+                 video_content_scale_test.cc
                  video_decoder_fill_test.cc
                  xml_subtitle_test.cc
                  """