diff options
| author | Carl Hetherington <cth@carlh.net> | 2022-03-24 13:34:08 +0100 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2022-03-25 07:53:08 +0100 |
| commit | 5215408c36898039e8fa294bb74bf94d5762b0c7 (patch) | |
| tree | 66d4937b35da2848a8ce85219d2330036f2ddd4f | |
| parent | a939e4b642ff9b398920dee1d0154729217347a5 (diff) | |
Bump libdcp for fix to remove erroneous <EntryPoint> and <Duration> markers from <MainMarkers> (#2215).
| -rw-r--r-- | cscript | 4 | ||||
| -rw-r--r-- | src/lib/reel_writer.cc | 2 | ||||
| -rw-r--r-- | src/wx/verify_dcp_dialog.cc | 6 | ||||
| m--------- | test/data | 0 | ||||
| -rw-r--r-- | test/video_mxf_content_test.cc | 2 | ||||
| -rw-r--r-- | wscript | 4 |
6 files changed, 12 insertions, 6 deletions
@@ -402,8 +402,8 @@ def dependencies(target, options): # Use distro-provided FFmpeg on Arch deps = [] - deps.append(('libdcp', 'v1.8.12')) - deps.append(('libsub', 'v1.6.12')) + deps.append(('libdcp', 'v1.8.13')) + deps.append(('libsub', 'v1.6.13')) deps.append(('leqm-nrt', '93ae9e6')) deps.append(('rtaudio', 'f619b76')) # We get our OpenSSL libraries from the environment, but we diff --git a/src/lib/reel_writer.cc b/src/lib/reel_writer.cc index 78148d18f..d8ce8882e 100644 --- a/src/lib/reel_writer.cc +++ b/src/lib/reel_writer.cc @@ -698,7 +698,7 @@ ReelWriter::create_reel_markers (shared_ptr<dcp::Reel> reel) const } if (!reel_markers.empty ()) { - auto ma = make_shared<dcp::ReelMarkersAsset>(dcp::Fraction(film()->video_frame_rate(), 1), reel->duration(), 0); + auto ma = make_shared<dcp::ReelMarkersAsset>(dcp::Fraction(film()->video_frame_rate(), 1), reel->duration()); for (auto const& i: reel_markers) { DCPTime relative = i.second - _period.from; auto hmsf = relative.split (film()->video_frame_rate()); diff --git a/src/wx/verify_dcp_dialog.cc b/src/wx/verify_dcp_dialog.cc index 3ab9062c7..b76176728 100644 --- a/src/wx/verify_dcp_dialog.cc +++ b/src/wx/verify_dcp_dialog.cc @@ -371,6 +371,12 @@ VerifyDCPDialog::VerifyDCPDialog (wxWindow* parent, shared_ptr<VerifyDCPJob> job case dcp::VerificationNote::Code::INCORRECT_CLOSED_CAPTION_ORDERING: add(i, _("Some closed captions are not listed in the order of their vertical position.")); break; + case dcp::VerificationNote::Code::UNEXPECTED_ENTRY_POINT: + add(i, _("There is a <EntryPoint> tag inside a <MainMarkers>.")); + break; + case dcp::VerificationNote::Code::UNEXPECTED_DURATION: + add(i, _("There is a <Duration> tag inside a <MainMarkers>.")); + break; } } diff --git a/test/data b/test/data -Subproject c0c10f0dff123764f412ae067825bbd1fc4c8c1 +Subproject 796f3e657f63985b360447a437c1d30be1ccaa2 diff --git a/test/video_mxf_content_test.cc b/test/video_mxf_content_test.cc index 1880935b1..f4f2adab0 100644 --- a/test/video_mxf_content_test.cc +++ b/test/video_mxf_content_test.cc @@ -41,7 +41,7 @@ using std::shared_ptr; using std::dynamic_pointer_cast; -static boost::filesystem::path ref_mxf = "test/data/scaling_test_185_185/j2c_74b946f4-1c33-4209-b639-b834de675eac.mxf"; +static boost::filesystem::path ref_mxf = "test/data/scaling_test_185_185/j2c_6a2ffab1-9ea5-4428-9027-9d458363c95f.mxf"; static void note (dcp::NoteType, std::string) @@ -35,8 +35,8 @@ except ImportError: from waflib import Logs, Context APPNAME = 'dcpomatic' -libdcp_version = '1.8.12' -libsub_version = '1.6.12' +libdcp_version = '1.8.13' +libsub_version = '1.6.13' this_version = subprocess.Popen(shlex.split('git tag -l --points-at HEAD'), stdout=subprocess.PIPE).communicate()[0] last_version = subprocess.Popen(shlex.split('git describe --tags --match v* --abbrev=0'), stdout=subprocess.PIPE).communicate()[0] |