Split the old PictureAsset into a new PictureAsset + J2KPictureAsset.

5 files changed, 170 insertions, 51 deletions

diff --git a/src/j2k_picture_asset.cc b/src/j2k_picture_asset.cc
index 5c31e9c2..98792253 100644
--- a/src/j2k_picture_asset.cc
+++ b/src/j2k_picture_asset.cc
@@ -64,16 +64,15 @@ using std::shared_ptr;
 using namespace dcp;
 
 
-J2KPictureAsset::J2KPictureAsset (boost::filesystem::path file)
-	: Asset (file)
+J2KPictureAsset::J2KPictureAsset(boost::filesystem::path file)
+	: PictureAsset(file)
 {
 
 }
 
 
-J2KPictureAsset::J2KPictureAsset (Fraction edit_rate, Standard standard)
-	: MXF (standard)
-	, _edit_rate (edit_rate)
+J2KPictureAsset::J2KPictureAsset(Fraction edit_rate, Standard standard)
+	: PictureAsset(edit_rate, standard)
 {
 
 }
diff --git a/src/j2k_picture_asset.h b/src/j2k_picture_asset.h
index 405f6531..cbcf5b37 100644
--- a/src/j2k_picture_asset.h
+++ b/src/j2k_picture_asset.h
@@ -37,13 +37,14 @@
  */
 
 
-#ifndef LIBDCP_PICTURE_ASSET_H
-#define LIBDCP_PICTURE_ASSET_H
+#ifndef LIBDCP_J2K_PICTURE_ASSET_H
+#define LIBDCP_J2K_PICTURE_ASSET_H
 
 
 #include "mxf.h"
-#include "util.h"
 #include "metadata.h"
+#include "picture_asset.h"
+#include "util.h"
 
 
 namespace ASDCP {
@@ -64,7 +65,7 @@ class J2KPictureAssetWriter;
 /** @class J2KPictureAsset
  *  @brief An asset made up of JPEG2000 data
  */
-class J2KPictureAsset : public Asset, public MXF
+class J2KPictureAsset : public PictureAsset
 {
 public:
 	/** Load a J2KPictureAsset from a file */
@@ -83,38 +84,6 @@ public:
 		Behaviour behaviour
 		) = 0;
 
-	Size size () const {
-		return _size;
-	}
-
-	void set_size (Size s) {
-		_size = s;
-	}
-
-	Fraction frame_rate () const {
-		return _frame_rate;
-	}
-
-	void set_frame_rate (Fraction r) {
-		_frame_rate = r;
-	}
-
-	Fraction screen_aspect_ratio () const {
-		return _screen_aspect_ratio;
-	}
-
-	void set_screen_aspect_ratio (Fraction r) {
-		_screen_aspect_ratio = r;
-	}
-
-	Fraction edit_rate () const {
-		return _edit_rate;
-	}
-
-	int64_t intrinsic_duration () const {
-		return _intrinsic_duration;
-	}
-
 	static std::string static_pkl_type (Standard standard);
 
 protected:
@@ -134,16 +103,6 @@ protected:
 
 	void read_picture_descriptor (ASDCP::JP2K::PictureDescriptor const &);
 
-	Fraction _edit_rate;
-	/** The total length of this content in video frames.  The amount of
-	 *  content presented may be less than this.
-	 */
-	int64_t _intrinsic_duration = 0;
-	/** picture size in pixels */
-	Size _size;
-	Fraction _frame_rate;
-	Fraction _screen_aspect_ratio;
-
 private:
 	std::string pkl_type (Standard standard) const override;
 };
diff --git a/src/picture_asset.cc b/src/picture_asset.cc
new file mode 100644
index 00000000..3b28bf4b
--- /dev/null
+++ b/src/picture_asset.cc
@@ -0,0 +1,55 @@
+/*
+    Copyright (C) 2012-2021 Carl Hetherington <cth@carlh.net>
+
+    This file is part of libdcp.
+
+    libdcp is free software; you can redistribute it and/or modify
+    it under the terms of the GNU General Public License as published by
+    the Free Software Foundation; either version 2 of the License, or
+    (at your option) any later version.
+
+    libdcp is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU General Public License for more details.
+
+    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.
+*/
+
+
+#include "picture_asset.h"
+
+
+using namespace dcp;
+
+
+PictureAsset::PictureAsset(boost::filesystem::path file)
+	: Asset(file)
+{
+
+}
+
+
+PictureAsset::PictureAsset(Fraction edit_rate, Standard standard)
+	: MXF(standard)
+	, _edit_rate(edit_rate)
+{
+
+}
+
+
diff --git a/src/picture_asset.h b/src/picture_asset.h
new file mode 100644
index 00000000..b91d6085
--- /dev/null
+++ b/src/picture_asset.h
@@ -0,0 +1,104 @@
+/*
+    Copyright (C) 2012-2021 Carl Hetherington <cth@carlh.net>
+
+    This file is part of libdcp.
+
+    libdcp is free software; you can redistribute it and/or modify
+    it under the terms of the GNU General Public License as published by
+    the Free Software Foundation; either version 2 of the License, or
+    (at your option) any later version.
+
+    libdcp is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU General Public License for more details.
+
+    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.
+*/
+
+
+#ifndef LIBDCP_PICTURE_ASSET_H
+#define LIBDCP_PICTURE_ASSET_H
+
+
+#include "asset.h"
+#include "mxf.h"
+#include "types.h"
+
+
+namespace dcp {
+
+
+class PictureAsset : public Asset, public MXF
+{
+public:
+	explicit PictureAsset(boost::filesystem::path file);
+	PictureAsset(Fraction edit_rate, Standard standard);
+
+	Fraction edit_rate () const {
+		return _edit_rate;
+	}
+
+	int64_t intrinsic_duration () const {
+		return _intrinsic_duration;
+	}
+
+
+	Size size () const {
+		return _size;
+	}
+
+	void set_size (Size s) {
+		_size = s;
+	}
+
+	Fraction frame_rate () const {
+		return _frame_rate;
+	}
+
+	void set_frame_rate (Fraction r) {
+		_frame_rate = r;
+	}
+
+	Fraction screen_aspect_ratio () const {
+		return _screen_aspect_ratio;
+	}
+
+	void set_screen_aspect_ratio (Fraction r) {
+		_screen_aspect_ratio = r;
+	}
+
+protected:
+	Fraction _edit_rate;
+	/** The total length of this content in video frames.  The amount of
+	 *  content presented may be less than this.
+	 */
+	int64_t _intrinsic_duration = 0;
+	/** picture size in pixels */
+	Size _size;
+	Fraction _frame_rate;
+	Fraction _screen_aspect_ratio;
+
+};
+
+
+}
+
+
+#endif
+
diff --git a/src/wscript b/src/wscript
index 428e2769..ba063298 100644
--- a/src/wscript
+++ b/src/wscript
@@ -81,6 +81,7 @@ def build(bld):
              name_format.cc
              object.cc
              openjpeg_image.cc
+             picture_asset.cc
              pkl.cc
              rating.cc
              raw_convert.cc
@@ -186,6 +187,7 @@ def build(bld):
               name_format.h
               object.h
               openjpeg_image.h
+              picture_asset.h
               piecewise_lut.h
               pkl.h
               rating.h