apps/ffmpeg-rockchip
1
0
Fork 0
mirror of https://github.com/nyanmisaka/ffmpeg-rockchip.git synced 2025-11-02 13:24:20 +08:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source 
handle NOPTS in RKMPP decoders.

Signed-off-by: nyanmisaka <nst799610810@gmail.com>
This commit is contained in:
nyanmisaka
2025-05-31 17:59:19 +08:00
parent 0bf5184715
commit 1a12af1ad3
2 changed files with 27 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
libavcodec/rkmppdec.c
View File

@@ -145,6 +145,7 @@ static av_cold int rkmpp_decode_close(AVCodecContext *avctx)
{ {
RKMPPDecContext *r = avctx->priv_data; RKMPPDecContext *r = avctx->priv_data;
r->last_pts = AV_NOPTS_VALUE;
r->eof = 0; r->eof = 0;
r->draining = 0; r->draining = 0;
r->info_change = 0; r->info_change = 0;
@@ -912,7 +913,8 @@ static int rkmpp_send_packet(AVCodecContext *avctx, AVPacket *pkt)
{ {
RKMPPDecContext *r = avctx->priv_data; RKMPPDecContext *r = avctx->priv_data;
MppPacket mpp_pkt = NULL; MppPacket mpp_pkt = NULL;
int64_t pts = PTS_TO_MPP_PTS(pkt->pts, avctx->pkt_timebase); int64_t mpp_pkt_pts = PTS_TO_MPP_PTS(pkt->pts, avctx->pkt_timebase);
int64_t last_pts = r->last_pts;
int ret; int ret;
/* avoid sending new data after EOS */ /* avoid sending new data after EOS */
@@ -928,17 +930,39 @@ static int rkmpp_send_packet(AVCodecContext *avctx, AVPacket *pkt)
return 0; return 0;
} }
/* make up some pts if it's not available from pkt */
if (pkt->pts == AV_NOPTS_VALUE) {
int64_t pts_diff = 1;
AVRational framerate = { avctx->framerate.num,
avctx->framerate.den };
if (avctx->pkt_timebase.num && avctx->pkt_timebase.den) {
if (!(framerate.num && framerate.den)) {
framerate.num = 25;
framerate.den = 1;
}
pts_diff = (avctx->pkt_timebase.den * framerate.den) /
(avctx->pkt_timebase.num * framerate.num);
}
last_pts += pts_diff;
mpp_pkt_pts = PTS_TO_MPP_PTS(last_pts, avctx->pkt_timebase);
}
if ((ret = mpp_packet_init(&mpp_pkt, pkt->data, pkt->size)) != MPP_OK) { 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); av_log(avctx, AV_LOG_ERROR, "Failed to init packet: %d\n", ret);
return AVERROR_EXTERNAL; return AVERROR_EXTERNAL;
} }
mpp_packet_set_pts(mpp_pkt, pts); mpp_packet_set_pts(mpp_pkt, mpp_pkt_pts);
if ((ret = r->mapi->decode_put_packet(r->mctx, mpp_pkt)) != MPP_OK) { if ((ret = r->mapi->decode_put_packet(r->mctx, mpp_pkt)) != MPP_OK) {
av_log(avctx, AV_LOG_TRACE, "Decoder buffer is full\n"); av_log(avctx, AV_LOG_TRACE, "Decoder buffer is full\n");
mpp_packet_deinit(&mpp_pkt); mpp_packet_deinit(&mpp_pkt);
return AVERROR(EAGAIN); return AVERROR(EAGAIN);
} }
/* update the last pts */
r->last_pts = pkt->pts == AV_NOPTS_VALUE ? last_pts : pkt->pts;
av_log(avctx, AV_LOG_DEBUG, "Wrote %d bytes to decoder\n", pkt->size); av_log(avctx, AV_LOG_DEBUG, "Wrote %d bytes to decoder\n", pkt->size);
mpp_packet_deinit(&mpp_pkt); mpp_packet_deinit(&mpp_pkt);

1
libavcodec/rkmppdec.h
View File

@@ -53,6 +53,7 @@ typedef struct RKMPPDecContext {
AVBufferRef *hwdevice; AVBufferRef *hwdevice;
AVBufferRef *hwframe; AVBufferRef *hwframe;
int64_t last_pts;
AVPacket last_pkt; AVPacket last_pkt;
int eof; int eof;
int draining; int draining;