har0ke/FFmpeg
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

libavcodec/qsvenc: Add max_frame_size reset support to qsv

Browse Source 
Signed-off-by: Wenbin Chen <wenbin.chen@intel.com>
This commit is contained in:
Wenbin Chen 2022-09-06 17:22:53 +08:00 committed by Haihao Xiang
parent 04e49bbbb1
commit c679de9be0
3 changed files with 26 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
doc/encoders.texi
View File

@ -3331,6 +3331,10 @@ Following options can be used durning qsv encoding.
@item @var{b_quant_offset} @item @var{b_quant_offset}
Supported in h264_qsv and hevc_qsv. Supported in h264_qsv and hevc_qsv.
Change these value to reset qsv codec's qp configuration. Change these value to reset qsv codec's qp configuration.
@item @var{max_frame_size}
Supported in h264_qsv and hevc_qsv.
Change this value to reset qsv codec's MaxFrameSize configuration.
@end table @end table
@subsection H264 options @subsection H264 options

20
libavcodec/qsvenc.c
View File

@ -827,6 +827,7 @@ static int init_video_param(AVCodecContext *avctx, QSVEncContext *q)
q->extco2.ExtBRC = q->extbrc ? MFX_CODINGOPTION_ON : MFX_CODINGOPTION_OFF; q->extco2.ExtBRC = q->extbrc ? MFX_CODINGOPTION_ON : MFX_CODINGOPTION_OFF;
if (q->max_frame_size >= 0) if (q->max_frame_size >= 0)
q->extco2.MaxFrameSize = q->max_frame_size; q->extco2.MaxFrameSize = q->max_frame_size;
q->old_max_frame_size = q->max_frame_size;
if (q->int_ref_type >= 0) if (q->int_ref_type >= 0)
q->extco2.IntRefType = q->int_ref_type; q->extco2.IntRefType = q->int_ref_type;
if (q->int_ref_cycle_size >= 0) if (q->int_ref_cycle_size >= 0)
@ -1678,6 +1679,24 @@ static int update_qp(AVCodecContext *avctx, QSVEncContext *q)
return updated; return updated;
} }
static int update_max_frame_size(AVCodecContext *avctx, QSVEncContext *q)
{
int updated = 0;
if (avctx->codec_id != AV_CODEC_ID_H264 && avctx->codec_id != AV_CODEC_ID_HEVC)
return 0;
UPDATE_PARAM(q->old_max_frame_size, q->max_frame_size);
if (!updated)
return 0;
q->extco2.MaxFrameSize = FFMAX(0, q->max_frame_size);
av_log(avctx, AV_LOG_DEBUG,
"Reset MaxFrameSize: %d;\n", q->extco2.MaxFrameSize);
return updated;
}
static int update_parameters(AVCodecContext *avctx, QSVEncContext *q, static int update_parameters(AVCodecContext *avctx, QSVEncContext *q,
const AVFrame *frame) const AVFrame *frame)
{ {
@ -1687,6 +1706,7 @@ static int update_parameters(AVCodecContext *avctx, QSVEncContext *q,
return 0; return 0;
needReset = update_qp(avctx, q); needReset = update_qp(avctx, q);
needReset |= update_max_frame_size(avctx, q);
if (!needReset) if (!needReset)
return 0; return 0;

2
libavcodec/qsvenc.h
View File

@ -251,6 +251,8 @@ typedef struct QSVEncContext {
float old_i_quant_offset; float old_i_quant_offset;
float old_b_quant_factor; float old_b_quant_factor;
float old_b_quant_offset; float old_b_quant_offset;
// This is used for max_frame_size reset
int old_max_frame_size;
} QSVEncContext; } QSVEncContext;
int ff_qsv_enc_init(AVCodecContext *avctx, QSVEncContext *q); int ff_qsv_enc_init(AVCodecContext *avctx, QSVEncContext *q);