From: Carl Hetherington Date: Thu, 18 Apr 2024 10:08:51 +0000 (+0200) Subject: Merge remote-tracking branch 'origin/main' into v2.17.x X-Git-Tag: v2.17.16~9 X-Git-Url: https://git.carlh.net/gitweb/?a=commitdiff_plain;h=44a4ff40df50688286e6db8b1fc2c024f6e5834b;hp=af20e21e2363f7c4d5f7031c444984f383c26914;p=dcpomatic.git Merge remote-tracking branch 'origin/main' into v2.17.x --- diff --git a/cscript b/cscript index 5d931f471..6545f6190 100644 --- a/cscript +++ b/cscript @@ -538,7 +538,7 @@ def dependencies(target, options): # Use distro-provided FFmpeg on Arch deps = [] - deps.append(('libdcp', 'v1.9.5', {'c++17': target.platform == 'osx'})) + deps.append(('libdcp', '816365d20e0c6ef37b6bf499a42a0d3ecad22c05', {'c++17': target.platform == 'osx'})) deps.append(('libsub', 'v1.6.47')) deps.append(('leqm-nrt', '30dcaea1373ac62fba050e02ce5b0c1085797a23')) deps.append(('rtaudio', 'f619b76')) diff --git a/src/lib/ffmpeg_decoder.cc b/src/lib/ffmpeg_decoder.cc index 09db1ff1c..17973d000 100644 --- a/src/lib/ffmpeg_decoder.cc +++ b/src/lib/ffmpeg_decoder.cc @@ -667,11 +667,11 @@ FFmpegDecoder::decode_and_process_subtitle_packet (AVPacket* packet) */ ContentTime from; from = sub_period.from + _pts_offset; + _have_current_subtitle = true; if (sub_period.to) { _current_subtitle_to = *sub_period.to + _pts_offset; } else { _current_subtitle_to = optional(); - _have_current_subtitle = true; } ContentBitmapText bitmap_text(from); diff --git a/src/wx/supporters.cc b/src/wx/supporters.cc index 711b6bbad..514b53d7b 100644 --- a/src/wx/supporters.cc +++ b/src/wx/supporters.cc @@ -126,6 +126,7 @@ supported_by.Add (wxT ("Phillip Branford")); supported_by.Add (wxT ("Ingebjørg Braseth")); supported_by.Add (wxT ("Studio Brauneis")); supported_by.Add (wxT ("Thomas Bray")); +supported_by.Add (wxT ("Thomas Bray")); supported_by.Add (wxT ("queerfilm festival Bremen")); supported_by.Add (wxT ("Martin Brenneis")); supported_by.Add (wxT ("Petra-Puk Bresser")); @@ -233,6 +234,7 @@ supported_by.Add (wxT ("Adam Cousins")); supported_by.Add (wxT ("Aria Covamonas")); supported_by.Add (wxT ("Tom Cowan")); supported_by.Add (wxT ("Jill Cox")); +supported_by.Add (wxT ("Tate Cozza")); supported_by.Add (wxT ("Stefano Cravero")); supported_by.Add (wxT ("Phillip Crawford")); supported_by.Add (wxT ("Root && Rust Creative")); @@ -372,6 +374,7 @@ supported_by.Add (wxT ("Marc Fiebig")); supported_by.Add (wxT ("Moshel Film")); supported_by.Add (wxT ("Juli Film")); supported_by.Add (wxT ("Pató Film")); +supported_by.Add (wxT ("HisStory Film")); supported_by.Add (wxT ("Hoppe Film")); supported_by.Add (wxT ("“How to Successfully Fail in Hollywood” Film")); supported_by.Add (wxT ("Hamann Film")); @@ -443,6 +446,7 @@ supported_by.Add (wxT ("Francesca Garau")); supported_by.Add (wxT ("Jordi Miró Garcia")); supported_by.Add (wxT ("Francisco Montoro Garcia")); supported_by.Add (wxT ("Stefano Gariglio")); +supported_by.Add (wxT ("Tom Garner")); supported_by.Add (wxT ("Bethwyn Garswood")); supported_by.Add (wxT ("Andris Gauja")); supported_by.Add (wxT ("DocCollection GbR")); @@ -569,6 +573,7 @@ supported_by.Add (wxT ("Shinya Isobe")); supported_by.Add (wxT ("Theodore Ivanov")); supported_by.Add (wxT ("Julien Ivanowich")); supported_by.Add (wxT ("Denis Ivashvkevych")); +supported_by.Add (wxT ("June Nho Ivers")); supported_by.Add (wxT ("Emilia Izquierdo")); supported_by.Add (wxT ("Mahboobani Jackie")); supported_by.Add (wxT ("Alexzandra Jackson")); @@ -813,6 +818,7 @@ supported_by.Add (wxT ("Kenjo McCurtain")); supported_by.Add (wxT ("Dawn McElligott")); supported_by.Add (wxT ("Caitlin Mcgrath")); supported_by.Add (wxT ("Neil McGrath")); +supported_by.Add (wxT ("Tom Mcintire")); supported_by.Add (wxT ("Andrew McKee")); supported_by.Add (wxT ("Gordon McLeod")); supported_by.Add (wxT ("Britt McTammany")); @@ -908,6 +914,7 @@ supported_by.Add (wxT ("Didier Oriol")); supported_by.Add (wxT ("Kevin Orman")); supported_by.Add (wxT ("George Orr")); supported_by.Add (wxT ("orwoid.com")); +supported_by.Add (wxT ("Neil Oseman")); supported_by.Add (wxT ("Danilo Marichal Osorio")); supported_by.Add (wxT ("Norbert Ostendorf")); supported_by.Add (wxT ("Peter Östlund")); @@ -927,6 +934,7 @@ supported_by.Add (wxT ("Christian Passeri")); supported_by.Add (wxT ("Sharad Patel")); supported_by.Add (wxT ("Panagiotis Patsiaouras")); supported_by.Add (wxT ("Anand Patwardhan")); +supported_by.Add (wxT ("Tomaz Pavkovic")); supported_by.Add (wxT ("Stanko Pavlica")); supported_by.Add (wxT ("Konstantinos Pavlidis")); supported_by.Add (wxT ("Natalie Peart")); @@ -985,6 +993,7 @@ supported_by.Add (wxT ("Pentimenti Productions")); supported_by.Add (wxT ("Hitman Productions")); supported_by.Add (wxT ("WLFK Productions")); supported_by.Add (wxT ("Ceridwen Productions")); +supported_by.Add (wxT ("ZooTime Productions")); supported_by.Add (wxT ("A Tractor Productions")); supported_by.Add (wxT ("Second Wind Productions")); supported_by.Add (wxT ("Locomotive Productions")); @@ -1060,6 +1069,7 @@ supported_by.Add (wxT ("Objectif 13 S.C.S.")); supported_by.Add (wxT ("Neil Sadwelkar")); supported_by.Add (wxT ("Hakan Sahin")); supported_by.Add (wxT ("Sebastien Saint-Cricq")); +supported_by.Add (wxT ("Milena Salazar")); supported_by.Add (wxT ("Lasse Salling")); supported_by.Add (wxT ("Community TV Salzburg")); supported_by.Add (wxT ("Keith Sanborn")); diff --git a/src/wx/verify_dcp_result_panel.cc b/src/wx/verify_dcp_result_panel.cc index bfeb14640..1e7e3395f 100644 --- a/src/wx/verify_dcp_result_panel.cc +++ b/src/wx/verify_dcp_result_panel.cc @@ -464,6 +464,12 @@ VerifyDCPResultPanel::fill(shared_ptr job) case dcp::VerificationNote::Code::EMPTY_CONTENT_VERSION_LABEL_TEXT: add(i, _("The in a in CPL %id is empty")); break; + case dcp::VerificationNote::Code::INVALID_CPL_NAMESPACE: + add(i, _("The CPL %id has an invalid namespace %n")); + break; + case dcp::VerificationNote::Code::MISSING_CPL_CONTENT_VERSION: + add(i, _("The CPL %id has no tag")); + break; case dcp::VerificationNote::Code::MATCHING_CPL_HASHES: case dcp::VerificationNote::Code::CORRECT_PICTURE_HASH: case dcp::VerificationNote::Code::VALID_PICTURE_FRAME_SIZES_IN_BYTES: diff --git a/test/subtitle_timing_test.cc b/test/subtitle_timing_test.cc index 79cc68849..8bb18f304 100644 --- a/test/subtitle_timing_test.cc +++ b/test/subtitle_timing_test.cc @@ -21,8 +21,13 @@ #include "lib/content.h" #include "lib/content_factory.h" +#include "lib/content_text.h" +#include "lib/dcpomatic_time.h" #include "lib/film.h" +#include "lib/ffmpeg_content.h" +#include "lib/ffmpeg_decoder.h" #include "lib/text_content.h" +#include "lib/text_decoder.h" #include "lib/video_content.h" #include "test.h" #include @@ -33,6 +38,9 @@ #include +using std::dynamic_pointer_cast; + + BOOST_AUTO_TEST_CASE (test_subtitle_timing_with_frame_rate_change) { Cleanup cl; @@ -72,3 +80,66 @@ BOOST_AUTO_TEST_CASE (test_subtitle_timing_with_frame_rate_change) cl.run(); } + +BOOST_AUTO_TEST_CASE(dvb_subtitles_replace_the_last) +{ + /* roh.mkv contains subtitles that come out of FFmpeg with incorrect stop times (30s + * after the start, which seems to be some kind of DVB "standard" timeout). + * Between actual subtitles it contains blanks that are apparently supposed to clear + * the previous subtitle. Make sure that happens. + */ + auto content = content_factory(TestPaths::private_data() / "roh.mkv"); + BOOST_REQUIRE(!content.empty()); + auto film = new_test_film2("dvb_subtitles_replace_the_last", { content[0] }); + + FFmpegDecoder decoder(film, dynamic_pointer_cast(content[0]), false); + BOOST_REQUIRE(!decoder.text.empty()); + + struct Event { + std::string type; + dcpomatic::ContentTime time; + + bool operator==(Event const& other) const { + return type == other.type && time == other.time; + } + }; + + std::vector events; + + auto start = [&events](ContentBitmapText text) { + events.push_back({"start", text.from()}); + }; + + auto stop = [&events](dcpomatic::ContentTime time) { + if (!events.empty() && events.back().type == "stop") { + /* We'll get a bad (too-late) stop time, then the correct one + * when the "clearing" subtitle arrives. + */ + events.pop_back(); + } + events.push_back({"stop", time}); + }; + + decoder.text.front()->BitmapStart.connect(start); + decoder.text.front()->Stop.connect(stop); + + while (!decoder.pass()) {} + + using dcpomatic::ContentTime; + + std::vector correct = { + { "start", ContentTime(439872) }, // 4.582000s actual subtitle #1 + { "stop", ContentTime(998400) }, // 10.400000s stop caused by incoming blank + { "start", ContentTime(998400) }, // 10.400000s blank + { "stop", ContentTime(1141248) }, // 11.888000s stop caused by incoming subtitle #2 + { "start", ContentTime(1141248) }, // 11.888000s subtitle #2 + { "stop", ContentTime(1455936) }, // 15.166000s ... + { "start", ContentTime(1455936) }, // 15.166000s + { "stop", ContentTime(1626816) }, // 16.946000s + { "start", ContentTime(1626816) }, // 16.946000s + }; + + BOOST_REQUIRE(events.size() > correct.size()); + BOOST_CHECK(std::vector(events.begin(), events.begin() + correct.size()) == correct); +} +