diff options
Diffstat (limited to 'tools')
| -rw-r--r-- | tools/dcpdecryptmxf.cc | 16 | ||||
| -rw-r--r-- | tools/dcpinfo.cc | 10 |
2 files changed, 13 insertions, 13 deletions
diff --git a/tools/dcpdecryptmxf.cc b/tools/dcpdecryptmxf.cc index 1145d77d..fe7a2261 100644 --- a/tools/dcpdecryptmxf.cc +++ b/tools/dcpdecryptmxf.cc @@ -82,7 +82,7 @@ void copy (T const& in, shared_ptr<U> writer, bool ignore_hmac) reader->set_check_hmac (!ignore_hmac); for (int64_t i = 0; i < in.intrinsic_duration(); ++i) { auto frame = reader->get_frame (i); - writer->write (frame->data(), frame->size()); + writer->write(frame.data(), frame.size()); } writer->finalize(); }; @@ -250,15 +250,15 @@ main (int argc, char* argv[]) reader->set_check_hmac(!ignore_hmac); for (int64_t i = 0; i < in.intrinsic_duration(); ++i) { auto frame = reader->get_frame(i); - std::vector<int32_t*> pointers(frame->channels()); - for (auto channel = 0; channel < frame->channels(); ++channel) { - pointers[channel] = new int32_t[frame->samples()]; - for (auto sample = 0; sample < frame->samples(); ++sample) { - pointers[channel][sample] = frame->get(channel, sample); + std::vector<int32_t*> pointers(frame.channels()); + for (auto channel = 0; channel < frame.channels(); ++channel) { + pointers[channel] = new int32_t[frame.samples()]; + for (auto sample = 0; sample < frame.samples(); ++sample) { + pointers[channel][sample] = frame.get(channel, sample); } } - writer->write(pointers.data(), frame->channels(), frame->samples()); - for (auto channel = 0; channel < frame->channels(); ++channel) { + writer->write(pointers.data(), frame.channels(), frame.samples()); + for (auto channel = 0; channel < frame.channels(); ++channel) { delete[] pointers[channel]; } } diff --git a/tools/dcpinfo.cc b/tools/dcpinfo.cc index f68fac24..8c7dcff7 100644 --- a/tools/dcpinfo.cc +++ b/tools/dcpinfo.cc @@ -163,16 +163,16 @@ main_picture (vector<string> const& only, shared_ptr<Reel> reel, bool analyse, b 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 MonoJ2KPictureFrame> frame = reader->get_frame (i); + auto frame = reader->get_frame(i); if (SHOULD_PICTURE) { - printf("Frame %" PRId64 " J2K size %7d", i, frame->size()); + printf("Frame %" PRId64 " J2K size %7d", i, frame.size()); } - j2k_size_range.first = min(j2k_size_range.first, frame->size()); - j2k_size_range.second = max(j2k_size_range.second, frame->size()); + j2k_size_range.first = min(j2k_size_range.first, frame.size()); + j2k_size_range.second = max(j2k_size_range.second, frame.size()); if (decompress) { try { - frame->xyz_image(); + frame.xyz_image(); if (SHOULD_PICTURE) { printf(" decrypted OK"); } |