diff options
| author | Carl Hetherington <cth@carlh.net> | 2016-04-14 01:01:28 +0100 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2016-05-18 11:50:29 +0100 |
| commit | 65b331d32c383f3a9049f29bf03ab3fe3193b31a (patch) | |
| tree | 3b27e0ca60742021094cee889a1c8d1ef4d75f8c /test/video_content_scale_test.cc | |
| parent | 6dd3777a0074f6f97c7f7286621006a1c14376e8 (diff) | |
Split audio; builds.
Diffstat (limited to 'test/video_content_scale_test.cc')
| -rw-r--r-- | test/video_content_scale_test.cc | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/test/video_content_scale_test.cc b/test/video_content_scale_test.cc index 1acac8a37..78f3bf9b0 100644 --- a/test/video_content_scale_test.cc +++ b/test/video_content_scale_test.cc @@ -20,6 +20,7 @@ #include <boost/test/unit_test.hpp> #include "lib/ffmpeg_content.h" #include "lib/ratio.h" +#include "lib/video_content.h" using std::list; using std::string; @@ -88,7 +89,7 @@ test (dcp::Size content_size, dcp::Size display_size, dcp::Size film_size, Crop doc->read_string(s.str ()); list<string> notes; - shared_ptr<VideoContent> vc (new FFmpegContent (film, doc, 10, notes)); + shared_ptr<FFmpegContent> vc (new FFmpegContent (film, doc, 10, notes)); optional<VideoContentScale> sc; if (ratio) { @@ -97,9 +98,9 @@ test (dcp::Size content_size, dcp::Size display_size, dcp::Size film_size, Crop sc = VideoContentScale (scale); } - dcp::Size answer = sc.get().size (vc, display_size, film_size); + dcp::Size answer = sc.get().size (vc->video, display_size, film_size); if (answer != correct) { - cerr << "Testing " << vc->video_size().width << "x" << vc->video_size().height << "\n"; + 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"; } |