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

lavc/rkmppenc: add low_delay flag support for RKMPP encoders

Browse source 
Signed-off-by: nyanmisaka <nst799610810@gmail.com>
This commit is contained in:
nyanmisaka 2024-03-13 21:45:36 +08:00
parent c7de8d3827
commit 76203202f6
2 changed files with 12 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

14
libavcodec/rkmppenc.c
View file

@ -681,7 +681,7 @@ static void rkmpp_free_packet_buf(void *opaque, uint8_t *data)
mpp_packet_deinit(&mpp_pkt);
}
static int rkmpp_get_packet(AVCodecContext *avctx, AVPacket *packet)
static int rkmpp_get_packet(AVCodecContext *avctx, AVPacket *packet, int timeout)
{
RKMPPEncContext *r = avctx->priv_data;
MppPacket mpp_pkt = NULL;
@ -690,6 +690,11 @@ static int rkmpp_get_packet(AVCodecContext *avctx, AVPacket *packet)
MppBuffer mpp_buf = NULL;
int ret, key_frame = 0;
if ((ret = r->mapi->control(r->mctx, MPP_SET_OUTPUT_TIMEOUT, (MppParam)&timeout)) != MPP_OK) {
av_log(avctx, AV_LOG_ERROR, "Failed to set output timeout: %d\n", ret);
return AVERROR_EXTERNAL;
}
if ((ret = r->mapi->encode_get_packet(r->mctx, &mpp_pkt)) != MPP_OK) {
int log_level = (ret == MPP_NOK) ? AV_LOG_DEBUG : AV_LOG_ERROR;
ret = (ret == MPP_NOK) ? AVERROR(EAGAIN) : AVERROR_EXTERNAL;
@ -759,10 +764,11 @@ static int rkmpp_encode_frame(AVCodecContext *avctx, AVPacket *packet,
{
RKMPPEncContext *r = avctx->priv_data;
MPPEncFrame *mpp_enc_frame = NULL;
int surfaces = r->surfaces;
int ret;
int timeout = (avctx->flags & AV_CODEC_FLAG_LOW_DELAY)
? MPP_TIMEOUT_BLOCK : MPP_TIMEOUT_NON_BLOCK;
if (get_used_frame_count(r->frame_list) > surfaces)
if (get_used_frame_count(r->frame_list) > H26X_ASYNC_FRAMES)
goto get;
mpp_enc_frame = rkmpp_submit_frame(avctx, (AVFrame *)frame);
@ -779,7 +785,7 @@ send:
return ret;
get:
ret = rkmpp_get_packet(avctx, packet);
ret = rkmpp_get_packet(avctx, packet, timeout);
if (!frame && ret == AVERROR(EAGAIN))
goto send;
if (ret == AVERROR_EOF ||

6
libavcodec/rkmppenc.h
View file

@ -38,7 +38,8 @@
#include "libavutil/opt.h"
#include "libavutil/pixdesc.h"
#define H26X_HEADER_SIZE 1024
#define H26X_HEADER_SIZE 1024
#define H26X_ASYNC_FRAMES 4
#define ALIGN_DOWN(a, b) ((a) & ~((b)-1))
typedef struct MPPEncFrame {
@ -70,7 +71,6 @@ typedef struct RKMPPEncContext {
int qp_min;
int qp_max_i;
int qp_min_i;
int surfaces;
int profile;
int tier;
int level;
@ -106,8 +106,6 @@ static const AVRational mpp_tb = { 1, 1000000 };
{ .i64 = -1 }, -1, 51, VE, "qp_max_i" }, \
{ "qp_min_i", "Set the min QP value for I frame", OFFSET(qp_min_i), AV_OPT_TYPE_INT, \
{ .i64 = -1 }, -1, 51, VE, "qp_min_i" }, \
{ "surfaces", "Set the maximum surfaces to be used for encoding", OFFSET(surfaces), AV_OPT_TYPE_INT, \
{ .i64 = 4 }, 1, 16, VE, "surfaces" },
static const AVOption h264_options[] = {
RKMPP_ENC_COMMON_OPTS