diff options
| author | Carl Hetherington <cth@carlh.net> | 2023-11-08 23:55:26 +0100 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2024-04-18 12:11:42 +0200 |
| commit | ddb999544ab9da2a3a4760baf241a5ef8520c37e (patch) | |
| tree | 641253a653aada191f9660f330a81ab79e598009 /tools | |
| parent | f6d466eee4f1381a65da4b5f6d60924e6a81df4e (diff) | |
Rename classes.
sed -i "s/\<PictureAsset/J2KPictureAsset/g" src/*.{cc,h}
sed -i "s/\<dcp::PictureAsset/dcp::J2KPictureAsset/g" src/*.{cc,h} test/*.{cc,h} tools/*.cc examples/*.cc
sed -i "s/\<MonoPictureAsset/MonoJ2KPictureAsset/g" src/*.{cc,h} tools/*.cc test/*.{cc,h}
sed -i "s/\<dcp::MonoPictureAsset/dcp::MonoJ2KPictureAsset/g" src/*.{cc,h} test/*.{cc,h} tools/*.cc examples/*.cc
sed -i "s/\<StereoPictureAsset/StereoJ2KPictureAsset/g" src/*.{cc,h} tools/*.cc
sed -i "s/\<dcp::StereoPictureAsset/dcp::StereoJ2KPictureAsset/g" src/*.{cc,h} test/*.{cc,h} tools/*.cc examples/*.cc
sed -i "s/\<MonoPictureFrame/MonoJ2KPictureFrame/g" src/*.{cc,h} tools/*.cc test/*.{cc,h}
sed -i "s/\<dcp::MonoPictureFrame/dcp::MonoJ2KPictureFrame/g" src/*.{cc,h} test/*.{cc,h} tools/*.cc examples/*.cc
sed -i "s/\<StereoPictureFrame/StereoJ2KPictureFrame/g" src/*.{cc,h} tools/*.cc
sed -i "s/\<dcp::StereoPictureFrame/dcp::StereoJ2KPictureFrame/g" src/*.{cc,h} test/*.{cc,h} tools/*.cc examples/*.cc
Diffstat (limited to 'tools')
| -rw-r--r-- | tools/dcpdecryptmxf.cc | 6 | ||||
| -rw-r--r-- | tools/dcpdumpimage.cc | 2 | ||||
| -rw-r--r-- | tools/dcpinfo.cc | 6 |
3 files changed, 7 insertions, 7 deletions
diff --git a/tools/dcpdecryptmxf.cc b/tools/dcpdecryptmxf.cc index 5285756a..ea90c34e 100644 --- a/tools/dcpdecryptmxf.cc +++ b/tools/dcpdecryptmxf.cc @@ -232,10 +232,10 @@ main (int argc, char* argv[]) } case Type::PICTURE: { - dcp::MonoPictureAsset in (input_file); + dcp::MonoJ2KPictureAsset in (input_file); add_key (in, decrypted_kdm); - dcp::MonoPictureAsset out (in.edit_rate(), dcp::Standard::SMPTE); - auto writer = out.start_write(output_file.get(), dcp::PictureAsset::Behaviour::MAKE_NEW); + dcp::MonoJ2KPictureAsset out (in.edit_rate(), dcp::Standard::SMPTE); + auto writer = out.start_write(output_file.get(), dcp::J2KPictureAsset::Behaviour::MAKE_NEW); copy (in, writer, ignore_hmac); break; } diff --git a/tools/dcpdumpimage.cc b/tools/dcpdumpimage.cc index c57857b2..0ddf2d62 100644 --- a/tools/dcpdumpimage.cc +++ b/tools/dcpdumpimage.cc @@ -152,7 +152,7 @@ main(int argc, char* argv[]) if (frame_index >= duration) { frame_index -= duration; } else { - auto reader = dynamic_pointer_cast<dcp::MonoPictureAsset>(reel->main_picture()->asset())->start_read(); + auto reader = dynamic_pointer_cast<dcp::MonoJ2KPictureAsset>(reel->main_picture()->asset())->start_read(); auto frame = reader->get_frame(frame_index); auto xyz = frame->xyz_image(); std::vector<uint8_t> rgba(xyz->size().width * xyz->size().height * 4); diff --git a/tools/dcpinfo.cc b/tools/dcpinfo.cc index 7e65d0d6..f68fac24 100644 --- a/tools/dcpinfo.cc +++ b/tools/dcpinfo.cc @@ -158,12 +158,12 @@ main_picture (vector<string> const& only, shared_ptr<Reel> reel, bool analyse, b OUTPUT_PICTURE("\n Picture: %1x%2\n", mp->asset()->size().width, mp->asset()->size().height); } - shared_ptr<MonoPictureAsset> ma = dynamic_pointer_cast<MonoPictureAsset>(mp->asset()); + shared_ptr<MonoJ2KPictureAsset> ma = dynamic_pointer_cast<MonoJ2KPictureAsset>(mp->asset()); if (analyse && ma) { - shared_ptr<MonoPictureAssetReader> reader = ma->start_read (); + shared_ptr<MonoJ2KPictureAssetReader> reader = ma->start_read (); pair<int, int> j2k_size_range (INT_MAX, 0); for (int64_t i = 0; i < ma->intrinsic_duration(); ++i) { - shared_ptr<const MonoPictureFrame> frame = reader->get_frame (i); + shared_ptr<const MonoJ2KPictureFrame> frame = reader->get_frame (i); if (SHOULD_PICTURE) { printf("Frame %" PRId64 " J2K size %7d", i, frame->size()); } |