Fix missing version string when Popen communicate returns byte strings.

[libdcp.git] / src / stereo_picture_frame.h

diff --git a/src/stereo_picture_frame.h b/src/stereo_picture_frame.h
index 7c4d676732033293d6263c0d1b73864ec1c6b1ee..a173b1c14cc7e36c50657b2900358c6f7318c48c 100644 (file)
--- a/src/stereo_picture_frame.h
+++ b/src/stereo_picture_frame.h
@@ -1,23 +1,41 @@
 /*
-    Copyright (C) 2012-2014 Carl Hetherington <cth@carlh.net>
+    Copyright (C) 2012-2016 Carl Hetherington <cth@carlh.net>
 
-    This program is free software; you can redistribute it and/or modify
+    This file is part of libdcp.
+
+    libdcp is free software; you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by
     the Free Software Foundation; either version 2 of the License, or
     (at your option) any later version.
 
-    This program is distributed in the hope that it will be useful,
+    libdcp is distributed in the hope that it will be useful,
     but WITHOUT ANY WARRANTY; without even the implied warranty of
     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
     GNU General Public License for more details.
 
     You should have received a copy of the GNU General Public License
-    along with this program; if not, write to the Free Software
-    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+    along with libdcp.  If not, see <http://www.gnu.org/licenses/>.
+
+    In addition, as a special exception, the copyright holders give
+    permission to link the code of portions of this program with the
+    OpenSSL library under certain conditions as described in each
+    individual source file, and distribute linked combinations
+    including the two.
 
+    You must obey the GNU General Public License in all respects
+    for all of the code used other than OpenSSL.  If you modify
+    file(s) with this exception, you may extend this exception to your
+    version of the file(s), but you are not obligated to do so.  If you
+    do not wish to do so, delete this exception statement from your
+    version.  If you delete this exception statement from all source
+    files in the program, then also delete it here.
 */
 
+#ifndef LIBDCP_STEREO_PICTURE_FRAME_H
+#define LIBDCP_STEREO_PICTURE_FRAME_H
+
 #include "types.h"
+#include "asset_reader.h"
 #include <boost/shared_ptr.hpp>
 #include <boost/noncopyable.hpp>
 #include <boost/filesystem.hpp>
@@ -27,33 +45,43 @@
 namespace ASDCP {
        namespace JP2K {
                struct SFrameBuffer;
+               class MXFSReader;
        }
        class AESDecContext;
 }
 
 namespace dcp {
 
-class ARGBFrame;
+class OpenJPEGImage;
 
-/** A single frame of a 3D (stereoscopic) picture asset */     
+/** A single frame of a 3D (stereoscopic) picture asset */
 class StereoPictureFrame : public boost::noncopyable
 {
 public:
-       StereoPictureFrame (boost::filesystem::path mxf_path, int n);
        StereoPictureFrame ();
        ~StereoPictureFrame ();
 
-       boost::shared_ptr<ARGBFrame> argb_frame (Eye eye, int reduce = 0) const;
-       void rgb_frame (Eye eye, uint16_t* buffer) const;
+       boost::shared_ptr<OpenJPEGImage> xyz_image (Eye eye, int reduce = 0) const;
+
        uint8_t const * left_j2k_data () const;
        uint8_t* left_j2k_data ();
        int left_j2k_size () const;
+
        uint8_t const * right_j2k_data () const;
        uint8_t* right_j2k_data ();
        int right_j2k_size () const;
 
 private:
+       /* XXX: this is a bit of a shame, but I tried friend StereoPictureAssetReader and it's
+          rejected by some (seemingly older) GCCs.
+       */
+       friend class AssetReader<ASDCP::JP2K::MXFSReader, StereoPictureFrame>;
+
+       StereoPictureFrame (ASDCP::JP2K::MXFSReader* reader, int n, boost::shared_ptr<DecryptionContext>);
+
        ASDCP::JP2K::SFrameBuffer* _buffer;
 };
 
 }
+
+#endif