virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2024-11-26 19:01:44 +02:00
Code Issues Releases Activity

avcodec/mediacodecdec: don't break out if both input and output port return try again

Browse Source 
At the beginning of decoding, if we feed mediacodec too fast, the
input port will return try again. It takes some time for mediacodec
to consume bitstream and output frame. So the output port also return
try again. It possible that mediacodec_receive_frame doesn't consume
any AVPacket and no AVFrame is output. Then both avcodec_send_packet()
and avcodec_receive_frame() return EAGAIN, which shouldn't happen.

This bug can be produced with decoding benchmark on Pixel 3.

Signed-off-by: Zhao Zhili <zhilizhao@tencent.com>
This commit is contained in:
Zhao Zhili 2022-10-19 10:38:41 +08:00
parent 093c437321
commit b1facd11a3
1 changed files with 10 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
libavcodec/mediacodecdec.c
View File

@ -444,7 +444,16 @@ static int mediacodec_receive_frame(AVCodecContext *avctx, AVFrame *frame)
index = ff_AMediaCodec_dequeueInputBuffer(s->ctx->codec, 0);
if (index < 0) {
/* no space, block for an output frame to appear */
return ff_mediacodec_dec_receive(avctx, s->ctx, frame, true);
ret = ff_mediacodec_dec_receive(avctx, s->ctx, frame, true);
/* Try again if both input port and output port return EAGAIN.
* If no data is consumed and no frame in output, it can make
* both avcodec_send_packet() and avcodec_receive_frame()
* return EAGAIN, which violate the design.
*/
if (ff_AMediaCodec_infoTryAgainLater(s->ctx->codec, index) &&
ret == AVERROR(EAGAIN))
continue;
return ret;
}
s->ctx->current_input_buffer = index;
}