using std::vector;
using std::list;
using std::pair;
-using boost::shared_ptr;
-using boost::dynamic_pointer_cast;
+using std::shared_ptr;
+using std::dynamic_pointer_cast;
+#if BOOST_VERSION >= 106100
+using namespace boost::placeholders;
+#endif
using namespace dcp;
MonoPictureAsset::MonoPictureAsset (boost::filesystem::path file)
ASDCP::JP2K::PictureDescriptor desc;
if (ASDCP_FAILURE (reader.FillPictureDescriptor (desc))) {
- boost::throw_exception (DCPReadError ("could not read video MXF information"));
+ boost::throw_exception (ReadError ("could not read video MXF information"));
}
read_picture_descriptor (desc);
ASDCP::WriterInfo info;
if (ASDCP_FAILURE (reader.FillWriterInfo (info))) {
- boost::throw_exception (DCPReadError ("could not read video MXF information"));
+ boost::throw_exception (ReadError ("could not read video MXF information"));
}
_id = read_writer_info (info);
}
-MonoPictureAsset::MonoPictureAsset (Fraction edit_rate)
- : PictureAsset (edit_rate)
+MonoPictureAsset::MonoPictureAsset (Fraction edit_rate, Standard standard)
+ : PictureAsset (edit_rate, standard)
{
}
}
ASDCP::JP2K::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::JP2K::MXFReader reader_B;
- r = reader_B.OpenRead (other->file().string().c_str());
+ DCP_ASSERT (other->file ());
+ 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::JP2K::PictureDescriptor desc_A;
if (ASDCP_FAILURE (reader_A.FillPictureDescriptor (desc_A))) {
- boost::throw_exception (DCPReadError ("could not read video MXF information"));
+ boost::throw_exception (ReadError ("could not read video MXF information"));
}
ASDCP::JP2K::PictureDescriptor desc_B;
if (ASDCP_FAILURE (reader_B.FillPictureDescriptor (desc_B))) {
- boost::throw_exception (DCPReadError ("could not read video MXF information"));
+ boost::throw_exception (ReadError ("could not read video MXF information"));
}
if (!descriptor_equals (desc_A, desc_B, note)) {
bool result = true;
+ shared_ptr<MonoPictureAssetReader> reader = start_read ();
+ shared_ptr<MonoPictureAssetReader> other_reader = other_picture->start_read ();
+
#ifdef LIBDCP_OPENMP
#pragma omp parallel for
#endif
- shared_ptr<MonoPictureAssetReader> reader = start_read ();
- shared_ptr<MonoPictureAssetReader> other_reader = other_picture->start_read ();
-
for (int i = 0; i < _intrinsic_duration; ++i) {
if (i >= other_picture->intrinsic_duration()) {
result = false;
if (!frame_buffer_equals (
i, opt, bind (&storing_note_handler, boost::ref(notes), _1, _2),
- frame_A->j2k_data(), frame_A->j2k_size(),
- frame_B->j2k_data(), frame_B->j2k_size()
+ frame_A->data(), frame_A->size(),
+ frame_B->data(), frame_B->size()
)) {
result = false;
}
}
shared_ptr<PictureAssetWriter>
-MonoPictureAsset::start_write (boost::filesystem::path file, Standard standard, bool overwrite)
+MonoPictureAsset::start_write (boost::filesystem::path file, bool overwrite)
{
/* XXX: can't we use shared_ptr here? */
- return shared_ptr<MonoPictureAssetWriter> (new MonoPictureAssetWriter (this, file, standard, overwrite));
+ return shared_ptr<MonoPictureAssetWriter> (new MonoPictureAssetWriter (this, file, overwrite));
}
shared_ptr<MonoPictureAssetReader>
MonoPictureAsset::start_read () const
{
- return shared_ptr<MonoPictureAssetReader> (new MonoPictureAssetReader (this));
+ return shared_ptr<MonoPictureAssetReader> (new MonoPictureAssetReader (this, key(), standard()));
}
string