@@ -1397,10 +1397,10 @@ Selects the speed preset (0-10) to encode with.
Selects how many tiles to encode with.
@item tile-rows
-Selects how many rows of tiles to encode with.
+Sets log2 of how many rows of tiles to encode with.
@item tile-columns
-Selects how many columns of tiles to encode with.
+Sets log2 of how many columns of tiles to encode with.
@item rav1e-params
Set rav1e options using a list of @var{key}=@var{value} pairs separated
@@ -319,7 +319,7 @@ static av_cold int librav1e_encode_init(AVCodecContext *avctx)
}
}
if (ctx->tile_rows > 0) {
- rret = rav1e_config_parse_int(cfg, "tile_rows", ctx->tile_rows);
+ rret = rav1e_config_parse_int(cfg, "tile_rows", 1 << ctx->tile_rows);
if (rret < 0) {
av_log(avctx, AV_LOG_ERROR, "Could not set number of tile rows to encode with.\n");
ret = AVERROR_EXTERNAL;
@@ -327,7 +327,7 @@ static av_cold int librav1e_encode_init(AVCodecContext *avctx)
}
}
if (ctx->tile_cols > 0) {
- rret = rav1e_config_parse_int(cfg, "tile_cols", ctx->tile_cols);
+ rret = rav1e_config_parse_int(cfg, "tile_cols", 1 << ctx->tile_cols);
if (rret < 0) {
av_log(avctx, AV_LOG_ERROR, "Could not set number of tile cols to encode with.\n");
ret = AVERROR_EXTERNAL;
@@ -564,8 +564,8 @@ static const AVOption options[] = {
{ "qp", "use constant quantizer mode", OFFSET(quantizer), AV_OPT_TYPE_INT, { .i64 = -1 }, -1, 255, VE },
{ "speed", "what speed preset to use", OFFSET(speed), AV_OPT_TYPE_INT, { .i64 = -1 }, -1, 10, VE },
{ "tiles", "number of tiles encode with", OFFSET(tiles), AV_OPT_TYPE_INT, { .i64 = 0 }, -1, INT64_MAX, VE },
- { "tile-rows", "number of tiles rows to encode with", OFFSET(tile_rows), AV_OPT_TYPE_INT, { .i64 = 0 }, -1, INT64_MAX, VE },
- { "tile-columns", "number of tiles columns to encode with", OFFSET(tile_cols), AV_OPT_TYPE_INT, { .i64 = 0 }, -1, INT64_MAX, VE },
+ { "tile-rows", "log2 of number of tiles rows to encode with", OFFSET(tile_rows), AV_OPT_TYPE_INT, { .i64 = 0 }, -1, INT64_MAX, VE },
+ { "tile-columns", "log2 of number of tiles columns to encode with", OFFSET(tile_cols), AV_OPT_TYPE_INT, { .i64 = 0 }, -1, INT64_MAX, VE },
{ "rav1e-params", "set the rav1e configuration using a :-separated list of key=value parameters", OFFSET(rav1e_opts), AV_OPT_TYPE_DICT, { 0 }, 0, 0, VE },
{ NULL }
};