> On Mon, 2022-01-24 at 10:59 +0800, Wenbin Chen wrote:
> > Add intra refresh support to hevc_qsv as well.
> > Add an new intra refresh type: "horizontal", and an new param
> > ref_cycle_dist. This param specify the distance between the
> > beginnings of the intra-refresh cycles in frames.
> >
> > Signed-off-by: Wenbin Chen <wenbin.c...@intel.com>
> > ---
> > doc/encoders.texi | 26 +++++++++++++++++++++++++-
> > libavcodec/qsvenc.c | 23 ++++++++++++++---------
> > libavcodec/qsvenc.h | 1 +
> > libavcodec/qsvenc_h264.c | 7 +++++--
> > libavcodec/qsvenc_hevc.c | 9 +++++++++
> > 5 files changed, 54 insertions(+), 12 deletions(-)
> >
> > diff --git a/doc/encoders.texi b/doc/encoders.texi
> > index 6c1c4df57a..4e35e50e4d 100644
> > --- a/doc/encoders.texi
> > +++ b/doc/encoders.texi
> > @@ -3344,7 +3344,8 @@ Specifies intra refresh type. The major goal of
> intra
> > refresh is improvement of
> > error resilience without significant impact on encoded bitstream size
> caused
> > by
> > I frames. The SDK encoder achieves this by encoding part of each frame in
> > refresh cycle using intra MBs. @var{none} means no refresh. @var{vertical}
> > means
> > -vertical refresh, by column of MBs.
> > +vertical refresh, by column of MBs. To enable intra refresh, B frame
> should
> > be
> > +set to 0.
> >
> > @item @var{int_ref_cycle_size}
> > Specifies number of pictures within refresh cycle starting from 2. 0 and 1
> > are
> > @@ -3355,6 +3356,9 @@ Specifies QP difference for inserted intra MBs.
> This is
> > signed value in
> > [-51, 51] range if target encoding bit-depth for luma samples is 8 and this
> > range is [-63, 63] for 10 bit-depth or [-75, 75] for 12 bit-depth
> > respectively.
> >
> > +@item @var{int_ref_cycle_dist}
> > +Distance between the beginnings of the intra-refresh cycles in frames.
> > +
> > @item @var{profile}
> > @table @samp
> > @item unknown
> > @@ -3463,6 +3467,26 @@ Insert picture timing SEI with pic_struct_syntax
> > element.
> > @item @var{transform_skip}
> > Turn this option ON to enable transformskip. It is supported on platform
> > equal
> > or newer than ICL.
> > +
> > +@item @var{int_ref_type}
> > +Specifies intra refresh type. The major goal of intra refresh is
> improvement
> > of
> > +error resilience without significant impact on encoded bitstream size
> caused
> > by
> > +I frames. The SDK encoder achieves this by encoding part of each frame in
> > +refresh cycle using intra MBs. @var{none} means no refresh.
> @var{vertical}
> > means
> > +vertical refresh, by column of MBs. To enable intra refresh, B frame
> should
> > be
> > +set to 0.
> > +
> > +@item @var{int_ref_cycle_size}
> > +Specifies number of pictures within refresh cycle starting from 2. 0 and 1
> > are
> > +invalid values.
> > +
> > +@item @var{int_ref_qp_delta}
> > +Specifies QP difference for inserted intra MBs. This is signed value in
> > +[-51, 51] range if target encoding bit-depth for luma samples is 8 and this
> > +range is [-63, 63] for 10 bit-depth or [-75, 75] for 12 bit-depth
> > respectively.
> > +
> > +@item @var{int_ref_cycle_dist}
> > +Distance between the beginnings of the intra-refresh cycles in frames.
> > @end table
> >
> > @subsection MPEG2 Options
> > diff --git a/libavcodec/qsvenc.c b/libavcodec/qsvenc.c
> > index a8d876d6d9..af1529936e 100644
> > --- a/libavcodec/qsvenc.c
> > +++ b/libavcodec/qsvenc.c
> > @@ -267,8 +267,10 @@ static void dump_video_param(AVCodecContext
> *avctx,
> > QSVEncContext *q,
> >
> > #if QSV_HAVE_CO2
> > av_log(avctx, AV_LOG_VERBOSE,
> > - "RecoveryPointSEI: %s IntRefType: %"PRIu16"; IntRefCycleSize:
> > %"PRIu16"; IntRefQPDelta: %"PRId16"\n",
> > - print_threestate(co->RecoveryPointSEI), co2->IntRefType, co2-
> > >IntRefCycleSize, co2->IntRefQPDelta);
> > + "RecoveryPointSEI: %s IntRefType: %"PRIu16"; IntRefCycleSize:
> > %"PRIu16
> > + "; IntRefQPDelta: %"PRId16"; IntRefCycleDist: %"PRId16"\n",
> > + print_threestate(co->RecoveryPointSEI), co2->IntRefType, co2-
> > >IntRefCycleSize,
> > + co2->IntRefQPDelta, co3->IntRefCycleDist);
>
>
> IntRefCycleDist is a member of mfxExtCodingOption3, and was introduced in
> mfx
> version 1.16, so it should be used under QSV_HAVE_CO3 &&
> QSV_VERSION_ATLEAST(1,
> 16), not QSV_HAVE_CO2.
>
> Thanks
> Haihao
Thanks for review. I will fix this.
Thanks
Wenbin
>
>
> >
> > av_log(avctx, AV_LOG_VERBOSE, "MaxFrameSize: %d; ", co2-
> >MaxFrameSize);
> > #if QSV_HAVE_MAX_SLICE_SIZE
> > @@ -865,13 +867,6 @@ static int init_video_param(AVCodecContext
> *avctx,
> > QSVEncContext *q)
> >
> > #if QSV_HAVE_CO2
> > if (avctx->codec_id == AV_CODEC_ID_H264) {
> > - if (q->int_ref_type >= 0)
> > - q->extco2.IntRefType = q->int_ref_type;
> > - if (q->int_ref_cycle_size >= 0)
> > - q->extco2.IntRefCycleSize = q->int_ref_cycle_size;
> > - if (q->int_ref_qp_delta != INT16_MIN)
> > - q->extco2.IntRefQPDelta = q->int_ref_qp_delta;
> > -
> > if (q->bitrate_limit >= 0)
> > q->extco2.BitrateLimit = q->bitrate_limit ?
> > MFX_CODINGOPTION_ON : MFX_CODINGOPTION_OFF;
> > if (q->mbbrc >= 0)
> > @@ -900,6 +895,12 @@ static int init_video_param(AVCodecContext
> *avctx,
> > QSVEncContext *q)
> > q->extco2.ExtBRC = q->extbrc ? MFX_CODINGOPTION_ON :
> > MFX_CODINGOPTION_OFF;
> > if (q->max_frame_size >= 0)
> > q->extco2.MaxFrameSize = q->max_frame_size;
> > + if (q->int_ref_type >= 0)
> > + q->extco2.IntRefType = q->int_ref_type;
> > + if (q->int_ref_cycle_size >= 0)
> > + q->extco2.IntRefCycleSize = q->int_ref_cycle_size;
> > + if (q->int_ref_qp_delta != INT16_MIN)
> > + q->extco2.IntRefQPDelta = q->int_ref_qp_delta;
> > #if QSV_HAVE_MAX_SLICE_SIZE
> > if (q->max_slice_size >= 0)
> > q->extco2.MaxSliceSize = q->max_slice_size;
> > @@ -973,6 +974,10 @@ static int init_video_param(AVCodecContext
> *avctx,
> > QSVEncContext *q)
> > av_log(avctx, AV_LOG_WARNING,
> > "Please set max_b_frames(-bf) to 0 to enable P-
> > pyramid\n");
> > }
> > +#endif
> > +#if QSV_VERSION_ATLEAST(1, 16)
> > + if (q->int_ref_cycle_dist >= 0)
> > + q->extco3.IntRefCycleDist = q->int_ref_cycle_dist;
> > #endif
> > }
> >
> > diff --git a/libavcodec/qsvenc.h b/libavcodec/qsvenc.h
> > index 65f035045c..5fa0b6f5ba 100644
> > --- a/libavcodec/qsvenc.h
> > +++ b/libavcodec/qsvenc.h
> > @@ -195,6 +195,7 @@ typedef struct QSVEncContext {
> > int int_ref_type;
> > int int_ref_cycle_size;
> > int int_ref_qp_delta;
> > + int int_ref_cycle_dist;
> > int recovery_point_sei;
> >
> > int repeat_pps;
> > diff --git a/libavcodec/qsvenc_h264.c b/libavcodec/qsvenc_h264.c
> > index 9f127607b7..bec3633268 100644
> > --- a/libavcodec/qsvenc_h264.c
> > +++ b/libavcodec/qsvenc_h264.c
> > @@ -126,13 +126,16 @@ static const AVOption options[] = {
> > { "4x" , NULL, 0, AV_OPT_TYPE_CONST, { .i64 =
> > MFX_LOOKAHEAD_DS_4x }, INT_MIN, INT_MAX, VE,
> > "look_ahead_downsampling" },
> > #endif
> >
> > - { "int_ref_type", "Intra refresh
> > type", OFFSET(qsv.int_ref_type),
> > AV_OPT_TYPE_INT, { .i64 = -1 }, -1, UINT16_MAX, VE, "int_ref_type" },
> > + { "int_ref_type", "Intra refresh type. B frames should be set to
> > 0.", OFFSET(qsv.int_ref_type), AV_OPT_TYPE_INT, { .i64 =
> > -1
> > }, -1, UINT16_MAX, VE, "int_ref_type" },
> > { "none", NULL, 0, AV_OPT_TYPE_CONST, { .i64 = 0 }, .flags =
> > VE,
> > "int_ref_type" },
> > { "vertical", NULL, 0, AV_OPT_TYPE_CONST, { .i64 = 1 }, .flags =
> > VE,
> > "int_ref_type" },
> > + { "horizontal", NULL, 0, AV_OPT_TYPE_CONST, { .i64 = 2 }, .flags =
> > VE, "int_ref_type" },
> > { "int_ref_cycle_size", "Number of frames in the intra refresh
> > cycle", OFFSET(qsv.int_ref_cycle_size), AV_OPT_TYPE_INT, { .i64 =
> > -1 }, -1, UINT16_MAX, VE },
> > { "int_ref_qp_delta", "QP difference for the refresh
> > MBs", OFFSET(qsv.int_ref_qp_delta), AV_OPT_TYPE_INT,
> > {
> > .i64 = INT16_MIN }, INT16_MIN, INT16_MAX, VE },
> > { "recovery_point_sei", "Insert recovery point SEI
> > messages", OFFSET(qsv.recovery_point_sei),
> > AV_OPT_TYPE_INT
> > , { .i64 = -1 }, -1, 1, VE },
> > -
> > +#if QSV_VERSION_ATLEAST(1, 16)
> > + { "int_ref_cycle_dist", "Distance between the beginnings of the
> > intra-
> > refresh cycles in
> > frames", OFFSET(qsv.int_ref_cycle_dist), AV_OPT_TYPE_INT, { .i64 = -1
> > },
> > -1, INT16_MAX, VE },
> > +#endif
> > { "profile", NULL, OFFSET(qsv.profile), AV_OPT_TYPE_INT, { .i64 =
> > MFX_PROFILE_UNKNOWN }, 0, INT_MAX, VE, "profile" },
> > { "unknown" , NULL, 0, AV_OPT_TYPE_CONST, { .i64 =
> > MFX_PROFILE_UNKNOWN }, INT_MIN, INT_MAX, VE, "profile" },
> > { "baseline", NULL, 0, AV_OPT_TYPE_CONST, { .i64 =
> > MFX_PROFILE_AVC_BASELINE }, INT_MIN, INT_MAX, VE, "profile" },
> > diff --git a/libavcodec/qsvenc_hevc.c b/libavcodec/qsvenc_hevc.c
> > index 91a316f9c8..5cac141c4d 100644
> > --- a/libavcodec/qsvenc_hevc.c
> > +++ b/libavcodec/qsvenc_hevc.c
> > @@ -258,6 +258,15 @@ static const AVOption options[] = {
> > #if QSV_VERSION_ATLEAST(1, 26)
> > { "transform_skip", "Turn this option ON to enable
> > transformskip", OFFSET(qsv.transform_skip), AV_OPT_TYPE_INT, {
> > .i64 = -1}, -1, 1, VE},
> > #endif
> > + { "int_ref_type", "Intra refresh type. B frames should be set to
> > 0", OFFSET(qsv.int_ref_type), AV_OPT_TYPE_INT, { .i64 =
> > -1
> > }, -1, UINT16_MAX, VE, "int_ref_type" },
> > + { "none", NULL, 0, AV_OPT_TYPE_CONST, { .i64 = 0 }, .flags =
> > VE,
> > "int_ref_type" },
> > + { "vertical", NULL, 0, AV_OPT_TYPE_CONST, { .i64 = 1 }, .flags =
> > VE,
> > "int_ref_type" },
> > + { "horizontal", NULL, 0, AV_OPT_TYPE_CONST, { .i64 = 2 }, .flags =
> > VE, "int_ref_type" },
> > + { "int_ref_cycle_size", "Number of frames in the intra refresh
> > cycle", OFFSET(qsv.int_ref_cycle_size), AV_OPT_TYPE_INT, { .i64 =
> > -1 }, -1, UINT16_MAX, VE },
> > + { "int_ref_qp_delta", "QP difference for the refresh
> > MBs", OFFSET(qsv.int_ref_qp_delta), AV_OPT_TYPE_INT,
> > {
> > .i64 = INT16_MIN }, INT16_MIN, INT16_MAX, VE },
> > +#if QSV_VERSION_ATLEAST(1, 16)
> > + { "int_ref_cycle_dist", "Distance between the beginnings of the
> > intra-
> > refresh cycles in
> > frames", OFFSET(qsv.int_ref_cycle_dist), AV_OPT_TYPE_INT, { .i64 = -1
> > },
> > -1, INT16_MAX, VE },
> > +#endif
> >
> > { NULL },
> > };
> _______________________________________________
> ffmpeg-devel mailing list
> ffmpeg-devel@ffmpeg.org
> https://ffmpeg.org/mailman/listinfo/ffmpeg-devel
>
> To unsubscribe, visit link above, or email
> ffmpeg-devel-requ...@ffmpeg.org with subject "unsubscribe".
_______________________________________________
ffmpeg-devel mailing list
ffmpeg-devel@ffmpeg.org
https://ffmpeg.org/mailman/listinfo/ffmpeg-devel
To unsubscribe, visit link above, or email
ffmpeg-devel-requ...@ffmpeg.org with subject "unsubscribe".
