# 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'))
*/
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<ContentTime>();
- _have_current_subtitle = true;
}
ContentBitmapText bitmap_text(from);
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"));
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"));
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"));
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"));
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"));
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"));
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"));
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"));
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"));
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"));
case dcp::VerificationNote::Code::EMPTY_CONTENT_VERSION_LABEL_TEXT:
add(i, _("The <LabelText> in a <ContentVersion> 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 <ContentVersion> 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:
#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 <dcp/cpl.h>
#include <iostream>
+using std::dynamic_pointer_cast;
+
+
BOOST_AUTO_TEST_CASE (test_subtitle_timing_with_frame_rate_change)
{
Cleanup cl;
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<FFmpegContent>(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<Event> 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<Event> 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<Event>(events.begin(), events.begin() + correct.size()) == correct);
+}
+