path -> dir, name for MXFs.

[libdcp.git] / src / picture_asset.cc

diff --git a/src/picture_asset.cc b/src/picture_asset.cc
index 848a2c270c0ed149643e1e30a4119710d2f40073..db3f02c3c89857c512ebb53a40a97d273972285e 100644 (file)
--- a/src/picture_asset.cc
+++ b/src/picture_asset.cc
@@ -17,76 +17,126 @@
 
 */
 
+/** @file  src/picture_asset.cc
+ *  @brief An asset made up of JPEG2000 files
+ */
+
 #include <list>
 #include <stdexcept>
 #include <iostream>
+#include <sstream>
 #include <boost/filesystem.hpp>
 #include "AS_DCP.h"
 #include "KM_fileio.h"
 #include "picture_asset.h"
 #include "util.h"
+#include "exceptions.h"
 
 using namespace std;
 using namespace boost;
 using namespace libdcp;
 
-PictureAsset::PictureAsset (list<string> const & files, string p, int fps, int len, int w, int h)
-       : Asset (p, fps, len)
-       , _width (w)
-       , _height (h)
+PictureAsset::PictureAsset (
+       sigc::slot<string, int> get_path,
+       string directory,
+       string mxf_name,
+       sigc::signal1<void, float>* progress,
+       int fps,
+       int length,
+       int width,
+       int height)
+       : Asset (directory, mxf_name, progress, fps, length)
+       , _width (width)
+       , _height (height)
+{
+       construct (get_path);
+}
+
+PictureAsset::PictureAsset (
+       vector<string> const & files,
+       string directory,
+       string mxf_name,
+       sigc::signal1<void, float>* progress,
+       int fps,
+       int length,
+       int width,
+       int height)
+       : Asset (directory, mxf_name, progress, fps, length)
+       , _width (width)
+       , _height (height)
+{
+       construct (sigc::bind (sigc::mem_fun (*this, &PictureAsset::path_from_list), files));
+}
+
+PictureAsset::PictureAsset (string directory, string mxf_name, int fps, int length, int width, int height)
+       : Asset (directory, mxf_name, 0, fps, length)
+       , _width (width)
+       , _height (height)
+{
+
+}
+
+string
+PictureAsset::path_from_list (int f, vector<string> const & files) const
+{
+       return files[f];
+}
+
+void
+PictureAsset::construct (sigc::slot<string, int> get_path)
 {
        ASDCP::JP2K::CodestreamParser j2k_parser;
        ASDCP::JP2K::FrameBuffer frame_buffer (4 * Kumu::Megabyte);
-       if (ASDCP_FAILURE (j2k_parser.OpenReadFrame (files.front().c_str(), frame_buffer))) {
-               throw runtime_error ("could not open J2K file for reading");
+       if (ASDCP_FAILURE (j2k_parser.OpenReadFrame (get_path(0).c_str(), frame_buffer))) {
+               throw FileError ("could not open JPEG2000 file for reading", get_path (0));
        }
        
        ASDCP::JP2K::PictureDescriptor picture_desc;
        j2k_parser.FillPictureDescriptor (picture_desc);
-       /* XXX: we round for DCP: not sure if this is right */
        picture_desc.EditRate = ASDCP::Rational (_fps, 1);
        
        ASDCP::WriterInfo writer_info;
        fill_writer_info (&writer_info);
        
        ASDCP::JP2K::MXFWriter mxf_writer;
-       if (ASDCP_FAILURE (mxf_writer.OpenWrite (_mxf_path.c_str(), writer_info, picture_desc))) {
-               throw runtime_error ("could not open MXF for writing");
+       if (ASDCP_FAILURE (mxf_writer.OpenWrite (mxf_path().c_str(), writer_info, picture_desc))) {
+               throw FileError ("could not open MXF file for writing", mxf_path().string());
        }
 
-       int j = 0;
-       for (list<string>::const_iterator i = files.begin(); i != files.end(); ++i) {
-               if (ASDCP_FAILURE (j2k_parser.OpenReadFrame (i->c_str(), frame_buffer))) {
-                       throw runtime_error ("could not open J2K file for reading");
+       for (int i = 0; i < _length; ++i) {
+
+               string const path = get_path (i);
+               
+               if (ASDCP_FAILURE (j2k_parser.OpenReadFrame (path.c_str(), frame_buffer))) {
+                       throw FileError ("could not open JPEG2000 file for reading", path);
                }
 
                /* XXX: passing 0 to WriteFrame ok? */
                if (ASDCP_FAILURE (mxf_writer.WriteFrame (frame_buffer, 0, 0))) {
-                       throw runtime_error ("error in writing video MXF");
+                       throw MiscError ("error in writing video MXF");
                }
                
-               ++j;
-               Progress (float (j) / files.size ());
+               (*_progress) (0.5 * float (i) / _length);
        }
        
        if (ASDCP_FAILURE (mxf_writer.Finalize())) {
-               throw runtime_error ("error in finalising video MXF");
+               throw MiscError ("error in finalising video MXF");
        }
 
-       _digest = make_digest (_mxf_path);
+       _digest = make_digest (mxf_path().string(), _progress);
 }
 
 void
 PictureAsset::write_to_cpl (ostream& s) const
 {
        s << "        <MainPicture>\n"
-         << "          <Id>" << _uuid << "</Id>\n"
-         << "          <AnnotationText>" << filesystem::path(_mxf_path).filename() << "</AnnotationText>\n"
-         << "          <EditRate>" << _fps << "</EditRate>\n"
+         << "          <Id>urn:uuid:" << _uuid << "</Id>\n"
+         << "          <AnnotationText>" << _mxf_name << "</AnnotationText>\n"
+         << "          <EditRate>" << _fps << " 1</EditRate>\n"
          << "          <IntrinsicDuration>" << _length << "</IntrinsicDuration>\n"
          << "          <EntryPoint>0</EntryPoint>\n"
          << "          <Duration>" << _length << "</Duration>\n"
-         << "          <FrameRate>" << _fps << "</FrameRate>\n"
+         << "          <FrameRate>" << _fps << " 1</FrameRate>\n"
          << "          <ScreenAspectRatio>" << _width << " " << _height << "</ScreenAspectRatio>\n"
          << "        </MainPicture>\n";
 }