diff options
| author | Carl Hetherington <cth@carlh.net> | 2016-06-01 23:53:06 +0100 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2016-06-01 23:53:06 +0100 |
| commit | a68b877d96a9e9f366f27752e071bc0e895e9dc7 (patch) | |
| tree | 11a32d1efd6abf182b03ce22f1f1fe84258bb7de /src/stereo_picture_asset.cc | |
| parent | f9cba324c8160a70b108d9e5b60a4ccad6ee9be2 (diff) | |
Add Reader classes to permit much more efficient DCP reading.
Diffstat (limited to 'src/stereo_picture_asset.cc')
| -rw-r--r-- | src/stereo_picture_asset.cc | 22 |
1 files changed, 13 insertions, 9 deletions
diff --git a/src/stereo_picture_asset.cc b/src/stereo_picture_asset.cc index d8cb7c9a..c7e0575c 100644 --- a/src/stereo_picture_asset.cc +++ b/src/stereo_picture_asset.cc @@ -1,5 +1,5 @@ /* - Copyright (C) 2012-2014 Carl Hetherington <cth@carlh.net> + Copyright (C) 2012-2016 Carl Hetherington <cth@carlh.net> This file is part of libdcp. @@ -23,6 +23,7 @@ #include "stereo_picture_frame.h" #include "exceptions.h" #include "stereo_picture_asset_writer.h" +#include "stereo_picture_asset_reader.h" #include "dcp_assert.h" using std::string; @@ -63,18 +64,18 @@ StereoPictureAsset::StereoPictureAsset (Fraction edit_rate) } -shared_ptr<const StereoPictureFrame> -StereoPictureAsset::get_frame (int n) const -{ - return shared_ptr<const StereoPictureFrame> (new StereoPictureFrame (file().string(), n)); -} - shared_ptr<PictureAssetWriter> StereoPictureAsset::start_write (boost::filesystem::path file, Standard standard, bool overwrite) { return shared_ptr<StereoPictureAssetWriter> (new StereoPictureAssetWriter (this, file, standard, overwrite)); } +shared_ptr<StereoPictureAssetReader> +StereoPictureAsset::start_read () const +{ + return shared_ptr<StereoPictureAssetReader> (new StereoPictureAssetReader (this)); +} + bool StereoPictureAsset::equals (shared_ptr<const Asset> other, EqualityOptions opt, NoteHandler note) const { @@ -106,14 +107,17 @@ StereoPictureAsset::equals (shared_ptr<const Asset> other, EqualityOptions opt, shared_ptr<const StereoPictureAsset> other_picture = dynamic_pointer_cast<const StereoPictureAsset> (other); DCP_ASSERT (other_picture); + shared_ptr<const StereoPictureAssetReader> reader = start_read (); + shared_ptr<const StereoPictureAssetReader> other_reader = other_picture->start_read (); + bool result = true; for (int i = 0; i < _intrinsic_duration; ++i) { shared_ptr<const StereoPictureFrame> frame_A; shared_ptr<const StereoPictureFrame> frame_B; try { - frame_A = get_frame (i); - frame_B = other_picture->get_frame (i); + frame_A = reader->get_frame (i); + frame_B = other_reader->get_frame (i); } catch (DCPReadError& e) { /* If there was a problem reading the frame data we'll just assume the two frames are not equal. |