diff options
| author | Carl Hetherington <cth@carlh.net> | 2016-01-05 01:24:19 +0000 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2016-01-05 01:24:19 +0000 |
| commit | 5ee3348142f4cfafdbcf2c9c833843d717affc11 (patch) | |
| tree | 1c97c80eeccc6b5f515a611e35dee35b21d3b09b /src/mono_picture_asset.cc | |
| parent | 740938890d95e853cf13d4780a5d674c3d6c7f6f (diff) | |
Various IMF hacks.imf
Diffstat (limited to 'src/mono_picture_asset.cc')
| -rw-r--r-- | src/mono_picture_asset.cc | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/src/mono_picture_asset.cc b/src/mono_picture_asset.cc index f1b5f9d5..9b83bae5 100644 --- a/src/mono_picture_asset.cc +++ b/src/mono_picture_asset.cc @@ -20,6 +20,7 @@ #include "mono_picture_asset.h" #include "mono_picture_asset_writer.h" #include "AS_DCP.h" +#include "AS_02.h" #include "KM_fileio.h" #include "exceptions.h" #include "dcp_assert.h" @@ -34,8 +35,9 @@ using boost::shared_ptr; using boost::dynamic_pointer_cast; using namespace dcp; -MonoPictureAsset::MonoPictureAsset (boost::filesystem::path file) +MonoPictureAsset::MonoPictureAsset (boost::filesystem::path file, AssetType type) : PictureAsset (file) + , _type (type) { ASDCP::JP2K::MXFReader reader; Kumu::Result_t r = reader.OpenRead (file.string().c_str()); @@ -60,6 +62,7 @@ MonoPictureAsset::MonoPictureAsset (boost::filesystem::path file) MonoPictureAsset::MonoPictureAsset (Fraction edit_rate) : PictureAsset (edit_rate) + , _type (ASSET_DCP) { } @@ -67,7 +70,7 @@ MonoPictureAsset::MonoPictureAsset (Fraction edit_rate) shared_ptr<const MonoPictureFrame> MonoPictureAsset::get_frame (int n) const { - return shared_ptr<const MonoPictureFrame> (new MonoPictureFrame (_file, n, _decryption_context)); + return shared_ptr<const MonoPictureFrame> (new MonoPictureFrame (_file, n, _decryption_context, _type)); } static void |