starred/ffmpeg-rockchip-nyanmisaka-1
1
0
Fork 0
mirror of https://github.com/nyanmisaka/ffmpeg-rockchip.git synced 2026-01-24 02:21:11 +01:00
Code Issues Projects Packages Wiki Activity Actions

fixup! lavc/rkmppdec: refactor RKMPP decoders and extend codecs

Browse source 
EAGAIN should never happen during draining.

Signed-off-by: nyanmisaka <nst799610810@gmail.com>
This commit is contained in:
nyanmisaka 2024-01-12 18:24:50 +08:00
parent c437e64c98
commit 428a11f982
2 changed files with 10 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

8
libavcodec/rkmppdec.c
View file

@ -787,6 +787,7 @@ static int rkmpp_decode_receive_frame(AVCodecContext *avctx, AVFrame *frame)
AVCodecInternal *avci = avctx->internal;
RKMPPDecContext *r = avctx->priv_data;
AVPacket *pkt = &r->last_pkt;
int retry_cnt = 0;
int ret_send, ret_get;
if (r->info_change && !r->buf_group)
@ -828,6 +829,13 @@ get_frame:
ret_get = rkmpp_get_frame(avctx, frame, 100);
if (ret_get == AVERROR_EOF)
av_log(avctx, AV_LOG_DEBUG, "Decoder is at EOF\n");
/* EAGAIN should never happen during draining */
else if (avci->draining && ret_get == AVERROR(EAGAIN)) {
if (retry_cnt++ < MAX_RETRY_COUNT)
goto get_frame;
else
ret_get = AVERROR_BUG;
}
/* this is not likely but lets handle it in case synchronization issues of MPP */
else if (ret_get == AVERROR(EAGAIN) && ret_send == AVERROR(EAGAIN))
goto send_pkt;

3
libavcodec/rkmppdec.h
View file

@ -40,7 +40,8 @@
#include "libavutil/opt.h"
#include "libavutil/pixdesc.h"
#define MAX_ERRINFO_COUNT 1000
#define MAX_ERRINFO_COUNT 100
#define MAX_RETRY_COUNT 100
typedef struct RKMPPDecContext {
AVClass *class;