X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Fsound_asset.cc;h=1c0a181f81255c72dea107d73b6100c556123e78;hb=b7c316ba78f7ca634008baa3ad7d8c48403a7151;hp=74d412123803435de48e19d364ef5570f684cdb0;hpb=eb772d227c378e17c99b5d609b81d0cc4b664d2c;p=libdcp.git diff --git a/src/sound_asset.cc b/src/sound_asset.cc index 74d41212..1c0a181f 100644 --- a/src/sound_asset.cc +++ b/src/sound_asset.cc @@ -1,5 +1,5 @@ /* - Copyright (C) 2012-2016 Carl Hetherington + Copyright (C) 2012-2021 Carl Hetherington This file is part of libdcp. @@ -31,10 +31,12 @@ 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" @@ -43,31 +45,39 @@ #include "sound_asset_reader.h" #include "compose.hpp" #include "dcp_assert.h" -#include #include +#include +#include #include #include #include + using std::string; using std::vector; using std::list; -using boost::shared_ptr; -using boost::dynamic_pointer_cast; +using std::shared_ptr; +using std::dynamic_pointer_cast; 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 (DCPReadError ("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; @@ -77,50 +87,67 @@ SoundAsset::SoundAsset (boost::filesystem::path file) _intrinsic_duration = desc.ContainerDuration; ASDCP::WriterInfo info; - if (ASDCP_FAILURE (reader.FillWriterInfo (info))) { - boost::throw_exception (DCPReadError ("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; + auto rr = reader.OP1aHeader().GetMDObjectByType( + asdcp_smpte_dict->ul(ASDCP::MDD_SoundfieldGroupLabelSubDescriptor), + reinterpret_cast(&soundfield) + ); + + if (KM_SUCCESS(rr)) { + if (!soundfield->RFC5646SpokenLanguage.empty()) { + char buffer[64]; + soundfield->RFC5646SpokenLanguage.get().EncodeString(buffer, sizeof(buffer)); + _language = buffer; + } } _id = read_writer_info (info); } -SoundAsset::SoundAsset (Fraction edit_rate, int sampling_rate, int channels) - : _edit_rate (edit_rate) - , _intrinsic_duration (0) + +SoundAsset::SoundAsset (Fraction edit_rate, int sampling_rate, int channels, LanguageTag language, Standard standard) + : MXF (standard) + , _edit_rate (edit_rate) , _channels (channels) , _sampling_rate (sampling_rate) + , _language (language.to_string()) { } + 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))) { - boost::throw_exception (DCPReadError ("could not read audio MXF information")); + 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))) { - boost::throw_exception (DCPReadError ("could not read audio MXF information")); + 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 @@ -129,7 +156,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, @@ -138,51 +165,53 @@ 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 i = 0; i < frame_A->size(); ++i) { - int const d = abs (frame_A->data()[i] - frame_B->data()[i]); - if (d > opt.max_audio_sample_error) { - note (DCP_ERROR, String::compose ("PCM data difference of %1", d)); - return false; + 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 (NoteType::ERROR, String::compose ("PCM data difference of %1", d)); + return false; + } } } } @@ -191,36 +220,43 @@ SoundAsset::equals (shared_ptr other, EqualityOptions opt, NoteHand return true; } + shared_ptr -SoundAsset::start_write (boost::filesystem::path file, Standard standard) +SoundAsset::start_write (boost::filesystem::path file, vector active_channels, bool atmos_sync) { - /* XXX: can't we use a shared_ptr here? */ - return shared_ptr (new SoundAssetWriter (this, file, standard)); + 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)); } + shared_ptr SoundAsset::start_read () const { - return shared_ptr (new SoundAssetReader (this, key ())); + return shared_ptr (new SoundAssetReader(this, key(), standard())); } + string -SoundAsset::pkl_type (Standard standard) const +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); }