Try to fix build on OS X.

[libdcp.git] / examples / read_dcp.cc

diff --git a/examples/read_dcp.cc b/examples/read_dcp.cc
index f3c47a3cf5d72fb76626cb90c4804091bcf0b6f9..4e3f48365f2fb73d405347b58c9d2b8dd7f6111b 100644 (file)
--- a/examples/read_dcp.cc
+++ b/examples/read_dcp.cc
@@ -1,5 +1,5 @@
 /*
-    Copyright (C) 2012-2014 Carl Hetherington <cth@carlh.net>
+    Copyright (C) 2012-2015 Carl Hetherington <cth@carlh.net>
 
     This program is free software; you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by
@@ -18,8 +18,8 @@
 */
 
 /* If you are using an installed libdcp, these #includes would need to be changed to
-#include <libdcp/dcp.h>
-#include <libdcp/picture_mxf.h>
+#include <dcp/dcp.h>
+#include <dcp/picture_asset.h>
 ... etc. ...
 */
 
@@ -28,12 +28,15 @@
 #include "reel.h"
 #include "reel_picture_asset.h"
 #include "mono_picture_frame.h"
-#include "mono_picture_mxf.h"
-#include "stereo_picture_mxf.h"
-#include "sound_mxf.h"
-#include "subtitle_content.h"
-#include "argb_frame.h"
+#include "mono_picture_asset.h"
+#include "stereo_picture_asset.h"
+#include "sound_asset.h"
+#include "subtitle_asset.h"
+#include "openjpeg_image.h"
+#include "colour_conversion.h"
+#include "rgb_xyz.h"
 #include <Magick++.h>
+#include <boost/scoped_array.hpp>
 
 /** @file examples/read_dcp.cc
  *  @brief Shows how to read a DCP.
@@ -57,13 +60,13 @@ main ()
        std::list<boost::shared_ptr<dcp::Asset> > assets = dcp.assets ();
        std::cout << "DCP has " << assets.size() << " assets.\n";
        for (std::list<boost::shared_ptr<dcp::Asset> >::const_iterator i = assets.begin(); i != assets.end(); ++i) {
-               if (boost::dynamic_pointer_cast<dcp::MonoPictureMXF> (*i)) {
+               if (boost::dynamic_pointer_cast<dcp::MonoPictureAsset> (*i)) {
                        std::cout << "2D picture\n";
-               } else if (boost::dynamic_pointer_cast<dcp::StereoPictureMXF> (*i)) {
+               } else if (boost::dynamic_pointer_cast<dcp::StereoPictureAsset> (*i)) {
                        std::cout << "3D picture\n";
-               } else if (boost::dynamic_pointer_cast<dcp::SoundMXF> (*i)) {
+               } else if (boost::dynamic_pointer_cast<dcp::SoundAsset> (*i)) {
                        std::cout << "Sound\n";
-               } else if (boost::dynamic_pointer_cast<dcp::SubtitleContent> (*i)) {
+               } else if (boost::dynamic_pointer_cast<dcp::SubtitleAsset> (*i)) {
                        std::cout << "Subtitle\n";
                } else if (boost::dynamic_pointer_cast<dcp::CPL> (*i)) {
                        std::cout << "CPL\n";
@@ -74,16 +77,22 @@ main ()
        /* Take the first CPL */
        boost::shared_ptr<dcp::CPL> cpl = dcp.cpls().front ();
 
-       /* Get the MXF of the picture asset in the first reel */
-       boost::shared_ptr<dcp::MonoPictureMXF> picture_mxf = boost::dynamic_pointer_cast<dcp::MonoPictureMXF> (cpl->reels().front()->main_picture()->mxf ());
+       /* Get the picture asset in the first reel */
+       boost::shared_ptr<dcp::MonoPictureAsset> picture_asset = boost::dynamic_pointer_cast<dcp::MonoPictureAsset> (
+               cpl->reels().front()->main_picture()->asset()
+               );
 
        /* Get the 1000th frame of it */
-       boost::shared_ptr<const dcp::MonoPictureFrame> picture_frame_j2k = picture_mxf->get_frame(999);
+       boost::shared_ptr<const dcp::MonoPictureFrame> picture_frame_j2k = picture_asset->get_frame(999);
 
-       /* Get a ARGB copy of it */
-       boost::shared_ptr<dcp::ARGBFrame> picture_frame_rgb = picture_frame_j2k->argb_frame ();
+       /* Get the frame as an XYZ image */
+       boost::shared_ptr<const dcp::OpenJPEGImage> picture_image_xyz = picture_frame_j2k->xyz_image ();
 
-       Magick::Image image (picture_frame_rgb->size().width, picture_frame_rgb->size().height, "BGRA", Magick::CharPixel, picture_frame_rgb->data ());
+       /* Convert to ARGB */
+       boost::scoped_array<uint8_t> rgba (new uint8_t[picture_image_xyz->size().width * picture_image_xyz->size().height * 4]);
+       dcp::xyz_to_rgba (picture_image_xyz, dcp::ColourConversion::srgb_to_xyz(), rgba.get ());
+
+       Magick::Image image (picture_image_xyz->size().width, picture_image_xyz->size().height, "BGRA", Magick::CharPixel, rgba.get ());
        image.write ("frame.png");
 
        return 0;