starred/ffmpeg-rockchip-nyanmisaka
1
0
Fork 0
mirror of https://github.com/nyanmisaka/ffmpeg-rockchip.git synced 2026-01-23 18:10:56 +01:00
Code Issues Projects Packages Wiki Activity Actions

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

Browse source 
Fix the latency issue in decoder output.

Signed-off-by: nyanmisaka <nst799610810@gmail.com>
This commit is contained in:
nyanmisaka 2024-01-23 16:13:32 +08:00
parent 668585f514
commit e753665e6d
2 changed files with 15 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

15
libavcodec/rkmppdec.c
View file

@ -90,6 +90,8 @@ static av_cold int rkmpp_decode_close(AVCodecContext *avctx)
r->eof = 0;
r->info_change = 0;
r->errinfo_cnt = 0;
r->queue_cnt = 0;
r->queue_size = 0;
if (r->mapi) {
r->mapi->reset(r->mctx);
@ -826,12 +828,17 @@ send_pkt:
if (ret_send == 0) {
/* send successful, continue until decoder input buffer is full */
av_packet_unref(pkt);
return AVERROR(EAGAIN);
r->queue_cnt++;
if (r->queue_size <= 0 ||
r->queue_cnt < r->queue_size)
return AVERROR(EAGAIN);
} else if (ret_send < 0 && ret_send != AVERROR(EAGAIN)) {
/* something went wrong, raise error */
av_log(avctx, AV_LOG_ERROR, "Decoder failed to send data: %d", ret_send);
return ret_send;
}
} else
/* input buffer is full, estimate queue size */
r->queue_size = FFMAX(r->queue_cnt, r->queue_size);
}
if (r->eof)
@ -854,6 +861,8 @@ get_frame:
goto send_pkt;
else if (ret_get < 0 && ret_get != AVERROR(EAGAIN))
av_log(avctx, AV_LOG_ERROR, "Decoder failed to get frame: %d\n", ret_get);
else
r->queue_cnt--;
return ret_get;
}
@ -869,6 +878,8 @@ static void rkmpp_decode_flush(AVCodecContext *avctx)
r->eof = 0;
r->info_change = 0;
r->errinfo_cnt = 0;
r->queue_cnt = 0;
r->queue_size = 0;
av_packet_unref(&r->last_pkt);
av_frame_unref(&r->last_frame);

2
libavcodec/rkmppdec.h
View file

@ -59,6 +59,8 @@ typedef struct RKMPPDecContext {
int eof;
int info_change;
int errinfo_cnt;
int queue_cnt;
int queue_size;
int deint;
int afbc;