X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Fsound_asset.cc;h=0eaa8fb50f69269c66b86b37e428a4f0e0368707;hb=dd672d926e3b88cbe42b0778fda397d9e858b592;hp=ea44e80640708b62c688cc3f1cc96149d5b3bf7f;hpb=0b39df958f534068950669a763be7b4602740107;p=libdcp.git diff --git a/src/sound_asset.cc b/src/sound_asset.cc index ea44e806..0eaa8fb5 100644 --- a/src/sound_asset.cc +++ b/src/sound_asset.cc @@ -1,5 +1,5 @@ /* - Copyright (C) 2012-2020 Carl Hetherington + Copyright (C) 2012-2021 Carl Hetherington This file is part of libdcp. @@ -31,25 +31,31 @@ files in the program, then also delete it here. */ -/** @file src/sound_mxf.cc - * @brief SoundAsset class. + +/** @file src/sound_asset.cc + * @brief SoundAsset class */ -#include "sound_asset.h" -#include "util.h" -#include "exceptions.h" -#include "sound_frame.h" -#include "sound_asset_writer.h" -#include "sound_asset_reader.h" + #include "compose.hpp" #include "dcp_assert.h" +#include "exceptions.h" +#include "sound_asset.h" +#include "sound_asset_reader.h" +#include "sound_asset_writer.h" +#include "sound_frame.h" +#include "util.h" +#include "warnings.h" +LIBDCP_DISABLE_WARNINGS #include #include #include +LIBDCP_ENABLE_WARNINGS #include #include #include + using std::string; using std::vector; using std::list; @@ -60,21 +66,16 @@ using namespace dcp; SoundAsset::SoundAsset (boost::filesystem::path file) : Asset (file) - /* XXX: this is a fallback language, which will be used if we can't find the RFC5646SpokenLanguage - * in the MXF header. Perhaps RFC5646SpokenLanguage is optional and we should just not write it - * if we don't know it. - */ - , _language ("en-US") { ASDCP::PCM::MXFReader reader; - Kumu::Result_t r = reader.OpenRead (file.string().c_str()); - if (ASDCP_FAILURE (r)) { - boost::throw_exception (MXFFileError ("could not open MXF file for reading", file.string(), r)); + auto r = reader.OpenRead (file.string().c_str()); + if (ASDCP_FAILURE(r)) { + boost::throw_exception (MXFFileError("could not open MXF file for reading", file.string(), r)); } ASDCP::PCM::AudioDescriptor desc; - if (ASDCP_FAILURE (reader.FillAudioDescriptor (desc))) { - boost::throw_exception (ReadError ("could not read audio MXF information")); + if (ASDCP_FAILURE (reader.FillAudioDescriptor(desc))) { + boost::throw_exception (ReadError("could not read audio MXF information")); } _sampling_rate = desc.AudioSamplingRate.Numerator / desc.AudioSamplingRate.Denominator; @@ -84,12 +85,12 @@ SoundAsset::SoundAsset (boost::filesystem::path file) _intrinsic_duration = desc.ContainerDuration; ASDCP::WriterInfo info; - if (ASDCP_FAILURE (reader.FillWriterInfo (info))) { - boost::throw_exception (ReadError ("could not read audio MXF information")); + if (ASDCP_FAILURE (reader.FillWriterInfo(info))) { + boost::throw_exception (ReadError("could not read audio MXF information")); } ASDCP::MXF::SoundfieldGroupLabelSubDescriptor* soundfield; - ASDCP::Result_t rr = reader.OP1aHeader().GetMDObjectByType( + auto rr = reader.OP1aHeader().GetMDObjectByType( asdcp_smpte_dict->ul(ASDCP::MDD_SoundfieldGroupLabelSubDescriptor), reinterpret_cast(&soundfield) ); @@ -105,10 +106,10 @@ SoundAsset::SoundAsset (boost::filesystem::path file) _id = read_writer_info (info); } + SoundAsset::SoundAsset (Fraction edit_rate, int sampling_rate, int channels, LanguageTag language, Standard standard) : MXF (standard) , _edit_rate (edit_rate) - , _intrinsic_duration (0) , _channels (channels) , _sampling_rate (sampling_rate) , _language (language.to_string()) @@ -116,34 +117,35 @@ SoundAsset::SoundAsset (Fraction edit_rate, int sampling_rate, int channels, Lan } + bool SoundAsset::equals (shared_ptr other, EqualityOptions opt, NoteHandler note) const { ASDCP::PCM::MXFReader reader_A; - DCP_ASSERT (file ()); - Kumu::Result_t r = reader_A.OpenRead (file()->string().c_str()); - if (ASDCP_FAILURE (r)) { - boost::throw_exception (MXFFileError ("could not open MXF file for reading", file()->string(), r)); + DCP_ASSERT (file()); + auto r = reader_A.OpenRead (file()->string().c_str()); + if (ASDCP_FAILURE(r)) { + boost::throw_exception (MXFFileError("could not open MXF file for reading", file()->string(), r)); } ASDCP::PCM::MXFReader reader_B; r = reader_B.OpenRead (other->file()->string().c_str()); if (ASDCP_FAILURE (r)) { - boost::throw_exception (MXFFileError ("could not open MXF file for reading", other->file()->string(), r)); + boost::throw_exception (MXFFileError("could not open MXF file for reading", other->file()->string(), r)); } ASDCP::PCM::AudioDescriptor desc_A; - if (ASDCP_FAILURE (reader_A.FillAudioDescriptor (desc_A))) { + if (ASDCP_FAILURE (reader_A.FillAudioDescriptor(desc_A))) { boost::throw_exception (ReadError ("could not read audio MXF information")); } ASDCP::PCM::AudioDescriptor desc_B; - if (ASDCP_FAILURE (reader_B.FillAudioDescriptor (desc_B))) { + if (ASDCP_FAILURE (reader_B.FillAudioDescriptor(desc_B))) { boost::throw_exception (ReadError ("could not read audio MXF information")); } if (desc_A.EditRate != desc_B.EditRate) { note ( - DCP_ERROR, + NoteType::ERROR, String::compose ( "audio edit rates differ: %1/%2 cf %3/%4", desc_A.EditRate.Numerator, desc_A.EditRate.Denominator, desc_B.EditRate.Numerator, desc_B.EditRate.Denominator @@ -152,7 +154,7 @@ SoundAsset::equals (shared_ptr other, EqualityOptions opt, NoteHand return false; } else if (desc_A.AudioSamplingRate != desc_B.AudioSamplingRate) { note ( - DCP_ERROR, + NoteType::ERROR, String::compose ( "audio sampling rates differ: %1 cf %2", desc_A.AudioSamplingRate.Numerator, desc_A.AudioSamplingRate.Denominator, @@ -161,51 +163,51 @@ SoundAsset::equals (shared_ptr other, EqualityOptions opt, NoteHand ); return false; } else if (desc_A.Locked != desc_B.Locked) { - note (DCP_ERROR, String::compose ("audio locked flags differ: %1 cf %2", desc_A.Locked, desc_B.Locked)); + note (NoteType::ERROR, String::compose ("audio locked flags differ: %1 cf %2", desc_A.Locked, desc_B.Locked)); return false; } else if (desc_A.ChannelCount != desc_B.ChannelCount) { - note (DCP_ERROR, String::compose ("audio channel counts differ: %1 cf %2", desc_A.ChannelCount, desc_B.ChannelCount)); + note (NoteType::ERROR, String::compose ("audio channel counts differ: %1 cf %2", desc_A.ChannelCount, desc_B.ChannelCount)); return false; } else if (desc_A.QuantizationBits != desc_B.QuantizationBits) { - note (DCP_ERROR, String::compose ("audio bits per sample differ: %1 cf %2", desc_A.QuantizationBits, desc_B.QuantizationBits)); + note (NoteType::ERROR, String::compose ("audio bits per sample differ: %1 cf %2", desc_A.QuantizationBits, desc_B.QuantizationBits)); return false; } else if (desc_A.BlockAlign != desc_B.BlockAlign) { - note (DCP_ERROR, String::compose ("audio bytes per sample differ: %1 cf %2", desc_A.BlockAlign, desc_B.BlockAlign)); + note (NoteType::ERROR, String::compose ("audio bytes per sample differ: %1 cf %2", desc_A.BlockAlign, desc_B.BlockAlign)); return false; } else if (desc_A.AvgBps != desc_B.AvgBps) { - note (DCP_ERROR, String::compose ("audio average bps differ: %1 cf %2", desc_A.AvgBps, desc_B.AvgBps)); + note (NoteType::ERROR, String::compose ("audio average bps differ: %1 cf %2", desc_A.AvgBps, desc_B.AvgBps)); return false; } else if (desc_A.LinkedTrackID != desc_B.LinkedTrackID) { - note (DCP_ERROR, String::compose ("audio linked track IDs differ: %1 cf %2", desc_A.LinkedTrackID, desc_B.LinkedTrackID)); + note (NoteType::ERROR, String::compose ("audio linked track IDs differ: %1 cf %2", desc_A.LinkedTrackID, desc_B.LinkedTrackID)); return false; } else if (desc_A.ContainerDuration != desc_B.ContainerDuration) { - note (DCP_ERROR, String::compose ("audio container durations differ: %1 cf %2", desc_A.ContainerDuration, desc_B.ContainerDuration)); + note (NoteType::ERROR, String::compose ("audio container durations differ: %1 cf %2", desc_A.ContainerDuration, desc_B.ContainerDuration)); return false; } else if (desc_A.ChannelFormat != desc_B.ChannelFormat) { /* XXX */ } - shared_ptr other_sound = dynamic_pointer_cast (other); + auto other_sound = dynamic_pointer_cast (other); - shared_ptr reader = start_read (); - shared_ptr other_reader = other_sound->start_read (); + auto reader = start_read (); + auto other_reader = other_sound->start_read (); for (int i = 0; i < _intrinsic_duration; ++i) { - shared_ptr frame_A = reader->get_frame (i); - shared_ptr frame_B = other_reader->get_frame (i); + auto frame_A = reader->get_frame (i); + auto frame_B = other_reader->get_frame (i); if (frame_A->size() != frame_B->size()) { - note (DCP_ERROR, String::compose ("sizes of audio data for frame %1 differ", i)); + note (NoteType::ERROR, String::compose ("sizes of audio data for frame %1 differ", i)); return false; } if (memcmp (frame_A->data(), frame_B->data(), frame_A->size()) != 0) { - for (int sample= 0; sample < frame_A->samples(); ++sample) { + for (int sample = 0; sample < frame_A->samples(); ++sample) { for (int channel = 0; channel < frame_A->channels(); ++channel) { int32_t const d = abs(frame_A->get(channel, sample) - frame_B->get(channel, sample)); if (d > opt.max_audio_sample_error) { - note (DCP_ERROR, String::compose ("PCM data difference of %1", d)); + note (NoteType::ERROR, String::compose("PCM data difference of %1 in frame %2, channel %3, sample %4", d, i, channel, sample)); return false; } } @@ -216,39 +218,43 @@ SoundAsset::equals (shared_ptr other, EqualityOptions opt, NoteHand return true; } + shared_ptr -SoundAsset::start_write (boost::filesystem::path file, vector active_channels, bool atmos_sync) +SoundAsset::start_write (boost::filesystem::path file, bool atmos_sync) { if (atmos_sync && _channels < 14) { throw MiscError ("Insufficient channels to write ATMOS sync (there must be at least 14)"); } - return shared_ptr (new SoundAssetWriter(this, file, active_channels, atmos_sync)); + return shared_ptr (new SoundAssetWriter(this, file, atmos_sync)); } + shared_ptr SoundAsset::start_read () const { - return shared_ptr (new SoundAssetReader (this, key(), standard())); + return shared_ptr (new SoundAssetReader(this, key(), standard())); } + string SoundAsset::static_pkl_type (Standard standard) { switch (standard) { - case INTEROP: + case Standard::INTEROP: return "application/x-smpte-mxf;asdcpKind=Sound"; - case SMPTE: + case Standard::SMPTE: return "application/mxf"; default: DCP_ASSERT (false); } } + bool SoundAsset::valid_mxf (boost::filesystem::path file) { ASDCP::PCM::MXFReader reader; - Kumu::Result_t r = reader.OpenRead (file.string().c_str ()); + Kumu::Result_t r = reader.OpenRead (file.string().c_str()); return !ASDCP_FAILURE (r); }