projects
/
libdcp.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fix incorrect day-of-month in LocalTime.
[libdcp.git]
/
src
/
sound_mxf.cc
diff --git
a/src/sound_mxf.cc
b/src/sound_mxf.cc
index ebcf12c60609587cf29e7a93e9c6c63f23028489..e338c16165abb2db3b28e519d3edd2f7270d88b9 100644
(file)
--- a/
src/sound_mxf.cc
+++ b/
src/sound_mxf.cc
@@
-26,11
+26,11
@@
#include "exceptions.h"
#include "sound_frame.h"
#include "sound_mxf_writer.h"
#include "exceptions.h"
#include "sound_frame.h"
#include "sound_mxf_writer.h"
+#include "compose.hpp"
#include "KM_fileio.h"
#include "AS_DCP.h"
#include <libxml++/nodes/element.h>
#include <boost/filesystem.hpp>
#include "KM_fileio.h"
#include "AS_DCP.h"
#include <libxml++/nodes/element.h>
#include <boost/filesystem.hpp>
-#include <boost/lexical_cast.hpp>
#include <iostream>
#include <stdexcept>
#include <iostream>
#include <stdexcept>
@@
-40,7
+40,6
@@
using std::ostream;
using std::vector;
using std::list;
using boost::shared_ptr;
using std::vector;
using std::list;
using boost::shared_ptr;
-using boost::lexical_cast;
using namespace dcp;
SoundMXF::SoundMXF (boost::filesystem::path file)
using namespace dcp;
SoundMXF::SoundMXF (boost::filesystem::path file)
@@
-64,6
+63,14
@@
SoundMXF::SoundMXF (boost::filesystem::path file)
_edit_rate = Fraction (desc.EditRate.Numerator, desc.EditRate.Denominator);
_intrinsic_duration = desc.ContainerDuration;
_edit_rate = Fraction (desc.EditRate.Numerator, desc.EditRate.Denominator);
_intrinsic_duration = desc.ContainerDuration;
+
+ ASDCP::WriterInfo info;
+ if (ASDCP_FAILURE (reader.FillWriterInfo (info))) {
+ boost::throw_exception (DCPReadError ("could not read audio MXF information"));
+ }
+
+ read_writer_info (info);
+
}
SoundMXF::SoundMXF (Fraction edit_rate, int sampling_rate, int channels)
}
SoundMXF::SoundMXF (Fraction edit_rate, int sampling_rate, int channels)
@@
-75,7
+82,7
@@
SoundMXF::SoundMXF (Fraction edit_rate, int sampling_rate, int channels)
}
bool
}
bool
-SoundMXF::equals (shared_ptr<const
Content> other, EqualityOptions opt, boost::function<void (NoteType, string)>
note) const
+SoundMXF::equals (shared_ptr<const
Asset> other, EqualityOptions opt, NoteHandler
note) const
{
if (!MXF::equals (other, opt, note)) {
return false;
{
if (!MXF::equals (other, opt, note)) {
return false;
@@
-115,7
+122,7
@@
SoundMXF::equals (shared_ptr<const Content> other, EqualityOptions opt, boost::f
// desc_A.ChannelFormat != desc_B.ChannelFormat ||
) {
// desc_A.ChannelFormat != desc_B.ChannelFormat ||
) {
- note (ERROR, "audio MXF picture descriptors differ");
+ note (
DCP_
ERROR, "audio MXF picture descriptors differ");
return false;
}
return false;
}
@@
-132,7
+139,7
@@
SoundMXF::equals (shared_ptr<const Content> other, EqualityOptions opt, boost::f
}
if (buffer_A.Size() != buffer_B.Size()) {
}
if (buffer_A.Size() != buffer_B.Size()) {
- note (
ERROR, "sizes of audio data for frame " + lexical_cast<string>(i) + " differ"
);
+ note (
DCP_ERROR, String::compose ("sizes of audio data for frame %1 differ", i)
);
return false;
}
return false;
}
@@
-140,7
+147,7
@@
SoundMXF::equals (shared_ptr<const Content> other, EqualityOptions opt, boost::f
for (uint32_t i = 0; i < buffer_A.Size(); ++i) {
int const d = abs (buffer_A.RoData()[i] - buffer_B.RoData()[i]);
if (d > opt.max_audio_sample_error) {
for (uint32_t i = 0; i < buffer_A.Size(); ++i) {
int const d = abs (buffer_A.RoData()[i] - buffer_B.RoData()[i]);
if (d > opt.max_audio_sample_error) {
- note (
ERROR, "PCM data difference of " + lexical_cast<string> (
d));
+ note (
DCP_ERROR, String::compose ("PCM data difference of %1",
d));
return false;
}
}
return false;
}
}
@@
-154,7
+161,7
@@
shared_ptr<const SoundFrame>
SoundMXF::get_frame (int n) const
{
/* XXX: should add on entry point here? */
SoundMXF::get_frame (int n) const
{
/* XXX: should add on entry point here? */
- return shared_ptr<const SoundFrame> (new SoundFrame (file()
.string()
, n, _decryption_context));
+ return shared_ptr<const SoundFrame> (new SoundFrame (file(), n, _decryption_context));
}
shared_ptr<SoundMXFWriter>
}
shared_ptr<SoundMXFWriter>
@@
-163,9
+170,3
@@
SoundMXF::start_write (boost::filesystem::path file, Standard standard)
/* XXX: can't we use a shared_ptr here? */
return shared_ptr<SoundMXFWriter> (new SoundMXFWriter (this, file, standard));
}
/* XXX: can't we use a shared_ptr here? */
return shared_ptr<SoundMXFWriter> (new SoundMXFWriter (this, file, standard));
}
-
-string
-SoundMXF::key_type () const
-{
- return "MDAK";
-}