From: Carl Hetherington Date: Tue, 28 Feb 2017 11:39:26 +0000 (+0000) Subject: Restore player_test and move black_fill_test into it. X-Git-Tag: v2.11.1~82 X-Git-Url: https://git.carlh.net/gitweb/?a=commitdiff_plain;h=edb7b4d0a662f8d2ed0218194179249d96d13103;hp=17e80bc37eea735629e13f068005653428c44cce;p=dcpomatic.git Restore player_test and move black_fill_test into it. --- diff --git a/test/black_fill_test.cc b/test/black_fill_test.cc deleted file mode 100644 index 79b97ad77..000000000 --- a/test/black_fill_test.cc +++ /dev/null @@ -1,72 +0,0 @@ -/* - Copyright (C) 2013-2016 Carl Hetherington - - 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. - - 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 DCP-o-matic. If not, see . - -*/ - -#include -#include "lib/image_content.h" -#include "lib/dcp_content_type.h" -#include "lib/film.h" -#include "lib/ratio.h" -#include "lib/video_content.h" -#include "test.h" - -/** @file test/black_fill_test.cc - * @brief Test insertion of black frames between separate bits of video content. - */ - -using boost::shared_ptr; - -BOOST_AUTO_TEST_CASE (black_fill_test) -{ - shared_ptr film = new_test_film ("black_fill_test"); - film->set_dcp_content_type (DCPContentType::from_isdcf_name ("FTR")); - film->set_name ("black_fill_test"); - film->set_container (Ratio::from_id ("185")); - film->set_sequence (false); - shared_ptr contentA (new ImageContent (film, "test/data/simple_testcard_640x480.png")); - shared_ptr contentB (new ImageContent (film, "test/data/simple_testcard_640x480.png")); - - film->examine_and_add_content (contentA); - film->examine_and_add_content (contentB); - wait_for_jobs (); - - contentA->video->set_scale (VideoContentScale (Ratio::from_id ("185"))); - contentA->video->set_length (3); - contentA->set_position (DCPTime::from_frames (2, film->video_frame_rate ())); - contentB->video->set_scale (VideoContentScale (Ratio::from_id ("185"))); - contentB->video->set_length (1); - contentB->set_position (DCPTime::from_frames (7, film->video_frame_rate ())); - - film->make_dcp (); - - wait_for_jobs (); - - boost::filesystem::path ref; - ref = "test"; - ref /= "data"; - ref /= "black_fill_test"; - - boost::filesystem::path check; - check = "build"; - check /= "test"; - check /= "black_fill_test"; - check /= film->dcp_name(); - - check_dcp (ref.string(), check.string()); -} diff --git a/test/player_test.cc b/test/player_test.cc index 57db3d778..81d1f4cce 100644 --- a/test/player_test.cc +++ b/test/player_test.cc @@ -30,11 +30,14 @@ #include "lib/ratio.h" #include "lib/audio_buffers.h" #include "lib/player.h" +#include "lib/video_content.h" +#include "lib/image_content.h" #include "test.h" using std::cout; using std::list; using boost::shared_ptr; +using boost::bind; static bool valid (Content const *) @@ -87,6 +90,16 @@ BOOST_AUTO_TEST_CASE (player_overlaps_test) BOOST_CHECK_EQUAL (o.front()->content, B); } +static shared_ptr accumulated; + +static void +accumulate (shared_ptr audio, DCPTime t) +{ + cout << "got " << audio->frames() << " @ " << to_string(t) << "\n"; + BOOST_REQUIRE (accumulated); + accumulated->append (audio); +} + /** Check that the Player correctly generates silence when used with a silent FFmpegContent */ BOOST_AUTO_TEST_CASE (player_silence_padding_test) { @@ -99,14 +112,57 @@ BOOST_AUTO_TEST_CASE (player_silence_padding_test) film->examine_and_add_content (c); wait_for_jobs (); - shared_ptr player (new Player (film, film->playlist ())); - shared_ptr test = player->get_audio (DCPTime (0), DCPTime::from_seconds (1), true); - BOOST_CHECK_EQUAL (test->frames(), 48000); - BOOST_CHECK_EQUAL (test->channels(), film->audio_channels ()); + accumulated.reset (new AudioBuffers (film->audio_channels(), 0)); - for (int i = 0; i < test->frames(); ++i) { - for (int c = 0; c < test->channels(); ++c) { - BOOST_CHECK_EQUAL (test->data()[c][i], 0); + shared_ptr player (new Player (film, film->playlist ())); + player->Audio.connect (bind (&accumulate, _1, _2)); + while (!player->pass ()) {} + BOOST_REQUIRE (accumulated->frames() >= 48000); + BOOST_CHECK_EQUAL (accumulated->channels(), film->audio_channels ()); + + for (int i = 0; i < 48000; ++i) { + for (int c = 0; c < accumulated->channels(); ++c) { + BOOST_CHECK_EQUAL (accumulated->data()[c][i], 0); } } } + +/* Test insertion of black frames between separate bits of video content */ +BOOST_AUTO_TEST_CASE (player_black_fill_test) +{ + shared_ptr film = new_test_film ("black_fill_test"); + film->set_dcp_content_type (DCPContentType::from_isdcf_name ("FTR")); + film->set_name ("black_fill_test"); + film->set_container (Ratio::from_id ("185")); + film->set_sequence (false); + shared_ptr contentA (new ImageContent (film, "test/data/simple_testcard_640x480.png")); + shared_ptr contentB (new ImageContent (film, "test/data/simple_testcard_640x480.png")); + + film->examine_and_add_content (contentA); + film->examine_and_add_content (contentB); + wait_for_jobs (); + + contentA->video->set_scale (VideoContentScale (Ratio::from_id ("185"))); + contentA->video->set_length (3); + contentA->set_position (DCPTime::from_frames (2, film->video_frame_rate ())); + contentB->video->set_scale (VideoContentScale (Ratio::from_id ("185"))); + contentB->video->set_length (1); + contentB->set_position (DCPTime::from_frames (7, film->video_frame_rate ())); + + film->make_dcp (); + + wait_for_jobs (); + + boost::filesystem::path ref; + ref = "test"; + ref /= "data"; + ref /= "black_fill_test"; + + boost::filesystem::path check; + check = "build"; + check /= "test"; + check /= "black_fill_test"; + check /= film->dcp_name(); + + check_dcp (ref.string(), check.string()); +} diff --git a/test/wscript b/test/wscript index 88eb3b5a9..24303953d 100644 --- a/test/wscript +++ b/test/wscript @@ -48,7 +48,6 @@ def build(bld): audio_merger_test.cc audio_processor_test.cc audio_processor_delay_test.cc - black_fill_test.cc client_server_test.cc colour_conversion_test.cc dcpomatic_time_test.cc @@ -72,6 +71,7 @@ def build(bld): job_test.cc make_black_test.cc pixel_formats_test.cc + player_test.cc ratio_test.cc repeat_frame_test.cc recover_test.cc @@ -107,7 +107,6 @@ def build(bld): # ffmpeg_decoder_seek_test.cc # ffmpeg_decoder_sequential_test.cc # silence_padding_test.cc - # player_test.cc # seek_zero_test.cc # upmixer_a_test.cc # video_decoder_fill_test.cc