X-Git-Url: https://main.carlh.net/gitweb/?p=dcpomatic.git;a=blobdiff_plain;f=test%2Fsilence_padding_test.cc;h=dcabf29555f69f0614bcac15145d2f81cd3b327c;hp=d876a0228d7acafa9cd7ab0bb8319097c127869d;hb=15a83d720780d58f905d40f8493cdcb86596eaee;hpb=3b48d5494c3cae7743d283203f5c8021860ab81f diff --git a/test/silence_padding_test.cc b/test/silence_padding_test.cc index d876a0228..dcabf2955 100644 --- a/test/silence_padding_test.cc +++ b/test/silence_padding_test.cc @@ -1,38 +1,41 @@ /* Copyright (C) 2013-2014 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 . */ /** @file test/silence_padding_test.cc * @brief Test the padding (with silence) of a mono source to a 6-channel DCP. + * @ingroup specific */ -#include +#include "lib/ffmpeg_content.h" +#include "lib/film.h" +#include "lib/dcp_content_type.h" +#include "lib/ratio.h" +#include "test.h" #include #include -#include +#include #include #include #include -#include "lib/sndfile_content.h" -#include "lib/film.h" -#include "lib/dcp_content_type.h" -#include "lib/ratio.h" -#include "test.h" +#include +#include using std::string; using boost::lexical_cast; @@ -47,13 +50,13 @@ test_silence_padding (int channels) film->set_container (Ratio::from_id ("185")); film->set_name (film_name); - shared_ptr content (new SndfileContent (film, "test/data/staircase.wav")); + shared_ptr content (new FFmpegContent("test/data/staircase.wav")); film->examine_and_add_content (content); - wait_for_jobs (); + BOOST_REQUIRE (!wait_for_jobs()); film->set_audio_channels (channels); film->make_dcp (); - wait_for_jobs (); + BOOST_REQUIRE (!wait_for_jobs()); boost::filesystem::path path = "build/test"; path /= film_name; @@ -63,60 +66,60 @@ test_silence_padding (int channels) shared_ptr sound_asset = check.cpls().front()->reels().front()->main_sound (); BOOST_CHECK (sound_asset); - BOOST_CHECK_EQUAL (sound_asset->mxf()->channels (), channels); + BOOST_CHECK_EQUAL (sound_asset->asset()->channels (), channels); /* Sample index in the DCP */ int n = 0; /* DCP sound asset frame */ int frame = 0; - while (n < sound_asset->mxf()->intrinsic_duration()) { - shared_ptr sound_frame = sound_asset->mxf()->get_frame (frame++); + while (n < sound_asset->asset()->intrinsic_duration()) { + shared_ptr sound_frame = sound_asset->asset()->start_read()->get_frame (frame++); uint8_t const * d = sound_frame->data (); - - for (int i = 0; i < sound_frame->size(); i += (3 * sound_asset->mxf()->channels())) { - if (sound_asset->mxf()->channels() > 0) { + for (int i = 0; i < sound_frame->size(); i += (3 * sound_asset->asset()->channels())) { + + if (sound_asset->asset()->channels() > 0) { /* L should be silent */ - int const sample = d[i + 0] | (d[i + 1] << 8); + int const sample = d[i + 1] | (d[i + 2] << 8); BOOST_CHECK_EQUAL (sample, 0); } - if (sound_asset->mxf()->channels() > 1) { + if (sound_asset->asset()->channels() > 1) { /* R should be silent */ - int const sample = d[i + 2] | (d[i + 3] << 8); + int const sample = d[i + 4] | (d[i + 5] << 8); BOOST_CHECK_EQUAL (sample, 0); } - - if (sound_asset->mxf()->channels() > 2) { + + if (sound_asset->asset()->channels() > 2) { /* Mono input so it will appear on centre */ int const sample = d[i + 7] | (d[i + 8] << 8); BOOST_CHECK_EQUAL (sample, n); } - if (sound_asset->mxf()->channels() > 3) { + if (sound_asset->asset()->channels() > 3) { /* Lfe should be silent */ - int const sample = d[i + 9] | (d[i + 10] << 8); + int const sample = d[i + 10] | (d[i + 11] << 8); BOOST_CHECK_EQUAL (sample, 0); } - if (sound_asset->mxf()->channels() > 4) { + if (sound_asset->asset()->channels() > 4) { /* Ls should be silent */ - int const sample = d[i + 11] | (d[i + 12] << 8); + int const sample = d[i + 13] | (d[i + 14] << 8); BOOST_CHECK_EQUAL (sample, 0); } - if (sound_asset->mxf()->channels() > 5) { + if (sound_asset->asset()->channels() > 5) { /* Rs should be silent */ - int const sample = d[i + 13] | (d[i + 14] << 8); + int const sample = d[i + 16] | (d[i + 17] << 8); BOOST_CHECK_EQUAL (sample, 0); } ++n; } } - + } BOOST_AUTO_TEST_CASE (silence_padding_test) @@ -125,3 +128,21 @@ BOOST_AUTO_TEST_CASE (silence_padding_test) test_silence_padding (i); } } + +/** Test a situation that used to crash because of a sub-sample rounding confusion + * caused by a trim. + */ + +BOOST_AUTO_TEST_CASE (silence_padding_test2) +{ + shared_ptr film = new_test_film2 ("silence_padding_test2"); + shared_ptr content (new FFmpegContent(TestPaths::private_data / "cars.mov")); + film->examine_and_add_content (content); + BOOST_REQUIRE (!wait_for_jobs()); + + film->set_video_frame_rate (24); + content->set_trim_start (dcpomatic::ContentTime(4003)); + + film->make_dcp (); + BOOST_REQUIRE (!wait_for_jobs()); +}