highperfocused/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

libavcodec/qsvenc: Add framerate reset support to qsv

Browse Source 
Signed-off-by: Wenbin Chen <wenbin.chen@intel.com>
This commit is contained in:
Wenbin Chen
2022-09-23 10:44:10 +08:00
committed by Haihao Xiang
parent 76d8f0dd14
commit 17df61083d
3 changed files with 31 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
doc/encoders.texi
View File

@@ -3362,6 +3362,9 @@ Change these value to reset qsv codec's max/min qp configuration.
@item @var{low_delay_brc} @item @var{low_delay_brc}
Supported in h264_qsv and hevc_qsv. Supported in h264_qsv and hevc_qsv.
Change this value to reset qsv codec's low_delay_brc configuration. Change this value to reset qsv codec's low_delay_brc configuration.
@item @var{framerate}
Change this value to reset qsv codec's framerate configuration.
@end table @end table
@subsection H264 options @subsection H264 options

26
libavcodec/qsvenc.c
View File

@@ -705,6 +705,7 @@ static int init_video_param(AVCodecContext *avctx, QSVEncContext *q)
q->param.mfx.FrameInfo.FrameRateExtN = avctx->time_base.den; q->param.mfx.FrameInfo.FrameRateExtN = avctx->time_base.den;
q->param.mfx.FrameInfo.FrameRateExtD = avctx->time_base.num; q->param.mfx.FrameInfo.FrameRateExtD = avctx->time_base.num;
} }
q->old_framerate = avctx->framerate;
ret = select_rc_mode(avctx, q); ret = select_rc_mode(avctx, q);
if (ret < 0) if (ret < 0)
@@ -1838,6 +1839,30 @@ static int update_low_delay_brc(AVCodecContext *avctx, QSVEncContext *q)
return updated; return updated;
} }
static int update_frame_rate(AVCodecContext *avctx, QSVEncContext *q)
{
int updated = 0;
UPDATE_PARAM(q->old_framerate.num, avctx->framerate.num);
UPDATE_PARAM(q->old_framerate.den, avctx->framerate.den);
if (!updated)
return 0;
if (avctx->framerate.den > 0 && avctx->framerate.num > 0) {
q->param.mfx.FrameInfo.FrameRateExtN = avctx->framerate.num;
q->param.mfx.FrameInfo.FrameRateExtD = avctx->framerate.den;
} else {
q->param.mfx.FrameInfo.FrameRateExtN = avctx->time_base.den;
q->param.mfx.FrameInfo.FrameRateExtD = avctx->time_base.num;
}
av_log(avctx, AV_LOG_DEBUG, "Reset framerate: %d/%d (%.2f fps).\n",
q->param.mfx.FrameInfo.FrameRateExtN,
q->param.mfx.FrameInfo.FrameRateExtD,
(double)q->param.mfx.FrameInfo.FrameRateExtN / q->param.mfx.FrameInfo.FrameRateExtD);
return updated;
}
static int update_parameters(AVCodecContext *avctx, QSVEncContext *q, static int update_parameters(AVCodecContext *avctx, QSVEncContext *q,
const AVFrame *frame) const AVFrame *frame)
{ {
@@ -1851,6 +1876,7 @@ static int update_parameters(AVCodecContext *avctx, QSVEncContext *q,
needReset |= update_gop_size(avctx, q); needReset |= update_gop_size(avctx, q);
needReset |= update_rir(avctx, q); needReset |= update_rir(avctx, q);
needReset |= update_low_delay_brc(avctx, q); needReset |= update_low_delay_brc(avctx, q);
needReset |= update_frame_rate(avctx, q);
ret = update_min_max_qp(avctx, q); ret = update_min_max_qp(avctx, q);
if (ret < 0) if (ret < 0)
return ret; return ret;

2
libavcodec/qsvenc.h
View File

@@ -271,6 +271,8 @@ typedef struct QSVEncContext {
int old_min_qp_b; int old_min_qp_b;
// This is used for low_delay_brc reset // This is used for low_delay_brc reset
int old_low_delay_brc; int old_low_delay_brc;
// This is used for framerate reset
AVRational old_framerate;
} QSVEncContext; } QSVEncContext;
int ff_qsv_enc_init(AVCodecContext *avctx, QSVEncContext *q); int ff_qsv_enc_init(AVCodecContext *avctx, QSVEncContext *q);