#include <boost/test/unit_test.hpp>
-using std::shared_ptr;
using namespace dcpomatic;
film->set_dcp_content_type (DCPContentType::from_isdcf_name ("FTR"));
film->set_name ("content_test1");
film->set_container (Ratio::from_id ("185"));
+ film->set_audio_channels(16);
auto content = content_factory(TestPaths::private_data() / "demo_sound_bug.mkv")[0];
film->examine_and_add_content (content);
{ dcp::VerificationNote::Code::MISSING_FFEC_IN_FEATURE, dcp::VerificationNote::Code::MISSING_FFMC_IN_FEATURE }
);
- boost::filesystem::path check;
-
- for (auto i: boost::filesystem::directory_iterator("build/test/content_test1/" + film->dcp_name())) {
- if (i.path().leaf().string().substr(0, 4) == "pcm_") {
- check = i;
- }
- }
-
- check_mxf_audio_file (TestPaths::private_data() / "content_test1.mxf", check);
+ check_mxf_audio_file(TestPaths::private_data() / "content_test1.mxf", dcp_file(film, "pcm_"));
}
{
auto content = content_factory("test/data/red_23976.mp4")[0];
auto film = new_test_film2 ("content_test2", {content});
- content->set_trim_start(ContentTime::from_seconds(0.5));
+ content->set_trim_start(film, ContentTime::from_seconds(0.5));
make_and_verify_dcp (film);
}
/* Trim */
/* 12 frames */
- content->set_trim_start (ContentTime::from_seconds (12.0 / 24.0));
+ content->set_trim_start(film, ContentTime::from_seconds (12.0 / 24.0));
BOOST_CHECK (content->trim_start() == ContentTime::from_seconds (12.0 / 24.0));
/* 11.2 frames */
- content->set_trim_start (ContentTime::from_seconds (11.2 / 24.0));
+ content->set_trim_start(film, ContentTime::from_seconds (11.2 / 24.0));
BOOST_CHECK (content->trim_start() == ContentTime::from_seconds (11.0 / 24.0));
/* 13.9 frames */
- content->set_trim_start (ContentTime::from_seconds (13.9 / 24.0));
+ content->set_trim_start(film, ContentTime::from_seconds (13.9 / 24.0));
BOOST_CHECK (content->trim_start() == ContentTime::from_seconds (14.0 / 24.0));
/* Position */
content->set_position (film, DCPTime::from_seconds(13.9 / 24.0));
BOOST_CHECK (content->position() == DCPTime::from_seconds (14.0 / 24.0));
- content->set_video_frame_rate (25);
+ content->set_video_frame_rate(film, 25);
/* Check that trim is fixed when the content's video frame rate is `forced' */
&cl
);
+ film->set_audio_channels(16);
+
make_and_verify_dcp (film);
check_dcp (TestPaths::private_data() / "fha", film);
content[0]->audio->set_delay(-1000);
make_and_verify_dcp (film, { dcp::VerificationNote::Code::INVALID_PICTURE_FRAME_RATE_FOR_2K });
}
+
+
+/** WAVs with markers (I think) can end up making audio packets with no channels and no frames (#2617) */
+BOOST_AUTO_TEST_CASE(wav_with_markers_zero_channels_test)
+{
+ auto content = content_factory(TestPaths::private_data() / "wav_with_markers.wav");
+ auto film = new_test_film2("wav_with_markers_zero_channels_test", content);
+ make_and_verify_dcp(film, { dcp::VerificationNote::Code::MISSING_CPL_METADATA });
+}