X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Fstereo_picture_asset.cc;h=2ce3cdc90f386ed172e7bc23315c6a6ed8ed8910;hb=dfc34502469e9c975bf78011b0efc365c11e9779;hp=e2494be6f417649bd7581e17603aa9d922e7bcd0;hpb=6e9b1b0ca5e839bda7b567b609cebb92a1cb95a7;p=libdcp.git diff --git a/src/stereo_picture_asset.cc b/src/stereo_picture_asset.cc index e2494be6..2ce3cdc9 100644 --- a/src/stereo_picture_asset.cc +++ b/src/stereo_picture_asset.cc @@ -1,130 +1,163 @@ /* - Copyright (C) 2012-2014 Carl Hetherington + Copyright (C) 2012-2021 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. */ -#include "AS_DCP.h" -#include "stereo_picture_asset.h" -#include "stereo_picture_frame.h" + +/** @file src/stereo_picture_asset.cc + * @brief StereoPictureAsset class + */ + + +#include "dcp_assert.h" +#include "equality_options.h" #include "exceptions.h" +#include "filesystem.h" +#include "stereo_picture_asset.h" +#include "stereo_picture_asset_reader.h" #include "stereo_picture_asset_writer.h" -#include "dcp_assert.h" +#include "stereo_picture_frame.h" +#include + using std::string; using std::pair; using std::make_pair; -using boost::shared_ptr; -using boost::dynamic_pointer_cast; +using std::shared_ptr; +using std::dynamic_pointer_cast; using namespace dcp; + StereoPictureAsset::StereoPictureAsset (boost::filesystem::path file) : PictureAsset (file) { ASDCP::JP2K::MXFSReader reader; - Kumu::Result_t r = reader.OpenRead (file.string().c_str()); - if (ASDCP_FAILURE (r)) { - boost::throw_exception (MXFFileError ("could not open MXF file for reading", file.string(), r)); + auto r = reader.OpenRead(dcp::filesystem::fix_long_path(file).string().c_str()); + if (ASDCP_FAILURE(r)) { + boost::throw_exception (MXFFileError("could not open MXF file for reading", file.string(), r)); } ASDCP::JP2K::PictureDescriptor desc; - if (ASDCP_FAILURE (reader.FillPictureDescriptor (desc))) { - boost::throw_exception (DCPReadError ("could not read video MXF information")); + if (ASDCP_FAILURE (reader.FillPictureDescriptor(desc))) { + 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")); + if (ASDCP_FAILURE (reader.FillWriterInfo(info))) { + boost::throw_exception (ReadError("could not read video MXF information")); } _id = read_writer_info (info); } -StereoPictureAsset::StereoPictureAsset (Fraction edit_rate) - : PictureAsset - (edit_rate) + +StereoPictureAsset::StereoPictureAsset (Fraction edit_rate, Standard standard) + : PictureAsset (edit_rate, standard) { } -shared_ptr -StereoPictureAsset::get_frame (int n) const + +shared_ptr +StereoPictureAsset::start_write(boost::filesystem::path file, Behaviour behaviour) { - return shared_ptr (new StereoPictureFrame (file().string(), n)); + return shared_ptr(new StereoPictureAssetWriter(this, file, behaviour == Behaviour::OVERWRITE_EXISTING)); } -shared_ptr -StereoPictureAsset::start_write (boost::filesystem::path file, Standard standard, bool overwrite) + +shared_ptr +StereoPictureAsset::start_read () const { - return shared_ptr (new StereoPictureAssetWriter (this, file, standard, overwrite)); + return shared_ptr (new StereoPictureAssetReader(this, key(), standard())); } + bool -StereoPictureAsset::equals (shared_ptr other, EqualityOptions opt, NoteHandler note) const +StereoPictureAsset::equals(shared_ptr other, EqualityOptions const& opt, NoteHandler note) const { ASDCP::JP2K::MXFSReader reader_A; - Kumu::Result_t r = reader_A.OpenRead (file().string().c_str()); + DCP_ASSERT (file()); + auto r = reader_A.OpenRead(dcp::filesystem::fix_long_path(*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::MXFSReader reader_B; - r = reader_B.OpenRead (other->file().string().c_str()); + DCP_ASSERT (other->file()); + r = reader_B.OpenRead(dcp::filesystem::fix_long_path(*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::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)) { return false; } - shared_ptr other_picture = dynamic_pointer_cast (other); + auto other_picture = dynamic_pointer_cast (other); DCP_ASSERT (other_picture); + auto reader = start_read (); + auto other_reader = other_picture->start_read (); + bool result = true; for (int i = 0; i < _intrinsic_duration; ++i) { shared_ptr frame_A; shared_ptr frame_B; try { - frame_A = get_frame (i); - frame_B = other_picture->get_frame (i); - } catch (DCPReadError& e) { + frame_A = reader->get_frame (i); + frame_B = other_reader->get_frame (i); + } catch (ReadError& e) { /* If there was a problem reading the frame data we'll just assume the two frames are not equal. */ - note (DCP_ERROR, e.what ()); + note (NoteType::ERROR, e.what ()); return false; } if (!frame_buffer_equals ( i, opt, note, - frame_A->left_j2k_data(), frame_A->left_j2k_size(), - frame_B->left_j2k_data(), frame_B->left_j2k_size() + frame_A->left()->data(), frame_A->left()->size(), + frame_B->left()->data(), frame_B->left()->size() )) { result = false; if (!opt.keep_going) { @@ -134,8 +167,8 @@ StereoPictureAsset::equals (shared_ptr other, EqualityOptions opt, if (!frame_buffer_equals ( i, opt, note, - frame_A->right_j2k_data(), frame_A->right_j2k_size(), - frame_B->right_j2k_data(), frame_B->right_j2k_size() + frame_A->right()->data(), frame_A->right()->size(), + frame_B->right()->data(), frame_B->right()->size() )) { result = false; if (!opt.keep_going) {