dcpomatic/src/lib/ffmpeg_decoder.cc, branch v2.17.16DCP-o-matic DCP toolshttps://git.carlh.net/cgit/dcpomatic/atom?h=v2.17.162024-04-18T10:08:51ZMerge remote-tracking branch 'origin/main' into v2.17.x2024-04-18T10:08:51ZCarl Hetheringtoncth@carlh.net2024-04-18T10:08:51Zurn:sha1:44a4ff40df50688286e6db8b1fc2c024f6e5834bFix hanging/overlapping dvb subtitles (#2792).2024-03-31T23:04:43ZCarl Hetheringtoncth@carlh.net2024-03-31T23:04:41Zurn:sha1:94618a724124cbf5fe9f0b47a3fdce601fcd5581
This reverts a change made in
8ca6fd6d97e6d42492afddb655fa85130946853c
"Fix doubled subtitles if subtitle stop times are specified."
That change breaks the case where a subtitle _does_ have a stop time,
but it's wrong (30s from the start time) and we want the next subtitle
to clear the previous one.
I can't now see how reverting this could cause doubled subtitles,
so maybe that problem wlil come back. At least now there's a test
for #2792.
Merge tag 'v2.16.78' into v2.17.x2024-02-22T00:25:03ZCarl Hetheringtoncth@carlh.net2024-02-22T00:25:03Zurn:sha1:a45f6245e8cc785fab436c9282fa3d1baf3a8575Make DCPExaminer::size() optional and deal with the consequences.2024-02-21T17:48:53ZCarl Hetheringtoncth@carlh.net2024-02-21T09:47:38Zurn:sha1:3ffd0163026be24e5373e0674c3301ed37546e44
This means we can fix the case of a VF having no known size in a nice way,
in turn fixing problems caused by the fix to #2775.
Change how video timing is done.2024-01-28T01:01:56ZCarl Hetheringtoncth@carlh.net2022-09-29T08:17:50Zurn:sha1:895143459866dcb373c93b8e674d1344a129a6df
This commit changes the approach with video timing. Previously,
we would (more-or-less) try to use every video frame from the content
in the output, hoping that they come at a constant frame rate.
This is not always the case, however. Here we preserve the PTS
of video frames, and then when one arrives we output whatever
DCP video frames we can (at the regular DCP frame rate).
Hopefully this will solve a range of sync problems, but it
could also introduce new ones.
Bump ffmpeg to 5.1.2 "Riemann"2024-01-28T01:01:38ZCarl Hetheringtoncth@carlh.net2022-09-30T20:46:33Zurn:sha1:c17bcd3bcaced30e4657aab7582ec9efa93b6ea1Build fix for HAVE_AVSUBTITLERECT_PICT case.2024-01-20T15:20:50ZCarl Hetheringtoncth@carlh.net2024-01-20T15:20:50Zurn:sha1:a7b6fe096f6072c97a1174cc2b8945fa9486fc4fFix scaling of bitmap subs when the corresponding video is cropped (#2670).2024-01-12T11:07:19ZCarl Hetheringtoncth@carlh.net2023-12-01T20:25:54Zurn:sha1:6ac468554c7fea0dfaefde85fb6cdd0fceaf5cad
Previously we would scale the bitmap size/position to a proportion
of the original video frame, then scale it back up again to the DCP
container. This didn't take into account some cropped cases where
the picture would end up the same shape but the subtitles would be
stretched.
Fix crash with subtitles for which we have no codec.2023-11-16T14:14:16ZCarl Hetheringtoncth@carlh.net2023-11-16T14:14:16Zurn:sha1:bae268cb8505bcc5bf4048cfd448168ad9bb0992Fix errors with WAVs containing markers (#2617).2023-09-28T22:57:58ZCarl Hetheringtoncth@carlh.net2023-09-26T22:16:38Zurn:sha1:e67ce8ae4b9121bbcef2c1dcb61bdb5b9330ad78
I'm not 100% sure about this but they seem to end up giving audio
packets with no channels and no frames. Here we handle such packets
better.