Fix missing const.

[libdcp.git] / src / stereo_picture_frame.cc

diff --git a/src/stereo_picture_frame.cc b/src/stereo_picture_frame.cc
index 8b8f9b91e8524b9c00b3deb1a6da8cd6b65dbf7a..4bbeae241cbc1846aa0995b9e8c60ee34abdae93 100644 (file)
--- a/src/stereo_picture_frame.cc
+++ b/src/stereo_picture_frame.cc
@@ -46,6 +46,43 @@ using std::string;
 using boost::shared_ptr;
 using namespace dcp;
 
+
+StereoPictureFrame::Part::Part (shared_ptr<ASDCP::JP2K::SFrameBuffer> buffer, Eye eye)
+       : _buffer (buffer)
+       , _eye (eye)
+{
+
+}
+
+
+ASDCP::JP2K::FrameBuffer &
+StereoPictureFrame::Part::mono () const
+{
+       return _eye == EYE_LEFT ? _buffer->Left : _buffer->Right;
+}
+
+
+uint8_t const *
+StereoPictureFrame::Part::data () const
+{
+       return mono().RoData();
+}
+
+
+uint8_t *
+StereoPictureFrame::Part::data ()
+{
+       return mono().Data();
+}
+
+
+int
+StereoPictureFrame::Part::size () const
+{
+       return mono().Size();
+}
+
+
 /** Make a picture frame from a 3D (stereoscopic) asset.
  *  @param reader Reader for the MXF file.
  *  @param n Frame within the asset, not taking EntryPoint into account.
@@ -53,22 +90,18 @@ using namespace dcp;
 StereoPictureFrame::StereoPictureFrame (ASDCP::JP2K::MXFSReader* reader, int n, shared_ptr<DecryptionContext> c)
 {
        /* XXX: unfortunate guesswork on this buffer size */
-       _buffer = new ASDCP::JP2K::SFrameBuffer (4 * Kumu::Megabyte);
+       _buffer.reset(new ASDCP::JP2K::SFrameBuffer(4 * Kumu::Megabyte));
 
        if (ASDCP_FAILURE (reader->ReadFrame (n, *_buffer, c->context(), c->hmac()))) {
-               boost::throw_exception (DCPReadError (String::compose ("could not read video frame %1 of %2", n)));
+               boost::throw_exception (ReadError (String::compose ("could not read video frame %1 of %2", n)));
        }
 }
 
 StereoPictureFrame::StereoPictureFrame ()
 {
-       _buffer = new ASDCP::JP2K::SFrameBuffer (4 * Kumu::Megabyte);
+       _buffer.reset(new ASDCP::JP2K::SFrameBuffer(4 * Kumu::Megabyte));
 }
 
-StereoPictureFrame::~StereoPictureFrame ()
-{
-       delete _buffer;
-}
 
 /** @param eye Eye to return (EYE_LEFT or EYE_RIGHT).
  *  @param reduce a factor by which to reduce the resolution
@@ -79,47 +112,27 @@ shared_ptr<OpenJPEGImage>
 StereoPictureFrame::xyz_image (Eye eye, int reduce) const
 {
        switch (eye) {
-       case LEFT:
+       case EYE_LEFT:
                return decompress_j2k (const_cast<uint8_t*> (_buffer->Left.RoData()), _buffer->Left.Size(), reduce);
-       case RIGHT:
+       case EYE_RIGHT:
                return decompress_j2k (const_cast<uint8_t*> (_buffer->Right.RoData()), _buffer->Right.Size(), reduce);
        }
 
        return shared_ptr<OpenJPEGImage> ();
 }
 
-uint8_t const *
-StereoPictureFrame::left_j2k_data () const
-{
-       return _buffer->Left.RoData ();
-}
 
-uint8_t*
-StereoPictureFrame::left_j2k_data ()
+shared_ptr<StereoPictureFrame::Part>
+StereoPictureFrame::right () const
 {
-       return _buffer->Left.Data ();
+       return shared_ptr<Part>(new Part(_buffer, EYE_RIGHT));
 }
 
-int
-StereoPictureFrame::left_j2k_size () const
-{
-       return _buffer->Left.Size ();
-}
 
-uint8_t const *
-StereoPictureFrame::right_j2k_data () const
+shared_ptr<StereoPictureFrame::Part>
+StereoPictureFrame::left () const
 {
-       return _buffer->Right.RoData ();
+       return shared_ptr<Part>(new Part(_buffer, EYE_LEFT));
 }
 
-uint8_t*
-StereoPictureFrame::right_j2k_data ()
-{
-       return _buffer->Right.Data ();
-}
 
-int
-StereoPictureFrame::right_j2k_size () const
-{
-       return _buffer->Right.Size ();
-}