videolan
/
ffmpeg
mirror of https://git.videolan.org/git/ffmpeg.git
1
Fork 0
Code Releases Activity

vaapi_encode_h265: Fix ordering of tile dimensions 

Dimensions are normally specified as width x height, and this will match
the same option to libaom-av1.

Remove the indirection through the private context at the same time.
This commit is contained in:
Mark Thompson 2020-07-28 23:50:21 +01:00
parent e80fe32943
commit bc58d1f58e
3 changed files with 5 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
doc/encoders.texi
View File

@ -3264,7 +3264,7 @@ messages).
@end table
@item tiles
Set the number of tiles to encode the input video with, as rows x columns.
Set the number of tiles to encode the input video with, as columns x rows.
Larger numbers allow greater parallelism in both encoding and decoding, but
may decrease coding efficiency.

2
libavcodec/vaapi_encode.h
View File

@ -307,8 +307,8 @@ typedef struct VAAPIEncodeContext {
int slice_size;
// Tile encoding.
int tile_rows;
int tile_cols;
int tile_rows;
// Tile width of the i-th column.
int col_width[MAX_TILE_COLS];
// Tile height of i-th row.

13
libavcodec/vaapi_encode_h265.c
View File

@ -63,9 +63,6 @@ typedef struct VAAPIEncodeH265Context {
int level;
int sei;
int trows;
int tcols;
// Derived settings.
int fixed_qp_idr;
int fixed_qp_p;
@ -1208,11 +1205,6 @@ static av_cold int vaapi_encode_h265_init(AVCodecContext *avctx)
if (priv->qp > 0)
ctx->explicit_qp = priv->qp;
if (priv->trows && priv->tcols) {
ctx->tile_rows = priv->trows;
ctx->tile_cols = priv->tcols;
}
return ff_vaapi_encode_init(avctx);
}
@ -1289,8 +1281,9 @@ static const AVOption vaapi_encode_h265_options[] = {
{ .i64 = SEI_MASTERING_DISPLAY | SEI_CONTENT_LIGHT_LEVEL },
INT_MIN, INT_MAX, FLAGS, "sei" },
{ "tiles", "Tile rows x cols",
OFFSET(trows), AV_OPT_TYPE_IMAGE_SIZE, { .str = NULL }, 0, 0, FLAGS },
{ "tiles", "Tile columns x rows",
OFFSET(common.tile_cols), AV_OPT_TYPE_IMAGE_SIZE,
{ .str = NULL }, 0, 0, FLAGS },
{ NULL },
};