lavc/qsvenc: add tile encoding support for VP9

Add -tile_rows and -tile_cols options to specify the number of tile
rows and columns

Signed-off-by: Haihao Xiang <haihao.xiang@intel.com>
release/5.1
Haihao Xiang 3 years ago committed by Haihao Xiang
parent 4cc7239d8b
commit 80801e5705
  1. 6
      doc/encoders.texi
  2. 4
      libavcodec/qsvenc.c
  3. 1
      libavcodec/qsvenc.h
  4. 10
      libavcodec/qsvenc_vp9.c

@ -3512,6 +3512,12 @@ These options are used by vp9_qsv
@item profile2
@item profile3
@end table
@item @var{tile_cols}
Number of columns for tiled encoding (requires libmfx >= 1.29).
@item @var{tile_rows}
Number of rows for tiled encoding (requires libmfx >= 1.29).
@end table
@section snow

@ -1004,6 +1004,10 @@ static int init_video_param(AVCodecContext *avctx, QSVEncContext *q)
q->extvp9param.Header.BufferId = MFX_EXTBUFF_VP9_PARAM;
q->extvp9param.Header.BufferSz = sizeof(q->extvp9param);
q->extvp9param.WriteIVFHeaders = MFX_CODINGOPTION_OFF;
#if QSV_HAVE_EXT_VP9_TILES
q->extvp9param.NumTileColumns = q->tile_cols;
q->extvp9param.NumTileRows = q->tile_rows;
#endif
q->extparam_internal[q->nb_extparam_internal++] = (mfxExtBuffer *)&q->extvp9param;
}
#endif

@ -41,6 +41,7 @@
#define QSV_HAVE_EXT_HEVC_TILES QSV_VERSION_ATLEAST(1, 13)
#define QSV_HAVE_EXT_VP9_PARAM QSV_VERSION_ATLEAST(1, 26)
#define QSV_HAVE_EXT_VP9_TILES QSV_VERSION_ATLEAST(1, 29)
#define QSV_HAVE_TRELLIS QSV_VERSION_ATLEAST(1, 8)
#define QSV_HAVE_MAX_SLICE_SIZE QSV_VERSION_ATLEAST(1, 9)

@ -73,6 +73,16 @@ static const AVOption options[] = {
{ "profile2", NULL, 0, AV_OPT_TYPE_CONST, { .i64 = MFX_PROFILE_VP9_2 }, INT_MIN, INT_MAX, VE, "profile" },
{ "profile3", NULL, 0, AV_OPT_TYPE_CONST, { .i64 = MFX_PROFILE_VP9_3 }, INT_MIN, INT_MAX, VE, "profile" },
#if QSV_HAVE_EXT_VP9_TILES
/* The minimum tile width in luma pixels is 256, set maximum tile_cols to 32 for 8K video */
{ "tile_cols", "Number of columns for tiled encoding", OFFSET(qsv.tile_cols), AV_OPT_TYPE_INT, { .i64 = 0 }, 0, 32, VE },
/* Set maximum tile_rows to 4 per VP9 spec */
{ "tile_rows", "Number of rows for tiled encoding", OFFSET(qsv.tile_rows), AV_OPT_TYPE_INT, { .i64 = 0 }, 0, 4, VE },
#else
{ "tile_cols", "(not supported)", OFFSET(qsv.tile_cols), AV_OPT_TYPE_INT, { .i64 = 0 }, 0, 0, VE },
{ "tile_rows", "(not supported)", OFFSET(qsv.tile_rows), AV_OPT_TYPE_INT, { .i64 = 0 }, 0, 0, VE },
#endif
{ NULL },
};

Loading…
Cancel
Save