mirror/openmw
1
0
Fork 0
mirror of https://github.com/OpenMW/openmw.git synced 2025-06-22 15:41:33 +00:00
Code Issues Releases Wiki Activity

Merge pull request #2236 from Capostrophic/audio

Browse source 
Fix EAGAIN error leading to packets getting lost (bugs #4906, #4909)
This commit is contained in:
Bret Curtis 2019-03-10 11:40:09 +01:00 committed by GitHub
commit a4b647db3e
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 12 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

24
apps/openmw/mwsound/ffmpeg_decoder.cpp
View file

@ -96,25 +96,25 @@ bool FFmpeg_Decoder::getAVAudioData()
return false; return false;
do { do {
if(mPacket.size == 0 && !getNextPacket())
return false;
/* Decode some data, and check for errors */ /* Decode some data, and check for errors */
int ret = 0; int ret = avcodec_receive_frame(mCodecCtx, mFrame);
ret = avcodec_receive_frame(mCodecCtx, mFrame);
if (ret == 0)
got_frame = true;
if (ret == AVERROR(EAGAIN)) if (ret == AVERROR(EAGAIN))
ret = 0; {
if (ret == 0) if (mPacket.size == 0 && !getNextPacket())
return false;
ret = avcodec_send_packet(mCodecCtx, &mPacket); ret = avcodec_send_packet(mCodecCtx, &mPacket);
if (ret < 0 && ret != AVERROR(EAGAIN)) av_packet_unref(&mPacket);
if (ret == 0)
continue;
}
if (ret != 0)
return false; return false;
av_packet_unref(&mPacket); av_packet_unref(&mPacket);
if (!got_frame || mFrame->nb_samples == 0) if (mFrame->nb_samples == 0)
continue; continue;
got_frame = true;
if(mSwr) if(mSwr)
{ {
@ -138,7 +138,7 @@ bool FFmpeg_Decoder::getAVAudioData()
else else
mFrameData = &mFrame->data[0]; mFrameData = &mFrame->data[0];
} while(!got_frame || mFrame->nb_samples == 0); } while(!got_frame);
mNextPts += (double)mFrame->nb_samples / mCodecCtx->sample_rate; mNextPts += (double)mFrame->nb_samples / mCodecCtx->sample_rate;
return true; return true;