From ed20305876e6743246996e8b4d77706d75dc63f8 Mon Sep 17 00:00:00 2001 From: Carl Hetherington Date: Tue, 6 Apr 2021 14:34:23 +0200 Subject: Don't try to verify encrypted JPEG2000 bitstreams. --- src/verify.cc | 18 +++++++++++------- 1 file changed, 11 insertions(+), 7 deletions(-) (limited to 'src') diff --git a/src/verify.cc b/src/verify.cc index 17f54e80..382a67ba 100644 --- a/src/verify.cc +++ b/src/verify.cc @@ -441,9 +441,11 @@ verify_picture_asset (shared_ptr reel_file_asset, boost::fi for (int64_t i = 0; i < duration; ++i) { auto frame = reader->get_frame (i); biggest_frame = max(biggest_frame, frame->size()); - vector j2k_notes; - verify_j2k (frame, j2k_notes); - check_and_add (j2k_notes); + if (!mono_asset->encrypted() || mono_asset->key()) { + vector j2k_notes; + verify_j2k (frame, j2k_notes); + check_and_add (j2k_notes); + } progress (float(i) / duration); } } else if (auto stereo_asset = dynamic_pointer_cast(asset)) { @@ -451,10 +453,12 @@ verify_picture_asset (shared_ptr reel_file_asset, boost::fi for (int64_t i = 0; i < duration; ++i) { auto frame = reader->get_frame (i); biggest_frame = max(biggest_frame, max(frame->left()->size(), frame->right()->size())); - vector j2k_notes; - verify_j2k (frame->left(), j2k_notes); - verify_j2k (frame->right(), j2k_notes); - check_and_add (j2k_notes); + if (!stereo_asset->encrypted() || mono_asset->key()) { + vector j2k_notes; + verify_j2k (frame->left(), j2k_notes); + verify_j2k (frame->right(), j2k_notes); + check_and_add (j2k_notes); + } progress (float(i) / duration); } -- cgit v1.2.3