dcpomatic/src/lib/ffmpeg_decoder.cc, branch win-fixDCP-o-matic DCP toolshttps://git.carlh.net/cgit/dcpomatic/atom?h=win-fix2026-04-23T14:49:48ZFix late subtitles when they are muxed late with respect to the video.2026-04-23T14:49:48ZCarl Hetheringtoncth@carlh.net2026-04-18T11:39:33Zurn:sha1:9f828b327e680c322a70883910233337a37e481e
In one example we have the sequence
video 3088,377
sub 3087,334
sub 3088,710
video 3088,419
so the 3087,334 sub is very late. Here we insert a queue to bring
subtitle packets a little forward for processing.
There is already a similar thing in the player (_delay) but adding
a longer delay there seems wasteful because a) the video is by
that point already decompressed and b) this problem only
applies to FFmpeg-decoded files (and then, I think only if we are
previewing or burning in subtitles).
White space: ffmpeg_decoder.{cc,h}2026-04-21T19:33:27ZCarl Hetheringtoncth@carlh.net2026-04-21T19:33:27Zurn:sha1:f40d22711523e038e311180471a1ced796982004Make FrameRateChange data private.2026-04-08T18:42:37ZCarl Hetheringtoncth@carlh.net2026-04-08T18:42:37Zurn:sha1:41b5c9b56a1ef4ac9119c11f166931936632ae0cUse dts rather than pts when noting the time of frames we are ignoring.2026-03-12T00:24:06ZCarl Hetheringtoncth@carlh.net2026-03-12T00:02:51Zurn:sha1:4285ff59480d526161905ecdc5fc05b57be7ed58
The docs for av_read_frame() say
"pkt->pts can be AV_NOPTS_VALUE if the video format has B-frames, so it
is better to rely on pkt->dts if you do not decompress the payload."
Before this there could be long hangs while we go through many packets
without pts values.
Add a debug note.2026-03-12T00:24:06ZCarl Hetheringtoncth@carlh.net2026-03-12T00:02:18Zurn:sha1:ef526ea3d6d6196f0e38ac9770504877388fc47aHandle FFmpeg content with only subtitles enabled better.2026-02-21T01:37:42ZCarl Hetheringtoncth@carlh.net2026-02-21T01:37:42Zurn:sha1:c2adc362e4ce0a64d7e7a1c6b634b024d862c8c1
Previously if some FFmpeg content was set to use only its subtitles, and
the first subtitle was 1 minute in to the content, the content would be
selected for pass() until its first minute had been scanned.
This could be slow, and incorrect as on the way to this 1 minute we want
to look at other content.
Here we store the PTS of dropped packets to use as a fallback position
when there is no video or audio enabled.
Fix error when seeking a file with no video and >1 audio stream (#3128).2025-12-14T23:20:53ZCarl Hetheringtoncth@carlh.net2025-12-12T10:43:45Zurn:sha1:52b3eee4e7285e26469b2a5f4d9d9eac20aba387Try AVSEEK_FLAG_ANY if _BACKWARD fails.2025-12-08T19:50:53ZCarl Hetheringtoncth@carlh.net2025-12-07T01:17:34Zurn:sha1:9bd8b3304f35f0b27bf18f2167302f1fd5d3f92b
We usually want to do _BACKWARD as this should seek to the keyframe
before the seek position. On some files this fails, and then it
seems that _ANY is a good next thing to try.
Clarify and improve decoder/player/butler logging a bit.2025-12-06T10:12:31ZCarl Hetheringtoncth@carlh.net2025-12-06T10:11:47Zurn:sha1:5029bf180a8b29c8e9f1aeef1c398b05e01eb663Cleanup: can now remove the _NC log variants.2025-12-05T20:36:53ZCarl Hetheringtoncth@carlh.net2025-12-05T20:36:53Zurn:sha1:59e358ae25f84314afc6d8235aecaec124822f3f