X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=test%2Fsilence_padding_test.cc;h=dd02d200d7e220b6504612d2c23fc998ca0fcd07;hb=4f0be04b28c3a4cfec9513db23f92a175d207dfb;hp=328f9bef74bc4bdce99d40428abb1ae25b1909af;hpb=41262015eb2bb1fc3da8585883420975de381a65;p=dcpomatic.git diff --git a/test/silence_padding_test.cc b/test/silence_padding_test.cc index 328f9bef7..dd02d200d 100644 --- a/test/silence_padding_test.cc +++ b/test/silence_padding_test.cc @@ -1,5 +1,5 @@ /* - Copyright (C) 2013-2014 Carl Hetherington + Copyright (C) 2013-2021 Carl Hetherington This file is part of DCP-o-matic. @@ -18,11 +18,14 @@ */ + /** @file test/silence_padding_test.cc * @brief Test the padding (with silence) of a mono source to a 6-channel DCP. * @ingroup feature */ + +#include "lib/constants.h" #include "lib/ffmpeg_content.h" #include "lib/film.h" #include "lib/dcp_content_type.h" @@ -37,11 +40,12 @@ #include #include + using std::make_shared; using std::string; -using std::shared_ptr; using boost::lexical_cast; + static void test_silence_padding (int channels) { @@ -120,6 +124,7 @@ test_silence_padding (int channels) } + BOOST_AUTO_TEST_CASE (silence_padding_test) { for (int i = 1; i < MAX_DCP_AUDIO_CHANNELS; ++i) { @@ -127,6 +132,7 @@ BOOST_AUTO_TEST_CASE (silence_padding_test) } } + /** Test a situation that used to crash because of a sub-sample rounding confusion * caused by a trim. */ @@ -139,7 +145,7 @@ BOOST_AUTO_TEST_CASE (silence_padding_test2) auto film = new_test_film2 ("silence_padding_test2", { content }, &cl); film->set_video_frame_rate (24); - content->set_trim_start (dcpomatic::ContentTime(4003)); + content->set_trim_start(film, dcpomatic::ContentTime(4003)); make_and_verify_dcp (film);