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 
support keyframe-only decoding: '-skip_frame nokey'

Signed-off-by: nyanmisaka <nst799610810@gmail.com>
This commit is contained in:
nyanmisaka 2024-09-20 01:50:24 +08:00
parent 27443ed8eb
commit 5ddd3d4f5b
2 changed files with 16 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

15
libavcodec/rkmppdec.c
View file

@ -115,6 +115,7 @@ static av_cold int rkmpp_decode_close(AVCodecContext *avctx)
r->draining = 0;
r->info_change = 0;
r->errinfo_cnt = 0;
r->got_frame = 0;
if (r->mapi) {
r->mapi->reset(r->mctx);
@ -212,6 +213,9 @@ static av_cold int rkmpp_decode_init(AVCodecContext *avctx)
goto fail;
}
if (avctx->skip_frame == AVDISCARD_NONKEY)
r->deint = 0;
if ((ret = r->mapi->control(r->mctx, MPP_DEC_SET_ENABLE_DEINTERLACE, &r->deint)) != MPP_OK) {
av_log(avctx, AV_LOG_ERROR, "Failed to set enable deinterlace: %d\n", ret);
ret = AVERROR_EXTERNAL;
@ -751,6 +755,7 @@ static int rkmpp_get_frame(AVCodecContext *avctx, AVFrame *frame, int timeout)
} else {
av_log(avctx, AV_LOG_DEBUG, "Received a frame\n");
r->errinfo_cnt = 0;
r->got_frame = 1;
switch (avctx->pix_fmt) {
case AV_PIX_FMT_DRM_PRIME:
@ -840,6 +845,15 @@ static int rkmpp_send_packet(AVCodecContext *avctx, AVPacket *pkt)
if (r->draining)
return AVERROR(EOF);
/* do not skip non-key pkt until got any frame */
if (r->got_frame &&
avctx->skip_frame == AVDISCARD_NONKEY &&
!(pkt->flags & AV_PKT_FLAG_KEY)) {
av_log(avctx, AV_LOG_TRACE, "Skip packet without key flag "
"at pts %"PRId64"\n", pkt->pts);
return 0;
}
if ((ret = mpp_packet_init(&mpp_pkt, pkt->data, pkt->size)) != MPP_OK) {
av_log(avctx, AV_LOG_ERROR, "Failed to init packet: %d\n", ret);
return AVERROR_EXTERNAL;
@ -930,6 +944,7 @@ static void rkmpp_decode_flush(AVCodecContext *avctx)
r->draining = 0;
r->info_change = 0;
r->errinfo_cnt = 0;
r->got_frame = 0;
av_packet_unref(&r->last_pkt);
} else

1
libavcodec/rkmppdec.h
View file

@ -57,6 +57,7 @@ typedef struct RKMPPDecContext {
int draining;
int info_change;
int errinfo_cnt;
int got_frame;
int deint;
int afbc;