[FFmpeg-devel] [PATCH V3 4/4] libavcodec/qsvenc: Add transform skip to hevc_qsv

[Xiang, Haihao]

On Thu, 2022-01-13 at 13:12 +0800, Wenbin Chen wrote:
> Add transform_skip option to hevc_qsv. By enabling this option,
> the transform_skip_enabled_flag in PPS will be set to 1.
> This option is supported on the platform equal or newer than CNL.
> 
> Signed-off-by: Wenbin Chen <wenbin.chen at intel.com>
> ---
>  doc/encoders.texi        |  4 ++++
>  libavcodec/qsvenc.c      | 10 +++++++++-
>  libavcodec/qsvenc.h      |  1 +
>  libavcodec/qsvenc_hevc.c |  3 +++
>  4 files changed, 17 insertions(+), 1 deletion(-)
> 
> diff --git a/doc/encoders.texi b/doc/encoders.texi
> index 3d7c944fba..7714084864 100644
> --- a/doc/encoders.texi
> +++ b/doc/encoders.texi
> @@ -3447,6 +3447,10 @@ Number of rows for tiled encoding.
>  
>  @item @var{aud}
>  Insert the Access Unit Delimiter NAL.
> +
> + at item @var{transform_skip}
> +Turn this option ON to enable transformskip. It is supported on platform
> equal
> +or newer than CNL.
>  @end table
>  
>  @subsection MPEG2 Options
> diff --git a/libavcodec/qsvenc.c b/libavcodec/qsvenc.c
> index f2ba0241c6..4e5997c9ed 100644
> --- a/libavcodec/qsvenc.c
> +++ b/libavcodec/qsvenc.c
> @@ -358,6 +358,9 @@ static void dump_video_param(AVCodecContext *avctx,
> QSVEncContext *q,
>      av_log(avctx, AV_LOG_VERBOSE, "DisableDeblockingIdc: %"PRIu32" \n", co2-
> >DisableDeblockingIdc);
>  #endif
>  
> +#if QSV_VERSION_ATLEAST(1, 26)
> +    av_log(avctx, AV_LOG_VERBOSE, "TransformSkip: %s \n",
> print_threestate(co3->TransformSkip));
> +#endif
>  }
>  
>  static void dump_video_vp9_param(AVCodecContext *avctx, QSVEncContext *q,
> @@ -970,10 +973,15 @@ static int init_video_param(AVCodecContext *avctx,
> QSVEncContext *q)
>  #endif
>          }
>  
> +        if (avctx->codec_id == AV_CODEC_ID_HEVC) {
> +#if QSV_VERSION_ATLEAST(1, 26)
> +            q->extco3.TransformSkip = q->transform_skip ? MFX_CODINGOPTION_ON
> :
> +                                                          MFX_CODINGOPTION_OF
> F;

q->extco3.TransformSkip is set to MFX_CODINGOPTION_ON when q->transform_skip is
-1, right ? TransformSkip is tri-state flag, we may set it to
MFX_CODINGOPTION_UNKNOWN when q->transform_skip is -1. 

Thanks
Haihao


> +#endif
>  #if QSV_HAVE_GPB
> -        if (avctx->codec_id == AV_CODEC_ID_HEVC)
>              q->extco3.GPB              = q->gpb ? MFX_CODINGOPTION_ON :
> MFX_CODINGOPTION_OFF;
>  #endif
> +        }
>          q->extparam_internal[q->nb_extparam_internal++] = (mfxExtBuffer *)&q-
> >extco3;
>  #endif
>      }
> diff --git a/libavcodec/qsvenc.h b/libavcodec/qsvenc.h
> index 960604cb9a..5a574ada30 100644
> --- a/libavcodec/qsvenc.h
> +++ b/libavcodec/qsvenc.h
> @@ -200,6 +200,7 @@ typedef struct QSVEncContext {
>      int repeat_pps;
>      int low_power;
>      int gpb;
> +    int transform_skip;
>  
>      int a53_cc;
>  
> diff --git a/libavcodec/qsvenc_hevc.c b/libavcodec/qsvenc_hevc.c
> index 08aba3011d..679c09c858 100644
> --- a/libavcodec/qsvenc_hevc.c
> +++ b/libavcodec/qsvenc_hevc.c
> @@ -251,6 +251,9 @@ static const AVOption options[] = {
>      { "tile_rows",  "Number of rows for tiled
> encoding",      OFFSET(qsv.tile_rows),    AV_OPT_TYPE_INT, { .i64 = 0 }, 0,
> UINT16_MAX, VE },
>      { "recovery_point_sei", "Insert recovery point SEI
> messages",       OFFSET(qsv.recovery_point_sei),      AV_OPT_TYPE_INT, { .i64
> = -1 },               -1,          1, VE },
>      { "aud", "Insert the Access Unit Delimiter NAL", OFFSET(qsv.aud),
> AV_OPT_TYPE_BOOL, { .i64 = 0 }, 0, 1, VE},
> +#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
>  
>      { NULL },
>  };