X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Fsound_asset.cc;h=74d412123803435de48e19d364ef5570f684cdb0;hb=refs%2Fheads%2F1.0-templates;hp=3d23b426b73126c81f5ad351c171b95bda636603;hpb=fe99eae4b95c5fcf2f3730efad4a18d0cb5c29bc;p=libdcp.git diff --git a/src/sound_asset.cc b/src/sound_asset.cc index 3d23b426..74d41212 100644 --- a/src/sound_asset.cc +++ b/src/sound_asset.cc @@ -1,20 +1,34 @@ /* - Copyright (C) 2012-2014 Carl Hetherington + Copyright (C) 2012-2016 Carl Hetherington - This program is free software; you can redistribute it and/or modify + This file is part of libdcp. + + libdcp 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. - This program is distributed in the hope that it will be useful, + libdcp 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 this program; if not, write to the Free Software - Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. - + along with libdcp. If not, see . + + In addition, as a special exception, the copyright holders give + permission to link the code of portions of this program with the + OpenSSL library under certain conditions as described in each + individual source file, and distribute linked combinations + including the two. + + You must obey the GNU General Public License in all respects + for all of the code used other than OpenSSL. If you modify + file(s) with this exception, you may extend this exception to your + version of the file(s), but you are not obligated to do so. If you + do not wish to do so, delete this exception statement from your + version. If you delete this exception statement from all source + files in the program, then also delete it here. */ /** @file src/sound_mxf.cc @@ -26,21 +40,20 @@ #include "exceptions.h" #include "sound_frame.h" #include "sound_asset_writer.h" +#include "sound_asset_reader.h" #include "compose.hpp" -#include "KM_fileio.h" -#include "AS_DCP.h" #include "dcp_assert.h" +#include +#include #include #include -#include #include using std::string; -using std::stringstream; -using std::ostream; using std::vector; using std::list; using boost::shared_ptr; +using boost::dynamic_pointer_cast; using namespace dcp; SoundAsset::SoundAsset (boost::filesystem::path file) @@ -84,15 +97,16 @@ bool SoundAsset::equals (shared_ptr other, EqualityOptions opt, NoteHandler note) const { ASDCP::PCM::MXFReader reader_A; - Kumu::Result_t r = reader_A.OpenRead (file().string().c_str()); + 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)); + 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()); + r = reader_B.OpenRead (other->file()->string().c_str()); if (ASDCP_FAILURE (r)) { - boost::throw_exception (MXFFileError ("could not open MXF file for reading", file().string(), r)); + boost::throw_exception (MXFFileError ("could not open MXF file for reading", other->file()->string(), r)); } ASDCP::PCM::AudioDescriptor desc_A; @@ -103,44 +117,69 @@ SoundAsset::equals (shared_ptr other, EqualityOptions opt, NoteHand if (ASDCP_FAILURE (reader_B.FillAudioDescriptor (desc_B))) { boost::throw_exception (DCPReadError ("could not read audio MXF information")); } - - if ( - desc_A.EditRate != desc_B.EditRate || - desc_A.AudioSamplingRate != desc_B.AudioSamplingRate || - desc_A.Locked != desc_B.Locked || - desc_A.ChannelCount != desc_B.ChannelCount || - desc_A.QuantizationBits != desc_B.QuantizationBits || - desc_A.BlockAlign != desc_B.BlockAlign || - desc_A.AvgBps != desc_B.AvgBps || - desc_A.LinkedTrackID != desc_B.LinkedTrackID || - desc_A.ContainerDuration != desc_B.ContainerDuration -// desc_A.ChannelFormat != desc_B.ChannelFormat || - ) { - - note (DCP_ERROR, "audio MXF picture descriptors differ"); + + if (desc_A.EditRate != desc_B.EditRate) { + note ( + DCP_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 + ) + ); + return false; + } else if (desc_A.AudioSamplingRate != desc_B.AudioSamplingRate) { + note ( + DCP_ERROR, + String::compose ( + "audio sampling rates differ: %1 cf %2", + desc_A.AudioSamplingRate.Numerator, desc_A.AudioSamplingRate.Denominator, + desc_B.AudioSamplingRate.Numerator, desc_B.AudioSamplingRate.Numerator + ) + ); + 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)); + 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)); + 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)); + 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)); 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)); + 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)); + 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)); + return false; + } else if (desc_A.ChannelFormat != desc_B.ChannelFormat) { + /* XXX */ } - - ASDCP::PCM::FrameBuffer buffer_A (1 * Kumu::Megabyte); - ASDCP::PCM::FrameBuffer buffer_B (1 * Kumu::Megabyte); - + + shared_ptr other_sound = dynamic_pointer_cast (other); + + shared_ptr reader = start_read (); + shared_ptr other_reader = other_sound->start_read (); + for (int i = 0; i < _intrinsic_duration; ++i) { - if (ASDCP_FAILURE (reader_A.ReadFrame (i, buffer_A))) { - boost::throw_exception (DCPReadError ("could not read audio frame")); - } - - if (ASDCP_FAILURE (reader_B.ReadFrame (i, buffer_B))) { - boost::throw_exception (DCPReadError ("could not read audio frame")); - } - - if (buffer_A.Size() != buffer_B.Size()) { + + shared_ptr frame_A = reader->get_frame (i); + shared_ptr 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)); return false; } - - if (memcmp (buffer_A.RoData(), buffer_B.RoData(), buffer_A.Size()) != 0) { - for (uint32_t i = 0; i < buffer_A.Size(); ++i) { - int const d = abs (buffer_A.RoData()[i] - buffer_B.RoData()[i]); + + 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; @@ -152,13 +191,6 @@ SoundAsset::equals (shared_ptr other, EqualityOptions opt, NoteHand return true; } -shared_ptr -SoundAsset::get_frame (int n) const -{ - /* XXX: should add on entry point here? */ - return shared_ptr (new SoundFrame (file(), n, _decryption_context)); -} - shared_ptr SoundAsset::start_write (boost::filesystem::path file, Standard standard) { @@ -166,6 +198,12 @@ SoundAsset::start_write (boost::filesystem::path file, Standard standard) return shared_ptr (new SoundAssetWriter (this, file, standard)); } +shared_ptr +SoundAsset::start_read () const +{ + return shared_ptr (new SoundAssetReader (this, key ())); +} + string SoundAsset::pkl_type (Standard standard) const { @@ -178,3 +216,11 @@ SoundAsset::pkl_type (Standard standard) const 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 ()); + return !ASDCP_FAILURE (r); +}