C++11 tidying.

[libdcp.git] / src / stereo_picture_frame.cc

diff --git a/src/stereo_picture_frame.cc b/src/stereo_picture_frame.cc
index 4bbeae241cbc1846aa0995b9e8c60ee34abdae93..8d3a2757359b6325c09309436e667eab51845b98 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,19 +31,27 @@
     files in the program, then also delete it here.
 */
 
-#include "stereo_picture_frame.h"
-#include "exceptions.h"
-#include "util.h"
-#include "rgb_xyz.h"
+
+/** @file  src/stereo_picture_frame.cc
+ *  @brief StereoPictureFrame class
+ */
+
+
 #include "colour_conversion.h"
 #include "compose.hpp"
-#include "j2k.h"
 #include "crypto_context.h"
+#include "exceptions.h"
+#include "j2k_transcode.h"
+#include "rgb_xyz.h"
+#include "stereo_picture_frame.h"
+#include "util.h"
 #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;
 
 
@@ -58,7 +66,7 @@ StereoPictureFrame::Part::Part (shared_ptr<ASDCP::JP2K::SFrameBuffer> buffer, Ey
 ASDCP::JP2K::FrameBuffer &
 StereoPictureFrame::Part::mono () const
 {
-       return _eye == EYE_LEFT ? _buffer->Left : _buffer->Right;
+       return _eye == Eye::LEFT ? _buffer->Left : _buffer->Right;
 }
 
 
@@ -86,20 +94,22 @@ StereoPictureFrame::Part::size () const
 /** 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.
+ *  @param check_hmac true to check the HMAC and give an error if it is not as expected.
  */
-StereoPictureFrame::StereoPictureFrame (ASDCP::JP2K::MXFSReader* reader, int n, shared_ptr<DecryptionContext> c)
+StereoPictureFrame::StereoPictureFrame (ASDCP::JP2K::MXFSReader* reader, int n, shared_ptr<DecryptionContext> c, bool check_hmac)
 {
        /* XXX: unfortunate guesswork on this buffer size */
-       _buffer.reset(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()))) {
+       if (ASDCP_FAILURE (reader->ReadFrame (n, *_buffer, c->context(), check_hmac ? c->hmac() : nullptr))) {
                boost::throw_exception (ReadError (String::compose ("could not read video frame %1 of %2", n)));
        }
 }
 
+
 StereoPictureFrame::StereoPictureFrame ()
 {
-       _buffer.reset(new ASDCP::JP2K::SFrameBuffer(4 * Kumu::Megabyte));
+       _buffer = make_shared<ASDCP::JP2K::SFrameBuffer>(4 * Kumu::Megabyte);
 }
 
 
@@ -112,27 +122,27 @@ shared_ptr<OpenJPEGImage>
 StereoPictureFrame::xyz_image (Eye eye, int reduce) const
 {
        switch (eye) {
-       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);
+       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 {};
 }
 
 
 shared_ptr<StereoPictureFrame::Part>
 StereoPictureFrame::right () const
 {
-       return shared_ptr<Part>(new Part(_buffer, EYE_RIGHT));
+       return make_shared<Part>(_buffer, Eye::RIGHT);
 }
 
 
 shared_ptr<StereoPictureFrame::Part>
 StereoPictureFrame::left () const
 {
-       return shared_ptr<Part>(new Part(_buffer, EYE_LEFT));
+       return make_shared<Part>(_buffer, Eye::LEFT);
 }