projects
/
dcpomatic.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
a939e4b
)
Bump libdcp for fix to remove erroneous <EntryPoint> and <Duration> markers from...
author
Carl Hetherington
<cth@carlh.net>
Thu, 24 Mar 2022 12:34:08 +0000
(13:34 +0100)
committer
Carl Hetherington
<cth@carlh.net>
Fri, 25 Mar 2022 06:53:08 +0000
(07:53 +0100)
cscript
patch
|
blob
|
history
src/lib/reel_writer.cc
patch
|
blob
|
history
src/wx/verify_dcp_dialog.cc
patch
|
blob
|
history
test/data
patch
|
blob
|
history
test/video_mxf_content_test.cc
patch
|
blob
|
history
wscript
patch
|
blob
|
history
diff --git
a/cscript
b/cscript
index f09128645c75639312a857433ed533dee47282d2..d007deb4cf4e161ab55822c159a121b014041919 100644
(file)
--- a/
cscript
+++ b/
cscript
@@
-402,8
+402,8
@@
def dependencies(target, options):
# Use distro-provided FFmpeg on Arch
deps = []
# Use distro-provided FFmpeg on Arch
deps = []
- deps.append(('libdcp', 'v1.8.1
2
'))
- deps.append(('libsub', 'v1.6.1
2
'))
+ deps.append(('libdcp', 'v1.8.1
3
'))
+ deps.append(('libsub', 'v1.6.1
3
'))
deps.append(('leqm-nrt', '93ae9e6'))
deps.append(('rtaudio', 'f619b76'))
# We get our OpenSSL libraries from the environment, but we
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 78148d18f1fb4b6c301b59269f177124d1da253e..d8ce8882e3ced36100a12c9037067348de3d0109 100644
(file)
--- 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 ()) {
}
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());
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 3ab9062c7b120277bc69ab6d036239f94b3054cb..b761767284d66426bdaa54fc6eb204fe13dd88a6 100644
(file)
--- 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::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
index c0c10f0dff123764f412ae067825bbd1fc4c8c16..796f3e657f63985b360447a437c1d30be1ccaa28 160000
(submodule)
--- a/
test/data
+++ b/
test/data
@@
-1
+1
@@
-Subproject commit
c0c10f0dff123764f412ae067825bbd1fc4c8c16
+Subproject commit
796f3e657f63985b360447a437c1d30be1ccaa28
diff --git
a/test/video_mxf_content_test.cc
b/test/video_mxf_content_test.cc
index 1880935b15c07f63a870efd4ba331604f9006bb2..f4f2adab0ffbe74e2b5be0bf7eb46dd0f611f378 100644
(file)
--- 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;
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)
static void note (dcp::NoteType, std::string)
diff --git
a/wscript
b/wscript
index 60be947eb1a6c1b9a48d0502078f40e477c2e588..03d2074283a357c38e5648cdb35e9d4dbb6f8bd4 100644
(file)
--- a/
wscript
+++ b/
wscript
@@
-35,8
+35,8
@@
except ImportError:
from waflib import Logs, Context
APPNAME = 'dcpomatic'
from waflib import Logs, Context
APPNAME = 'dcpomatic'
-libdcp_version = '1.8.1
2
'
-libsub_version = '1.6.1
2
'
+libdcp_version = '1.8.1
3
'
+libsub_version = '1.6.1
3
'
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]
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]