Tidying.

[libdcp.git] / src / stereo_picture_frame.cc

diff --git a/src/stereo_picture_frame.cc b/src/stereo_picture_frame.cc
index 8b8f9b91e8524b9c00b3deb1a6da8cd6b65dbf7a..ac9cb6d9890396b12ec3424c32c81fa601357231 100644 (file)
--- a/src/stereo_picture_frame.cc
+++ b/src/stereo_picture_frame.cc
@@ -1,5 +1,5 @@
 /*
-    Copyright (C) 2012-2014 Carl Hetherington <cth@carlh.net>
+    Copyright (C) 2012-2021 Carl Hetherington <cth@carlh.net>
 
     This file is part of libdcp.
 
@@ -31,6 +31,12 @@
     files in the program, then also delete it here.
 */
 
+
+/** @file  src/stereo_picture_frame.cc
+ *  @brief StereoPictureFrame class
+ */
+
+
 #include "stereo_picture_frame.h"
 #include "exceptions.h"
 #include "util.h"
@@ -42,10 +48,49 @@
 #include <asdcp/AS_DCP.h>
 #include <asdcp/KM_fileio.h>
 
+
 using std::string;
-using boost::shared_ptr;
+using std::shared_ptr;
+using std::make_shared;
 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 +98,19 @@ 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 = make_shared<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 = make_shared<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 +121,27 @@ shared_ptr<OpenJPEGImage>
 StereoPictureFrame::xyz_image (Eye eye, int reduce) const
 {
        switch (eye) {
-       case LEFT:
-               return decompress_j2k (const_cast<uint8_t*> (_buffer->Left.RoData()), _buffer->Left.Size(), reduce);
-       case RIGHT:
-               return decompress_j2k (const_cast<uint8_t*> (_buffer->Right.RoData()), _buffer->Right.Size(), reduce);
+       case Eye::LEFT:
+               return decompress_j2k (const_cast<uint8_t*>(_buffer->Left.RoData()), _buffer->Left.Size(), reduce);
+       case Eye::RIGHT:
+               return decompress_j2k (const_cast<uint8_t*>(_buffer->Right.RoData()), _buffer->Right.Size(), reduce);
        }
 
-       return shared_ptr<OpenJPEGImage> ();
+       return {};
 }
 
-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 make_shared<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 make_shared<Part>(_buffer, Eye::LEFT);
 }
 
-uint8_t*
-StereoPictureFrame::right_j2k_data ()
-{
-       return _buffer->Right.Data ();
-}
 
-int
-StereoPictureFrame::right_j2k_size () const
-{
-       return _buffer->Right.Size ();
-}