You should have received a copy of the GNU General Public License
along with libdcp. If not, see <http://www.gnu.org/licenses/>.
+ 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
#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 <asdcp/KM_fileio.h>
+#include <asdcp/AS_DCP.h>
#include <libxml++/nodes/element.h>
#include <boost/filesystem.hpp>
-#include <iostream>
#include <stdexcept>
using std::string;
-using std::stringstream;
-using std::ostream;
using std::vector;
using std::list;
using boost::shared_ptr;
_id = read_writer_info (info);
}
-SoundAsset::SoundAsset (Fraction edit_rate, int sampling_rate, int channels)
- : _edit_rate (edit_rate)
+SoundAsset::SoundAsset (Fraction edit_rate, int sampling_rate, int channels, Standard standard)
+ : MXF (standard)
+ , _edit_rate (edit_rate)
, _intrinsic_duration (0)
, _channels (channels)
, _sampling_rate (sampling_rate)
SoundAsset::equals (shared_ptr<const Asset> 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;
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 */
}
shared_ptr<const SoundAsset> other_sound = dynamic_pointer_cast<const SoundAsset> (other);
}
shared_ptr<SoundAssetWriter>
-SoundAsset::start_write (boost::filesystem::path file, Standard standard)
+SoundAsset::start_write (boost::filesystem::path file)
{
/* XXX: can't we use a shared_ptr here? */
- return shared_ptr<SoundAssetWriter> (new SoundAssetWriter (this, file, standard));
+ return shared_ptr<SoundAssetWriter> (new SoundAssetWriter (this, file));
}
shared_ptr<SoundAssetReader>
SoundAsset::start_read () const
{
- return shared_ptr<SoundAssetReader> (new SoundAssetReader (this));
+ return shared_ptr<SoundAssetReader> (new SoundAssetReader (this, key(), standard()));
}
string
-SoundAsset::pkl_type (Standard standard) const
+SoundAsset::static_pkl_type (Standard standard)
{
switch (standard) {
case INTEROP:
projects / libdcp.git / blobdiff