LOVE/love
1
0
Fork 0
mirror of https://github.com/love2d/love.git synced 2026-08-17 11:00:31 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1944 from MellowArpeggiation/main

Browse Source 
Fix #1943 - Duplicate frames being skipped when decoding Theora
This commit is contained in:
Sasha Szpakowski
2023-06-18 12:56:07 -03:00
committed by GitHub
parent 5f4f0b424b 241378e437
commit 6563aec89d
1 changed files with 7 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/modules/video/theora/TheoraVideoStream.cpp
+7 -3
View File
@@ -232,14 +232,18 @@ void TheoraVideoStream::threadedFillBackBuffer(double dt)
th_decode_ycbcr_out(decoder, bufferinfo); th_decode_ycbcr_out(decoder, bufferinfo);
hasFrame = true; hasFrame = true;
ogg_int64_t granulePosition; ogg_int64_t decoderPosition;
do do
{ {
if (demuxer.readPacket(packet)) if (demuxer.readPacket(packet))
return; return;
} while (th_decode_packetin(decoder, &packet, &granulePosition) != 0);
if (packet.granulepos > 0)
th_decode_ctl(decoder, TH_DECCTL_SET_GRANPOS, &packet.granulepos, sizeof(packet.granulepos));
} while (th_decode_packetin(decoder, &packet, &decoderPosition) != 0);
lastFrame = nextFrame; lastFrame = nextFrame;
nextFrame = th_granule_time(decoder, granulePosition); nextFrame = th_granule_time(decoder, decoderPosition);
} }
// Only swap once, even if we read many frames to get here // Only swap once, even if we read many frames to get here