#include "libavutil/avassert.h"
#include "libavutil/common.h"
+#include "libavutil/internal.h"
#include "libavutil/log.h"
#include "libavutil/pixdesc.h"
#include "vaapi_encode.h"
+#include "encode.h"
#include "avcodec.h"
+const AVCodecHWConfigInternal *const ff_vaapi_encode_hw_configs[] = {
+ HW_CONFIG_ENCODER_FRAMES(VAAPI, VAAPI),
+ NULL,
+};
+
static const char * const picture_type_name[] = { "IDR", "I", "P", "B" };
static int vaapi_encode_make_packed_header(AVCodecContext *avctx,
return 0;
}
+static int vaapi_encode_make_row_slice(AVCodecContext *avctx,
+ VAAPIEncodePicture *pic)
+{
+ VAAPIEncodeContext *ctx = avctx->priv_data;
+ VAAPIEncodeSlice *slice;
+ int i, rounding;
+
+ for (i = 0; i < pic->nb_slices; i++)
+ pic->slices[i].row_size = ctx->slice_size;
+
+ rounding = ctx->slice_block_rows - ctx->nb_slices * ctx->slice_size;
+ if (rounding > 0) {
+ // Place rounding error at top and bottom of frame.
+ av_assert0(rounding < pic->nb_slices);
+ // Some Intel drivers contain a bug where the encoder will fail
+ // if the last slice is smaller than the one before it. Since
+ // that's straightforward to avoid here, just do so.
+ if (rounding <= 2) {
+ for (i = 0; i < rounding; i++)
+ ++pic->slices[i].row_size;
+ } else {
+ for (i = 0; i < (rounding + 1) / 2; i++)
+ ++pic->slices[pic->nb_slices - i - 1].row_size;
+ for (i = 0; i < rounding / 2; i++)
+ ++pic->slices[i].row_size;
+ }
+ } else if (rounding < 0) {
+ // Remove rounding error from last slice only.
+ av_assert0(rounding < ctx->slice_size);
+ pic->slices[pic->nb_slices - 1].row_size += rounding;
+ }
+
+ for (i = 0; i < pic->nb_slices; i++) {
+ slice = &pic->slices[i];
+ slice->index = i;
+ if (i == 0) {
+ slice->row_start = 0;
+ slice->block_start = 0;
+ } else {
+ const VAAPIEncodeSlice *prev = &pic->slices[i - 1];
+ slice->row_start = prev->row_start + prev->row_size;
+ slice->block_start = prev->block_start + prev->block_size;
+ }
+ slice->block_size = slice->row_size * ctx->slice_block_cols;
+
+ av_log(avctx, AV_LOG_DEBUG, "Slice %d: %d-%d (%d rows), "
+ "%d-%d (%d blocks).\n", i, slice->row_start,
+ slice->row_start + slice->row_size - 1, slice->row_size,
+ slice->block_start, slice->block_start + slice->block_size - 1,
+ slice->block_size);
+ }
+
+ return 0;
+}
+
+static int vaapi_encode_make_tile_slice(AVCodecContext *avctx,
+ VAAPIEncodePicture *pic)
+{
+ VAAPIEncodeContext *ctx = avctx->priv_data;
+ VAAPIEncodeSlice *slice;
+ int i, j, index;
+
+ for (i = 0; i < ctx->tile_cols; i++) {
+ for (j = 0; j < ctx->tile_rows; j++) {
+ index = j * ctx->tile_cols + i;
+ slice = &pic->slices[index];
+ slice->index = index;
+
+ pic->slices[index].block_start = ctx->col_bd[i] +
+ ctx->row_bd[j] * ctx->slice_block_cols;
+ pic->slices[index].block_size = ctx->row_height[j] * ctx->col_width[i];
+
+ av_log(avctx, AV_LOG_DEBUG, "Slice %2d: (%2d, %2d) start at: %4d "
+ "width:%2d height:%2d (%d blocks).\n", index, ctx->col_bd[i],
+ ctx->row_bd[j], slice->block_start, ctx->col_width[i],
+ ctx->row_height[j], slice->block_size);
+ }
+ }
+
+ return 0;
+}
+
static int vaapi_encode_issue(AVCodecContext *avctx,
VAAPIEncodePicture *pic)
{
if (pic->nb_slices == 0)
pic->nb_slices = ctx->nb_slices;
if (pic->nb_slices > 0) {
- int rounding;
-
pic->slices = av_mallocz_array(pic->nb_slices, sizeof(*pic->slices));
if (!pic->slices) {
err = AVERROR(ENOMEM);
goto fail;
}
- for (i = 0; i < pic->nb_slices; i++)
- pic->slices[i].row_size = ctx->slice_size;
-
- rounding = ctx->slice_block_rows - ctx->nb_slices * ctx->slice_size;
- if (rounding > 0) {
- // Place rounding error at top and bottom of frame.
- av_assert0(rounding < pic->nb_slices);
- // Some Intel drivers contain a bug where the encoder will fail
- // if the last slice is smaller than the one before it. Since
- // that's straightforward to avoid here, just do so.
- if (rounding <= 2) {
- for (i = 0; i < rounding; i++)
- ++pic->slices[i].row_size;
- } else {
- for (i = 0; i < (rounding + 1) / 2; i++)
- ++pic->slices[pic->nb_slices - i - 1].row_size;
- for (i = 0; i < rounding / 2; i++)
- ++pic->slices[i].row_size;
- }
- } else if (rounding < 0) {
- // Remove rounding error from last slice only.
- av_assert0(rounding < ctx->slice_size);
- pic->slices[pic->nb_slices - 1].row_size += rounding;
- }
+ if (ctx->tile_rows && ctx->tile_cols)
+ vaapi_encode_make_tile_slice(avctx, pic);
+ else
+ vaapi_encode_make_row_slice(avctx, pic);
}
+
for (i = 0; i < pic->nb_slices; i++) {
slice = &pic->slices[i];
- slice->index = i;
- if (i == 0) {
- slice->row_start = 0;
- slice->block_start = 0;
- } else {
- const VAAPIEncodeSlice *prev = &pic->slices[i - 1];
- slice->row_start = prev->row_start + prev->row_size;
- slice->block_start = prev->block_start + prev->block_size;
- }
- slice->block_size = slice->row_size * ctx->slice_block_cols;
-
- av_log(avctx, AV_LOG_DEBUG, "Slice %d: %d-%d (%d rows), "
- "%d-%d (%d blocks).\n", i, slice->row_start,
- slice->row_start + slice->row_size - 1, slice->row_size,
- slice->block_start, slice->block_start + slice->block_size - 1,
- slice->block_size);
if (ctx->codec->slice_params_size > 0) {
slice->codec_slice_params = av_mallocz(ctx->codec->slice_params_size);
fail:
for(i = 0; i < pic->nb_param_buffers; i++)
vaDestroyBuffer(ctx->hwctx->display, pic->param_buffers[i]);
- for (i = 0; i < pic->nb_slices; i++) {
- if (pic->slices) {
- av_freep(&pic->slices[i].priv_data);
+ if (pic->slices) {
+ for (i = 0; i < pic->nb_slices; i++)
av_freep(&pic->slices[i].codec_slice_params);
- }
}
fail_at_end:
av_freep(&pic->codec_picture_params);
for (buf = buf_list; buf; buf = buf->next)
total_size += buf->size;
- err = av_new_packet(pkt, total_size);
+ err = ff_get_encode_buffer(avctx, pkt, total_size, 0);
ptr = pkt->data;
if (err < 0)
if (pic->encode_issued)
vaapi_encode_discard(avctx, pic);
- for (i = 0; i < pic->nb_slices; i++) {
- if (pic->slices) {
- av_freep(&pic->slices[i].priv_data);
+ if (pic->slices) {
+ for (i = 0; i < pic->nb_slices; i++)
av_freep(&pic->slices[i].codec_slice_params);
- }
}
av_freep(&pic->codec_picture_params);
return 0;
}
-int ff_vaapi_encode_send_frame(AVCodecContext *avctx, const AVFrame *frame)
+static int vaapi_encode_send_frame(AVCodecContext *avctx, AVFrame *frame)
{
VAAPIEncodeContext *ctx = avctx->priv_data;
VAAPIEncodePicture *pic;
err = AVERROR(ENOMEM);
goto fail;
}
- err = av_frame_ref(pic->input_image, frame);
- if (err < 0)
- goto fail;
if (ctx->input_order == 0 || frame->pict_type == AV_PICTURE_TYPE_I)
pic->force_idr = 1;
pic->input_surface = (VASurfaceID)(uintptr_t)frame->data[3];
pic->pts = frame->pts;
+ av_frame_move_ref(pic->input_image, frame);
+
if (ctx->input_order == 0)
ctx->first_pts = pic->pts;
if (ctx->input_order == ctx->decode_delay)
{
VAAPIEncodeContext *ctx = avctx->priv_data;
VAAPIEncodePicture *pic;
+ AVFrame *frame = ctx->frame;
int err;
+ err = ff_encode_get_frame(avctx, frame);
+ if (err < 0 && err != AVERROR_EOF)
+ return err;
+
+ if (err == AVERROR_EOF)
+ frame = NULL;
+
+ err = vaapi_encode_send_frame(avctx, frame);
+ if (err < 0)
+ return err;
+
if (!ctx->pic_start) {
if (ctx->end_of_stream)
return AVERROR_EOF;
{ "YUV400", VA_RT_FORMAT_YUV400, 8, 1, },
{ "YUV420", VA_RT_FORMAT_YUV420, 8, 3, 1, 1 },
{ "YUV422", VA_RT_FORMAT_YUV422, 8, 3, 1, 0 },
+#if VA_CHECK_VERSION(1, 2, 0)
+ { "YUV422_10", VA_RT_FORMAT_YUV422_10, 10, 3, 1, 0 },
+#endif
{ "YUV444", VA_RT_FORMAT_YUV444, 8, 3, 0, 0 },
{ "YUV411", VA_RT_FORMAT_YUV411, 8, 3, 2, 0 },
#if VA_CHECK_VERSION(0, 38, 1)
return 0;
}
+static av_cold int vaapi_encode_init_row_slice_structure(AVCodecContext *avctx,
+ uint32_t slice_structure)
+{
+ VAAPIEncodeContext *ctx = avctx->priv_data;
+ int req_slices;
+
+ // For fixed-size slices currently we only support whole rows, making
+ // rectangular slices. This could be extended to arbitrary runs of
+ // blocks, but since slices tend to be a conformance requirement and
+ // most cases (such as broadcast or bluray) want rectangular slices
+ // only it would need to be gated behind another option.
+ if (avctx->slices > ctx->slice_block_rows) {
+ av_log(avctx, AV_LOG_WARNING, "Not enough rows to use "
+ "configured number of slices (%d < %d); using "
+ "maximum.\n", ctx->slice_block_rows, avctx->slices);
+ req_slices = ctx->slice_block_rows;
+ } else {
+ req_slices = avctx->slices;
+ }
+ if (slice_structure & VA_ENC_SLICE_STRUCTURE_ARBITRARY_ROWS ||
+ slice_structure & VA_ENC_SLICE_STRUCTURE_ARBITRARY_MACROBLOCKS) {
+ ctx->nb_slices = req_slices;
+ ctx->slice_size = ctx->slice_block_rows / ctx->nb_slices;
+ } else if (slice_structure & VA_ENC_SLICE_STRUCTURE_POWER_OF_TWO_ROWS) {
+ int k;
+ for (k = 1;; k *= 2) {
+ if (2 * k * (req_slices - 1) + 1 >= ctx->slice_block_rows)
+ break;
+ }
+ ctx->nb_slices = (ctx->slice_block_rows + k - 1) / k;
+ ctx->slice_size = k;
+#if VA_CHECK_VERSION(1, 0, 0)
+ } else if (slice_structure & VA_ENC_SLICE_STRUCTURE_EQUAL_ROWS) {
+ ctx->nb_slices = ctx->slice_block_rows;
+ ctx->slice_size = 1;
+#endif
+ } else {
+ av_log(avctx, AV_LOG_ERROR, "Driver does not support any usable "
+ "slice structure modes (%#x).\n", slice_structure);
+ return AVERROR(EINVAL);
+ }
+
+ return 0;
+}
+
+static av_cold int vaapi_encode_init_tile_slice_structure(AVCodecContext *avctx,
+ uint32_t slice_structure)
+{
+ VAAPIEncodeContext *ctx = avctx->priv_data;
+ int i, req_tiles;
+
+ if (!(slice_structure & VA_ENC_SLICE_STRUCTURE_ARBITRARY_MACROBLOCKS ||
+ (slice_structure & VA_ENC_SLICE_STRUCTURE_ARBITRARY_ROWS &&
+ ctx->tile_cols == 1))) {
+ av_log(avctx, AV_LOG_ERROR, "Supported slice structure (%#x) doesn't work for "
+ "current tile requirement.\n", slice_structure);
+ return AVERROR(EINVAL);
+ }
+
+ if (ctx->tile_rows > ctx->slice_block_rows ||
+ ctx->tile_cols > ctx->slice_block_cols) {
+ av_log(avctx, AV_LOG_WARNING, "Not enough block rows/cols (%d x %d) "
+ "for configured number of tile (%d x %d); ",
+ ctx->slice_block_rows, ctx->slice_block_cols,
+ ctx->tile_rows, ctx->tile_cols);
+ ctx->tile_rows = ctx->tile_rows > ctx->slice_block_rows ?
+ ctx->slice_block_rows : ctx->tile_rows;
+ ctx->tile_cols = ctx->tile_cols > ctx->slice_block_cols ?
+ ctx->slice_block_cols : ctx->tile_cols;
+ av_log(avctx, AV_LOG_WARNING, "using allowed maximum (%d x %d).\n",
+ ctx->tile_rows, ctx->tile_cols);
+ }
+
+ req_tiles = ctx->tile_rows * ctx->tile_cols;
+
+ // Tile slice is not allowed to cross the boundary of a tile due to
+ // the constraints of media-driver. Currently we support one slice
+ // per tile. This could be extended to multiple slices per tile.
+ if (avctx->slices != req_tiles)
+ av_log(avctx, AV_LOG_WARNING, "The number of requested slices "
+ "mismatches with configured number of tile (%d != %d); "
+ "using requested tile number for slice.\n",
+ avctx->slices, req_tiles);
+
+ ctx->nb_slices = req_tiles;
+
+ // Default in uniform spacing
+ // 6-3, 6-5
+ for (i = 0; i < ctx->tile_cols; i++) {
+ ctx->col_width[i] = ( i + 1 ) * ctx->slice_block_cols / ctx->tile_cols -
+ i * ctx->slice_block_cols / ctx->tile_cols;
+ ctx->col_bd[i + 1] = ctx->col_bd[i] + ctx->col_width[i];
+ }
+ // 6-4, 6-6
+ for (i = 0; i < ctx->tile_rows; i++) {
+ ctx->row_height[i] = ( i + 1 ) * ctx->slice_block_rows / ctx->tile_rows -
+ i * ctx->slice_block_rows / ctx->tile_rows;
+ ctx->row_bd[i + 1] = ctx->row_bd[i] + ctx->row_height[i];
+ }
+
+ av_log(avctx, AV_LOG_VERBOSE, "Encoding pictures with %d x %d tile.\n",
+ ctx->tile_rows, ctx->tile_cols);
+
+ return 0;
+}
+
static av_cold int vaapi_encode_init_slice_structure(AVCodecContext *avctx)
{
VAAPIEncodeContext *ctx = avctx->priv_data;
- VAConfigAttrib attr[2] = { { VAConfigAttribEncMaxSlices },
- { VAConfigAttribEncSliceStructure } };
+ VAConfigAttrib attr[3] = { { VAConfigAttribEncMaxSlices },
+ { VAConfigAttribEncSliceStructure },
+#if VA_CHECK_VERSION(1, 1, 0)
+ { VAConfigAttribEncTileSupport },
+#endif
+ };
VAStatus vas;
uint32_t max_slices, slice_structure;
- int req_slices;
+ int ret;
if (!(ctx->codec->flags & FLAG_SLICE_CONTROL)) {
if (avctx->slices > 0) {
ctx->slice_block_cols = (avctx->width + ctx->slice_block_width - 1) /
ctx->slice_block_width;
- if (avctx->slices <= 1) {
+ if (avctx->slices <= 1 && !ctx->tile_rows && !ctx->tile_cols) {
ctx->nb_slices = 1;
ctx->slice_size = ctx->slice_block_rows;
return 0;
return AVERROR(EINVAL);
}
- // For fixed-size slices currently we only support whole rows, making
- // rectangular slices. This could be extended to arbitrary runs of
- // blocks, but since slices tend to be a conformance requirement and
- // most cases (such as broadcast or bluray) want rectangular slices
- // only it would need to be gated behind another option.
- if (avctx->slices > ctx->slice_block_rows) {
- av_log(avctx, AV_LOG_WARNING, "Not enough rows to use "
- "configured number of slices (%d < %d); using "
- "maximum.\n", ctx->slice_block_rows, avctx->slices);
- req_slices = ctx->slice_block_rows;
- } else {
- req_slices = avctx->slices;
- }
- if (slice_structure & VA_ENC_SLICE_STRUCTURE_ARBITRARY_ROWS ||
- slice_structure & VA_ENC_SLICE_STRUCTURE_ARBITRARY_MACROBLOCKS) {
- ctx->nb_slices = req_slices;
- ctx->slice_size = ctx->slice_block_rows / ctx->nb_slices;
- } else if (slice_structure & VA_ENC_SLICE_STRUCTURE_POWER_OF_TWO_ROWS) {
- int k;
- for (k = 1;; k *= 2) {
- if (2 * k * (req_slices - 1) + 1 >= ctx->slice_block_rows)
- break;
+ if (ctx->tile_rows && ctx->tile_cols) {
+#if VA_CHECK_VERSION(1, 1, 0)
+ uint32_t tile_support = attr[2].value;
+ if (tile_support == VA_ATTRIB_NOT_SUPPORTED) {
+ av_log(avctx, AV_LOG_ERROR, "Driver does not support encoding "
+ "pictures as multiple tiles.\n.");
+ return AVERROR(EINVAL);
}
- ctx->nb_slices = (ctx->slice_block_rows + k - 1) / k;
- ctx->slice_size = k;
-#if VA_CHECK_VERSION(1, 0, 0)
- } else if (slice_structure & VA_ENC_SLICE_STRUCTURE_EQUAL_ROWS) {
- ctx->nb_slices = ctx->slice_block_rows;
- ctx->slice_size = 1;
-#endif
- } else {
- av_log(avctx, AV_LOG_ERROR, "Driver does not support any usable "
- "slice structure modes (%#x).\n", slice_structure);
+#else
+ av_log(avctx, AV_LOG_ERROR, "Tile encoding option is "
+ "not supported with this VAAPI version.\n");
return AVERROR(EINVAL);
+#endif
}
+ if (ctx->tile_rows && ctx->tile_cols)
+ ret = vaapi_encode_init_tile_slice_structure(avctx, slice_structure);
+ else
+ ret = vaapi_encode_init_row_slice_structure(avctx, slice_structure);
+ if (ret < 0)
+ return ret;
+
if (ctx->nb_slices > avctx->slices) {
av_log(avctx, AV_LOG_WARNING, "Slice count rounded up to "
"%d (from %d) due to driver constraints on slice "
return AVERROR(EINVAL);
}
- av_log(avctx, AV_LOG_VERBOSE, "Encoding pictures with %d slices "
- "(default size %d block rows).\n",
- ctx->nb_slices, ctx->slice_size);
+ av_log(avctx, AV_LOG_VERBOSE, "Encoding pictures with %d slices.\n",
+ ctx->nb_slices);
return 0;
}
}
static AVBufferRef *vaapi_encode_alloc_output_buffer(void *opaque,
- int size)
+ size_t size)
{
AVCodecContext *avctx = opaque;
VAAPIEncodeContext *ctx = avctx->priv_data;
VAStatus vas;
int err;
+ ctx->frame = av_frame_alloc();
+ if (!ctx->frame) {
+ return AVERROR(ENOMEM);
+ }
+
if (!avctx->hw_frames_ctx) {
av_log(avctx, AV_LOG_ERROR, "A hardware frames reference is "
"required to associate the encoding device.\n");
return 0;
fail:
- ff_vaapi_encode_close(avctx);
return err;
}
ctx->va_config = VA_INVALID_ID;
}
+ av_frame_free(&ctx->frame);
+
av_freep(&ctx->codec_sequence_params);
av_freep(&ctx->codec_picture_params);
projects / ffmpeg / blobdiff