files in the program, then also delete it here.
*/
+
+#include "atmos_asset.h"
+#include "compose.hpp"
+#include "cpl.h"
#include "dcp.h"
+#include "equality_options.h"
#include "metadata.h"
-#include "cpl.h"
#include "mono_picture_asset.h"
-#include "stereo_picture_asset.h"
#include "picture_asset_writer.h"
-#include "reel_picture_asset.h"
-#include "sound_asset_writer.h"
-#include "sound_asset.h"
-#include "atmos_asset.h"
#include "reel.h"
-#include "test.h"
-#include "reel_mono_picture_asset.h"
-#include "reel_stereo_picture_asset.h"
-#include "reel_sound_asset.h"
#include "reel_atmos_asset.h"
#include "reel_markers_asset.h"
+#include "reel_mono_picture_asset.h"
+#include "reel_picture_asset.h"
+#include "reel_sound_asset.h"
+#include "reel_stereo_picture_asset.h"
+#include "sound_asset.h"
+#include "sound_asset_writer.h"
+#include "stereo_picture_asset.h"
+#include "test.h"
#include <asdcp/KM_util.h>
#include <sndfile.h>
#include <boost/test/unit_test.hpp>
-using std::string;
-using std::vector;
+
using std::dynamic_pointer_cast;
-using std::shared_ptr;
using std::make_shared;
+using std::shared_ptr;
+using std::string;
+using std::vector;
#if BOOST_VERSION >= 106100
using namespace boost::placeholders;
#endif
auto mp = make_shared<dcp::StereoPictureAsset>(dcp::Fraction (24, 1), dcp::Standard::SMPTE);
mp->set_metadata (mxf_meta);
- auto picture_writer = mp->start_write ("build/test/DCP/dcp_test2/video.mxf", false);
+ auto picture_writer = mp->start_write("build/test/DCP/dcp_test2/video.mxf", dcp::PictureAsset::Behaviour::MAKE_NEW);
dcp::ArrayData j2c ("test/data/flat_red.j2c");
for (int i = 0; i < 24; ++i) {
/* Left */
auto ms = make_shared<dcp::SoundAsset>(dcp::Fraction(24, 1), 48000, 1, dcp::LanguageTag("en-GB"), dcp::Standard::SMPTE);
ms->set_metadata (mxf_meta);
- auto sound_writer = ms->start_write ("build/test/DCP/dcp_test2/audio.mxf");
+ auto sound_writer = ms->start_write("build/test/DCP/dcp_test2/audio.mxf", {}, dcp::SoundAsset::AtmosSync::DISABLED, dcp::SoundAsset::MCASubDescriptors::ENABLED);
SF_INFO info;
info.format = 0;
channels[0] = buffer;
while (true) {
auto N = sf_readf_float (sndfile, buffer, 4096);
- sound_writer->write (channels, N);
+ sound_writer->write(channels, 1, N);
if (N < 4096) {
break;
}
auto reader = A_sound->asset()->start_read();
auto sound = make_shared<dcp::SoundAsset>(A_sound->asset()->edit_rate(), A_sound->asset()->sampling_rate(), A_sound->asset()->channels(), dcp::LanguageTag("en-US"), dcp::Standard::SMPTE);
- auto writer = sound->start_write(path("build") / "test" / name / "pcm_8246f87f-e1df-4c42-a290-f3b3069ff021.mxf", {});
+ auto writer = sound->start_write(path("build") / "test" / name / "pcm_8246f87f-e1df-4c42-a290-f3b3069ff021.mxf", {}, dcp::SoundAsset::AtmosSync::DISABLED, dcp::SoundAsset::MCASubDescriptors::ENABLED);
bool need_to_modify = modify;
for (int i = 0; i < A_sound->asset()->intrinsic_duration(); ++i) {
}
}
}
- writer->write (out, sf->samples());
+ writer->write(out, sf->channels(), sf->samples());
for (int j = 0; j < sf->channels(); ++j) {
delete[] out[j];
}
auto mp = make_shared<dcp::MonoPictureAsset>(dcp::Fraction (24, 1), dcp::Standard::SMPTE);
mp->set_metadata (mxf_meta);
- shared_ptr<dcp::PictureAssetWriter> picture_writer = mp->start_write ("build/test/DCP/dcp_test5/video.mxf", false);
+ auto picture_writer = mp->start_write("build/test/DCP/dcp_test5/video.mxf", dcp::PictureAsset::Behaviour::MAKE_NEW);
dcp::ArrayData j2c ("test/data/flat_red.j2c");
for (int i = 0; i < 24; ++i) {
picture_writer->write (j2c.data (), j2c.size ());
auto ms = make_shared<dcp::SoundAsset>(dcp::Fraction(24, 1), 48000, 1, dcp::LanguageTag("en-GB"), dcp::Standard::SMPTE);
ms->set_metadata (mxf_meta);
- auto sound_writer = ms->start_write ("build/test/DCP/dcp_test5/audio.mxf");
+ auto sound_writer = ms->start_write("build/test/DCP/dcp_test5/audio.mxf", {}, dcp::SoundAsset::AtmosSync::DISABLED, dcp::SoundAsset::MCASubDescriptors::ENABLED);
SF_INFO info;
info.format = 0;
channels[0] = buffer;
while (true) {
sf_count_t N = sf_readf_float (sndfile, buffer, 4096);
- sound_writer->write (channels, N);
+ sound_writer->write(channels, 1, N);
if (N < 4096) {
break;
}
BOOST_CHECK_EQUAL (reels[2]->_kdms[0].keys()[1].id(), kdm_2_uuid_2);
}
+
+BOOST_AUTO_TEST_CASE(hashes_preserved_when_loading_corrupted_dcp)
+{
+ boost::filesystem::path const dir = "build/test/hashes_preserved_when_loading_corrupted_dcp";
+ boost::filesystem::remove_all(dir);
+
+ auto dcp = make_simple(dir / "1");
+ dcp->write_xml();
+
+ auto asset_1_id = dcp::MonoPictureAsset(dir / "1" / "video.mxf").id();
+ auto asset_1_hash = dcp::MonoPictureAsset(dir / "1" / "video.mxf").hash();
+
+ /* Replace the hash in the CPL (the one that corresponds to the actual file)
+ * with an incorrect one new_hash.
+ */
+ string new_hash;
+ {
+ Editor editor(find_file(dir / "1", "cpl_"));
+ auto const after = "<Duration>24</Duration>";
+ editor.delete_lines_after(after, 1);
+
+ if (asset_1_hash[0] == 'A') {
+ new_hash = 'B' + asset_1_hash.substr(1);
+ } else {
+ new_hash = 'A' + asset_1_hash.substr(1);
+ }
+
+ editor.insert(after, dcp::String::compose(" <Hash>%1</Hash>", new_hash));
+ }
+
+ dcp::DCP read_back(dir / "1");
+ read_back.read();
+
+ BOOST_REQUIRE_EQUAL(read_back.cpls().size(), 1U);
+ auto cpl = read_back.cpls()[0];
+ BOOST_REQUIRE_EQUAL(cpl->reels().size(), 1U);
+ auto reel = cpl->reels()[0];
+ BOOST_REQUIRE(reel->main_picture());
+ /* Now the asset should think it has the wrong hash written to the PKL file; it shouldn't have
+ * checked the file again.
+ */
+ BOOST_CHECK_EQUAL(reel->main_picture()->asset_ref()->hash(), new_hash);
+}
projects / libdcp.git / blobdiff