From a6a6d8a7a1c4c59bac9de6fa8f4cd879ebeef55d Mon Sep 17 00:00:00 2001 From: Carl Hetherington Date: Fri, 17 May 2024 15:52:39 +0200 Subject: Generalise SMPTE Bv2.0 limitation to also support SMPTE A. --- test/bv20_test.cc | 95 -------------------------- test/data | 2 +- test/smpte_flavour_test.cc | 164 +++++++++++++++++++++++++++++++++++++++++++++ test/wscript | 2 +- 4 files changed, 166 insertions(+), 97 deletions(-) delete mode 100644 test/bv20_test.cc create mode 100644 test/smpte_flavour_test.cc (limited to 'test') diff --git a/test/bv20_test.cc b/test/bv20_test.cc deleted file mode 100644 index 5530a05d0..000000000 --- a/test/bv20_test.cc +++ /dev/null @@ -1,95 +0,0 @@ -/* - Copyright (C) 2023 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 "lib/content_factory.h" -#include "lib/film.h" -#include "test.h" -#include -LIBDCP_DISABLE_WARNINGS -#include -LIBDCP_ENABLE_WARNINGS -#include -#include -#include - - -using std::shared_ptr; - - -bool -has_cpl_mca_subdescriptors(shared_ptr film) -{ - auto cpl = dcp::file_to_string(find_file(film->dir(film->dcp_name()), "cpl_")); - return cpl.find("MCASubDescriptors") != std::string::npos; -} - - -bool -has_mxf_mca_subdescriptors(shared_ptr film) -{ - /* One day hopefully libdcp will read these descriptors and we can find out from the SoundAsset - * whether they exist. - */ - - ASDCP::PCM::MXFReader reader; - auto r = reader.OpenRead(find_file(film->dir(film->dcp_name()), "pcm_").string()); - BOOST_REQUIRE(!ASDCP_FAILURE(r)); - - ASDCP::MXF::WaveAudioDescriptor* essence_descriptor = nullptr; - auto const rr = reader.OP1aHeader().GetMDObjectByType( - dcp::asdcp_smpte_dict->ul(ASDCP::MDD_WaveAudioDescriptor), - reinterpret_cast(&essence_descriptor) - ); - - if (!KM_SUCCESS(rr)) { - return false; - } - - return essence_descriptor->SubDescriptors.size() > 0; -} - - -BOOST_AUTO_TEST_CASE(bv21_extensions_used_when_not_limited) -{ - auto picture = content_factory("test/data/flat_red.png"); - auto sound = content_factory("test/data/sine_440.wav"); - auto film = new_test_film2("bv21_extensions_used_when_not_limited", { picture.front(), sound.front() }); - - make_and_verify_dcp(film); - - BOOST_CHECK(has_cpl_mca_subdescriptors(film)); - BOOST_CHECK(has_mxf_mca_subdescriptors(film)); -} - - -BOOST_AUTO_TEST_CASE(bv21_extensions_not_used_when_limited) -{ - auto picture = content_factory("test/data/flat_red.png"); - auto sound = content_factory("test/data/sine_440.wav"); - auto film = new_test_film2("bv21_extensions_not_used_when_limited", { picture.front(), sound.front () }); - film->set_limit_to_smpte_bv20(true); - - make_and_verify_dcp(film); - - BOOST_CHECK(!has_cpl_mca_subdescriptors(film)); - BOOST_CHECK(!has_mxf_mca_subdescriptors(film)); -} - diff --git a/test/data b/test/data index 4cb08962b..0499768c5 160000 --- a/test/data +++ b/test/data @@ -1 +1 @@ -Subproject commit 4cb08962ba07e99c442cb12091c0347d84d8fd89 +Subproject commit 0499768c5485c75728182ac235ec1b7f3166691f diff --git a/test/smpte_flavour_test.cc b/test/smpte_flavour_test.cc new file mode 100644 index 000000000..6a665ac6c --- /dev/null +++ b/test/smpte_flavour_test.cc @@ -0,0 +1,164 @@ +/* + Copyright (C) 2023 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 "lib/content_factory.h" +#include "lib/film.h" +#include "test.h" +#include +LIBDCP_DISABLE_WARNINGS +#include +LIBDCP_ENABLE_WARNINGS +#include +#include +#include + + +using std::shared_ptr; +using std::string; + + +bool +has_cpl_text(shared_ptr film, string tag) +{ + auto cpl = dcp::file_to_string(find_file(film->dir(film->dcp_name()), "cpl_")); + return cpl.find(tag) != std::string::npos; +} + + +bool +has_cpl_mca_subdescriptors(shared_ptr film) +{ + return has_cpl_text(film, "MCASubDescriptors"); +} + + +bool +has_rating_list(shared_ptr film) +{ + return has_cpl_text(film, "RatingList"); +} + + +bool +has_cpl_metadata(shared_ptr film) +{ + return has_cpl_text(film, "CompositionMetadataAsset"); +} + + +bool +has_markers(shared_ptr film) +{ + return has_cpl_text(film, "MainMarkers"); +} + + +bool +has_bv21_profile(shared_ptr film) +{ + return has_cpl_text(film, "SMPTE-RDD-52:2020-Bv2.1"); +} + + +bool +has_mxf_mca_subdescriptors(shared_ptr film) +{ + /* One day hopefully libdcp will read these descriptors and we can find out from the SoundAsset + * whether they exist. + */ + + ASDCP::PCM::MXFReader reader; + auto r = reader.OpenRead(find_file(film->dir(film->dcp_name()), "pcm_").string()); + BOOST_REQUIRE(!ASDCP_FAILURE(r)); + + ASDCP::MXF::WaveAudioDescriptor* essence_descriptor = nullptr; + auto const rr = reader.OP1aHeader().GetMDObjectByType( + dcp::asdcp_smpte_dict->ul(ASDCP::MDD_WaveAudioDescriptor), + reinterpret_cast(&essence_descriptor) + ); + + if (!KM_SUCCESS(rr)) { + return false; + } + + return essence_descriptor->SubDescriptors.size() > 0; +} + + +BOOST_AUTO_TEST_CASE(bv21_done_right) +{ + auto picture = content_factory("test/data/flat_red.png"); + auto sound = content_factory("test/data/sine_440.wav"); + auto film = new_test_film2("bv21_done_right", { picture.front(), sound.front() }); + + make_and_verify_dcp(film); + + BOOST_CHECK(has_cpl_mca_subdescriptors(film)); + BOOST_CHECK(has_mxf_mca_subdescriptors(film)); + BOOST_CHECK(has_bv21_profile(film)); + BOOST_CHECK(has_cpl_metadata(film)); + BOOST_CHECK(has_markers(film)); +} + + +BOOST_AUTO_TEST_CASE(bv20_done_right) +{ + auto picture = content_factory("test/data/flat_red.png"); + auto sound = content_factory("test/data/sine_440.wav"); + auto film = new_test_film2("bv20_done_right", { picture.front(), sound.front () }); + film->set_smpte_flavour(dcp::SMPTEFlavour::BV20); + + make_and_verify_dcp( + film, + { + dcp::VerificationNote::Code::MISSING_EXTENSION_METADATA, + }, true, false); + + BOOST_CHECK(!has_cpl_mca_subdescriptors(film)); + BOOST_CHECK(!has_mxf_mca_subdescriptors(film)); + BOOST_CHECK(!has_bv21_profile(film)); + BOOST_CHECK(has_cpl_metadata(film)); + BOOST_CHECK(has_markers(film)); +} + + +BOOST_AUTO_TEST_CASE(a_done_right) +{ + auto picture = content_factory("test/data/flat_red.png"); + auto sound = content_factory("test/data/sine_440.wav"); + auto film = new_test_film2("a_done_right", { picture.front(), sound.front () }); + film->set_smpte_flavour(dcp::SMPTEFlavour::A); + + make_and_verify_dcp( + film, + { + dcp::VerificationNote::Code::MISSING_FFOC, + dcp::VerificationNote::Code::MISSING_LFOC, + dcp::VerificationNote::Code::MISSING_CPL_METADATA, + }); + + BOOST_CHECK(!has_cpl_mca_subdescriptors(film)); + BOOST_CHECK(!has_mxf_mca_subdescriptors(film)); + BOOST_CHECK(!has_bv21_profile(film)); + BOOST_CHECK(!has_cpl_metadata(film)); + BOOST_CHECK(!has_markers(film)); +} + diff --git a/test/wscript b/test/wscript index cd23badc0..040a8e489 100644 --- a/test/wscript +++ b/test/wscript @@ -59,7 +59,6 @@ def build(bld): audio_ring_buffers_test.cc burnt_subtitle_test.cc butler_test.cc - bv20_test.cc cinema_sound_processor_test.cc client_server_test.cc closed_caption_test.cc @@ -145,6 +144,7 @@ def build(bld): silence_padding_test.cc shuffler_test.cc skip_frame_test.cc + smpte_flavour_test.cc socket_test.cc srt_subtitle_test.cc ssa_subtitle_test.cc -- cgit v1.2.3