X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;ds=sidebyside;f=src%2Fpicture_asset.h;h=2c3917a491c5549670ba3e539a4aef6656f40337;hb=2ae92dcc97765deb2845dd07a338858aeb375cb3;hp=8a697f2cd3ca13ca6b579a02ee3933dcf67e720d;hpb=4f6b9809ed4c9291e2577ee8e0f3bebf15ca2629;p=libdcp.git

diff --git a/src/picture_asset.h b/src/picture_asset.h
index 8a697f2c..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
@@ -17,82 +17,110 @@
 
 */
 
+#ifndef LIBDCP_PICTURE_ASSET_H
+#define LIBDCP_PICTURE_ASSET_H
+
 /** @file  src/picture_asset.h
- *  @brief An asset made up of JPEG2000 files
+ *  @brief PictureAsset class.
  */
 
+#include "mxf.h"
+#include "util.h"
+#include "metadata.h"
 #include <openjpeg.h>
-#include "asset.h"
 
-namespace libdcp
+namespace ASDCP {
+	namespace JP2K {
+		struct PictureDescriptor;
+	}
+}
+
+namespace dcp
 {
 
-/** @brief An asset made up of JPEG2000 files */
-class PictureAsset : public Asset
+class MonoPictureFrame;
+class StereoPictureFrame;
+class PictureAssetWriter;
+
+/** @class PictureAsset
+ *  @brief An asset made up of JPEG2000 data.
+ */
+class PictureAsset : public Asset, public MXF
 {
 public:
-	/** Construct a PictureAsset, generating the MXF from the JPEG2000 files.
-	 *  This may take some time; progress is indicated by emission of the Progress signal.
-	 *  @param files Pathnames of JPEG2000 files, in frame order.
-	 *  @param directory Directory in which to create MXF file.
-	 *  @param mxf_name Name of MXF file to create.
-	 *  @param progress Signal to inform of progress.
-	 *  @param fps Frames per second.
-	 *  @param length Length in frames.
-	 *  @param width Width of images in pixels.
-	 *  @param height Height of images in pixels.
-	 */
-	PictureAsset (
-		std::vector<std::string> const & files,
-		std::string directory,
-		std::string mxf_name,
-		sigc::signal1<void, float>* progress,
-		int fps,
-		int length,
-		int width,
-		int height
-		);
-
-	/** Construct a PictureAsset, generating the MXF from the JPEG2000 files.
-	 *  This may take some time; progress is indicated by emission of the Progress signal.
-	 *  @param get_path Functor which returns a JPEG2000 file path for a given frame (frames counted from 0).
-	 *  @param directory Directory in which to create MXF file.
-	 *  @param mxf_name Name of MXF file to create.
-	 *  @param progress Signal to inform of progress.
-	 *  @param fps Frames per second.
-	 *  @param length Length in frames.
-	 *  @param width Width of images in pixels.
-	 *  @param height Height of images in pixels.
-	 */
-	PictureAsset (
-		sigc::slot<std::string, int> get_path,
-		std::string directory,
-		std::string mxf_name,
-		sigc::signal1<void, float>* progress,
-		int fps,
-		int length,
-		int width,
-		int height
-		);
-
-	PictureAsset (std::string directory, std::string mxf_name, int fps, int length, int width, int height);
-	
-	/** Write details of this asset to a CPL stream.
-	 *  @param s Stream.
+	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;
+
+	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;
+	}
+
+protected:
+	friend class MonoPictureAssetWriter;
+	friend class StereoPictureAssetWriter;
+
+	bool frame_buffer_equals (
+		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,
+		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.
 	 */
-	void write_to_cpl (std::ostream& s) const;
+	int64_t _intrinsic_duration;
+	/** picture size in pixels */
+	Size _size;
+	Fraction _frame_rate;
+	Fraction _screen_aspect_ratio;
 
-	std::list<std::string> equals (boost::shared_ptr<const Asset> other, EqualityFlags flags, double max_mean, double max_std_dev) const;
-	
 private:
-	std::string path_from_list (int f, std::vector<std::string> const & files) const;
-	void construct (sigc::slot<std::string, int>);
-	opj_image_t* decompress_j2k (uint8_t* data, int64_t size) const;
-	
-	/** picture width in pixels */
-	int _width;
-	/** picture height in pixels */
-	int _height;
+	std::string pkl_type (Standard standard) const;
 };
 
+
 }
+
+#endif