Switch to testing on Ubuntu 16.04 and 22.04.

[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 88df661215274893a0c4f043e03fce839d8becc7..82866aac518207586c643fdee4492e0ce9e10f34 100644 (file)
--- a/src/picture_asset_writer_common.cc
+++ b/src/picture_asset_writer_common.cc
@@ -1,5 +1,5 @@
 /*
-    Copyright (C) 2012-2015 Carl Hetherington <cth@carlh.net>
+    Copyright (C) 2012-2021 Carl Hetherington <cth@carlh.net>
 
     This file is part of libdcp.
 
@@ -15,12 +15,37 @@
 
     You should have received a copy of the GNU General Public License
     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.
 */
 
-using boost::shared_ptr;
+
+/** @file  src/picture_asset_writer_common.cc
+ *  @brief Common parts of PictureAssetWriter
+ */
+
+
+#include "filesystem.h"
+
+
+using std::shared_ptr;
+
 
 namespace dcp {
 
+
 struct ASDCPStateBase
 {
        ASDCPStateBase ()
@@ -33,14 +58,16 @@ struct ASDCPStateBase
        ASDCP::JP2K::PictureDescriptor picture_descriptor;
 };
 
+
 }
 
+
 template <class P, class Q>
-void dcp::start (PictureAssetWriter* writer, shared_ptr<P> state, Standard standard, Q* asset, uint8_t* data, int size)
+void dcp::start (PictureAssetWriter* writer, shared_ptr<P> state, Q* asset, uint8_t const * data, int size)
 {
        asset->set_file (writer->_file);
 
-       if (ASDCP_FAILURE (state->j2k_parser.OpenReadFrame (data, size, state->frame_buffer))) {
+       if (ASDCP_FAILURE (state->j2k_parser.OpenReadFrame(data, size, state->frame_buffer))) {
                boost::throw_exception (MiscError ("could not parse J2K frame"));
        }
 
@@ -50,18 +77,18 @@ void dcp::start (PictureAssetWriter* writer, shared_ptr<P> state, Standard stand
        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);
+       asset->fill_writer_info (&state->writer_info, asset->id());
 
-       Kumu::Result_t r = state->mxf_writer.OpenWrite (
-               asset->file().string().c_str(),
+       auto r = state->mxf_writer.OpenWrite(
+               dcp::filesystem::fix_long_path(*asset->file()).string().c_str(),
                state->writer_info,
                state->picture_descriptor,
                16384,
                writer->_overwrite
                );
 
-       if (ASDCP_FAILURE (r)) {
-               boost::throw_exception (MXFFileError ("could not open MXF file for writing", asset->file().string(), r));
+       if (ASDCP_FAILURE(r)) {
+               boost::throw_exception (MXFFileError("could not open MXF file for writing", asset->file()->string(), r));
        }
 
        writer->_started = true;