jp9000/obs-studio
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

deps/media-playback: Always check for new frame first

Browse Source 
Fixes potential decoding errors with FFmpeg's new decode API.  Because
avcodec_send_packet may process multiple packets, you must call
avcodec_receive_frame continually until no more frames are left.
This commit is contained in:
jp9000 2017-05-17 17:10:32 -07:00
parent d54b51edf4
commit 4aea3ce7da
1 changed files with 22 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
deps/media-playback/media-playback/decode.c vendored
View File

@ -210,13 +210,6 @@ static int decode_packet(struct mp_decode *d, int *got_frame)
*got_frame = 0; *got_frame = 0;
#ifdef USE_NEW_FFMPEG_DECODE_API #ifdef USE_NEW_FFMPEG_DECODE_API
ret = avcodec_send_packet(d->decoder, &d->pkt);
if (ret != 0 && ret != AVERROR(EAGAIN)) {
if (ret == AVERROR_EOF)
ret = 0;
return ret;
}
ret = avcodec_receive_frame(d->decoder, d->frame); ret = avcodec_receive_frame(d->decoder, d->frame);
if (ret != 0 && ret != AVERROR(EAGAIN)) { if (ret != 0 && ret != AVERROR(EAGAIN)) {
if (ret == AVERROR_EOF) if (ret == AVERROR_EOF)
@ -224,8 +217,28 @@ static int decode_packet(struct mp_decode *d, int *got_frame)
return ret; return ret;
} }
*got_frame = (ret == 0); if (ret != 0) {
ret = d->pkt.size; ret = avcodec_send_packet(d->decoder, &d->pkt);
if (ret != 0 && ret != AVERROR(EAGAIN)) {
if (ret == AVERROR_EOF)
ret = 0;
return ret;
}
ret = avcodec_receive_frame(d->decoder, d->frame);
if (ret != 0 && ret != AVERROR(EAGAIN)) {
if (ret == AVERROR_EOF)
ret = 0;
return ret;
}
*got_frame = (ret == 0);
ret = d->pkt.size;
} else {
ret = 0;
*got_frame = 1;
}
#else #else
if (d->audio) { if (d->audio) {
ret = avcodec_decode_audio4(d->decoder, ret = avcodec_decode_audio4(d->decoder,