mirror/RetroArch
1
0
Fork 0
mirror of https://github.com/libretro/RetroArch synced 2025-04-01 04:20:27 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #9979 from hasenbanck/better-buffer-logic

Browse Source 
Fix the ffmpeg core packet buffer logic.
This commit is contained in:
Twinaphex 2020-01-10 15:04:31 +01:00 committed by GitHub
commit 28520af599
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 16 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
cores/libretro-ffmpeg/ffmpeg_core.c
View File

@ -1530,8 +1530,16 @@ static void decode_thread_seek(double time)
#endif #endif
} }
static bool earlier_or_close_enough(double p1, double p2) { /**
return (p1 <= p2 || (p1-p2) <= 0.001); * This function makes sure that we don't decode too many
* packets and cause stalls in our decoding pipeline.
* This could happen if we decode too many packets and
* saturate our buffers. We have a window of "still okay"
* to decode, that depends on the media fps.
**/
static bool earlier_or_close_enough(double p1, double p2)
{
return (p1 <= p2 || (p1-p2) < (1.0 / media.interpolate_fps) );
} }
static void decode_thread(void *data) static void decode_thread(void *data)
@ -1643,15 +1651,14 @@ static void decode_thread(void *data)
/* /*
* Decode audio packet if: * Decode audio packet if:
* 1. there is a vido packet for in the buffer * 1. it's the start of file or it's audio only media
* 2. it's the start of file * 2. there is a video packet for in the buffer
* 3. it's audio only media * 3. EOF
* 4. EOF
**/ **/
if (!packet_buffer_empty(audio_packet_buffer) && if (!packet_buffer_empty(audio_packet_buffer) &&
((!eof && earlier_or_close_enough(next_audio_start, next_video_end)) || ((next_video_end == 0.0 ||
next_video_end == 0.0 || !eof && earlier_or_close_enough(next_audio_start, next_video_end)) ||
eof)) eof))
{ {
packet_buffer_get_packet(audio_packet_buffer, pkt); packet_buffer_get_packet(audio_packet_buffer, pkt);
last_audio_end = audio_timebase * (pkt->pts + pkt->duration); last_audio_end = audio_timebase * (pkt->pts + pkt->duration);