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.
*/
#include "mono_picture_asset.h"
#include "mono_picture_asset_writer.h"
#include "mono_picture_asset_reader.h"
-#include "AS_DCP.h"
-#include "KM_fileio.h"
#include "exceptions.h"
#include "dcp_assert.h"
#include "mono_picture_frame.h"
#include "compose.hpp"
+#include <asdcp/AS_DCP.h>
+#include <asdcp/KM_fileio.h>
using std::string;
using std::vector;
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;
}
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