Rename classes to follow preparatory renames in libdcp.

diff --git a/src/lib/dcp_decoder.cc b/src/lib/dcp_decoder.cc
index 303126caa840292ab894bd6455e194d4c50193d2..d473476a00cf7c91b7cbd040b1a314d7587729bc 100644 (file)
--- a/src/lib/dcp_decoder.cc
+++ b/src/lib/dcp_decoder.cc
@@ -36,9 +36,9 @@
 #include <dcp/cpl.h>
 #include <dcp/dcp.h>
 #include <dcp/decrypted_kdm.h>
-#include <dcp/mono_picture_asset.h>
-#include <dcp/mono_picture_asset_reader.h>
-#include <dcp/mono_picture_frame.h>
+#include <dcp/mono_j2k_picture_asset.h>
+#include <dcp/mono_j2k_picture_asset_reader.h>
+#include <dcp/mono_j2k_picture_frame.h>
 #include <dcp/reel.h>
 #include <dcp/reel_atmos_asset.h>
 #include <dcp/reel_closed_caption_asset.h>
@@ -48,9 +48,9 @@
 #include <dcp/search.h>
 #include <dcp/sound_asset_reader.h>
 #include <dcp/sound_frame.h>
-#include <dcp/stereo_picture_asset.h>
-#include <dcp/stereo_picture_asset_reader.h>
-#include <dcp/stereo_picture_frame.h>
+#include <dcp/stereo_j2k_picture_asset.h>
+#include <dcp/stereo_j2k_picture_asset_reader.h>
+#include <dcp/stereo_j2k_picture_frame.h>
 #include <dcp/subtitle_image.h>
 #include <iostream>
 
@@ -169,24 +169,24 @@ DCPDecoder::pass ()
        */
        pass_texts (_next, picture_asset->size());
 
