summaryrefslogtreecommitdiff
path: root/src/stereo_picture_frame.h
diff options
context:
space:
mode:
authorCarl Hetherington <cth@carlh.net>2015-02-02 22:33:27 +0000
committerCarl Hetherington <cth@carlh.net>2015-02-02 22:33:27 +0000
commit989f182558193a51e0a26603fb2ca59f827216a0 (patch)
tree7d2b2511967e5417838a4343341e5aa9d26cf2b8 /src/stereo_picture_frame.h
parent0d7fe66361a40702cb97357955cf35256f1d2c26 (diff)
Remove Image and ARGBImage and just dump RGB data into
uint8_t* buffers. This is hopefully simpler than trying to come up with some Image hierarchy that suits everything.
Diffstat (limited to 'src/stereo_picture_frame.h')
-rw-r--r--src/stereo_picture_frame.h9
1 files changed, 4 insertions, 5 deletions
diff --git a/src/stereo_picture_frame.h b/src/stereo_picture_frame.h
index ba78d922..0aeb6849 100644
--- a/src/stereo_picture_frame.h
+++ b/src/stereo_picture_frame.h
@@ -28,13 +28,11 @@ namespace ASDCP {
namespace JP2K {
struct SFrameBuffer;
}
- class AESDecContext;
}
namespace dcp {
-class ARGBImage;
-class Image;
+class XYZImage;
/** A single frame of a 3D (stereoscopic) picture asset */
class StereoPictureFrame : public boost::noncopyable
@@ -44,11 +42,12 @@ public:
StereoPictureFrame ();
~StereoPictureFrame ();
- boost::shared_ptr<ARGBImage> argb_image (Eye eye, int reduce = 0) const;
- void rgb_frame (Eye eye, boost::shared_ptr<Image>) const;
+ boost::shared_ptr<XYZImage> 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;