dcpomatic/src/lib/ffmpeg_decoder.cc, branch processorDCP-o-matic DCP toolshttps://git.carlh.net/cgit/dcpomatic/atom?h=processor2025-10-15T20:33:26ZDisable use of stream IDs if there are duplicates, rather than rewriting.2025-10-15T20:33:26ZCarl Hetheringtoncth@carlh.net2025-10-14T15:02:15Zurn:sha1:2d8d05c2e7ad67ebac2ff250670a219a891d09ca
It turns out that FFmpeg decoders (e.g. flv, see FFmpeg
25faaa311a74efdfdc4fed56996d7338ed807488) check stream IDs and sometimes
create new streams if they see one that they didn't see before. If we
change stream IDs we break this.
Here we try to use stream indices in cases where the IDs are duplicated.
We also account for the case where a new stream appears during
examination. This wasn't covered by tests until the FFmpeg commit
mentioned above, were the flv decoder creates a new stream during
examination of boon_telly.mkv.
Remove compose.hpp includes.2025-07-10T18:50:32ZCarl Hetheringtoncth@carlh.net2025-07-09T20:58:37Zurn:sha1:bad01065584014aee4024e7cbc4a66acac7617e1
sed -i "/include.*compose.hpp/d;" src/lib/*.cc src/wx/*.cc src/wx/*.h src/tools/*.cc src/lib/*.h test/*.cc
Replace String::compose with fmt.2025-07-10T18:50:32ZCarl Hetheringtoncth@carlh.net2025-07-09T20:53:27Zurn:sha1:62c34b28567a097e8f22576e7d7891bd3dbe0ac0
sed -i "/Plural-Forms/n;/%100/n;/scanf/n;s/%[123456789]/{}/g" src/lib/*.cc src/lib/*.h src/wx/*.cc src/tools/*.cc src/lib/po/*.po src/wx/po/*.po src/tools/po/*.po test/*.cc
sed -i "s/String::compose */fmt::format/g" src/lib/*.cc src/lib/*.h src/wx/*.cc src/tools/*.cc test/*.cc
Tidy comment.2025-03-25T22:32:42ZCarl Hetheringtoncth@carlh.net2025-03-25T22:32:42Zurn:sha1:920668c0e09b373a6c52dde30e8133cf894c1d2aReset _flush_state on seek().2024-12-13T23:33:08ZCarl Hetheringtoncth@carlh.net2024-12-13T23:33:08Zurn:sha1:a3640be5cb04a2bda6726eb34c628727b3c11278
Otherwise we do the wrong thing at the end of a file on the second
run-through.
Fix decoding of SSA subs in files decoded by FFmpeg (#2904).2024-12-09T00:40:48ZCarl Hetheringtoncth@carlh.net2024-12-04T23:53:34Zurn:sha1:08aa3861e526cbf45ac332294a835358f3903207
Suddenly we have 8 commas, not 9, perhaps because of
29412821241050c846dbceaad4b9752857659977
in ffmpeg (although that's strange, because it was a long time ago).
Fix doubled subtitles (again).2024-12-09T00:40:29ZCarl Hetheringtoncth@carlh.net2024-12-05T22:36:51Zurn:sha1:5a980207377e67b6aa3595d0cde441ae7659f5a6
This was re-introduced when
94618a724124cbf5fe9f0b47a3fdce601fcd5581
reverted a previous attempt at a fix.
At the time I couldn't understand the doubled-subtitles problem,
but it's apparent in the test introduced in the next commit.
This is another attempt to fix it by only sending a "stop" for
a subtitle if we didn't already stop the subtitle because the
next one arrived.
Cleanup: use default initializers.2024-12-09T00:40:29ZCarl Hetheringtoncth@carlh.net2024-12-04T23:52:43Zurn:sha1:42fa4dea81483359bf67676e2a931db103531a69Adapt to some libdcp class renaming to allow open captions/closed subtitles.2024-09-03T15:02:24ZCarl Hetheringtoncth@carlh.net2024-08-06T21:57:22Zurn:sha1:f3ab77e34a41ad4d8f5156e9d6598314975b9565Merge remote-tracking branch 'origin/main' into v2.17.x2024-05-29T19:12:17ZCarl Hetheringtoncth@carlh.net2024-05-29T19:12:17Zurn:sha1:07aa4852acfd908c4e3a92f7bed2c7328cfcf123