X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Fpicture_asset.h;h=2c3917a491c5549670ba3e539a4aef6656f40337;hb=2ae92dcc97765deb2845dd07a338858aeb375cb3;hp=b404abd2e5d0bb897d23391adcd3e520e4291d5f;hpb=bfb33feb40c5b014e9eae3958b1ecb8161f1d090;p=libdcp.git

diff --git a/src/picture_asset.h b/src/picture_asset.h
index b404abd2..2c3917a4 100644
--- a/src/picture_asset.h
+++ b/src/picture_asset.h
@@ -1,5 +1,5 @@
 /*
-    Copyright (C) 2012 Carl Hetherington <cth@carlh.net>
+    Copyright (C) 2012-2014 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
@@ -21,13 +21,13 @@
 #define LIBDCP_PICTURE_ASSET_H
 
 /** @file  src/picture_asset.h
- *  @brief An asset made up of JPEG2000 data
+ *  @brief PictureAsset class.
  */
 
-#include <openjpeg.h>
-#include "mxf_asset.h"
+#include "mxf.h"
 #include "util.h"
 #include "metadata.h"
+#include <openjpeg.h>
 
 namespace ASDCP {
 	namespace JP2K {
@@ -35,39 +35,28 @@ namespace ASDCP {
 	}
 }
 
-namespace libdcp
+namespace dcp
 {
 
-class MonoPictureFrame;	
+class MonoPictureFrame;
 class StereoPictureFrame;
 class PictureAssetWriter;
 
-/** @brief An asset made up of JPEG2000 data */
-class PictureAsset : public MXFAsset
+/** @class PictureAsset
+ *  @brief An asset made up of JPEG2000 data.
+ */
+class PictureAsset : public Asset, public MXF
 {
 public:
-	/** Construct a PictureAsset.
-	 *  
-	 *  @param directory Directory where MXF file is.
-	 *  @param mxf_name Name of MXF file.
-	 */
-	PictureAsset (boost::filesystem::path directory, boost::filesystem::path mxf_name);
-
-	/** Start a progressive write to this asset.
-	 *  The following parameters must be set up (if required) before calling this:
-	 *      Interop mode (set_interop)
-	 *      Edit rate    (set_edit_rate)
-	 *      MXF Metadata (set_metadata)
-	 *      
-	 *  @param overwrite true to overwrite an existing MXF file; in this mode, writing can be resumed to a partially-written MXF; false if the
-	 *  MXF file does not exist.
-	 */
-	virtual boost::shared_ptr<PictureAssetWriter> start_write (bool overwrite) = 0;
+	PictureAsset (boost::filesystem::path file);
+	PictureAsset (Fraction edit_rate);
+
+	virtual boost::shared_ptr<PictureAssetWriter> start_write (
+		boost::filesystem::path file,
+		Standard standard,
+		bool overwrite
+		) = 0;
 
-	virtual void read () = 0;
-	virtual void create (std::vector<boost::filesystem::path> const &) {}
-	virtual void create (boost::function<boost::filesystem::path (int)>) {}
-	
 	Size size () const {
 		return _size;
 	}
@@ -76,31 +65,61 @@ public:
 		_size = s;
 	}
 
-	void write_to_cpl (xmlpp::Element *) const;
+	Fraction frame_rate () const {
+		return _frame_rate;
+	}
 
-protected:
+	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;
+	}
 
-	std::string asdcp_kind () const {
-		return "Picture";
+	int64_t intrinsic_duration () const {
+		return _intrinsic_duration;
 	}
 
+protected:
+	friend class MonoPictureAssetWriter;
+	friend class StereoPictureAssetWriter;
+
 	bool frame_buffer_equals (
-		int frame, EqualityOptions opt, boost::function<void (NoteType, std::string)> note,
+		int frame, EqualityOptions opt, NoteHandler note,
 		uint8_t const * data_A, unsigned int size_A, uint8_t const * data_B, unsigned int size_B
 		) const;
 
 	bool descriptor_equals (
-		ASDCP::JP2K::PictureDescriptor const & a, ASDCP::JP2K::PictureDescriptor const & b, boost::function<void (NoteType, std::string)>
+		ASDCP::JP2K::PictureDescriptor const & a,
+		ASDCP::JP2K::PictureDescriptor const & b,
+		NoteHandler note
 		) const;
 
+	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;
 	/** picture size in pixels */
 	Size _size;
+	Fraction _frame_rate;
+	Fraction _screen_aspect_ratio;
 
 private:
-	std::string key_type () const;
-	virtual int edit_rate_factor () const = 0;
+	std::string pkl_type (Standard standard) const;
 };
-	
+
 
 }