[FFmpeg-devel] [PATCH v4 7/8] lavc/vaapi_encode: Add VAAPI AV1 encoder
Xiang, Haihao
haihao.xiang at intel.com
Fri Sep 8 09:31:21 EEST 2023
On Do, 2023-08-31 at 15:21 +0800, fei.w.wang-at-intel.com at ffmpeg.org wrote:
> From: Fei Wang <fei.w.wang at intel.com>
>
> Signed-off-by: Fei Wang <fei.w.wang at intel.com>
> ---
> Fixed the discussions in V3.
>
> Changelog | 1 +
> configure | 3 +
> doc/encoders.texi | 14 +
> libavcodec/Makefile | 2 +
> libavcodec/allcodecs.c | 1 +
> libavcodec/av1_levels.c | 92 ++++
> libavcodec/av1_levels.h | 58 +++
> libavcodec/vaapi_encode.c | 198 +++++--
> libavcodec/vaapi_encode.h | 24 +
> libavcodec/vaapi_encode_av1.c | 949 ++++++++++++++++++++++++++++++++++
> libavcodec/version.h | 2 +-
> 11 files changed, 1311 insertions(+), 33 deletions(-)
> create mode 100644 libavcodec/av1_levels.c
> create mode 100644 libavcodec/av1_levels.h
> create mode 100644 libavcodec/vaapi_encode_av1.c
FF_PROFILE_* were deprecated recently, please use AV_PROFILE_* in
vaapi_encode_av1.c
Thanks
Haihao
>
> diff --git a/Changelog b/Changelog
> index c010e86159..b10c65a4c5 100644
> --- a/Changelog
> +++ b/Changelog
> @@ -30,6 +30,7 @@ version <next>:
> - support for the P_SKIP hinting to speed up libx264 encoding
> - Support HEVC,VP9,AV1 codec in enhanced flv format
> - apsnr and asisdr audio filters
> +- VAAPI AV1 encoder
>
>
> version 6.0:
> diff --git a/configure b/configure
> index bd7f7697c8..ec7a80cd48 100755
> --- a/configure
> +++ b/configure
> @@ -3323,6 +3323,8 @@ av1_qsv_decoder_select="qsvdec"
> av1_qsv_encoder_select="qsvenc"
> av1_qsv_encoder_deps="libvpl"
> av1_amf_encoder_deps="amf"
> +av1_vaapi_encoder_deps="VAEncPictureParameterBufferAV1"
> +av1_vaapi_encoder_select="cbs_av1 vaapi_encode"
>
> # parsers
> aac_parser_select="adts_header mpeg4audio"
> @@ -7110,6 +7112,7 @@ if enabled vaapi; then
> check_type "va/va.h va/va_enc_jpeg.h" "VAEncPictureParameterBufferJPEG"
> check_type "va/va.h va/va_enc_vp8.h" "VAEncPictureParameterBufferVP8"
> check_type "va/va.h va/va_enc_vp9.h" "VAEncPictureParameterBufferVP9"
> + check_type "va/va.h va/va_enc_av1.h" "VAEncPictureParameterBufferAV1"
> fi
>
> if enabled_all opencl libdrm ; then
> diff --git a/doc/encoders.texi b/doc/encoders.texi
> index 6f8f5e127e..d7d9584a0c 100644
> --- a/doc/encoders.texi
> +++ b/doc/encoders.texi
> @@ -3995,6 +3995,20 @@ Average variable bitrate.
> Each encoder also has its own specific options:
> @table @option
>
> + at item av1_vaapi
> + at option{profile} sets the value of @emph{seq_profile}.
> + at option{tier} sets the value of @emph{seq_tier}.
> + at option{level} sets the value of @emph{seq_level_idx}.
> +
> + at table @option
> + at item tiles
> +Set the number of tiles to encode the input video with, as columns x rows.
> +(default is auto, which means use minimal tile column/row number).
> + at item tile_groups
> +Set tile groups number. All the tiles will be distributed as evenly as
> possible to
> +each tile group. (default is 1).
> + at end table
> +
> @item h264_vaapi
> @option{profile} sets the value of @emph{profile_idc} and the
> @emph{constraint_set*_flag}s.
> @option{level} sets the value of @emph{level_idc}.
> diff --git a/libavcodec/Makefile b/libavcodec/Makefile
> index f961d0abd6..e315299a0e 100644
> --- a/libavcodec/Makefile
> +++ b/libavcodec/Makefile
> @@ -258,6 +258,7 @@ OBJS-$(CONFIG_AV1_MEDIACODEC_DECODER) += mediacodecdec.o
> OBJS-$(CONFIG_AV1_MEDIACODEC_ENCODER) += mediacodecenc.o
> OBJS-$(CONFIG_AV1_NVENC_ENCODER) += nvenc_av1.o nvenc.o
> OBJS-$(CONFIG_AV1_QSV_ENCODER) += qsvenc_av1.o
> +OBJS-$(CONFIG_AV1_VAAPI_ENCODER) += vaapi_encode_av1.o av1_levels.o
> OBJS-$(CONFIG_AVRN_DECODER) += avrndec.o
> OBJS-$(CONFIG_AVRP_DECODER) += r210dec.o
> OBJS-$(CONFIG_AVRP_ENCODER) += r210enc.o
> @@ -1322,6 +1323,7 @@ TESTPROGS =
> avcodec \
> jpeg2000dwt \
> mathops \
>
> +TESTPROGS-$(CONFIG_AV1_VAAPI_ENCODER) += av1_levels
> TESTPROGS-$(CONFIG_CABAC) += cabac
> TESTPROGS-$(CONFIG_DCT) += avfft
> TESTPROGS-$(CONFIG_FFT) += fft fft-fixed32
> diff --git a/libavcodec/allcodecs.c b/libavcodec/allcodecs.c
> index 8775d15a4f..c43c1d7b48 100644
> --- a/libavcodec/allcodecs.c
> +++ b/libavcodec/allcodecs.c
> @@ -844,6 +844,7 @@ extern const FFCodec ff_av1_nvenc_encoder;
> extern const FFCodec ff_av1_qsv_decoder;
> extern const FFCodec ff_av1_qsv_encoder;
> extern const FFCodec ff_av1_amf_encoder;
> +extern const FFCodec ff_av1_vaapi_encoder;
> extern const FFCodec ff_libopenh264_encoder;
> extern const FFCodec ff_libopenh264_decoder;
> extern const FFCodec ff_h264_amf_encoder;
> diff --git a/libavcodec/av1_levels.c b/libavcodec/av1_levels.c
> new file mode 100644
> index 0000000000..19b6ee1736
> --- /dev/null
> +++ b/libavcodec/av1_levels.c
> @@ -0,0 +1,92 @@
> +/*
> + * Copyright (c) 2023 Intel Corporation
> + *
> + * This file is part of FFmpeg.
> + *
> + * FFmpeg is free software; you can redistribute it and/or
> + * modify it under the terms of the GNU Lesser General Public
> + * License as published by the Free Software Foundation; either
> + * version 2.1 of the License, or (at your option) any later version.
> + *
> + * FFmpeg is distributed in the hope that it will be useful,
> + * but WITHOUT ANY WARRANTY; without even the implied warranty of
> + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
> + * Lesser General Public License for more details.
> + *
> + * You should have received a copy of the GNU Lesser General Public
> + * License along with FFmpeg; if not, write to the Free Software
> + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301
> USA
> + */
> +
> +#include <stddef.h>
> +#include "libavutil/macros.h"
> +#include "av1_levels.h"
> +
> +/** ignore entries which named in spec but no details. Like level 2.2 and
> 7.0. */
> +static const AV1LevelDescriptor av1_levels[] = {
> + // Name MaxVSize
> MainMbps MaxTiles
> + // | level_idx | MaxDisplayRate |
> HighMbps | MaxTileCols
> + // | | MaxPicSize | | MaxDecodeRate |
> | MainCR | |
> + // | | | MaxHSize | | | MaxHeaderRate |
> | | HighCR| |
> + // | | | | | | | | |
> | | | | |
> + { "2.0", 0, 147456, 2048, 1152, 4423680, 5529600, 150,
> 1.5, 0, 2, 0, 8, 4 },
> + { "2.1", 1, 278784, 2816, 1584, 8363520, 10454400, 150,
> 3.0, 0, 2, 0, 8, 4 },
> + { "3.0", 4, 665856, 4352, 2448, 19975680, 24969600, 150,
> 6.0, 0, 2, 0, 16, 6 },
> + { "3.1", 5, 1065024, 5504, 3096, 31950720, 39938400, 150,
> 10.0, 0, 2, 0, 16, 6 },
> + { "4.0", 8, 2359296, 6144, 3456, 70778880, 77856768, 300, 12.0,
> 30.0, 4, 4, 32, 8 },
> + { "4.1", 9, 2359296, 6144, 3456, 141557760, 155713536, 300, 20.0,
> 50.0, 4, 4, 32, 8 },
> + { "5.0", 12, 8912896, 8192, 4352, 267386880, 273715200, 300, 30.0,
> 100.0, 6, 4, 64, 8 },
> + { "5.1", 13, 8912896, 8192, 4352, 534773760, 547430400, 300, 40.0,
> 160.0, 8, 4, 64, 8 },
> + { "5.2", 14, 8912896, 8192, 4352, 1069547520, 1094860800, 300, 60.0,
> 240.0, 8, 4, 64, 8 },
> + { "5.3", 15, 8912896, 8192, 4352, 1069547520, 1176502272, 300, 60.0,
> 240.0, 8, 4, 64, 8 },
> + { "6.0", 16, 35651584, 16384, 8704, 1069547520, 1176502272, 300, 60.0,
> 240.0, 8, 4, 128, 16 },
> + { "6.1", 17, 35651584, 16384, 8704, 2139095040, 2189721600, 300, 100.0,
> 480.0, 8, 4, 128, 16 },
> + { "6.2", 18, 35651584, 16384, 8704, 4278190080, 4379443200, 300, 160.0,
> 800.0, 8, 4, 128, 16 },
> + { "6.3", 19, 35651584, 16384, 8704, 4278190080, 4706009088, 300, 160.0,
> 800.0, 8, 4, 128, 16 },
> +};
> +
> +const AV1LevelDescriptor *ff_av1_guess_level(int64_t bitrate,
> + int tier,
> + int width,
> + int height,
> + int tiles,
> + int tile_cols,
> + float fps)
> +{
> + int pic_size;
> + uint64_t display_rate;
> + float max_br;
> +
> + pic_size = width * height;
> + display_rate = (uint64_t)pic_size * fps;
> +
> + for (int i = 0; i < FF_ARRAY_ELEMS(av1_levels); i++) {
> + const AV1LevelDescriptor *level = &av1_levels[i];
> + // Limitation: decode rate, header rate, compress rate, etc. are not
> considered.
> + if (pic_size > level->max_pic_size)
> + continue;
> + if (width > level->max_h_size)
> + continue;
> + if (height > level->max_v_size)
> + continue;
> + if (display_rate > level->max_display_rate)
> + continue;
> +
> + if (tier)
> + max_br = level->high_mbps;
> + else
> + max_br = level->main_mbps;
> + if (!max_br)
> + continue;
> + if (bitrate > (int64_t)(1000000.0 * max_br))
> + continue;
> +
> + if (tiles > level->max_tiles)
> + continue;
> + if (tile_cols > level->max_tile_cols)
> + continue;
> + return level;
> + }
> +
> + return NULL;
> +}
> diff --git a/libavcodec/av1_levels.h b/libavcodec/av1_levels.h
> new file mode 100644
> index 0000000000..164cb876ba
> --- /dev/null
> +++ b/libavcodec/av1_levels.h
> @@ -0,0 +1,58 @@
> +/*
> + * Copyright (c) 2023 Intel Corporation
> + *
> + * This file is part of FFmpeg.
> + *
> + * FFmpeg is free software; you can redistribute it and/or
> + * modify it under the terms of the GNU Lesser General Public
> + * License as published by the Free Software Foundation; either
> + * version 2.1 of the License, or (at your option) any later version.
> + *
> + * FFmpeg is distributed in the hope that it will be useful,
> + * but WITHOUT ANY WARRANTY; without even the implied warranty of
> + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
> + * Lesser General Public License for more details.
> + *
> + * You should have received a copy of the GNU Lesser General Public
> + * License along with FFmpeg; if not, write to the Free Software
> + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301
> USA
> + */
> +
> +#ifndef AVCODEC_AV1_LEVELS_H
> +#define AVCODEC_AV1_LEVELS_H
> +
> +#include <stdint.h>
> +
> +typedef struct AV1LevelDescriptor {
> + char name[4];
> + uint8_t level_idx;
> +
> + uint32_t max_pic_size;
> + uint32_t max_h_size;
> + uint32_t max_v_size;
> + uint64_t max_display_rate;
> + uint64_t max_decode_rate;
> +
> + uint32_t max_header_rate;
> + float main_mbps;
> + float high_mbps;
> + uint32_t main_cr;
> + uint32_t high_cr;
> + uint32_t max_tiles;
> + uint32_t max_tile_cols;
> +} AV1LevelDescriptor;
> +
> +/**
> + * Guess the level of a stream from some parameters.
> + *
> + * Unknown parameters may be zero, in which case they will be ignored.
> + */
> +const AV1LevelDescriptor *ff_av1_guess_level(int64_t bitrate,
> + int tier,
> + int width,
> + int height,
> + int tile_rows,
> + int tile_cols,
> + float fps);
> +
> +#endif /* AVCODEC_AV1_LEVELS_H */
> diff --git a/libavcodec/vaapi_encode.c b/libavcodec/vaapi_encode.c
> index 790450aa21..f5bf5ab680 100644
> --- a/libavcodec/vaapi_encode.c
> +++ b/libavcodec/vaapi_encode.c
> @@ -683,6 +683,11 @@ static int
> vaapi_encode_set_output_property(AVCodecContext *avctx,
> pic->opaque_ref = NULL;
> }
>
> + if (ctx->codec->flags & FLAG_TIMESTAMP_NO_DELAY) {
> + pkt->dts = pkt->pts;
> + return 0;
> + }
> +
> if (ctx->output_delay == 0) {
> pkt->dts = pkt->pts;
> } else if (pic->encode_order < ctx->decode_delay) {
> @@ -698,65 +703,160 @@ static int
> vaapi_encode_set_output_property(AVCodecContext *avctx,
> return 0;
> }
>
> -static int vaapi_encode_output(AVCodecContext *avctx,
> - VAAPIEncodePicture *pic, AVPacket *pkt)
> +static int vaapi_encode_get_coded_buffer_size(AVCodecContext *avctx,
> VABufferID buf_id)
> {
> VAAPIEncodeContext *ctx = avctx->priv_data;
> VACodedBufferSegment *buf_list, *buf;
> + int size = 0;
> VAStatus vas;
> - int total_size = 0;
> - uint8_t *ptr;
> int err;
>
> - err = vaapi_encode_wait(avctx, pic);
> - if (err < 0)
> - return err;
> -
> - buf_list = NULL;
> - vas = vaMapBuffer(ctx->hwctx->display, pic->output_buffer,
> + vas = vaMapBuffer(ctx->hwctx->display, buf_id,
> (void**)&buf_list);
> if (vas != VA_STATUS_SUCCESS) {
> av_log(avctx, AV_LOG_ERROR, "Failed to map output buffers: "
> "%d (%s).\n", vas, vaErrorStr(vas));
> err = AVERROR(EIO);
> - goto fail;
> + return err;
> }
>
> for (buf = buf_list; buf; buf = buf->next)
> - total_size += buf->size;
> + size += buf->size;
>
> - err = ff_get_encode_buffer(avctx, pkt, total_size, 0);
> - ptr = pkt->data;
> + vas = vaUnmapBuffer(ctx->hwctx->display, buf_id);
> + if (vas != VA_STATUS_SUCCESS) {
> + av_log(avctx, AV_LOG_ERROR, "Failed to unmap output buffers: "
> + "%d (%s).\n", vas, vaErrorStr(vas));
> + err = AVERROR(EIO);
> + return err;
> + }
>
> - if (err < 0)
> - goto fail_mapped;
> + return size;
> +}
> +
> +static int vaapi_encode_get_coded_buffer_data(AVCodecContext *avctx,
> + VABufferID buf_id, uint8_t
> **dst)
> +{
> + VAAPIEncodeContext *ctx = avctx->priv_data;
> + VACodedBufferSegment *buf_list, *buf;
> + VAStatus vas;
> + int err;
> +
> + vas = vaMapBuffer(ctx->hwctx->display, buf_id,
> + (void**)&buf_list);
> + if (vas != VA_STATUS_SUCCESS) {
> + av_log(avctx, AV_LOG_ERROR, "Failed to map output buffers: "
> + "%d (%s).\n", vas, vaErrorStr(vas));
> + err = AVERROR(EIO);
> + return err;
> + }
>
> for (buf = buf_list; buf; buf = buf->next) {
> av_log(avctx, AV_LOG_DEBUG, "Output buffer: %u bytes "
> "(status %08x).\n", buf->size, buf->status);
>
> - memcpy(ptr, buf->buf, buf->size);
> - ptr += buf->size;
> + memcpy(*dst, buf->buf, buf->size);
> + *dst += buf->size;
> }
>
> - vas = vaUnmapBuffer(ctx->hwctx->display, pic->output_buffer);
> + vas = vaUnmapBuffer(ctx->hwctx->display, buf_id);
> if (vas != VA_STATUS_SUCCESS) {
> av_log(avctx, AV_LOG_ERROR, "Failed to unmap output buffers: "
> "%d (%s).\n", vas, vaErrorStr(vas));
> err = AVERROR(EIO);
> - goto fail;
> + return err;
> + }
> +
> + return 0;
> +}
> +
> +static int vaapi_encode_get_coded_data(AVCodecContext *avctx,
> + VAAPIEncodePicture *pic, AVPacket
> *pkt)
> +{
> + VAAPIEncodeContext *ctx = avctx->priv_data;
> + VABufferID output_buffer_prev;
> + int total_size = 0;
> + uint8_t *ptr;
> + int ret;
> +
> + if (ctx->coded_buffer_ref) {
> + output_buffer_prev = (VABufferID)(uintptr_t)ctx->coded_buffer_ref-
> >data;
> + ret = vaapi_encode_get_coded_buffer_size(avctx, output_buffer_prev);
> + if (ret < 0)
> + goto end;
> + total_size += ret;
> }
>
> + ret = vaapi_encode_get_coded_buffer_size(avctx, pic->output_buffer);
> + if (ret < 0)
> + goto end;
> + total_size += ret;
> +
> + ret = ff_get_encode_buffer(avctx, pkt, total_size, 0);
> + if (ret < 0)
> + goto end;
> + ptr = pkt->data;
> +
> + if (ctx->coded_buffer_ref) {
> + ret = vaapi_encode_get_coded_buffer_data(avctx, output_buffer_prev,
> &ptr);
> + if (ret < 0)
> + goto end;
> + }
> +
> + ret = vaapi_encode_get_coded_buffer_data(avctx, pic->output_buffer,
> &ptr);
> + if (ret < 0)
> + goto end;
> +
> +end:
> + if (ctx->coded_buffer_ref) {
> + av_buffer_unref(&ctx->coded_buffer_ref);
> + }
> av_buffer_unref(&pic->output_buffer_ref);
> pic->output_buffer = VA_INVALID_ID;
>
> + return ret;
> +}
> +
> +static int vaapi_encode_output(AVCodecContext *avctx,
> + VAAPIEncodePicture *pic, AVPacket *pkt)
> +{
> + VAAPIEncodeContext *ctx = avctx->priv_data;
> + AVPacket *pkt_ptr = pkt;
> + int err;
> +
> + err = vaapi_encode_wait(avctx, pic);
> + if (err < 0)
> + return err;
> +
> + if (pic->non_independent_frame) {
> + av_assert0(!ctx->coded_buffer_ref);
> + ctx->coded_buffer_ref = av_buffer_ref(pic->output_buffer_ref);
> +
> + if (pic->tail_size) {
> + if (ctx->tail_pkt->size) {
> + err = AVERROR(AVERROR_BUG);
> + goto end;
> + }
> +
> + err = ff_get_encode_buffer(avctx, ctx->tail_pkt, pic->tail_size,
> 0);
> + if (err < 0)
> + goto end;
> +
> + memcpy(ctx->tail_pkt->data, pic->tail_data, pic->tail_size);
> + pkt_ptr = ctx->tail_pkt;
> + }
> + } else {
> + err = vaapi_encode_get_coded_data(avctx, pic, pkt);
> + if (err < 0)
> + goto end;
> + }
> +
> av_log(avctx, AV_LOG_DEBUG, "Output read for pic %"PRId64"/%"PRId64".\n",
> pic->display_order, pic->encode_order);
> - return 0;
>
> -fail_mapped:
> - vaUnmapBuffer(ctx->hwctx->display, pic->output_buffer);
> -fail:
> + vaapi_encode_set_output_property(avctx, pic, pkt_ptr);
> +
> +end:
> av_buffer_unref(&pic->output_buffer_ref);
> pic->output_buffer = VA_INVALID_ID;
> return err;
> @@ -1128,9 +1228,19 @@ static int vaapi_encode_pick_next(AVCodecContext
> *avctx,
>
> vaapi_encode_add_ref(avctx, pic, pic, 0, 1, 0);
> if (pic->type != PICTURE_TYPE_IDR) {
> - vaapi_encode_add_ref(avctx, pic, start,
> - pic->type == PICTURE_TYPE_P,
> - b_counter > 0, 0);
> + // TODO: apply both previous and forward multi reference for all
> vaapi encoders.
> + // And L0/L1 reference frame number can be set dynamically through
> query
> + // VAConfigAttribEncMaxRefFrames attribute.
> + if (avctx->codec_id == AV_CODEC_ID_AV1) {
> + for (i = 0; i < ctx->nb_next_prev; i++)
> + vaapi_encode_add_ref(avctx, pic, ctx->next_prev[i],
> + pic->type == PICTURE_TYPE_P,
> + b_counter > 0, 0);
> + } else
> + vaapi_encode_add_ref(avctx, pic, start,
> + pic->type == PICTURE_TYPE_P,
> + b_counter > 0, 0);
> +
> vaapi_encode_add_ref(avctx, pic, ctx->next_prev[ctx->nb_next_prev -
> 1], 0, 0, 1);
> }
>
> @@ -1292,6 +1402,19 @@ int ff_vaapi_encode_receive_packet(AVCodecContext
> *avctx, AVPacket *pkt)
> AVFrame *frame = ctx->frame;
> int err;
>
> +start:
> + /** if no B frame before repeat P frame, sent repeat P frame out. */
> + if (ctx->tail_pkt->size) {
> + for (VAAPIEncodePicture *tmp = ctx->pic_start; tmp; tmp = tmp->next)
> {
> + if (tmp->type == PICTURE_TYPE_B && tmp->pts < ctx->tail_pkt->pts)
> + break;
> + else if (!tmp->next) {
> + av_packet_move_ref(pkt, ctx->tail_pkt);
> + goto end;
> + }
> + }
> + }
> +
> err = ff_encode_get_frame(avctx, frame);
> if (err < 0 && err != AVERROR_EOF)
> return err;
> @@ -1356,17 +1479,21 @@ int ff_vaapi_encode_receive_packet(AVCodecContext
> *avctx, AVPacket *pkt)
> return err;
> }
>
> - vaapi_encode_set_output_property(avctx, pic, pkt);
> - av_log(avctx, AV_LOG_DEBUG, "Output packet: pts %"PRId64", dts %"PRId64",
> "
> - "size %d bytes.\n", pkt->pts, pkt->dts, pkt->size);
> -
> ctx->output_order = pic->encode_order;
> vaapi_encode_clear_old(avctx);
>
> + /** loop to get an available pkt in encoder flushing. */
> + if (ctx->end_of_stream && !pkt->size)
> + goto start;
> +
> +end:
> + if (pkt->size)
> + av_log(avctx, AV_LOG_DEBUG, "Output packet: pts %"PRId64", dts
> %"PRId64", "
> + "size %d bytes.\n", pkt->pts, pkt->dts, pkt->size);
> +
> return 0;
> }
>
> -
> static av_cold void vaapi_encode_add_global_param(AVCodecContext *avctx, int
> type,
> void *buffer, size_t size)
> {
> @@ -2667,6 +2794,12 @@ av_cold int ff_vaapi_encode_init(AVCodecContext *avctx)
> ctx->device = (AVHWDeviceContext*)ctx->device_ref->data;
> ctx->hwctx = ctx->device->hwctx;
>
> + ctx->tail_pkt = av_packet_alloc();
> + if (!ctx->tail_pkt) {
> + err = AVERROR(ENOMEM);
> + goto fail;
> + }
> +
> err = vaapi_encode_profile_entrypoint(avctx);
> if (err < 0)
> goto fail;
> @@ -2859,6 +2992,7 @@ av_cold int ff_vaapi_encode_close(AVCodecContext *avctx)
> }
>
> av_frame_free(&ctx->frame);
> + av_packet_free(&ctx->tail_pkt);
>
> av_freep(&ctx->codec_sequence_params);
> av_freep(&ctx->codec_picture_params);
> diff --git a/libavcodec/vaapi_encode.h b/libavcodec/vaapi_encode.h
> index d5452a37b3..416a3ced5b 100644
> --- a/libavcodec/vaapi_encode.h
> +++ b/libavcodec/vaapi_encode.h
> @@ -133,6 +133,17 @@ typedef struct VAAPIEncodePicture {
>
> int nb_slices;
> VAAPIEncodeSlice *slices;
> +
> + /**
> + * indicate if current frame is an independent frame that the coded data
> + * can be pushed to downstream directly. Coded of non-independent frame
> + * data will be concatenated into next independent frame.
> + */
> + int non_independent_frame;
> + /** Tail data of current pic, used only for repeat header of AV1. */
> + char tail_data[MAX_PARAM_BUFFER_SIZE];
> + /** Byte length of tail_data. */
> + size_t tail_size;
> } VAAPIEncodePicture;
>
> typedef struct VAAPIEncodeProfile {
> @@ -367,6 +378,16 @@ typedef struct VAAPIEncodeContext {
> AVFifo *encode_fifo;
> // Max number of frame buffered in encoder.
> int async_depth;
> +
> + /** Head data for current output pkt, used only for AV1. */
> + //void *header_data;
> + //size_t header_data_size;
> +
> + /** Buffered coded data of a pic if it is an non-independent frame. */
> + AVBufferRef *coded_buffer_ref;
> +
> + /** Tail data of a pic, now only used for av1 repeat frame header. */
> + AVPacket *tail_pkt;
> } VAAPIEncodeContext;
>
> enum {
> @@ -383,6 +404,9 @@ enum {
> // Codec supports non-IDR key pictures (that is, key pictures do
> // not necessarily empty the DPB).
> FLAG_NON_IDR_KEY_PICTURES = 1 << 5,
> + // Codec output packet without timestamp delay, which means the
> + // output packet has same PTS and DTS.
> + FLAG_TIMESTAMP_NO_DELAY = 1 << 6,
> };
>
> typedef struct VAAPIEncodeType {
> diff --git a/libavcodec/vaapi_encode_av1.c b/libavcodec/vaapi_encode_av1.c
> new file mode 100644
> index 0000000000..2cfbbd7c67
> --- /dev/null
> +++ b/libavcodec/vaapi_encode_av1.c
> @@ -0,0 +1,949 @@
> +/*
> + * Copyright (c) 2023 Intel Corporation
> + *
> + * This file is part of FFmpeg.
> + *
> + * FFmpeg is free software; you can redistribute it and/or
> + * modify it under the terms of the GNU Lesser General Public
> + * License as published by the Free Software Foundation; either
> + * version 2.1 of the License, or (at your option) any later version.
> + *
> + * FFmpeg is distributed in the hope that it will be useful,
> + * but WITHOUT ANY WARRANTY; without even the implied warranty of
> + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
> + * Lesser General Public License for more details.
> + *
> + * You should have received a copy of the GNU Lesser General Public
> + * License along with FFmpeg; if not, write to the Free Software
> + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301
> USA
> + */
> +
> +#include <va/va.h>
> +#include <va/va_enc_av1.h>
> +
> +#include "libavutil/pixdesc.h"
> +#include "libavutil/opt.h"
> +
> +#include "cbs_av1.h"
> +#include "put_bits.h"
> +#include "codec_internal.h"
> +#include "av1_levels.h"
> +#include "vaapi_encode.h"
> +
> +#define AV1_MAX_QUANT 255
> +
> +typedef struct VAAPIEncodeAV1Picture {
> + int64_t last_idr_frame;
> + int slot;
> +} VAAPIEncodeAV1Picture;
> +
> +typedef struct VAAPIEncodeAV1Context {
> + VAAPIEncodeContext common;
> + AV1RawOBU sh; /**< sequence header.*/
> + AV1RawOBU fh; /**< frame header.*/
> + CodedBitstreamContext *cbc;
> + CodedBitstreamFragment current_obu;
> + VAConfigAttribValEncAV1 attr;
> + VAConfigAttribValEncAV1Ext1 attr_ext1;
> + VAConfigAttribValEncAV1Ext2 attr_ext2;
> +
> + char sh_data[MAX_PARAM_BUFFER_SIZE]; /**< coded sequence header data. */
> + size_t sh_data_len; /**< bit length of sh_data. */
> + char fh_data[MAX_PARAM_BUFFER_SIZE]; /**< coded frame header data. */
> + size_t fh_data_len; /**< bit length of fh_data. */
> +
> + uint8_t uniform_tile;
> + uint8_t use_128x128_superblock;
> + int sb_cols;
> + int sb_rows;
> + int tile_cols_log2;
> + int tile_rows_log2;
> + int max_tile_width_sb;
> + int max_tile_height_sb;
> + uint8_t width_in_sbs_minus_1[AV1_MAX_TILE_COLS];
> + uint8_t height_in_sbs_minus_1[AV1_MAX_TILE_ROWS];
> +
> + int min_log2_tile_cols;
> + int max_log2_tile_cols;
> + int min_log2_tile_rows;
> + int max_log2_tile_rows;
> +
> + int q_idx_idr;
> + int q_idx_p;
> + int q_idx_b;
> +
> + /** bit positions in current frame header */
> + int qindex_offset;
> + int loopfilter_offset;
> + int cdef_start_offset;
> + int cdef_param_size;
> +
> + /** user options */
> + int profile;
> + int level;
> + int tier;
> + int tile_cols, tile_rows;
> + int tile_groups;
> +} VAAPIEncodeAV1Context;
> +
> +static void vaapi_encode_av1_trace_write_log(void *ctx,
> + PutBitContext *pbc, int length,
> + const char *str, const int
> *subscripts,
> + int64_t value)
> +{
> + VAAPIEncodeAV1Context *priv = ctx;
> + int position;
> +
> + position = put_bits_count(pbc);
> + av_assert0(position >= length);
> +
> + if (!strcmp(str, "base_q_idx"))
> + priv->qindex_offset = position - length;
> + else if (!strcmp(str, "loop_filter_level[0]"))
> + priv->loopfilter_offset = position - length;
> + else if (!strcmp(str, "cdef_damping_minus_3"))
> + priv->cdef_start_offset = position - length;
> + else if (!strcmp(str, "cdef_uv_sec_strength[i]"))
> + priv->cdef_param_size = position - priv->cdef_start_offset;
> +}
> +
> +static av_cold int vaapi_encode_av1_get_encoder_caps(AVCodecContext *avctx)
> +{
> + VAAPIEncodeContext *ctx = avctx->priv_data;
> + VAAPIEncodeAV1Context *priv = avctx->priv_data;
> +
> + // Surfaces must be aligned to superblock boundaries.
> + ctx->surface_width = FFALIGN(avctx->width, priv->use_128x128_superblock
> ? 128 : 64);
> + ctx->surface_height = FFALIGN(avctx->height, priv->use_128x128_superblock
> ? 128 : 64);
> +
> + return 0;
> +}
> +
> +static av_cold int vaapi_encode_av1_configure(AVCodecContext *avctx)
> +{
> + VAAPIEncodeContext *ctx = avctx->priv_data;
> + VAAPIEncodeAV1Context *priv = avctx->priv_data;
> + int ret;
> +
> + ret = ff_cbs_init(&priv->cbc, AV_CODEC_ID_AV1, avctx);
> + if (ret < 0)
> + return ret;
> + priv->cbc->trace_enable = 1;
> + priv->cbc->trace_level = AV_LOG_DEBUG;
> + priv->cbc->trace_context = ctx;
> + priv->cbc->trace_write_callback = vaapi_encode_av1_trace_write_log;
> +
> + if (ctx->rc_mode->quality) {
> + priv->q_idx_p = av_clip(ctx->rc_quality, 0, AV1_MAX_QUANT);
> + if (fabs(avctx->i_quant_factor) > 0.0)
> + priv->q_idx_idr =
> + av_clip((fabs(avctx->i_quant_factor) * priv->q_idx_p +
> + avctx->i_quant_offset) + 0.5,
> + 0, AV1_MAX_QUANT);
> + else
> + priv->q_idx_idr = priv->q_idx_p;
> +
> + if (fabs(avctx->b_quant_factor) > 0.0)
> + priv->q_idx_b =
> + av_clip((fabs(avctx->b_quant_factor) * priv->q_idx_p +
> + avctx->b_quant_offset) + 0.5,
> + 0, AV1_MAX_QUANT);
> + else
> + priv->q_idx_b = priv->q_idx_p;
> + } else {
> + /** Arbitrary value */
> + priv->q_idx_idr = priv->q_idx_p = priv->q_idx_b = 128;
> + }
> +
> + return 0;
> +}
> +
> +static int vaapi_encode_av1_add_obu(AVCodecContext *avctx,
> + CodedBitstreamFragment *au,
> + uint8_t type,
> + void *obu_unit)
> +{
> + int ret;
> +
> + ret = ff_cbs_insert_unit_content(au, -1,
> + type, obu_unit, NULL);
> + if (ret < 0) {
> + av_log(avctx, AV_LOG_ERROR, "Failed to add OBU unit: "
> + "type = %d.\n", type);
> + return ret;
> + }
> +
> + return 0;
> +}
> +
> +static int vaapi_encode_av1_write_obu(AVCodecContext *avctx,
> + char *data, size_t *data_len,
> + CodedBitstreamFragment *bs)
> +{
> + VAAPIEncodeAV1Context *priv = avctx->priv_data;
> + int ret;
> +
> + ret = ff_cbs_write_fragment_data(priv->cbc, bs);
> + if (ret < 0) {
> + av_log(avctx, AV_LOG_ERROR, "Failed to write packed header.\n");
> + return ret;
> + }
> +
> + if ((size_t)8 * MAX_PARAM_BUFFER_SIZE < 8 * bs->data_size - bs-
> >data_bit_padding) {
> + av_log(avctx, AV_LOG_ERROR, "Access unit too large: "
> + "%zu < %zu.\n", (size_t)8 * MAX_PARAM_BUFFER_SIZE,
> + 8 * bs->data_size - bs->data_bit_padding);
> + return AVERROR(ENOSPC);
> + }
> +
> + memcpy(data, bs->data, bs->data_size);
> + *data_len = 8 * bs->data_size - bs->data_bit_padding;
> +
> + return 0;
> +}
> +
> +static int tile_log2(int blkSize, int target) {
> + int k;
> + for (k = 0; (blkSize << k) < target; k++);
> + return k;
> +}
> +
> +static int vaapi_encode_av1_set_tile(AVCodecContext *avctx)
> +{
> + VAAPIEncodeAV1Context *priv = avctx->priv_data;
> + int mi_cols, mi_rows, sb_shift, sb_size;
> + int max_tile_area_sb, max_tile_area_sb_varied;
> + int tile_width_sb, tile_height_sb, widest_tile_sb;
> + int tile_cols, tile_rows;
> + int min_log2_tiles;
> + int i;
> +
> + if (priv->tile_cols > AV1_MAX_TILE_COLS ||
> + priv->tile_rows > AV1_MAX_TILE_ROWS) {
> + av_log(avctx, AV_LOG_ERROR, "Invalid tile number %dx%d, should less
> than %dx%d.\n",
> + priv->tile_cols, priv->tile_rows, AV1_MAX_TILE_COLS,
> AV1_MAX_TILE_ROWS);
> + return AVERROR(EINVAL);
> + }
> +
> + mi_cols = 2 * ((avctx->width + 7) >> 3);
> + mi_rows = 2 * ((avctx->height + 7) >> 3);
> + priv->sb_cols = priv->use_128x128_superblock ?
> + ((mi_cols + 31) >> 5) : ((mi_cols + 15) >> 4);
> + priv->sb_rows = priv->use_128x128_superblock ?
> + ((mi_rows + 31) >> 5) : ((mi_rows + 15) >> 4);
> + sb_shift = priv->use_128x128_superblock ? 5 : 4;
> + sb_size = sb_shift + 2;
> + priv->max_tile_width_sb = AV1_MAX_TILE_WIDTH >> sb_size;
> + max_tile_area_sb = AV1_MAX_TILE_AREA >> (2 * sb_size);
> +
> + priv->min_log2_tile_cols = tile_log2(priv->max_tile_width_sb, priv-
> >sb_cols);
> + priv->max_log2_tile_cols = tile_log2(1, FFMIN(priv->sb_cols,
> AV1_MAX_TILE_COLS));
> + priv->max_log2_tile_rows = tile_log2(1, FFMIN(priv->sb_rows,
> AV1_MAX_TILE_ROWS));
> + min_log2_tiles = FFMAX(priv->min_log2_tile_cols,
> + tile_log2(max_tile_area_sb, priv->sb_rows * priv-
> >sb_cols));
> +
> + tile_cols = av_clip(priv->tile_cols, (priv->sb_cols + priv-
> >max_tile_width_sb - 1) / priv->max_tile_width_sb, priv->sb_cols);
> +
> + if (!priv->tile_cols)
> + priv->tile_cols = tile_cols;
> + else if (priv->tile_cols != tile_cols){
> + av_log(avctx, AV_LOG_ERROR, "Invalid tile cols %d, should be in range
> of %d~%d\n",
> + priv->tile_cols,
> + (priv->sb_cols + priv->max_tile_width_sb - 1) / priv-
> >max_tile_width_sb,
> + priv->sb_cols);
> + return AVERROR(EINVAL);
> + }
> +
> + priv->tile_cols_log2 = tile_log2(1, priv->tile_cols);
> + tile_width_sb = (priv->sb_cols + (1 << priv->tile_cols_log2) - 1) >>
> + priv->tile_cols_log2;
> +
> + if (priv->tile_rows > priv->sb_rows) {
> + av_log(avctx, AV_LOG_ERROR, "Invalid tile rows %d, should be less
> than %d.\n",
> + priv->tile_rows, priv->sb_rows);
> + return AVERROR(EINVAL);
> + }
> +
> + /** Try user setting tile rows number first. */
> + tile_rows = priv->tile_rows ? priv->tile_rows : 1;
> + for (; tile_rows <= priv->sb_rows && tile_rows <= AV1_MAX_TILE_ROWS;
> tile_rows++) {
> + /** try uniformed tile. */
> + priv->tile_rows_log2 = tile_log2(1, tile_rows);
> + if ((priv->sb_cols + tile_width_sb - 1) / tile_width_sb == priv-
> >tile_cols) {
> + for (i = 0; i < priv->tile_cols - 1; i++)
> + priv->width_in_sbs_minus_1[i] = tile_width_sb - 1;
> + priv->width_in_sbs_minus_1[i] = priv->sb_cols - (priv->tile_cols
> - 1) * tile_width_sb - 1;
> +
> + tile_height_sb = (priv->sb_rows + (1 << priv->tile_rows_log2) -
> 1) >>
> + priv->tile_rows_log2;
> +
> + if ((priv->sb_rows + tile_height_sb - 1) / tile_height_sb ==
> tile_rows &&
> + tile_height_sb <= max_tile_area_sb / tile_width_sb) {
> + for (i = 0; i < tile_rows - 1; i++)
> + priv->height_in_sbs_minus_1[i] = tile_height_sb - 1;
> + priv->height_in_sbs_minus_1[i] = priv->sb_rows - (tile_rows -
> 1) * tile_height_sb - 1;
> +
> + priv->uniform_tile = 1;
> + priv->min_log2_tile_rows = FFMAX(min_log2_tiles - priv-
> >tile_cols_log2, 0);
> +
> + break;
> + }
> + }
> +
> + /** try non-uniformed tile. */
> + widest_tile_sb = 0;
> + for (i = 0; i < priv->tile_cols; i++) {
> + priv->width_in_sbs_minus_1[i] = (i + 1) * priv->sb_cols / priv-
> >tile_cols - i * priv->sb_cols / priv->tile_cols - 1;
> + widest_tile_sb = FFMAX(widest_tile_sb, priv-
> >width_in_sbs_minus_1[i] + 1);
> + }
> +
> + if (min_log2_tiles)
> + max_tile_area_sb_varied = (priv->sb_rows * priv->sb_cols) >>
> (min_log2_tiles + 1);
> + else
> + max_tile_area_sb_varied = priv->sb_rows * priv->sb_cols;
> + priv->max_tile_height_sb = FFMAX(1, max_tile_area_sb_varied /
> widest_tile_sb);
> +
> + if (tile_rows == av_clip(tile_rows, (priv->sb_rows + priv-
> >max_tile_height_sb - 1) / priv->max_tile_height_sb, priv->sb_rows)) {
> + for (i = 0; i < tile_rows; i++)
> + priv->height_in_sbs_minus_1[i] = (i + 1) * priv->sb_rows /
> tile_rows - i * priv->sb_rows / tile_rows - 1;
> +
> + break;
> + }
> +
> + /** Return invalid parameter if explicit tile rows is set. */
> + if (priv->tile_rows) {
> + av_log(avctx, AV_LOG_ERROR, "Invalid tile rows %d.\n", priv-
> >tile_rows);
> + return AVERROR(EINVAL);
> + }
> + }
> +
> + priv->tile_rows = tile_rows;
> + av_log(avctx, AV_LOG_DEBUG, "Setting tile cols/rows to %d/%d.\n",
> + priv->tile_cols, priv->tile_rows);
> +
> + /** check if tile cols/rows is supported by driver. */
> + if (priv->attr_ext2.bits.max_tile_num_minus1) {
> + if ((priv->tile_cols * priv->tile_rows - 1) > priv-
> >attr_ext2.bits.max_tile_num_minus1) {
> + av_log(avctx, AV_LOG_ERROR, "Unsupported tile num %d * %d = %d by
> driver, "
> + "should be at most %d.\n", priv->tile_cols, priv-
> >tile_rows,
> + priv->tile_cols * priv->tile_rows,
> + priv->attr_ext2.bits.max_tile_num_minus1 + 1);
> + return AVERROR(EINVAL);
> + }
> + }
> +
> + /** check if tile group numbers is valid. */
> + if (priv->tile_groups > priv->tile_cols * priv->tile_rows) {
> + av_log(avctx, AV_LOG_WARNING, "Invalid tile groups number %d, "
> + "correct to %d.\n", priv->tile_groups, priv->tile_cols * priv-
> >tile_rows);
> + priv->tile_groups = priv->tile_cols * priv->tile_rows;
> + }
> +
> + return 0;
> +}
> +
> +static int vaapi_encode_av1_write_sequence_header(AVCodecContext *avctx,
> + char *data, size_t
> *data_len)
> +{
> + VAAPIEncodeAV1Context *priv = avctx->priv_data;
> +
> + memcpy(data, &priv->sh_data, MAX_PARAM_BUFFER_SIZE * sizeof(char));
> + *data_len = priv->sh_data_len;
> +
> + return 0;
> +}
> +
> +static int vaapi_encode_av1_init_sequence_params(AVCodecContext *avctx)
> +{
> + VAAPIEncodeContext *ctx = avctx->priv_data;
> + VAAPIEncodeAV1Context *priv = avctx->priv_data;
> + AV1RawOBU *sh_obu = &priv->sh;
> + AV1RawSequenceHeader *sh = &sh_obu->obu.sequence_header;
> + VAEncSequenceParameterBufferAV1 *vseq = ctx->codec_sequence_params;
> + CodedBitstreamFragment *obu = &priv->current_obu;
> + const AVPixFmtDescriptor *desc;
> + int ret;
> +
> + memset(sh_obu, 0, sizeof(*sh_obu));
> + sh_obu->header.obu_type = AV1_OBU_SEQUENCE_HEADER;
> +
> + desc = av_pix_fmt_desc_get(priv->common.input_frames->sw_format);
> + av_assert0(desc);
> +
> + sh->seq_profile = avctx->profile;
> + if (!sh->seq_force_screen_content_tools)
> + sh->seq_force_integer_mv = AV1_SELECT_INTEGER_MV;
> + sh->frame_width_bits_minus_1 = av_log2(avctx->width);
> + sh->frame_height_bits_minus_1 = av_log2(avctx->height);
> + sh->max_frame_width_minus_1 = avctx->width - 1;
> + sh->max_frame_height_minus_1 = avctx->height - 1;
> + sh->seq_tier[0] = priv->tier;
> + /** enable order hint and reserve maximum 8 bits for it by default. */
> + sh->enable_order_hint = 1;
> + sh->order_hint_bits_minus_1 = 7;
> +
> + sh->color_config = (AV1RawColorConfig) {
> + .high_bitdepth = desc->comp[0].depth == 8 ? 0 : 1,
> + .color_primaries = avctx->color_primaries,
> + .transfer_characteristics = avctx->color_trc,
> + .matrix_coefficients = avctx->colorspace,
> + .color_description_present_flag = (avctx->color_primaries !=
> AVCOL_PRI_UNSPECIFIED ||
> + avctx->color_trc !=
> AVCOL_TRC_UNSPECIFIED ||
> + avctx->colorspace !=
> AVCOL_SPC_UNSPECIFIED),
> + .color_range = avctx->color_range ==
> AVCOL_RANGE_JPEG,
> + .subsampling_x = desc->log2_chroma_w,
> + .subsampling_y = desc->log2_chroma_h,
> + };
> +
> + switch (avctx->chroma_sample_location) {
> + case AVCHROMA_LOC_LEFT:
> + sh->color_config.chroma_sample_position = AV1_CSP_VERTICAL;
> + break;
> + case AVCHROMA_LOC_TOPLEFT:
> + sh->color_config.chroma_sample_position = AV1_CSP_COLOCATED;
> + break;
> + default:
> + sh->color_config.chroma_sample_position = AV1_CSP_UNKNOWN;
> + break;
> + }
> +
> + if (avctx->level != FF_LEVEL_UNKNOWN) {
> + sh->seq_level_idx[0] = avctx->level;
> + } else {
> + const AV1LevelDescriptor *level;
> + float framerate;
> +
> + if (avctx->framerate.num > 0 && avctx->framerate.den > 0)
> + framerate = avctx->framerate.num / avctx->framerate.den;
> + else
> + framerate = 0;
> +
> + level = ff_av1_guess_level(avctx->bit_rate, priv->tier,
> + ctx->surface_width, ctx->surface_height,
> + priv->tile_rows * priv->tile_cols,
> + priv->tile_cols, framerate);
> + if (level) {
> + av_log(avctx, AV_LOG_VERBOSE, "Using level %s.\n", level->name);
> + sh->seq_level_idx[0] = level->level_idx;
> + } else {
> + av_log(avctx, AV_LOG_VERBOSE, "Stream will not conform to "
> + "any normal level, using maximum parameters level by
> default.\n");
> + sh->seq_level_idx[0] = 31;
> + sh->seq_tier[0] = 1;
> + }
> + }
> + vseq->seq_profile = sh->seq_profile;
> + vseq->seq_level_idx = sh->seq_level_idx[0];
> + vseq->seq_tier = sh->seq_tier[0];
> + vseq->order_hint_bits_minus_1 = sh->order_hint_bits_minus_1;
> + vseq->intra_period = ctx->gop_size;
> + vseq->ip_period = ctx->b_per_p + 1;
> +
> + vseq->seq_fields.bits.enable_order_hint = sh->enable_order_hint;
> +
> + if (!(ctx->va_rc_mode & VA_RC_CQP)) {
> + vseq->bits_per_second = ctx->va_bit_rate;
> + vseq->seq_fields.bits.enable_cdef = sh->enable_cdef = 1;
> + }
> +
> + ret = vaapi_encode_av1_add_obu(avctx, obu, AV1_OBU_SEQUENCE_HEADER,
> &priv->sh);
> + if (ret < 0)
> + goto end;
> +
> + ret = vaapi_encode_av1_write_obu(avctx, priv->sh_data, &priv-
> >sh_data_len, obu);
> + if (ret < 0)
> + goto end;
> +
> +end:
> + ff_cbs_fragment_reset(obu);
> + return ret;
> +}
> +
> +static int vaapi_encode_av1_init_picture_params(AVCodecContext *avctx,
> + VAAPIEncodePicture *pic)
> +{
> + VAAPIEncodeContext *ctx = avctx->priv_data;
> + VAAPIEncodeAV1Context *priv = avctx->priv_data;
> + VAAPIEncodeAV1Picture *hpic = pic->priv_data;
> + AV1RawOBU *fh_obu = &priv->fh;
> + AV1RawFrameHeader *fh = &fh_obu->obu.frame.header;
> + VAEncPictureParameterBufferAV1 *vpic = pic->codec_picture_params;
> + CodedBitstreamFragment *obu = &priv->current_obu;
> + VAAPIEncodePicture *ref;
> + VAAPIEncodeAV1Picture *href;
> + int slot, i;
> + int ret;
> + static const int8_t
> default_loop_filter_ref_deltas[AV1_TOTAL_REFS_PER_FRAME] =
> + { 1, 0, 0, 0, -1, 0, -1, -1 };
> +
> + memset(fh_obu, 0, sizeof(*fh_obu));
> + pic->nb_slices = priv->tile_groups;
> + pic->non_independent_frame = pic->encode_order < pic->display_order;
> + fh_obu->header.obu_type = AV1_OBU_FRAME_HEADER;
> + fh_obu->header.obu_has_size_field = 1;
> +
> + switch (pic->type) {
> + case PICTURE_TYPE_IDR:
> + av_assert0(pic->nb_refs[0] == 0 || pic->nb_refs[1]);
> + fh->frame_type = AV1_FRAME_KEY;
> + fh->refresh_frame_flags = 0xFF;
> + fh->base_q_idx = priv->q_idx_idr;
> + hpic->slot = 0;
> + hpic->last_idr_frame = pic->display_order;
> + break;
> + case PICTURE_TYPE_P:
> + av_assert0(pic->nb_refs[0]);
> + fh->frame_type = AV1_FRAME_INTER;
> + fh->base_q_idx = priv->q_idx_p;
> + ref = pic->refs[0][pic->nb_refs[0] - 1];
> + href = ref->priv_data;
> + hpic->slot = !href->slot;
> + hpic->last_idr_frame = href->last_idr_frame;
> + fh->refresh_frame_flags = 1 << hpic->slot;
> +
> + /** set the nearest frame in L0 as all reference frame. */
> + for (i = 0; i < AV1_REFS_PER_FRAME; i++) {
> + fh->ref_frame_idx[i] = href->slot;
> + }
> + fh->primary_ref_frame = href->slot;
> + fh->ref_order_hint[href->slot] = ref->display_order - href-
> >last_idr_frame;
> + vpic->ref_frame_ctrl_l0.fields.search_idx0 = AV1_REF_FRAME_LAST;
> +
> + /** set the 2nd nearest frame in L0 as Golden frame. */
> + if (pic->nb_refs[0] > 1) {
> + ref = pic->refs[0][pic->nb_refs[0] - 2];
> + href = ref->priv_data;
> + fh->ref_frame_idx[3] = href->slot;
> + fh->ref_order_hint[href->slot] = ref->display_order - href-
> >last_idr_frame;
> + vpic->ref_frame_ctrl_l0.fields.search_idx1 =
> AV1_REF_FRAME_GOLDEN;
> + }
> + break;
> + case PICTURE_TYPE_B:
> + av_assert0(pic->nb_refs[0] && pic->nb_refs[1]);
> + fh->frame_type = AV1_FRAME_INTER;
> + fh->base_q_idx = priv->q_idx_b;
> + fh->refresh_frame_flags = 0x0;
> + fh->reference_select = 1;
> +
> + /** B frame will not be referenced, disable its recon frame. */
> + vpic->picture_flags.bits.disable_frame_recon = 1;
> +
> + /** Use LAST_FRAME and BWDREF_FRAME for reference. */
> + vpic->ref_frame_ctrl_l0.fields.search_idx0 = AV1_REF_FRAME_LAST;
> + vpic->ref_frame_ctrl_l1.fields.search_idx0 = AV1_REF_FRAME_BWDREF;
> +
> + ref = pic->refs[0][pic->nb_refs[0] - 1];
> + href = ref->priv_data;
> + hpic->last_idr_frame = href->last_idr_frame;
> + fh->primary_ref_frame = href->slot;
> + fh->ref_order_hint[href->slot] = ref->display_order - href-
> >last_idr_frame;
> + for (i = 0; i < AV1_REF_FRAME_GOLDEN; i++) {
> + fh->ref_frame_idx[i] = href->slot;
> + }
> +
> + ref = pic->refs[1][pic->nb_refs[1] - 1];
> + href = ref->priv_data;
> + fh->ref_order_hint[href->slot] = ref->display_order - href-
> >last_idr_frame;
> + for (i = AV1_REF_FRAME_GOLDEN; i < AV1_REFS_PER_FRAME; i++) {
> + fh->ref_frame_idx[i] = href->slot;
> + }
> + break;
> + default:
> + av_assert0(0 && "invalid picture type");
> + }
> +
> + fh->show_frame = pic->display_order <= pic->encode_order;
> + fh->showable_frame = fh->frame_type != AV1_FRAME_KEY;
> + fh->frame_width_minus_1 = avctx->width - 1;
> + fh->frame_height_minus_1 = avctx->height - 1;
> + fh->render_width_minus_1 = fh->frame_width_minus_1;
> + fh->render_height_minus_1 = fh->frame_height_minus_1;
> + fh->order_hint = pic->display_order - hpic-
> >last_idr_frame;
> + fh->tile_cols = priv->tile_cols;
> + fh->tile_rows = priv->tile_rows;
> + fh->tile_cols_log2 = priv->tile_cols_log2;
> + fh->tile_rows_log2 = priv->tile_rows_log2;
> + fh->uniform_tile_spacing_flag = priv->uniform_tile;
> + fh->tile_size_bytes_minus1 = priv-
> >attr_ext2.bits.tile_size_bytes_minus1;
> +
> + /** ignore ONLY_4x4 mode for codedlossless is not fully implemented. */
> + if (priv->attr_ext2.bits.tx_mode_support & 0x04)
> + fh->tx_mode = AV1_TX_MODE_SELECT;
> + else if (priv->attr_ext2.bits.tx_mode_support & 0x02)
> + fh->tx_mode = AV1_TX_MODE_LARGEST;
> + else {
> + av_log(avctx, AV_LOG_ERROR, "No available tx mode found.\n");
> + return AVERROR(EINVAL);
> + }
> +
> + for (i = 0; i < fh->tile_cols; i++)
> + fh->width_in_sbs_minus_1[i] = vpic->width_in_sbs_minus_1[i] = priv-
> >width_in_sbs_minus_1[i];
> +
> + for (i = 0; i < fh->tile_rows; i++)
> + fh->height_in_sbs_minus_1[i] = vpic->height_in_sbs_minus_1[i] = priv-
> >height_in_sbs_minus_1[i];
> +
> + memcpy(fh->loop_filter_ref_deltas, default_loop_filter_ref_deltas,
> + AV1_TOTAL_REFS_PER_FRAME * sizeof(int8_t));
> +
> + if (fh->frame_type == AV1_FRAME_KEY && fh->show_frame) {
> + fh->error_resilient_mode = 1;
> + }
> +
> + if (fh->frame_type == AV1_FRAME_KEY || fh->error_resilient_mode)
> + fh->primary_ref_frame = AV1_PRIMARY_REF_NONE;
> +
> + vpic->base_qindex = fh->base_q_idx;
> + vpic->frame_width_minus_1 = fh->frame_width_minus_1;
> + vpic->frame_height_minus_1 = fh->frame_height_minus_1;
> + vpic->primary_ref_frame = fh->primary_ref_frame;
> + vpic->reconstructed_frame = pic->recon_surface;
> + vpic->coded_buf = pic->output_buffer;
> + vpic->tile_cols = fh->tile_cols;
> + vpic->tile_rows = fh->tile_rows;
> + vpic->order_hint = fh->order_hint;
> +#if VA_CHECK_VERSION(1, 15, 0)
> + vpic->refresh_frame_flags = fh->refresh_frame_flags;
> +#endif
> +
> + vpic->picture_flags.bits.enable_frame_obu = 0;
> + vpic->picture_flags.bits.frame_type = fh->frame_type;
> + vpic->picture_flags.bits.reduced_tx_set = fh->reduced_tx_set;
> + vpic->picture_flags.bits.error_resilient_mode = fh->error_resilient_mode;
> +
> + /** let driver decide to use single or compound reference prediction
> mode. */
> + vpic->mode_control_flags.bits.reference_mode = fh->reference_select ? 2 :
> 0;
> + vpic->mode_control_flags.bits.tx_mode = fh->tx_mode;
> +
> + vpic->tile_group_obu_hdr_info.bits.obu_has_size_field = 1;
> +
> + /** set reference. */
> + for (i = 0; i < AV1_REFS_PER_FRAME; i++)
> + vpic->ref_frame_idx[i] = fh->ref_frame_idx[i];
> +
> + for (i = 0; i < FF_ARRAY_ELEMS(vpic->reference_frames); i++)
> + vpic->reference_frames[i] = VA_INVALID_SURFACE;
> +
> + for (i = 0; i < MAX_REFERENCE_LIST_NUM; i++) {
> + for (int j = 0; j < pic->nb_refs[i]; j++) {
> + VAAPIEncodePicture *ref_pic = pic->refs[i][j];
> +
> + slot = ((VAAPIEncodeAV1Picture*)ref_pic->priv_data)->slot;
> + av_assert0(vpic->reference_frames[slot] == VA_INVALID_SURFACE);
> +
> + vpic->reference_frames[slot] = ref_pic->recon_surface;
> + }
> + }
> +
> + fh_obu->obu_size_byte_len = priv->attr_ext2.bits.obu_size_bytes_minus1 +
> 1;
> + ret = vaapi_encode_av1_add_obu(avctx, obu, AV1_OBU_FRAME_HEADER, &priv-
> >fh);
> + if (ret < 0)
> + goto end;
> +
> + ret = vaapi_encode_av1_write_obu(avctx, priv->fh_data, &priv-
> >fh_data_len, obu);
> + if (ret < 0)
> + goto end;
> +
> + if (!(ctx->va_rc_mode & VA_RC_CQP)) {
> + vpic->min_base_qindex = av_clip(avctx->qmin, 1, AV1_MAX_QUANT);
> + vpic->max_base_qindex = av_clip(avctx->qmax, 1, AV1_MAX_QUANT);
> +
> + vpic->bit_offset_qindex = priv->qindex_offset;
> + vpic->bit_offset_loopfilter_params = priv->loopfilter_offset;
> + vpic->bit_offset_cdef_params = priv->cdef_start_offset;
> + vpic->size_in_bits_cdef_params = priv->cdef_param_size;
> + vpic->size_in_bits_frame_hdr_obu = priv->fh_data_len;
> + vpic->byte_offset_frame_hdr_obu_size = (((pic->type ==
> PICTURE_TYPE_IDR) ?
> + priv->sh_data_len / 8 : 0) +
> + (fh_obu-
> >header.obu_extension_flag ?
> + 2 : 1));
> + }
> +
> +end:
> + ff_cbs_fragment_reset(obu);
> + return ret;
> +}
> +
> +static int vaapi_encode_av1_init_slice_params(AVCodecContext *avctx,
> + VAAPIEncodePicture *pic,
> + VAAPIEncodeSlice *slice)
> +{
> + VAAPIEncodeAV1Context *priv = avctx->priv_data;
> + VAEncTileGroupBufferAV1 *vslice = slice->codec_slice_params;
> + CodedBitstreamAV1Context *cbctx = priv->cbc->priv_data;
> + int div;
> +
> + /** Set tile group info. */
> + div = priv->tile_cols * priv->tile_rows / priv->tile_groups;
> + vslice->tg_start = slice->index * div;
> + if (slice->index == (priv->tile_groups - 1)) {
> + vslice->tg_end = priv->tile_cols * priv->tile_rows - 1;
> + cbctx->seen_frame_header = 0;
> + } else {
> + vslice->tg_end = (slice->index + 1) * div - 1;
> + }
> +
> + return 0;
> +}
> +
> +static int vaapi_encode_av1_write_picture_header(AVCodecContext *avctx,
> + VAAPIEncodePicture *pic,
> + char *data, size_t
> *data_len)
> +{
> + VAAPIEncodeAV1Context *priv = avctx->priv_data;
> + CodedBitstreamFragment *obu = &priv->current_obu;
> + CodedBitstreamAV1Context *cbctx = priv->cbc->priv_data;
> + AV1RawOBU *fh_obu = &priv->fh;
> + AV1RawFrameHeader *rep_fh = &fh_obu->obu.frame_header;
> + VAAPIEncodeAV1Picture *href;
> + int ret = 0;
> +
> + pic->tail_size = 0;
> + /** Pack repeat frame header. */
> + if (pic->display_order > pic->encode_order) {
> + memset(fh_obu, 0, sizeof(*fh_obu));
> + href = pic->refs[0][pic->nb_refs[0] - 1]->priv_data;
> + fh_obu->header.obu_type = AV1_OBU_FRAME_HEADER;
> + fh_obu->header.obu_has_size_field = 1;
> +
> + rep_fh->show_existing_frame = 1;
> + rep_fh->frame_to_show_map_idx = href->slot == 0;
> + rep_fh->frame_type = AV1_FRAME_INTER;
> + rep_fh->frame_width_minus_1 = avctx->width - 1;
> + rep_fh->frame_height_minus_1 = avctx->height - 1;
> + rep_fh->render_width_minus_1 = rep_fh->frame_width_minus_1;
> + rep_fh->render_height_minus_1 = rep_fh->frame_height_minus_1;
> +
> + cbctx->seen_frame_header = 0;
> +
> + ret = vaapi_encode_av1_add_obu(avctx, obu, AV1_OBU_FRAME_HEADER,
> &priv->fh);
> + if (ret < 0)
> + goto end;
> +
> + ret = vaapi_encode_av1_write_obu(avctx, pic->tail_data, &pic-
> >tail_size, obu);
> + if (ret < 0)
> + goto end;
> +
> + pic->tail_size /= 8;
> + }
> +
> + memcpy(data, &priv->fh_data, MAX_PARAM_BUFFER_SIZE * sizeof(char));
> + *data_len = priv->fh_data_len;
> +
> +end:
> + ff_cbs_fragment_reset(obu);
> + return ret;
> +}
> +
> +static const VAAPIEncodeProfile vaapi_encode_av1_profiles[] = {
> + { FF_PROFILE_AV1_MAIN, 8, 3, 1, 1, VAProfileAV1Profile0 },
> + { FF_PROFILE_AV1_MAIN, 10, 3, 1, 1, VAProfileAV1Profile0 },
> + { FF_PROFILE_UNKNOWN }
> +};
> +
> +static const VAAPIEncodeType vaapi_encode_type_av1 = {
> + .profiles = vaapi_encode_av1_profiles,
> + .flags = FLAG_B_PICTURES | FLAG_TIMESTAMP_NO_DELAY,
> + .default_quality = 25,
> +
> + .get_encoder_caps = &vaapi_encode_av1_get_encoder_caps,
> + .configure = &vaapi_encode_av1_configure,
> +
> + .sequence_header_type = VAEncPackedHeaderSequence,
> + .sequence_params_size = sizeof(VAEncSequenceParameterBufferAV1),
> + .init_sequence_params = &vaapi_encode_av1_init_sequence_params,
> + .write_sequence_header = &vaapi_encode_av1_write_sequence_header,
> +
> + .picture_priv_data_size = sizeof(VAAPIEncodeAV1Picture),
> + .picture_header_type = VAEncPackedHeaderPicture,
> + .picture_params_size = sizeof(VAEncPictureParameterBufferAV1),
> + .init_picture_params = &vaapi_encode_av1_init_picture_params,
> + .write_picture_header = &vaapi_encode_av1_write_picture_header,
> +
> + .slice_params_size = sizeof(VAEncTileGroupBufferAV1),
> + .init_slice_params = &vaapi_encode_av1_init_slice_params,
> +};
> +
> +static av_cold int vaapi_encode_av1_init(AVCodecContext *avctx)
> +{
> + VAAPIEncodeContext *ctx = avctx->priv_data;
> + VAAPIEncodeAV1Context *priv = avctx->priv_data;
> + VAConfigAttrib attr;
> + VAStatus vas;
> + int ret;
> +
> + ctx->codec = &vaapi_encode_type_av1;
> +
> + ctx->desired_packed_headers =
> + VA_ENC_PACKED_HEADER_SEQUENCE |
> + VA_ENC_PACKED_HEADER_PICTURE;
> +
> + if (avctx->profile == FF_PROFILE_UNKNOWN)
> + avctx->profile = priv->profile;
> + if (avctx->level == FF_LEVEL_UNKNOWN)
> + avctx->level = priv->level;
> +
> + if (avctx->level != FF_LEVEL_UNKNOWN && avctx->level & ~0x1f) {
> + av_log(avctx, AV_LOG_ERROR, "Invalid level %d\n", avctx->level);
> + return AVERROR(EINVAL);
> + }
> +
> + ret = ff_vaapi_encode_init(avctx);
> + if (ret < 0)
> + return ret;
> +
> + attr.type = VAConfigAttribEncAV1;
> + vas = vaGetConfigAttributes(ctx->hwctx->display,
> + ctx->va_profile,
> + ctx->va_entrypoint,
> + &attr, 1);
> + if (vas != VA_STATUS_SUCCESS) {
> + av_log(avctx, AV_LOG_ERROR, "Failed to query "
> + "config attribute: %d (%s).\n", vas, vaErrorStr(vas));
> + return AVERROR_EXTERNAL;
> + } else if (attr.value == VA_ATTRIB_NOT_SUPPORTED) {
> + priv->attr.value = 0;
> + av_log(avctx, AV_LOG_WARNING, "Attribute type:%d is not "
> + "supported.\n", attr.type);
> + } else {
> + priv->attr.value = attr.value;
> + }
> +
> + attr.type = VAConfigAttribEncAV1Ext1;
> + vas = vaGetConfigAttributes(ctx->hwctx->display,
> + ctx->va_profile,
> + ctx->va_entrypoint,
> + &attr, 1);
> + if (vas != VA_STATUS_SUCCESS) {
> + av_log(avctx, AV_LOG_ERROR, "Failed to query "
> + "config attribute: %d (%s).\n", vas, vaErrorStr(vas));
> + return AVERROR_EXTERNAL;
> + } else if (attr.value == VA_ATTRIB_NOT_SUPPORTED) {
> + priv->attr_ext1.value = 0;
> + av_log(avctx, AV_LOG_WARNING, "Attribute type:%d is not "
> + "supported.\n", attr.type);
> + } else {
> + priv->attr_ext1.value = attr.value;
> + }
> +
> + /** This attr provides essential indicators, return error if not support.
> */
> + attr.type = VAConfigAttribEncAV1Ext2;
> + vas = vaGetConfigAttributes(ctx->hwctx->display,
> + ctx->va_profile,
> + ctx->va_entrypoint,
> + &attr, 1);
> + if (vas != VA_STATUS_SUCCESS || attr.value == VA_ATTRIB_NOT_SUPPORTED) {
> + av_log(avctx, AV_LOG_ERROR, "Failed to query "
> + "config attribute: %d (%s).\n", vas, vaErrorStr(vas));
> + return AVERROR_EXTERNAL;
> + } else {
> + priv->attr_ext2.value = attr.value;
> + }
> +
> + ret = vaapi_encode_av1_set_tile(avctx);
> + if (ret < 0)
> + return ret;
> +
> + return 0;
> +}
> +
> +static av_cold int vaapi_encode_av1_close(AVCodecContext *avctx)
> +{
> + VAAPIEncodeAV1Context *priv = avctx->priv_data;
> +
> + ff_cbs_fragment_free(&priv->current_obu);
> + ff_cbs_close(&priv->cbc);
> +
> + return ff_vaapi_encode_close(avctx);
> +}
> +
> +#define OFFSET(x) offsetof(VAAPIEncodeAV1Context, x)
> +#define FLAGS (AV_OPT_FLAG_VIDEO_PARAM | AV_OPT_FLAG_ENCODING_PARAM)
> +
> +static const AVOption vaapi_encode_av1_options[] = {
> + VAAPI_ENCODE_COMMON_OPTIONS,
> + VAAPI_ENCODE_RC_OPTIONS,
> + { "profile", "Set profile (seq_profile)",
> + OFFSET(profile), AV_OPT_TYPE_INT,
> + { .i64 = FF_PROFILE_UNKNOWN }, FF_PROFILE_UNKNOWN, 0xff, FLAGS,
> "profile" },
> +
> +#define PROFILE(name, value) name, NULL, 0, AV_OPT_TYPE_CONST, \
> + { .i64 = value }, 0, 0, FLAGS, "profile"
> + { PROFILE("main", FF_PROFILE_AV1_MAIN) },
> + { PROFILE("high", FF_PROFILE_AV1_HIGH) },
> + { PROFILE("professional", FF_PROFILE_AV1_PROFESSIONAL) },
> +#undef PROFILE
> +
> + { "tier", "Set tier (seq_tier)",
> + OFFSET(tier), AV_OPT_TYPE_INT, { .i64 = 0 }, 0, 1, FLAGS, "tier" },
> + { "main", NULL, 0, AV_OPT_TYPE_CONST,
> + { .i64 = 0 }, 0, 0, FLAGS, "tier" },
> + { "high", NULL, 0, AV_OPT_TYPE_CONST,
> + { .i64 = 1 }, 0, 0, FLAGS, "tier" },
> + { "level", "Set level (seq_level_idx)",
> + OFFSET(level), AV_OPT_TYPE_INT,
> + { .i64 = FF_LEVEL_UNKNOWN }, FF_LEVEL_UNKNOWN, 0x1f, FLAGS, "level" },
> +
> +#define LEVEL(name, value) name, NULL, 0, AV_OPT_TYPE_CONST, \
> + { .i64 = value }, 0, 0, FLAGS, "level"
> + { LEVEL("2.0", 0) },
> + { LEVEL("2.1", 1) },
> + { LEVEL("3.0", 4) },
> + { LEVEL("3.1", 5) },
> + { LEVEL("4.0", 8) },
> + { LEVEL("4.1", 9) },
> + { LEVEL("5.0", 12) },
> + { LEVEL("5.1", 13) },
> + { LEVEL("5.2", 14) },
> + { LEVEL("5.3", 15) },
> + { LEVEL("6.0", 16) },
> + { LEVEL("6.1", 17) },
> + { LEVEL("6.2", 18) },
> + { LEVEL("6.3", 19) },
> +#undef LEVEL
> +
> + { "tiles", "Tile columns x rows (Use minimal tile column/row number
> automatically by default)",
> + OFFSET(tile_cols), AV_OPT_TYPE_IMAGE_SIZE, { .str = NULL }, 0, 0, FLAGS
> },
> + { "tile_groups", "Number of tile groups for encoding",
> + OFFSET(tile_groups), AV_OPT_TYPE_INT, { .i64 = 1 }, 1,
> AV1_MAX_TILE_ROWS * AV1_MAX_TILE_COLS, FLAGS },
> +
> + { NULL },
> +};
> +
> +static const FFCodecDefault vaapi_encode_av1_defaults[] = {
> + { "b", "0" },
> + { "bf", "2" },
> + { "g", "120" },
> + { "qmin", "1" },
> + { "qmax", "255" },
> + { NULL },
> +};
> +
> +static const AVClass vaapi_encode_av1_class = {
> + .class_name = "av1_vaapi",
> + .item_name = av_default_item_name,
> + .option = vaapi_encode_av1_options,
> + .version = LIBAVUTIL_VERSION_INT,
> +};
> +
> +const FFCodec ff_av1_vaapi_encoder = {
> + .p.name = "av1_vaapi",
> + CODEC_LONG_NAME("AV1 (VAAPI)"),
> + .p.type = AVMEDIA_TYPE_VIDEO,
> + .p.id = AV_CODEC_ID_AV1,
> + .priv_data_size = sizeof(VAAPIEncodeAV1Context),
> + .init = &vaapi_encode_av1_init,
> + FF_CODEC_RECEIVE_PACKET_CB(&ff_vaapi_encode_receive_packet),
> + .close = &vaapi_encode_av1_close,
> + .p.priv_class = &vaapi_encode_av1_class,
> + .p.capabilities = AV_CODEC_CAP_DELAY | AV_CODEC_CAP_HARDWARE |
> + AV_CODEC_CAP_DR1 |
> AV_CODEC_CAP_ENCODER_REORDERED_OPAQUE,
> + .caps_internal = FF_CODEC_CAP_NOT_INIT_THREADSAFE |
> + FF_CODEC_CAP_INIT_CLEANUP,
> + .defaults = vaapi_encode_av1_defaults,
> + .p.pix_fmts = (const enum AVPixelFormat[]) {
> + AV_PIX_FMT_VAAPI,
> + AV_PIX_FMT_NONE,
> + },
> + .hw_configs = ff_vaapi_encode_hw_configs,
> + .p.wrapper_name = "vaapi",
> +};
> diff --git a/libavcodec/version.h b/libavcodec/version.h
> index 728ab8839d..e0fe2eb7b8 100644
> --- a/libavcodec/version.h
> +++ b/libavcodec/version.h
> @@ -29,7 +29,7 @@
>
> #include "version_major.h"
>
> -#define LIBAVCODEC_VERSION_MINOR 23
> +#define LIBAVCODEC_VERSION_MINOR 24
> #define LIBAVCODEC_VERSION_MICRO 100
>
> #define LIBAVCODEC_VERSION_INT AV_VERSION_INT(LIBAVCODEC_VERSION_MAJOR, \
More information about the ffmpeg-devel
mailing list