Bump version

[libdcp.git] / src / picture_asset_writer_common.cc

diff --git a/src/picture_asset_writer_common.cc b/src/picture_asset_writer_common.cc
index 99f55be06934f983cf5d778ac8be226317c4836d..43b843855fcbd8c3a9447a8f0591da18ea20b305 100644 (file)
--- a/src/picture_asset_writer_common.cc
+++ b/src/picture_asset_writer_common.cc
@@ -1,5 +1,5 @@
 /*
-    Copyright (C) 2012-2013 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
@@ -19,33 +19,41 @@
 
 using boost::shared_ptr;
 
+namespace dcp {
+
 struct ASDCPStateBase
 {
        ASDCPStateBase ()
                : frame_buffer (4 * Kumu::Megabyte)
        {}
-       
+
        ASDCP::JP2K::CodestreamParser j2k_parser;
        ASDCP::JP2K::FrameBuffer frame_buffer;
        ASDCP::WriterInfo writer_info;
        ASDCP::JP2K::PictureDescriptor picture_descriptor;
-       ASDCP::AESEncContext* encryption_context;
 };
 
+}
+
 template <class P, class Q>
-void libdcp::start (PictureAssetWriter* writer, shared_ptr<P> state, Q* asset, uint8_t* data, int size)
+void dcp::start (PictureAssetWriter* writer, shared_ptr<P> state, Standard standard, Q* asset, uint8_t* data, int size)
 {
+       asset->set_file (writer->_file);
+
        if (ASDCP_FAILURE (state->j2k_parser.OpenReadFrame (data, size, state->frame_buffer))) {
                boost::throw_exception (MiscError ("could not parse J2K frame"));
        }
 
        state->j2k_parser.FillPictureDescriptor (state->picture_descriptor);
-       state->picture_descriptor.EditRate = ASDCP::Rational (asset->edit_rate(), 1);
-       
-       asset->fill_writer_info (&state->writer_info, asset->uuid(), writer->_asset->interop(), writer->_asset->metadata());
-       
+       state->picture_descriptor.EditRate = ASDCP::Rational (asset->edit_rate().numerator, asset->edit_rate().denominator);
+
+       asset->set_size (Size (state->picture_descriptor.StoredWidth, state->picture_descriptor.StoredHeight));
+       asset->set_screen_aspect_ratio (Fraction (state->picture_descriptor.AspectRatio.Numerator, state->picture_descriptor.AspectRatio.Denominator));
+
+       asset->fill_writer_info (&state->writer_info, asset->id(), standard);
+
        Kumu::Result_t r = state->mxf_writer.OpenWrite (
-               asset->path().string().c_str(),
+               asset->file().string().c_str(),
                state->writer_info,
                state->picture_descriptor,
                16384,
@@ -53,7 +61,7 @@ void libdcp::start (PictureAssetWriter* writer, shared_ptr<P> state, Q* asset, u
                );
 
        if (ASDCP_FAILURE (r)) {
-               boost::throw_exception (MXFFileError ("could not open MXF file for writing", asset->path().string(), r));
+               boost::throw_exception (MXFFileError ("could not open MXF file for writing", asset->file().string(), r));
        }
 
        writer->_started = true;