X-Git-Url: https://main.carlh.net/gitweb/?p=dcpomatic.git;a=blobdiff_plain;f=test%2Fvideo_content_scale_test.cc;h=b3e3ff76c4a28947ad4ba3f36b6800c8a35aa741;hp=78f3bf9b0519be8ecda0e4a25b89d2c3dcbae905;hb=15a83d720780d58f905d40f8493cdcb86596eaee;hpb=65b331d32c383f3a9049f29bf03ab3fe3193b31a diff --git a/test/video_content_scale_test.cc b/test/video_content_scale_test.cc index 78f3bf9b0..b3e3ff76c 100644 --- a/test/video_content_scale_test.cc +++ b/test/video_content_scale_test.cc @@ -1,198 +1,145 @@ /* - Copyright (C) 2015 Carl Hetherington + Copyright (C) 2020 Carl Hetherington - This program is free software; you can redistribute it and/or modify + This file is part of DCP-o-matic. + + DCP-o-matic is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2 of the License, or (at your option) any later version. - This program is distributed in the hope that it will be useful, + DCP-o-matic is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. You should have received a copy of the GNU General Public License - along with this program; if not, write to the Free Software - Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. + along with DCP-o-matic. If not, see . */ -#include -#include "lib/ffmpeg_content.h" + #include "lib/ratio.h" #include "lib/video_content.h" +#include -using std::list; -using std::string; -using std::cerr; -using boost::shared_ptr; -using boost::optional; -static -void -test (dcp::Size content_size, dcp::Size display_size, dcp::Size film_size, Crop crop, Ratio const * ratio, bool scale, dcp::Size correct) -{ - shared_ptr film; - SafeStringStream s; - s << "" - "" - "FFmpeg" - "/home/c.hetherington/DCP/prophet_clip.mkv" - "f3f23663da5bef6d2cbaa0db066f3351314142710" - "0" - "0" - "0" - "2879" - "" << content_size.width << "" - "" << content_size.height << "" - "23.97602462768555" - "23.97602462768555" - "0" - "1" - "12" - "" << crop.left << "" - "" << crop.right << "" - "" << crop.top << "" - "" << crop.bottom << "" - ""; - - if (ratio) { - s << "" << ratio->id() << ""; - } else { - s << "" << scale << ""; - } +static dcp::Size const FOUR_TO_THREE(1436, 1080); +static dcp::Size const FLAT(1998, 1080); +static dcp::Size const SCOPE(2048, 858); - s << "" - "" - "2.4" - "1" - "0.4124564" - "0.3575761" - "0.1804375" - "0.2126729" - "0.7151522" - "0.072175" - "0.0193339" - "0.119192" - "0.9503041" - "2.6" - "" - "0" - "0" - "0" - "0" - "0" - "0" - ""; - - shared_ptr doc (new cxml::Document ()); - doc->read_string(s.str ()); - - list notes; - shared_ptr vc (new FFmpegContent (film, doc, 10, notes)); - - optional sc; - if (ratio) { - sc = VideoContentScale (ratio); - } else { - sc = VideoContentScale (scale); - } - dcp::Size answer = sc.get().size (vc->video, display_size, film_size); - if (answer != correct) { - cerr << "Testing " << vc->video->video_size().width << "x" << vc->video->video_size().height << "\n"; - cerr << "Testing " << display_size.width << "x" << display_size.height << "\n"; - cerr << answer.width << "x" << answer.height << " instead of " << correct.width << "x" << correct.height << "\n"; - } - BOOST_CHECK (answer == correct); +/* Test VideoContent::scaled_size() without any legacy stuff */ +BOOST_AUTO_TEST_CASE (scaled_size_test1) +{ + VideoContent vc (0); + + /* Images at full size and in DCP-approved sizes that will not be scaled */ + // Flat/scope content into flat/scope container + vc._size = FLAT; + BOOST_CHECK_EQUAL (vc.scaled_size(FLAT), FLAT); + vc._size = SCOPE; + BOOST_CHECK_EQUAL (vc.scaled_size(SCOPE), SCOPE); + // 1.33:1 into flat container + vc._size = FOUR_TO_THREE; + BOOST_CHECK_EQUAL (vc.scaled_size(FLAT), dcp::Size(FOUR_TO_THREE)); + // Scope into flat container + vc._size = SCOPE; + BOOST_CHECK_EQUAL (vc.scaled_size(FLAT), dcp::Size(1998, 837)); + + /* Smaller images but in the same ratios */ + vc._size = dcp::Size(185, 100); + BOOST_CHECK_EQUAL (vc.scaled_size(FLAT), FLAT); + vc._size = dcp::Size(955, 400); + BOOST_CHECK_EQUAL (vc.scaled_size(SCOPE), SCOPE); + // 1.33:1 into flat container + vc._size = dcp::Size(133, 100); + BOOST_CHECK_EQUAL (vc.scaled_size(FLAT), dcp::Size(FOUR_TO_THREE)); + // Scope into flat container + vc._size = dcp::Size(239, 100); + BOOST_CHECK_EQUAL (vc.scaled_size(FLAT), dcp::Size(1998, 836)); + + /* Images at full size that are not DCP-approved but will still remain unscaled */ + vc._size = dcp::Size(600, 1080); + BOOST_CHECK_EQUAL (vc.scaled_size(FLAT), dcp::Size(600, 1080)); + vc._size = dcp::Size(1700, 1080); + BOOST_CHECK_EQUAL (vc.scaled_size(FLAT), dcp::Size(1700, 1080)); + + /* Image at full size that is too big for the container and will be shrunk */ + vc._size = dcp::Size(3000, 1080); + BOOST_CHECK_EQUAL (vc.scaled_size(FLAT), dcp::Size(1998, 719)); } -/* Test scale and stretch to specified ratio */ -BOOST_AUTO_TEST_CASE (video_content_scale_test_to_ratio) + +/* Same as scaled_size_test1 but with a non-unity sample aspect ratio */ +BOOST_AUTO_TEST_CASE (scaled_size_test2) { - /* To DCP */ - - // Flat in flat container - test ( - dcp::Size (400, 200), - dcp::Size (1998, 1080), - dcp::Size (1998, 1080), - Crop (0, 0, 0, 0), - Ratio::from_id ("185"), - true, - dcp::Size (1998, 1080) - ); - - // Scope in flat container - test ( - dcp::Size (400, 200), - dcp::Size (1998, 1080), - dcp::Size (1998, 1080), - Crop (0, 0, 0, 0), - Ratio::from_id ("239"), - true, - dcp::Size (1998, 837) - ); - - // Flat in scope container - test ( - dcp::Size (400, 200), - dcp::Size (2048, 858), - dcp::Size (2048, 858), - Crop (0, 0, 0, 0), - Ratio::from_id ("185"), - true, - dcp::Size (1587, 858) - ); - - - /* To player */ - - // Flat in flat container - test ( - dcp::Size (400, 200), - dcp::Size (185, 100), - dcp::Size (1998, 1080), - Crop (0, 0, 0, 0), - Ratio::from_id ("185"), - true, - dcp::Size (185, 100) - ); - - // Scope in flat container - test ( - dcp::Size (400, 200), - dcp::Size (185, 100), - dcp::Size (1998, 1080), - Crop (0, 0, 0, 0), - Ratio::from_id ("239"), - true, - dcp::Size (185, 78) - ); - - // Flat in scope container - test ( - dcp::Size (400, 200), - dcp::Size (239, 100), - dcp::Size (2048, 858), - Crop (0, 0, 0, 0), - Ratio::from_id ("185"), - true, - dcp::Size (185, 100) - ); + VideoContent vc (0); + + vc._sample_aspect_ratio = 2; + + /* Images at full size and in DCP-approved sizes that will not be scaled */ + // Flat/scope content into flat/scope container + vc._size = dcp::Size (1998 / 2, 1080); + BOOST_CHECK_EQUAL (vc.scaled_size(FLAT), FLAT); + vc._size = dcp::Size (2048 / 2, 858); + BOOST_CHECK_EQUAL (vc.scaled_size(SCOPE), SCOPE); + // 1.33:1 into flat container + vc._size = dcp::Size (1436 / 2, 1080); + BOOST_CHECK_EQUAL (vc.scaled_size(FLAT), dcp::Size(FOUR_TO_THREE)); + // Scope into flat container + vc._size = dcp::Size (2048 / 2, 858); + BOOST_CHECK_EQUAL (vc.scaled_size(FLAT), dcp::Size(1998, 837)); + + /* Smaller images but in the same ratios */ + vc._size = dcp::Size(185, 200); + BOOST_CHECK_EQUAL (vc.scaled_size(FLAT), FLAT); + vc._size = dcp::Size(955, 800); + BOOST_CHECK_EQUAL (vc.scaled_size(SCOPE), SCOPE); + // 4:3 into flat container + vc._size = dcp::Size(133, 200); + BOOST_CHECK_EQUAL (vc.scaled_size(FLAT), dcp::Size(FOUR_TO_THREE)); + // Scope into flat container + vc._size = dcp::Size(239, 200); + BOOST_CHECK_EQUAL (vc.scaled_size(FLAT), dcp::Size(1998, 836)); + + /* Images at full size that are not DCP-approved but will still remain unscaled */ + vc._size = dcp::Size(600 / 2, 1080); + BOOST_CHECK_EQUAL (vc.scaled_size(FLAT), dcp::Size(600, 1080)); + vc._size = dcp::Size(1700 / 2, 1080); + BOOST_CHECK_EQUAL (vc.scaled_size(FLAT), dcp::Size(1700, 1080)); + + /* Image at full size that is too big for the container and will be shrunk */ + vc._size = dcp::Size(3000 / 2, 1080); + BOOST_CHECK_EQUAL (vc.scaled_size(FLAT), dcp::Size(1998, 719)); } -/* Test no scale */ -BOOST_AUTO_TEST_CASE (video_content_scale_no_scale) + +/* Test VideoContent::scaled_size() with some legacy stuff */ +BOOST_AUTO_TEST_CASE (scaled_size_legacy_test) { - /* No scale where the content is bigger than even the film container */ - test ( - dcp::Size (1920, 1080), - dcp::Size (887, 371), - dcp::Size (2048, 858), - Crop (), - 0, - false, - dcp::Size (659, 371) - ); + { + /* 640x480 content that the user had asked to be stretched to 1.85:1 */ + VideoContent vc (0); + vc._size = dcp::Size(640, 480); + vc._legacy_ratio = Ratio::from_id("185")->ratio(); + BOOST_CHECK_EQUAL (vc.scaled_size(FLAT), FLAT); + } + + { + /* 640x480 content that the user had asked to be scaled to fit the container, without stretch */ + VideoContent vc (0); + vc._size = dcp::Size(640, 480); + vc._legacy_ratio = 1.33; + BOOST_CHECK_EQUAL (vc.scaled_size(FLAT), FOUR_TO_THREE); + } + + { + /* 640x480 content that the user had asked to be kept the same size */ + VideoContent vc (0); + vc._size = dcp::Size(640, 480); + vc._custom_size = dcp::Size(640, 480); + BOOST_CHECK_EQUAL (vc.scaled_size(FLAT), dcp::Size(640, 480)); + } } +