From 436a02462f5aa2a5b8fdcaa1c5da79f48d167244 Mon Sep 17 00:00:00 2001 From: Carl Hetherington Date: Sun, 7 Feb 2021 02:46:58 +0100 Subject: [PATCH] libdcp update. --- cscript | 4 ++-- src/wx/verify_dcp_dialog.cc | 39 +++++++++++++++++++++++++++++++++++++ 2 files changed, 41 insertions(+), 2 deletions(-) diff --git a/cscript b/cscript index 537611ccb..41f98b135 100644 --- a/cscript +++ b/cscript @@ -370,8 +370,8 @@ def dependencies(target, options): # Use distro-provided FFmpeg on Arch deps = [] - deps.append(('libdcp', 'c2b47fe')) - deps.append(('libsub', '61cafd0')) + deps.append(('libdcp', 'bed820d')) + deps.append(('libsub', '2ac27e6')) deps.append(('leqm-nrt', '131f971')) deps.append(('rtaudio', 'f619b76')) # We get our OpenSSL libraries from the environment, but we diff --git a/src/wx/verify_dcp_dialog.cc b/src/wx/verify_dcp_dialog.cc index 604327ebd..44b2ed134 100644 --- a/src/wx/verify_dcp_dialog.cc +++ b/src/wx/verify_dcp_dialog.cc @@ -296,6 +296,45 @@ VerifyDCPDialog::VerifyDCPDialog (wxWindow* parent, shared_ptr job case dcp::VerificationNote::Code::PARTIALLY_ENCRYPTED: add(i, _("The DCP has encrypted content, but not all its assets are encrypted.")); break; + case dcp::VerificationNote::Code::INVALID_JPEG2000_CODESTREAM: + add(i, _("A picture frame has an invalid JPEG2000 codestream (%n)")); + break; + case dcp::VerificationNote::Code::INVALID_JPEG2000_GUARD_BITS_FOR_2K: + add(i, _("A 2K JPEG2000 frame has %n guard bits instead of 1.")); + break; + case dcp::VerificationNote::Code::INVALID_JPEG2000_GUARD_BITS_FOR_4K: + add(i, _("A 4K JPEG2000 frame has %n guard bits instead of 2.")); + break; + case dcp::VerificationNote::Code::INVALID_JPEG2000_TILE_SIZE: + add(i, _("A JPEG2000 tile size does not match the image size.")); + break; + case dcp::VerificationNote::Code::INVALID_JPEG2000_CODE_BLOCK_WIDTH: + add(i, _("A JPEG2000 frame has a code-block width of %n instead of 32.")); + break; + case dcp::VerificationNote::Code::INVALID_JPEG2000_CODE_BLOCK_HEIGHT: + add(i, _("A JPEG2000 frame has a code-block height of %n instead of 32.")); + break; + case dcp::VerificationNote::Code::INCORRECT_JPEG2000_POC_MARKER_COUNT_FOR_2K: + add(i, _("A 2K JPEG2000 frame has %n POC marker(s) instead of 0.")); + break; + case dcp::VerificationNote::Code::INCORRECT_JPEG2000_POC_MARKER_COUNT_FOR_4K: + add(i, _("A 4K JPEG2000 frame has %n POC marker(s) instead of 1.")); + break; + case dcp::VerificationNote::Code::INCORRECT_JPEG2000_POC_MARKER: + add(i, _("A JPEG2000 frame contains an invalid POC marker (%n).")); + break; + case dcp::VerificationNote::Code::INVALID_JPEG2000_POC_MARKER_LOCATION: + add(i, _("A JPEG2000 frame contains POC marker in an invalid location.")); + break; + case dcp::VerificationNote::Code::INVALID_JPEG2000_TILE_PARTS_FOR_2K: + add(i, _("A 2K JPEG2000 frame contains %n tile parts instead of 3.")); + break; + case dcp::VerificationNote::Code::INVALID_JPEG2000_TILE_PARTS_FOR_4K: + add(i, _("A 2K JPEG2000 frame contains %n tile parts instead of 6.")); + break; + case dcp::VerificationNote::Code::MISSING_JPEG200_TLM_MARKER: + add(i, _("A JPEG2000 frame has no TLM marker.")); + break; } } -- 2.30.2