summaryrefslogtreecommitdiff
path: root/src/picture_asset.h
diff options
context:
space:
mode:
authorCarl Hetherington <cth@carlh.net>2021-01-24 04:15:26 +0100
committerCarl Hetherington <cth@carlh.net>2021-01-24 04:15:26 +0100
commitceaf7bc52712cb60708ed5eb5c62c5e463dd8e89 (patch)
treec55e4b85ee30138ce83263045d77d01631378b2e /src/picture_asset.h
parent6c37cc1979b2a01205a888c4c98f3334685ee8dd (diff)
Tidying.
Diffstat (limited to 'src/picture_asset.h')
-rw-r--r--src/picture_asset.h26
1 files changed, 18 insertions, 8 deletions
diff --git a/src/picture_asset.h b/src/picture_asset.h
index a49d1a7d..6ee3bd24 100644
--- a/src/picture_asset.h
+++ b/src/picture_asset.h
@@ -1,5 +1,5 @@
/*
- Copyright (C) 2012-2014 Carl Hetherington <cth@carlh.net>
+ Copyright (C) 2012-2021 Carl Hetherington <cth@carlh.net>
This file is part of libdcp.
@@ -31,37 +31,46 @@
files in the program, then also delete it here.
*/
-#ifndef LIBDCP_PICTURE_ASSET_H
-#define LIBDCP_PICTURE_ASSET_H
/** @file src/picture_asset.h
- * @brief PictureAsset class.
+ * @brief PictureAsset class
*/
+
+#ifndef LIBDCP_PICTURE_ASSET_H
+#define LIBDCP_PICTURE_ASSET_H
+
+
#include "mxf.h"
#include "util.h"
#include "metadata.h"
+
namespace ASDCP {
namespace JP2K {
struct PictureDescriptor;
}
}
-namespace dcp
-{
+
+namespace dcp {
+
class MonoPictureFrame;
class StereoPictureFrame;
class PictureAssetWriter;
+
/** @class PictureAsset
- * @brief An asset made up of JPEG2000 data.
+ * @brief An asset made up of JPEG2000 data
*/
class PictureAsset : public Asset, public MXF
{
public:
+ /** Load a PictureAsset from a file */
explicit PictureAsset (boost::filesystem::path file);
+
+ /** Create a new PictureAsset with a given edit rate and standard */
explicit PictureAsset (Fraction edit_rate, Standard standard);
virtual std::shared_ptr<PictureAssetWriter> start_write (
@@ -124,7 +133,7 @@ protected:
/** The total length of this content in video frames. The amount of
* content presented may be less than this.
*/
- int64_t _intrinsic_duration;
+ int64_t _intrinsic_duration = 0;
/** picture size in pixels */
Size _size;
Fraction _frame_rate;
@@ -137,4 +146,5 @@ private:
}
+
#endif