projects
/
libdcp.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Rename classes.
[libdcp.git]
/
src
/
stereo_j2k_picture_asset.cc
diff --git
a/src/stereo_j2k_picture_asset.cc
b/src/stereo_j2k_picture_asset.cc
index ffce0f51a0cb1dc05f2687a0e3b470bc0a3d355e..6a5e7d794cc71ad75394a364ef1fe3a95266e51c 100644
(file)
--- a/
src/stereo_j2k_picture_asset.cc
+++ b/
src/stereo_j2k_picture_asset.cc
@@
-33,7
+33,7
@@
/** @file src/stereo_picture_asset.cc
/** @file src/stereo_picture_asset.cc
- * @brief StereoPictureAsset class
+ * @brief Stereo
J2K
PictureAsset class
*/
*/
@@
-56,8
+56,8
@@
using std::dynamic_pointer_cast;
using namespace dcp;
using namespace dcp;
-Stereo
PictureAsset::Stereo
PictureAsset (boost::filesystem::path file)
- : PictureAsset (file)
+Stereo
J2KPictureAsset::StereoJ2K
PictureAsset (boost::filesystem::path file)
+ :
J2K
PictureAsset (file)
{
Kumu::FileReaderFactory factory;
ASDCP::JP2K::MXFSReader reader(factory);
{
Kumu::FileReaderFactory factory;
ASDCP::JP2K::MXFSReader reader(factory);
@@
-82,29
+82,29
@@
StereoPictureAsset::StereoPictureAsset (boost::filesystem::path file)
}
}
-Stereo
PictureAsset::Stereo
PictureAsset (Fraction edit_rate, Standard standard)
- : PictureAsset (edit_rate, standard)
+Stereo
J2KPictureAsset::StereoJ2K
PictureAsset (Fraction edit_rate, Standard standard)
+ :
J2K
PictureAsset (edit_rate, standard)
{
}
{
}
-shared_ptr<PictureAssetWriter>
-StereoPictureAsset::start_write(boost::filesystem::path file, Behaviour behaviour)
+shared_ptr<
J2K
PictureAssetWriter>
+Stereo
J2K
PictureAsset::start_write(boost::filesystem::path file, Behaviour behaviour)
{
{
- return shared_ptr<Stereo
PictureAssetWriter>(new Stereo
PictureAssetWriter(this, file, behaviour == Behaviour::OVERWRITE_EXISTING));
+ return shared_ptr<Stereo
J2KPictureAssetWriter>(new StereoJ2K
PictureAssetWriter(this, file, behaviour == Behaviour::OVERWRITE_EXISTING));
}
}
-shared_ptr<StereoPictureAssetReader>
-StereoPictureAsset::start_read () const
+shared_ptr<Stereo
J2K
PictureAssetReader>
+Stereo
J2K
PictureAsset::start_read () const
{
{
- return shared_ptr<Stereo
PictureAssetReader> (new Stereo
PictureAssetReader(this, key(), standard()));
+ return shared_ptr<Stereo
J2KPictureAssetReader> (new StereoJ2K
PictureAssetReader(this, key(), standard()));
}
bool
}
bool
-StereoPictureAsset::equals(shared_ptr<const Asset> other, EqualityOptions const& opt, NoteHandler note) const
+Stereo
J2K
PictureAsset::equals(shared_ptr<const Asset> other, EqualityOptions const& opt, NoteHandler note) const
{
Kumu::FileReaderFactory factory;
ASDCP::JP2K::MXFSReader reader_A(factory);
{
Kumu::FileReaderFactory factory;
ASDCP::JP2K::MXFSReader reader_A(factory);
@@
-134,7
+134,7
@@
StereoPictureAsset::equals(shared_ptr<const Asset> other, EqualityOptions const&
return false;
}
return false;
}
- auto other_picture = dynamic_pointer_cast<const StereoPictureAsset> (other);
+ auto other_picture = dynamic_pointer_cast<const Stereo
J2K
PictureAsset> (other);
DCP_ASSERT (other_picture);
auto reader = start_read ();
DCP_ASSERT (other_picture);
auto reader = start_read ();
@@
-143,8
+143,8
@@
StereoPictureAsset::equals(shared_ptr<const Asset> other, EqualityOptions const&
bool result = true;
for (int i = 0; i < _intrinsic_duration; ++i) {
bool result = true;
for (int i = 0; i < _intrinsic_duration; ++i) {
- shared_ptr<const StereoPictureFrame> frame_A;
- shared_ptr<const StereoPictureFrame> frame_B;
+ shared_ptr<const Stereo
J2K
PictureFrame> frame_A;
+ shared_ptr<const Stereo
J2K
PictureFrame> frame_B;
try {
frame_A = reader->get_frame (i);
frame_B = other_reader->get_frame (i);
try {
frame_A = reader->get_frame (i);
frame_B = other_reader->get_frame (i);