-       if ((_mono_reader || _stereo_reader) && (_decode_referenced || !_dcp_content->reference_video())) {
+       if ((_j2k_mono_reader || _j2k_stereo_reader) && (_decode_referenced || !_dcp_content->reference_video())) {
                auto const entry_point = (*_reel)->main_picture()->entry_point().get_value_or(0);
-               if (_mono_reader) {
+               if (_j2k_mono_reader) {
                        video->emit (
                                film(),
                                std::make_shared<J2KImageProxy>(
-                                       _mono_reader->get_frame (entry_point + frame),
+                                       _j2k_mono_reader->get_frame(entry_point + frame),
                                        picture_asset->size(),
                                        AV_PIX_FMT_XYZ12LE,
                                        _forced_reduction
                                        ),
                                ContentTime::from_frames(_offset + frame, vfr)
                                );
-               } else {
+               } else if (_j2k_stereo_reader) {
                        video->emit (
                                film(),
                                std::make_shared<J2KImageProxy>(
-                                       _stereo_reader->get_frame (entry_point + frame),
+                                       _j2k_stereo_reader->get_frame (entry_point + frame),
                                        picture_asset->size(),
                                        dcp::Eye::LEFT,
                                        AV_PIX_FMT_XYZ12LE,
@@ -198,7 +198,7 @@ DCPDecoder::pass ()
                        video->emit (
                                film(),
                                std::make_shared<J2KImageProxy>(
-                                       _stereo_reader->get_frame (entry_point + frame),
+                                       _j2k_stereo_reader->get_frame (entry_point + frame),
                                        picture_asset->size(),
                                        dcp::Eye::RIGHT,
                                        AV_PIX_FMT_XYZ12LE,
@@ -367,38 +367,33 @@ DCPDecoder::next_reel ()
 void
 DCPDecoder::get_readers ()
 {
+       _j2k_mono_reader.reset();
+       _j2k_stereo_reader.reset();
+       _sound_reader.reset();
+       _atmos_reader.reset();
+       _atmos_metadata = boost::none;
+
        if (_reel == _reels.end() || !_dcp_content->can_be_played ()) {
-               _mono_reader.reset ();
-               _stereo_reader.reset ();
-               _sound_reader.reset ();
-               _atmos_reader.reset ();
                return;
        }
 
        if (video && !video->ignore() && (*_reel)->main_picture()) {
                auto asset = (*_reel)->main_picture()->asset ();
-               auto mono = dynamic_pointer_cast<dcp::MonoPictureAsset> (asset);
-               auto stereo = dynamic_pointer_cast<dcp::StereoPictureAsset> (asset);
-               DCPOMATIC_ASSERT (mono || stereo);
-               if (mono) {
-                       _mono_reader = mono->start_read ();
-                       _mono_reader->set_check_hmac (false);
-                       _stereo_reader.reset ();
-               } else {
-                       _stereo_reader = stereo->start_read ();
-                       _stereo_reader->set_check_hmac (false);
-                       _mono_reader.reset ();
+               auto j2k_mono = dynamic_pointer_cast<dcp::MonoJ2KPictureAsset>(asset);
+               auto j2k_stereo = dynamic_pointer_cast<dcp::StereoJ2KPictureAsset>(asset);
+               DCPOMATIC_ASSERT(j2k_mono || j2k_stereo)
+               if (j2k_mono) {
+                       _j2k_mono_reader = j2k_mono->start_read();
+                       _j2k_mono_reader->set_check_hmac(false);
+               } else if (j2k_stereo) {
+                       _j2k_stereo_reader = j2k_stereo->start_read();
+                       _j2k_stereo_reader->set_check_hmac(false);
                }
-       } else {
-               _mono_reader.reset ();
-               _stereo_reader.reset ();
        }
 
        if (audio && !audio->ignore() && (*_reel)->main_sound()) {
                _sound_reader = (*_reel)->main_sound()->asset()->start_read ();
                _sound_reader->set_check_hmac (false);
-       } else {
-               _sound_reader.reset ();
        }
 
        if ((*_reel)->atmos()) {
@@ -406,9 +401,6 @@ DCPDecoder::get_readers ()
                _atmos_reader = asset->start_read();
                _atmos_reader->set_check_hmac (false);
                _atmos_metadata = AtmosMetadata (asset);
-       } else {
-               _atmos_reader.reset ();
-               _atmos_metadata = boost::none;
        }
 }
 

diff --git a/src/lib/dcp_decoder.h b/src/lib/dcp_decoder.h
index 2c0cd8f413ad7612ceeeae3e122694a9bf6d2bf2..0143ef881cf7f43d5a06b6ad927f6ce03840cef3 100644 (file)
--- a/src/lib/dcp_decoder.h
+++ b/src/lib/dcp_decoder.h
@@ -27,8 +27,8 @@
 #include "atmos_metadata.h"
 #include "decoder.h"
 #include "font_id_allocator.h"
-#include <dcp/mono_picture_asset_reader.h>
-#include <dcp/stereo_picture_asset_reader.h>
+#include <dcp/mono_j2k_picture_asset_reader.h>
+#include <dcp/stereo_j2k_picture_asset_reader.h>
 #include <dcp/sound_asset_reader.h>
 #include <dcp/subtitle_asset.h>
 
@@ -94,10 +94,10 @@ private:
        std::vector<std::shared_ptr<dcp::Reel>>::iterator _reel;
        /** Offset of _reel from the start of the content in frames */
        int64_t _offset = 0;
-       /** Reader for current mono picture asset, if applicable */
-       std::shared_ptr<dcp::MonoPictureAssetReader> _mono_reader;
-       /** Reader for current stereo picture asset, if applicable */
-       std::shared_ptr<dcp::StereoPictureAssetReader> _stereo_reader;
+       /** Reader for current J2K mono picture asset, if applicable */
+       std::shared_ptr<dcp::MonoJ2KPictureAssetReader> _j2k_mono_reader;
+       /** Reader for current J2K stereo picture asset, if applicable */
+       std::shared_ptr<dcp::StereoJ2KPictureAssetReader> _j2k_stereo_reader;
        /** Reader for current sound asset, if applicable */
        std::shared_ptr<dcp::SoundAssetReader> _sound_reader;
        std::shared_ptr<dcp::AtmosAssetReader> _atmos_reader;

diff --git a/src/lib/dcp_examiner.cc b/src/lib/dcp_examiner.cc
index 3515f34c287e749970809cbd3f750d2f8d8da40c..584ba4116315d0398ee52f7929729a348080a9e9 100644 (file)
--- a/src/lib/dcp_examiner.cc
+++ b/src/lib/dcp_examiner.cc
@@ -32,9 +32,9 @@
 #include <dcp/cpl.h>
 #include <dcp/dcp.h>
 #include <dcp/decrypted_kdm.h>
-#include <dcp/mono_picture_asset.h>
-#include <dcp/mono_picture_asset_reader.h>
-#include <dcp/mono_picture_frame.h>
+#include <dcp/mono_j2k_picture_asset.h>
+#include <dcp/mono_j2k_picture_asset_reader.h>
+#include <dcp/mono_j2k_picture_frame.h>
 #include <dcp/reel.h>
 #include <dcp/reel_atmos_asset.h>
 #include <dcp/reel_closed_caption_asset.h>
@@ -46,9 +46,9 @@
 #include <dcp/sound_asset.h>
 #include <dcp/sound_asset.h>
 #include <dcp/sound_asset_reader.h>
-#include <dcp/stereo_picture_asset.h>
-#include <dcp/stereo_picture_asset_reader.h>
-#include <dcp/stereo_picture_frame.h>
+#include <dcp/stereo_j2k_picture_asset.h>
+#include <dcp/stereo_j2k_picture_asset_reader.h>
+#include <dcp/stereo_j2k_picture_frame.h>
 #include <dcp/subtitle_asset.h>
 #include <iostream>
 
@@ -293,15 +293,15 @@ DCPExaminer::DCPExaminer (shared_ptr<const DCPContent> content, bool tolerant)
                                        LOG_GENERAL_NC ("Picture has no key");
                                        break;
                                }
-                               auto mono = dynamic_pointer_cast<dcp::MonoPictureAsset>(pic);
-                               auto stereo = dynamic_pointer_cast<dcp::StereoPictureAsset>(pic);
+                               auto j2k_mono = dynamic_pointer_cast<dcp::MonoJ2KPictureAsset>(pic);
+                               auto j2k_stereo = dynamic_pointer_cast<dcp::StereoJ2KPictureAsset>(pic);
 
-                               if (mono) {
-                                       auto reader = mono->start_read();
+                               if (j2k_mono) {
+                                       auto reader = j2k_mono->start_read();
                                        reader->set_check_hmac (false);
                                        reader->get_frame(0)->xyz_image();
-                               } else {
-                                       auto reader = stereo->start_read();
+                               } else if (j2k_stereo) {
+                                       auto reader = j2k_stereo->start_read();
                                        reader->set_check_hmac (false);
                                        reader->get_frame(0)->xyz_image(dcp::Eye::LEFT);
                                }
@@ -354,7 +354,7 @@ DCPExaminer::DCPExaminer (shared_ptr<const DCPContent> content, bool tolerant)
        _standard = selected_cpl->standard();
        if (!selected_cpl->reels().empty()) {
                auto first_reel = selected_cpl->reels()[0];
-               _three_d = first_reel->main_picture() && first_reel->main_picture()->asset_ref().resolved() && dynamic_pointer_cast<dcp::StereoPictureAsset>(first_reel->main_picture()->asset());
+               _three_d = first_reel->main_picture() && first_reel->main_picture()->asset_ref().resolved() && dynamic_pointer_cast<dcp::StereoJ2KPictureAsset>(first_reel->main_picture()->asset());
        }
        _ratings = selected_cpl->ratings();
        for (auto version: selected_cpl->content_versions()) {

diff --git a/src/lib/j2k_image_proxy.cc b/src/lib/j2k_image_proxy.cc
index 869e96967723d279142a5249de0f1e09b0534739..023723c8b00465d2f7140a83440b81c091ed0cde 100644 (file)
--- a/src/lib/j2k_image_proxy.cc
+++ b/src/lib/j2k_image_proxy.cc
@@ -25,11 +25,11 @@
 #include "j2k_image_proxy.h"
 #include <dcp/colour_conversion.h>
 #include <dcp/j2k_transcode.h>
-#include <dcp/mono_picture_frame.h>
+#include <dcp/mono_j2k_picture_frame.h>
 #include <dcp/openjpeg_image.h>
 #include <dcp/raw_convert.h>
 #include <dcp/rgb_xyz.h>
-#include <dcp/stereo_picture_frame.h>
+#include <dcp/stereo_j2k_picture_frame.h>
 #include <dcp/warnings.h>
 #include <libcxml/cxml.h>
 LIBDCP_DISABLE_WARNINGS
@@ -64,7 +64,7 @@ J2KImageProxy::J2KImageProxy (boost::filesystem::path path, dcp::Size size, AVPi
 
 
 J2KImageProxy::J2KImageProxy (
-       shared_ptr<const dcp::MonoPictureFrame> frame,
+       shared_ptr<const dcp::MonoJ2KPictureFrame> frame,
        dcp::Size size,
        AVPixelFormat pixel_format,
        optional<int> forced_reduction
@@ -81,7 +81,7 @@ J2KImageProxy::J2KImageProxy (
 
 
 J2KImageProxy::J2KImageProxy (
-       shared_ptr<const dcp::StereoPictureFrame> frame,
+       shared_ptr<const dcp::StereoJ2KPictureFrame> frame,
        dcp::Size size,
        dcp::Eye eye,
        AVPixelFormat pixel_format,

diff --git a/src/lib/j2k_image_proxy.h b/src/lib/j2k_image_proxy.h
index 3346fff08c4dc8d8cc82d5270468c52d0d17dd11..1d2d5cc21563e611cf97195d272dd0e0a44e68cc 100644 (file)
--- a/src/lib/j2k_image_proxy.h
+++ b/src/lib/j2k_image_proxy.h
@@ -26,8 +26,8 @@
 
 
 namespace dcp {
-       class MonoPictureFrame;
-       class StereoPictureFrame;
+       class MonoJ2KPictureFrame;
+       class StereoJ2KPictureFrame;
 }
 
 
@@ -37,14 +37,14 @@ public:
        J2KImageProxy (boost::filesystem::path path, dcp::Size, AVPixelFormat pixel_format);
 
        J2KImageProxy (
-               std::shared_ptr<const dcp::MonoPictureFrame> frame,
+               std::shared_ptr<const dcp::MonoJ2KPictureFrame> frame,
                dcp::Size,
                AVPixelFormat pixel_format,
                boost::optional<int> forced_reduction
                );
 
        J2KImageProxy (
-               std::shared_ptr<const dcp::StereoPictureFrame> frame,
+               std::shared_ptr<const dcp::StereoJ2KPictureFrame> frame,
                dcp::Size,
                dcp::Eye,
                AVPixelFormat pixel_format,

diff --git a/src/lib/map_cli.cc b/src/lib/map_cli.cc
index b158499a8d204628a87ddeb275d102d5f9556242..be3841deb187938e996f9040a18ba276c7dcf665 100644 (file)
--- a/src/lib/map_cli.cc
+++ b/src/lib/map_cli.cc
@@ -27,7 +27,7 @@
 #include <dcp/interop_subtitle_asset.h>
 #include <dcp/filesystem.h>
 #include <dcp/font_asset.h>
-#include <dcp/mono_picture_asset.h>
+#include <dcp/mono_j2k_picture_asset.h>
 #include <dcp/reel.h>
 #include <dcp/reel_atmos_asset.h>
 #include <dcp/reel_closed_caption_asset.h>
@@ -37,7 +37,7 @@
 #include <dcp/reel_subtitle_asset.h>
 #include <dcp/smpte_subtitle_asset.h>
 #include <dcp/sound_asset.h>
-#include <dcp/stereo_picture_asset.h>
+#include <dcp/stereo_j2k_picture_asset.h>
 #include <boost/optional.hpp>
 #include <getopt.h>
 #include <algorithm>

diff --git a/src/lib/reel_writer.cc b/src/lib/reel_writer.cc
index 1b33cae852eedcbb1ed5330d9e20bf52bc77bd03..1cca3fd17e3355dba20b8425c8c47a51dc8d5375 100644 (file)
--- a/src/lib/reel_writer.cc
+++ b/src/lib/reel_writer.cc
@@ -40,7 +40,7 @@
 #include <dcp/dcp.h>
 #include <dcp/filesystem.h>
 #include <dcp/interop_subtitle_asset.h>
-#include <dcp/mono_picture_asset.h>
+#include <dcp/mono_j2k_picture_asset.h>
 #include <dcp/raw_convert.h>
 #include <dcp/reel.h>
 #include <dcp/reel_atmos_asset.h>
@@ -55,7 +55,7 @@
 #include <dcp/smpte_subtitle_asset.h>
 #include <dcp/sound_asset.h>
 #include <dcp/sound_asset_writer.h>
-#include <dcp/stereo_picture_asset.h>
+#include <dcp/stereo_j2k_picture_asset.h>
 #include <dcp/subtitle_image.h>
 
 #include "i18n.h"
@@ -150,9 +150,9 @@ ReelWriter::ReelWriter (
 
 
                if (film()->three_d()) {
-                       _picture_asset.reset (new dcp::StereoPictureAsset(dcp::Fraction(film()->video_frame_rate(), 1), standard));
+                       _picture_asset = std::make_shared<dcp::StereoJ2KPictureAsset>(dcp::Fraction(film()->video_frame_rate(), 1), standard);
                } else {
-                       _picture_asset.reset (new dcp::MonoPictureAsset(dcp::Fraction(film()->video_frame_rate(), 1), standard));
+                       _picture_asset = std::make_shared<dcp::MonoJ2KPictureAsset>(dcp::Fraction(film()->video_frame_rate(), 1), standard);
                }
 
                _picture_asset->set_size (film()->frame_size());
@@ -164,14 +164,14 @@ ReelWriter::ReelWriter (
                }
 
                _picture_asset->set_file (asset);
-               _picture_asset_writer = _picture_asset->start_write(asset, _first_nonexistent_frame > 0 ? dcp::PictureAsset::Behaviour::OVERWRITE_EXISTING : dcp::PictureAsset::Behaviour::MAKE_NEW);
+               _picture_asset_writer = _picture_asset->start_write(asset, _first_nonexistent_frame > 0 ? dcp::Behaviour::OVERWRITE_EXISTING : dcp::Behaviour::MAKE_NEW);
        } else if (!text_only) {
                /* We already have a complete picture asset that we can just re-use */
                /* XXX: what about if the encryption key changes? */
                if (film()->three_d()) {
-                       _picture_asset = make_shared<dcp::StereoPictureAsset>(asset);
+                       _picture_asset = make_shared<dcp::StereoJ2KPictureAsset>(asset);
                } else {
-                       _picture_asset = make_shared<dcp::MonoPictureAsset>(asset);
+                       _picture_asset = make_shared<dcp::MonoJ2KPictureAsset>(asset);
                }
        }
 
@@ -546,12 +546,12 @@ ReelWriter::create_reel_picture (shared_ptr<dcp::Reel> reel, list<ReferencedReel
 
        if (_picture_asset) {
                /* We have made a picture asset of our own.  Put it into the reel */
-               auto mono = dynamic_pointer_cast<dcp::MonoPictureAsset> (_picture_asset);
+               auto mono = dynamic_pointer_cast<dcp::MonoJ2KPictureAsset>(_picture_asset);
                if (mono) {
                        reel_asset = make_shared<dcp::ReelMonoPictureAsset>(mono, 0);
                }
 
-               auto stereo = dynamic_pointer_cast<dcp::StereoPictureAsset> (_picture_asset);
+               auto stereo = dynamic_pointer_cast<dcp::StereoJ2KPictureAsset>(_picture_asset);
                if (stereo) {
                        reel_asset = make_shared<dcp::ReelStereoPictureAsset>(stereo, 0);
                }

diff --git a/src/lib/reel_writer.h b/src/lib/reel_writer.h
index c9052c832fd8570223bc8e4b6b6166bb14a2b25a..0886482a817b98685ebec80749cd195a642256af 100644 (file)
--- a/src/lib/reel_writer.h
+++ b/src/lib/reel_writer.h
@@ -30,7 +30,7 @@
 #include "weak_film.h"
 #include <dcp/atmos_asset_writer.h>
 #include <dcp/file.h>
-#include <dcp/picture_asset_writer.h>
+#include <dcp/j2k_picture_asset_writer.h>
 
 
 class AudioBuffers;
@@ -41,17 +41,17 @@ struct write_frame_info_test;
 
 namespace dcp {
        class AtmosAsset;
-       class MonoPictureAsset;
-       class MonoPictureAssetWriter;
-       class PictureAsset;
-       class PictureAssetWriter;
+       class MonoJ2KPictureAsset;
+       class MonoJ2KPictureAssetWriter;
+       class J2KPictureAsset;
+       class J2KPictureAssetWriter;
        class Reel;
        class ReelAsset;
        class ReelPictureAsset;
        class SoundAsset;
        class SoundAssetWriter;
-       class StereoPictureAsset;
-       class StereoPictureAssetWriter;
+       class StereoJ2KPictureAsset;
+       class StereoJ2KPictureAssetWriter;
        class SubtitleAsset;
 }
 
@@ -134,9 +134,9 @@ private:
 
        dcp::ArrayData _default_font;
 
-       std::shared_ptr<dcp::PictureAsset> _picture_asset;
+       std::shared_ptr<dcp::J2KPictureAsset> _picture_asset;
        /** picture asset writer, or 0 if we are not writing any picture because we already have one */
-       std::shared_ptr<dcp::PictureAssetWriter> _picture_asset_writer;
+       std::shared_ptr<dcp::J2KPictureAssetWriter> _picture_asset_writer;
        std::shared_ptr<dcp::SoundAsset> _sound_asset;
        std::shared_ptr<dcp::SoundAssetWriter> _sound_asset_writer;
        std::shared_ptr<dcp::SubtitleAsset> _subtitle_asset;

diff --git a/src/lib/video_mxf_content.cc b/src/lib/video_mxf_content.cc
index 546e1445b2110a1191f436a09a25f69e2b03a698..eeee6222c970058159c2560ed781b20596997965 100644 (file)
--- a/src/lib/video_mxf_content.cc
+++ b/src/lib/video_mxf_content.cc
@@ -26,8 +26,8 @@
 #include "film.h"
 #include "compose.hpp"
 #include <asdcp/KM_log.h>
-#include <dcp/mono_picture_asset.h>
-#include <dcp/stereo_picture_asset.h>
+#include <dcp/mono_j2k_picture_asset.h>
+#include <dcp/stereo_j2k_picture_asset.h>
 #include <dcp/exceptions.h>
 #include <libxml++/libxml++.h>
 
@@ -61,7 +61,7 @@ VideoMXFContent::valid_mxf (boost::filesystem::path path)
        Kumu::DefaultLogSink().UnsetFilterFlag(Kumu::LOG_ALLOW_ALL);
 
        try {
-               dcp::MonoPictureAsset mp (path);
+               dcp::MonoJ2KPictureAsset mp(path);
                return true;
        } catch (dcp::MXFFileError& e) {
 
@@ -71,7 +71,7 @@ VideoMXFContent::valid_mxf (boost::filesystem::path path)
 
        try {
                Kumu::DefaultLogSink().SetFilterFlag(0);
-               dcp::StereoPictureAsset sp (path);
+               dcp::StereoJ2KPictureAsset sp (path);
                return true;
        } catch (dcp::MXFFileError& e) {
 

diff --git a/src/lib/video_mxf_decoder.cc b/src/lib/video_mxf_decoder.cc
index 9f451297b992d9a9fa0ecc7297aedfc340412b73..3d1ed7f4e4873652e86f04793004b0ed5a9ab92b 100644 (file)
--- a/src/lib/video_mxf_decoder.cc
+++ b/src/lib/video_mxf_decoder.cc
@@ -24,10 +24,10 @@
 #include "video_mxf_content.h"
 #include "j2k_image_proxy.h"
 #include "frame_interval_checker.h"
-#include <dcp/mono_picture_asset.h>
-#include <dcp/mono_picture_asset_reader.h>
-#include <dcp/stereo_picture_asset.h>
-#include <dcp/stereo_picture_asset_reader.h>
+#include <dcp/mono_j2k_picture_asset.h>
+#include <dcp/mono_j2k_picture_asset_reader.h>
+#include <dcp/stereo_j2k_picture_asset.h>
+#include <dcp/stereo_j2k_picture_asset_reader.h>
 #include <dcp/exceptions.h>
 
 
@@ -44,7 +44,7 @@ VideoMXFDecoder::VideoMXFDecoder (shared_ptr<const Film> film, shared_ptr<const
        video = make_shared<VideoDecoder>(this, content);
 
        try {
-               auto mono = make_shared<dcp::MonoPictureAsset>(_content->path(0));
+               auto mono = make_shared<dcp::MonoJ2KPictureAsset>(_content->path(0));
                _mono_reader = mono->start_read ();
                _mono_reader->set_check_hmac (false);
                _size = mono->size ();
@@ -55,7 +55,7 @@ VideoMXFDecoder::VideoMXFDecoder (shared_ptr<const Film> film, shared_ptr<const
                /* maybe it's stereo */
        }
 
-       auto stereo = make_shared<dcp::StereoPictureAsset>(_content->path(0));
+       auto stereo = make_shared<dcp::StereoJ2KPictureAsset>(_content->path(0));
        _stereo_reader = stereo->start_read ();
        _stereo_reader->set_check_hmac (false);
        _size = stereo->size ();

diff --git a/src/lib/video_mxf_decoder.h b/src/lib/video_mxf_decoder.h
index 774e269c6d5da15275e1ccf61259f4ad1f510fa3..16d8b112e96abd21ca9b49a880470cce42d1c2b3 100644 (file)
--- a/src/lib/video_mxf_decoder.h
+++ b/src/lib/video_mxf_decoder.h
@@ -20,8 +20,8 @@
 
 
 #include "decoder.h"
-#include <dcp/mono_picture_asset_reader.h>
-#include <dcp/stereo_picture_asset_reader.h>
+#include <dcp/mono_j2k_picture_asset_reader.h>
+#include <dcp/stereo_j2k_picture_asset_reader.h>
 
 
 class VideoMXFContent;
@@ -42,7 +42,7 @@ private:
        /** Time of next thing to return from pass */
        dcpomatic::ContentTime _next;
 
-       std::shared_ptr<dcp::MonoPictureAssetReader> _mono_reader;
-       std::shared_ptr<dcp::StereoPictureAssetReader> _stereo_reader;
+       std::shared_ptr<dcp::MonoJ2KPictureAssetReader> _mono_reader;
+       std::shared_ptr<dcp::StereoJ2KPictureAssetReader> _stereo_reader;
        dcp::Size _size;
 };

diff --git a/src/lib/video_mxf_examiner.cc b/src/lib/video_mxf_examiner.cc
index 7a05f33691a756499f93b7f07ca06ee0696c22b9..276664a147000caca3a4c80e4459ae96b4e9aa20 100644 (file)
--- a/src/lib/video_mxf_examiner.cc
+++ b/src/lib/video_mxf_examiner.cc
@@ -21,8 +21,8 @@
 #include "video_mxf_content.h"
 #include "video_mxf_examiner.h"
 #include <dcp/exceptions.h>
-#include <dcp/mono_picture_asset.h>
-#include <dcp/stereo_picture_asset.h>
+#include <dcp/mono_j2k_picture_asset.h>
+#include <dcp/stereo_j2k_picture_asset.h>
 
 using std::shared_ptr;
 using boost::optional;
@@ -30,7 +30,7 @@ using boost::optional;
 VideoMXFExaminer::VideoMXFExaminer (shared_ptr<const VideoMXFContent> content)
 {
        try {
-               _asset.reset (new dcp::MonoPictureAsset (content->path(0)));
+               _asset = std::make_shared<dcp::MonoJ2KPictureAsset>(content->path(0));
        } catch (dcp::MXFFileError& e) {
                /* maybe it's stereo */
        } catch (dcp::ReadError& e) {
@@ -38,7 +38,7 @@ VideoMXFExaminer::VideoMXFExaminer (shared_ptr<const VideoMXFContent> content)
        }
 
        if (!_asset) {
-               _asset.reset (new dcp::StereoPictureAsset (content->path(0)));
+               _asset = std::make_shared<dcp::StereoJ2KPictureAsset>(content->path(0));
        }
 }
 

diff --git a/test/burnt_subtitle_test.cc b/test/burnt_subtitle_test.cc
index 8d7dcd143f872357fec0f542aceb3a7289e9e9cb..9d25287b2dc29b4fe512e757174eb00dcea7b247 100644 (file)
--- a/test/burnt_subtitle_test.cc
+++ b/test/burnt_subtitle_test.cc
@@ -39,9 +39,9 @@
 #include <dcp/cpl.h>
 #include <dcp/reel.h>
 #include <dcp/j2k_transcode.h>
-#include <dcp/mono_picture_asset.h>
-#include <dcp/mono_picture_asset_reader.h>
-#include <dcp/mono_picture_frame.h>
+#include <dcp/mono_j2k_picture_asset.h>
+#include <dcp/mono_j2k_picture_asset_reader.h>
+#include <dcp/mono_j2k_picture_frame.h>
 #include <dcp/openjpeg_image.h>
 #include <dcp/reel_picture_asset.h>
 #include <dcp/reel_mono_picture_asset.h>

diff --git a/test/dcp_subtitle_test.cc b/test/dcp_subtitle_test.cc
index 837362e84127e6e6abd2009aa89506620edecfb9..e62bd70ba2e76d91ecdaee20f365c5ddf635cbea 100644 (file)
--- a/test/dcp_subtitle_test.cc
+++ b/test/dcp_subtitle_test.cc
@@ -37,7 +37,7 @@
 #include "lib/text_content.h"
 #include "lib/text_decoder.h"
 #include "test.h"
-#include <dcp/mono_picture_asset.h>
+#include <dcp/mono_j2k_picture_asset.h>
 #include <dcp/openjpeg_image.h>
 #include <dcp/smpte_subtitle_asset.h>
 #include <boost/test/unit_test.hpp>
@@ -327,7 +327,7 @@ BOOST_AUTO_TEST_CASE(entity_from_dcp_source)
                        dcp::VerificationNote::Code::INVALID_SUBTITLE_SPACING,
                });
 
-       dcp::MonoPictureAsset burnt(dcp_file(film, "j2c_"));
+       dcp::MonoJ2KPictureAsset burnt(dcp_file(film, "j2c_"));
        auto frame = burnt.start_read()->get_frame(12)->xyz_image();
        auto const size = frame->size();
        int max_X = 0;

diff --git a/test/overlap_video_test.cc b/test/overlap_video_test.cc
index cb5fcb430cb84a41de679210120fa87951e5e2cd..9bef93d6783155ed68c5e005d45fdd4b2250ea12 100644 (file)
--- a/test/overlap_video_test.cc
+++ b/test/overlap_video_test.cc
@@ -30,8 +30,8 @@
 #include <dcp/cpl.h>
 #include <dcp/dcp.h>
 #include <dcp/j2k_transcode.h>
-#include <dcp/mono_picture_asset.h>
-#include <dcp/mono_picture_frame.h>
+#include <dcp/mono_j2k_picture_asset.h>
+#include <dcp/mono_j2k_picture_frame.h>
 #include <dcp/openjpeg_image.h>
 #include <dcp/reel.h>
 #include <dcp/reel_mono_picture_asset.h>

diff --git a/test/recover_test.cc b/test/recover_test.cc
index 63c611831ea69b98fbc273a3f1ed55f55e966349..01b71a05e5bde26006fa5eab1eea14df096313bf 100644 (file)
--- a/test/recover_test.cc
+++ b/test/recover_test.cc
@@ -33,8 +33,8 @@
 #include "lib/video_content.h"
 #include "lib/ratio.h"
 #include <dcp/equality_options.h>
-#include <dcp/mono_picture_asset.h>
-#include <dcp/stereo_picture_asset.h>
+#include <dcp/mono_j2k_picture_asset.h>
+#include <dcp/stereo_j2k_picture_asset.h>
 #include <boost/test/unit_test.hpp>
 #include <iostream>
 
@@ -94,8 +94,8 @@ BOOST_AUTO_TEST_CASE (recover_test_2d)
                false
                );
 
-       auto A = make_shared<dcp::MonoPictureAsset>("build/test/recover_test_2d/original.mxf");
-       auto B = make_shared<dcp::MonoPictureAsset>(video);
+       auto A = make_shared<dcp::MonoJ2KPictureAsset>("build/test/recover_test_2d/original.mxf");
+       auto B = make_shared<dcp::MonoJ2KPictureAsset>(video);
 
        dcp::EqualityOptions eq;
        BOOST_CHECK (A->equals (B, eq, boost::bind (&note, _1, _2)));
@@ -137,8 +137,8 @@ BOOST_AUTO_TEST_CASE (recover_test_3d, * boost::unit_test::depends_on("recover_t
                false
                );
 
-       auto A = make_shared<dcp::StereoPictureAsset>("build/test/recover_test_3d/original.mxf");
-       auto B = make_shared<dcp::StereoPictureAsset>(video);
+       auto A = make_shared<dcp::StereoJ2KPictureAsset>("build/test/recover_test_3d/original.mxf");
+       auto B = make_shared<dcp::StereoJ2KPictureAsset>(video);
 
        dcp::EqualityOptions eq;
        BOOST_CHECK (A->equals (B, eq, boost::bind (&note, _1, _2)));
@@ -181,9 +181,9 @@ BOOST_AUTO_TEST_CASE (recover_test_2d_encrypted, * boost::unit_test::depends_on(
                false
                );
 
-       auto A = make_shared<dcp::MonoPictureAsset>("build/test/recover_test_2d_encrypted/original.mxf");
+       auto A = make_shared<dcp::MonoJ2KPictureAsset>("build/test/recover_test_2d_encrypted/original.mxf");
        A->set_key (film->key ());
-       auto B = make_shared<dcp::MonoPictureAsset>(video);
+       auto B = make_shared<dcp::MonoJ2KPictureAsset>(video);
        B->set_key (film->key ());
 
        dcp::EqualityOptions eq;

diff --git a/test/remake_video_test.cc b/test/remake_video_test.cc
index a076598446e2cd434db350b0e7de9341229c20a6..2afe90b63ce3e8a09104853c439cc5458f731c8e 100644 (file)
--- a/test/remake_video_test.cc
+++ b/test/remake_video_test.cc
@@ -26,7 +26,7 @@
 #include <dcp/colour_conversion.h>
 #include <dcp/cpl.h>
 #include <dcp/dcp.h>
-#include <dcp/mono_picture_asset_reader.h>
+#include <dcp/mono_j2k_picture_asset_reader.h>
 #include <dcp/reel.h>
 #include <dcp/reel_mono_picture_asset.h>
 #include <boost/test/unit_test.hpp>
@@ -58,7 +58,7 @@ BOOST_AUTO_TEST_CASE(remake_video_after_yub_rgb_matrix_changed)
                BOOST_REQUIRE(!cpl->reels().empty());
                auto reel = cpl->reels()[0];
                BOOST_REQUIRE(reel->main_picture());
-               auto mono = dynamic_pointer_cast<dcp::MonoPictureAsset>(reel->main_picture()->asset());
+               auto mono = dynamic_pointer_cast<dcp::MonoJ2KPictureAsset>(reel->main_picture()->asset());
                BOOST_REQUIRE(mono);
                auto reader = mono->start_read();
 

diff --git a/test/test.cc b/test/test.cc
index 4064f9b0ef0f900a6ededf913e08171f713c7c79..64a48b7147111cb2ea3ff0a8aefe1bc1ef6aeca1 100644 (file)
--- a/test/test.cc
+++ b/test/test.cc
@@ -47,8 +47,8 @@
 #include <dcp/dcp.h>
 #include <dcp/equality_options.h>
 #include <dcp/filesystem.h>
-#include <dcp/mono_picture_asset.h>
-#include <dcp/mono_picture_frame.h>
+#include <dcp/mono_j2k_picture_asset.h>
+#include <dcp/mono_j2k_picture_frame.h>
 #include <dcp/openjpeg_image.h>
 #include <dcp/reel.h>
 #include <dcp/reel_picture_asset.h>
@@ -829,10 +829,10 @@ check_one_frame (boost::filesystem::path dcp_dir, int64_t index, boost::filesyst
 {
        dcp::DCP dcp (dcp_dir);
        dcp.read ();
-       auto asset = dynamic_pointer_cast<dcp::MonoPictureAsset> (dcp.cpls().front()->reels().front()->main_picture()->asset());
+       auto asset = dynamic_pointer_cast<dcp::MonoJ2KPictureAsset>(dcp.cpls().front()->reels().front()->main_picture()->asset());
        BOOST_REQUIRE (asset);
        auto frame = asset->start_read()->get_frame(index);
-       dcp::MonoPictureFrame ref_frame(ref);
+       dcp::MonoJ2KPictureFrame ref_frame(ref);
 
        auto image = frame->xyz_image ();
        auto ref_image = ref_frame.xyz_image();

diff --git a/test/threed_test.cc b/test/threed_test.cc
index 78d74add4f29da42bc292dac8afeda997a207512..38b8f36d47e009510fdd923d50c9ed8f17f9851a 100644 (file)
--- a/test/threed_test.cc
+++ b/test/threed_test.cc
@@ -42,8 +42,8 @@
 #include "lib/util.h"
 #include "lib/video_content.h"
 #include "test.h"
-#include <dcp/mono_picture_asset.h>
-#include <dcp/stereo_picture_asset.h>
+#include <dcp/mono_j2k_picture_asset.h>
+#include <dcp/stereo_j2k_picture_asset.h>
 #include <boost/test/unit_test.hpp>
 #include <iostream>
 
@@ -330,10 +330,10 @@ BOOST_AUTO_TEST_CASE(threed_passthrough_test, * boost::unit_test::depends_on("th
 
        BOOST_REQUIRE_EQUAL(matches.size(), 1U);
 
-       auto stereo = dcp::StereoPictureAsset(matches[0]);
+       auto stereo = dcp::StereoJ2KPictureAsset(matches[0]);
        auto stereo_reader = stereo.start_read();
 
-       auto mono = dcp::MonoPictureAsset(dcp_file(film, "j2c"));
+       auto mono = dcp::MonoJ2KPictureAsset(dcp_file(film, "j2c"));
        auto mono_reader = mono.start_read();
 
        BOOST_REQUIRE_EQUAL(stereo.intrinsic_duration(), mono.intrinsic_duration());

diff --git a/test/torture_test.cc b/test/torture_test.cc
index 8e6a516bd196cb463522fbeeb77245d82058493f..e5ce694ce6e083300b0c5fe458bf1953f1f1a742 100644 (file)
--- a/test/torture_test.cc
+++ b/test/torture_test.cc
@@ -35,8 +35,8 @@
 #include "lib/video_content.h"
 #include "test.h"
 #include <dcp/cpl.h>
-#include <dcp/mono_picture_asset.h>
-#include <dcp/mono_picture_frame.h>
+#include <dcp/mono_j2k_picture_asset.h>
+#include <dcp/mono_j2k_picture_frame.h>
 #include <dcp/openjpeg_image.h>
 #include <dcp/reel.h>
 #include <dcp/reel_picture_asset.h>
@@ -230,7 +230,7 @@ BOOST_AUTO_TEST_CASE (torture_test1)
 
        auto reel_picture = reels.front()->main_picture();
        BOOST_REQUIRE (reel_picture);
-       auto picture = dynamic_pointer_cast<dcp::MonoPictureAsset> (reel_picture->asset());
+       auto picture = dynamic_pointer_cast<dcp::MonoJ2KPictureAsset>(reel_picture->asset());
        BOOST_REQUIRE (picture);
        BOOST_CHECK_EQUAL (picture->intrinsic_duration(), 144);
 

diff --git a/test/vf_test.cc b/test/vf_test.cc
index ca987b22d4ce4cc91d51bf41b5ad7b86ff4beb5a..051712debe0fb6e3e2368edd5bc39bdd62e39d1f 100644 (file)
--- a/test/vf_test.cc
+++ b/test/vf_test.cc
@@ -40,8 +40,8 @@
 #include "lib/video_content.h"
 #include "test.h"
 #include <dcp/cpl.h>
-#include <dcp/mono_picture_asset.h>
-#include <dcp/picture_asset_writer.h>
+#include <dcp/mono_j2k_picture_asset.h>
+#include <dcp/j2k_picture_asset_writer.h>
 #include <dcp/reel.h>
 #include <dcp/reel_mono_picture_asset.h>
 #include <dcp/reel_sound_asset.h>
@@ -492,8 +492,8 @@ BOOST_AUTO_TEST_CASE(test_referencing_ov_with_missing_subtitle_in_some_reels)
        dcp::DCP ov(path / "ov");
 
        auto make_picture = [path](string filename) {
-               auto pic = make_shared<dcp::MonoPictureAsset>(dcp::Fraction(24, 1), dcp::Standard::SMPTE);
-               auto writer = pic->start_write(path / "ov" / filename, dcp::PictureAsset::Behaviour::MAKE_NEW);
+               auto pic = make_shared<dcp::MonoJ2KPictureAsset>(dcp::Fraction(24, 1), dcp::Standard::SMPTE);
+               auto writer = pic->start_write(path / "ov" / filename, dcp::Behaviour::MAKE_NEW);
                auto frame = dcp::ArrayData("test/data/picture.j2c");
                for (int i = 0; i < 240; ++i) {
                        writer->write(frame);

diff --git a/test/video_level_test.cc b/test/video_level_test.cc
index 0ff2c47321231e0f27ff0ed154893fe561ae69ef..c8e939861f877abb10ea2f9b3a0679fb45e22067 100644 (file)
--- a/test/video_level_test.cc
+++ b/test/video_level_test.cc
@@ -45,8 +45,8 @@
 #include "test.h"
 #include <dcp/cpl.h>
 #include <dcp/dcp.h>
-#include <dcp/mono_picture_asset.h>
-#include <dcp/mono_picture_frame.h>
+#include <dcp/mono_j2k_picture_asset.h>
+#include <dcp/mono_j2k_picture_frame.h>
 #include <dcp/openjpeg_image.h>
 #include <dcp/reel.h>
 #include <dcp/reel_picture_asset.h>
@@ -275,7 +275,7 @@ pixel_range (boost::filesystem::path dcp_path)
        dcp::DCP dcp (dcp_path);
        dcp.read ();
 
-       auto picture = dynamic_pointer_cast<dcp::MonoPictureAsset>(dcp.cpls().front()->reels().front()->main_picture()->asset());
+       auto picture = dynamic_pointer_cast<dcp::MonoJ2KPictureAsset>(dcp.cpls().front()->reels().front()->main_picture()->asset());
        BOOST_REQUIRE (picture);
        auto frame = picture->start_read()->get_frame(0)->xyz_image();
 

diff --git a/test/video_mxf_content_test.cc b/test/video_mxf_content_test.cc
index f3766e4afcbe6e731023ee5c669c6a23726b775c..819706803f51bc7ac6e1c32864e29e5d9d0e5ac3 100644 (file)
--- a/test/video_mxf_content_test.cc
+++ b/test/video_mxf_content_test.cc
@@ -33,7 +33,7 @@
 #include "lib/video_mxf_content.h"
 #include "test.h"
 #include <dcp/equality_options.h>
-#include <dcp/mono_picture_asset.h>
+#include <dcp/mono_j2k_picture_asset.h>
 #include <boost/test/unit_test.hpp>
 
 
@@ -70,9 +70,9 @@ BOOST_AUTO_TEST_CASE (video_mxf_content_test)
                        dcp::VerificationNote::Code::INVALID_JPEG2000_GUARD_BITS_FOR_2K
                });
 
-       auto ref = make_shared<dcp::MonoPictureAsset>(ref_mxf);
+       auto ref = make_shared<dcp::MonoJ2KPictureAsset>(ref_mxf);
        boost::filesystem::directory_iterator i ("build/test/video_mxf_content_test/video");
-       auto comp = make_shared<dcp::MonoPictureAsset>(*i);
+       auto comp = make_shared<dcp::MonoJ2KPictureAsset>(*i);
        dcp::EqualityOptions op;
        BOOST_CHECK (ref->equals (comp, op, note));
 }