July 2024 - ffmpeg-devel - lists.ffmpeg.org

[PATCH v14] avformat: add farbfeld muxer and demuxer
by Marcus B Spencer 02 Jul '24

02 Jul '24

farbfeld is an uncompressed image format that is a part of suckless tools (https://tools.suckless.org) Its documentation is available at https://tools.suckless.org/farbfeld. Add support for this image format in avformat. Signed-off-by: Marcus B Spencer <marcus(a)marcusspencer.xyz> --- Changelog | 1 + doc/general_contents.texi | 4 + libavformat/Makefile | 2 + libavformat/allformats.c | 2 + libavformat/farbfelddec.c | 207 ++++++++++++++++++++++++++++++++++++++ libavformat/farbfeldenc.c | 153 ++++++++++++++++++++++++++++ libavformat/version.h | 2 +- 7 files changed, 370 insertions(+), 1 deletion(-) create mode 100644 libavformat/farbfelddec.c create mode 100644 libavformat/farbfeldenc.c diff --git a/Changelog b/Changelog index 2d3bd43336..2b382bbfbf 100644 --- a/Changelog +++ b/Changelog @@ -16,6 +16,7 @@ version <next>: - VVC encoding support via libvvenc - perlin video source - D3D12VA HEVC encoder +- farbfeld muxer and demuxer version 7.0: - DXV DXT1 encoder diff --git a/doc/general_contents.texi b/doc/general_contents.texi index e7cf4f8239..bbc49d3665 100644 --- a/doc/general_contents.texi +++ b/doc/general_contents.texi @@ -489,6 +489,8 @@ library: @item Electronic Arts Multimedia @tab @tab X @tab Used in various EA games; files have extensions like WVE and UV2. @item Ensoniq Paris Audio File @tab @tab X +@item FF @tab X @tab X + @tab farbfeld uncompressed image @item FFM (FFserver live feed) @tab X @tab X @item Flash (SWF) @tab X @tab X @item Flash 9 (AVM2) @tab X @tab X @@ -786,6 +788,8 @@ following image formats are supported: @tab Digital Picture Exchange @item EXR @tab @tab X @tab OpenEXR +@item FF @tab X @tab X + @tab farbfeld uncompressed image @item FITS @tab X @tab X @tab Flexible Image Transport System @item HDR @tab X @tab X diff --git a/libavformat/Makefile b/libavformat/Makefile index 7ca68a7036..ab8f8216ff 100644 --- a/libavformat/Makefile +++ b/libavformat/Makefile @@ -204,6 +204,8 @@ OBJS-$(CONFIG_EA_DEMUXER) += electronicarts.o OBJS-$(CONFIG_EAC3_DEMUXER) += ac3dec.o rawdec.o OBJS-$(CONFIG_EAC3_MUXER) += rawenc.o OBJS-$(CONFIG_EPAF_DEMUXER) += epafdec.o pcm.o +OBJS-$(CONFIG_FARBFELD_DEMUXER) += farbfelddec.o +OBJS-$(CONFIG_FARBFELD_MUXER) += farbfeldenc.o OBJS-$(CONFIG_FFMETADATA_DEMUXER) += ffmetadec.o OBJS-$(CONFIG_FFMETADATA_MUXER) += ffmetaenc.o OBJS-$(CONFIG_FIFO_MUXER) += fifo.o diff --git a/libavformat/allformats.c b/libavformat/allformats.c index 305fa46532..2cfbf1a648 100644 --- a/libavformat/allformats.c +++ b/libavformat/allformats.c @@ -162,6 +162,8 @@ extern const FFInputFormat ff_epaf_demuxer; extern const FFInputFormat ff_evc_demuxer; extern const FFOutputFormat ff_evc_muxer; extern const FFOutputFormat ff_f4v_muxer; +extern const FFInputFormat ff_farbfeld_demuxer; +extern const FFOutputFormat ff_farbfeld_muxer; extern const FFInputFormat ff_ffmetadata_demuxer; extern const FFOutputFormat ff_ffmetadata_muxer; extern const FFOutputFormat ff_fifo_muxer; diff --git a/libavformat/farbfelddec.c b/libavformat/farbfelddec.c new file mode 100644 index 0000000000..454f063ac1 --- /dev/null +++ b/libavformat/farbfelddec.c @@ -0,0 +1,207 @@ +/* + * Image format + * + * Copyright (c) 2000, 2001, 2002 Fabrice Bellard + * Copyright (c) 2004 Michael Niedermayer + * Copyright (c) 2024 Marcus B Spencer + * + * 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 "avformat.h" +#include "avio.h" +#include "demux.h" +#include "internal.h" +#include "libavutil/opt.h" +#include "utils.h" + +typedef struct FarbfeldDemuxContext { + const AVClass *class; + int start_number, start_number_range, img_first, img_number, img_last; + AVRational framerate; + int loop; +} FarbfeldDemuxContext; + + +/** + * Get index range of image files matched by path. + * + * @param pfirst_index pointer to index updated with the first number in the range + * @param plast_index pointer to index updated with the last number in the range + * @param path path which has to be matched by the image files in the range + * @param start_index minimum accepted value for the first index in the range + * @return -1 if no image file could be found + */ +static int find_image_range(int *pfirst_index, int *plast_index, + const char *path, int start_index, int start_index_range) +{ + char buf[1024]; + int range, last_index, range1, first_index; + + /* find the first image */ + for (first_index = start_index; first_index < start_index + start_index_range; first_index++) { + if (av_get_frame_filename(buf, sizeof(buf), path, first_index) < 0) { + *pfirst_index = + *plast_index = 1; + if (avio_check(buf, AVIO_FLAG_READ) > 0) + return 0; + return -1; + } + if (avio_check(buf, AVIO_FLAG_READ) > 0) + break; + } + if (first_index == start_index + start_index_range) + goto fail; + + /* find the last image */ + last_index = first_index; + for (;;) { + range = 0; + for (;;) { + if (!range) + range1 = 1; + else + range1 = 2 * range; + if (av_get_frame_filename(buf, sizeof(buf), path, + last_index + range1) < 0) + goto fail; + if (avio_check(buf, AVIO_FLAG_READ) <= 0) + break; + range = range1; + /* just in case... */ + if (range >= (1 << 30)) + goto fail; + } + /* we are sure than image last_index + range exists */ + if (!range) + break; + last_index += range; + } + *pfirst_index = first_index; + *plast_index = last_index; + return 0; + + fail: + return -1; +} + +static int farbfeld_init(AVFormatContext *ctx) +{ + FarbfeldDemuxContext *priv = ctx->priv_data; + + ctx->ctx_flags |= AVFMTCTX_NOHEADER; + + if (find_image_range(&priv->img_first, &priv->img_last, ctx->url, + priv->start_number, priv->start_number_range) < 0) { + av_log(ctx, AV_LOG_ERROR, + "Could find no file with path '%s' and index in the range %d-%d\n", + ctx->url, priv->start_number, priv->start_number + + priv->start_number_range - 1); + return AVERROR(ENOENT); + } + + priv->img_number = priv->img_first; + + return 0; +} + +static int farbfeld_read_packet(AVFormatContext *ctx, AVPacket *pkt) +{ + FarbfeldDemuxContext *priv = ctx->priv_data; + unsigned char magic[8]; + char filename[1024]; + AVIOContext *pb; + AVStream *st; + int ret; + + if (priv->loop && priv->img_number > priv->img_last) + priv->img_number = priv->img_first; + else if (priv->img_number > priv->img_last) + return AVERROR_EOF; + + if (av_get_frame_filename2(filename, sizeof filename, ctx->url, + priv->img_number, + AV_FRAME_FILENAME_FLAGS_MULTIPLE) < 0 + && priv->img_number > 1) + return AVERROR(EIO); + + if ((ret = ctx->io_open(ctx, &pb, filename, AVIO_FLAG_READ, NULL)) < 0) { + av_log(ctx, AV_LOG_ERROR, "Could not open file : %s\n", filename); + return ret; + } + + if ((ret = avio_read(pb, magic, 8)) < 0) { + ff_format_io_close(ctx, &pb); + return ret; + } + + if (memcmp(magic, "farbfeld", 8)) { + ff_format_io_close(ctx, &pb); + return AVERROR_INVALIDDATA; + } + + if (!(st = avformat_new_stream(ctx, NULL))) { + ff_format_io_close(ctx, &pb); + return AVERROR(ENOMEM); + } + + st->codecpar->codec_type = AVMEDIA_TYPE_VIDEO; + st->codecpar->codec_id = AV_CODEC_ID_RAWVIDEO; + st->codecpar->format = AV_PIX_FMT_RGBA64BE; + + st->codecpar->width = avio_rb32(pb); + st->codecpar->height = avio_rb32(pb); + st->codecpar->framerate = + st->avg_frame_rate = + st->r_frame_rate = priv->framerate; + + if ((ret = av_get_packet(pb, pkt, avio_size(pb) - 16)) < 0) + return ret; + + priv->img_number++; + + return ff_format_io_close(ctx, &pb); +} + +#define OFFSET(x) offsetof(FarbfeldDemuxContext, x) +#define DEC AV_OPT_FLAG_DECODING_PARAM + +static const AVOption demuxoptions[] = { + { "framerate", "set the video framerate", OFFSET(framerate), AV_OPT_TYPE_VIDEO_RATE,{.str = "25"}, 0, INT_MAX, DEC }, + { "loop", "force loop over input file sequence", OFFSET(loop), AV_OPT_TYPE_BOOL, {.i64 = 0 }, 0, 1, DEC }, + { "start_number", "set first number in the sequence", OFFSET(start_number), AV_OPT_TYPE_INT, {.i64 = 0}, INT_MIN, INT_MAX, DEC }, + { "start_number_range", "set range for looking at the first sequence number", OFFSET(start_number_range), AV_OPT_TYPE_INT, {.i64 = 5}, 1, INT_MAX, DEC }, + { NULL }, +}; + +static const AVClass farbfeld_demux_class = { + .class_name = "FarbfeldDemuxContext", + .item_name = av_default_item_name, + .option = demuxoptions, + .version = LIBAVUTIL_VERSION_INT, +}; + +const FFInputFormat ff_farbfeld_demuxer = { + .p.name = "farbfeld", + .p.long_name = NULL_IF_CONFIG_SMALL("farbfeld uncompressed image"), + .p.extensions = "ff", + .p.flags = AVFMT_NOTIMESTAMPS | AVFMT_NOFILE, + .p.priv_class = &farbfeld_demux_class, + .priv_data_size = sizeof(FarbfeldDemuxContext), + .read_header = farbfeld_init, + .read_packet = farbfeld_read_packet, +}; diff --git a/libavformat/farbfeldenc.c b/libavformat/farbfeldenc.c new file mode 100644 index 0000000000..6d3c004400 --- /dev/null +++ b/libavformat/farbfeldenc.c @@ -0,0 +1,153 @@ +/* + * misc image utilities + * YUV4MPEG muxer + * Image format + * + * Modified by Marcus B Spencer to suit the farbfeld muxer on 30 June 2024 + * + * Copyright (c) 2001, 2002, 2003 Fabrice Bellard + * Copyright (c) 2000, 2001, 2002 Fabrice Bellard + * Copyright (c) 2004 Michael Niedermayer + * Copyright (c) 2024 Marcus B Spencer + * + * 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 "avformat.h" +#include "internal.h" +#include "libavutil/avstring.h" +#include "libavutil/frame.h" +#include "libavutil/imgutils.h" +#include "libavutil/opt.h" +#include "libavutil/mem.h" +#include "mux.h" + +#define PLANE_COUNT 4 // required by av_image_copy_to_buffer + +typedef struct FarbfeldMuxContext { + const AVClass *class; + int start_number, img_number; + int update; +} FarbfeldMuxContext; + +static int farbfeld_init(AVFormatContext *ctx) +{ + FarbfeldMuxContext *priv = ctx->priv_data; + + if (ctx->streams[0]->codecpar->codec_id != AV_CODEC_ID_WRAPPED_AVFRAME && + ctx->streams[0]->codecpar->codec_id != AV_CODEC_ID_RAWVIDEO) { + av_log(ctx, AV_LOG_ERROR, "Codec not supported.\n"); + return AVERROR_INVALIDDATA; + } + + if (ctx->streams[0]->codecpar->format != AV_PIX_FMT_RGBA64BE) { + av_log(ctx, AV_LOG_ERROR, + "farbfeld only supports the rgba64be pixel format. " + "Add '-pix_fmt rgba64be' to your output options to resolve " + "this error.\n" + ); + return AVERROR_INVALIDDATA; + } + + priv->img_number = priv->start_number; + + return 0; +} + +static int farbfeld_write_packet(AVFormatContext *ctx, AVPacket *pkt) +{ + AVStream *st = ctx->streams[pkt->stream_index]; + int width = st->codecpar->width, height = st->codecpar->height; + FarbfeldMuxContext *priv = ctx->priv_data; + char filename[1024]; + const uint8_t *src; + const AVFrame *p; + AVIOContext *pb; + int ret; + + if (priv->update) + av_strlcpy(filename, ctx->url, sizeof filename); + else if (av_get_frame_filename2(filename, sizeof filename, ctx->url, + priv->img_number, AV_FRAME_FILENAME_FLAGS_MULTIPLE) < 0) { + if (priv->img_number == priv->start_number) { + av_log(ctx, AV_LOG_WARNING, "The specified filename '%s' does not contain an image sequence pattern or a pattern is invalid.\n", ctx->url); + av_log(ctx, AV_LOG_WARNING, "Use a pattern such as %%03d for an image sequence.\n"); + av_strlcpy(filename, ctx->url, sizeof filename); + } else { + av_log(ctx, AV_LOG_ERROR, "Cannot write more than one file with the same name.\n"); + return AVERROR(EINVAL); + } + } + + if ((ret = ctx->io_open(ctx, &pb, filename, AVIO_FLAG_WRITE, NULL)) < 0) { + av_log(ctx, AV_LOG_ERROR, "Could not open file : %s\n", filename); + return ret; + } + + avio_write(pb, "farbfeld", 8); + + avio_wb32(pb, width); + avio_wb32(pb, height); + + if (st->codecpar->codec_id == AV_CODEC_ID_RAWVIDEO) + avio_write(pb, pkt->data, pkt->size); + else { + p = (const AVFrame *)pkt->data; + src = p->data[0]; + + for (int i = 0; i < height; i++) { + avio_write(pb, src, width * 8); // 8 bytes per pixel + src += p->linesize[0]; + } + } + + priv->img_number++; + + avio_flush(pb); + + return ff_format_io_close(ctx, &pb); +} + +#define OFFSET(x) offsetof(FarbfeldMuxContext, x) +#define ENC AV_OPT_FLAG_ENCODING_PARAM +static const AVOption muxoptions[] = { + { "update", "continuously overwrite one file", OFFSET(update), AV_OPT_TYPE_BOOL,{ .i64 = 0 }, 0, 1, ENC }, + { "start_number", "set first number in the sequence", OFFSET(start_number), AV_OPT_TYPE_INT, { .i64 = 1 }, 0, INT_MAX, ENC }, + { NULL }, +}; + +static const AVClass farbfeld_mux_class = { + .class_name = "FarbfeldMuxContext", + .item_name = av_default_item_name, + .option = muxoptions, + .version = LIBAVUTIL_VERSION_INT, +}; + +const FFOutputFormat ff_farbfeld_muxer = { + .p.name = "farbfeld", + .p.long_name = NULL_IF_CONFIG_SMALL("farbfeld uncompressed image"), + .p.extensions = "ff", + .p.audio_codec = AV_CODEC_ID_NONE, + .p.video_codec = AV_CODEC_ID_WRAPPED_AVFRAME, + .p.subtitle_codec = AV_CODEC_ID_NONE, + .p.flags = AVFMT_NOTIMESTAMPS | AVFMT_NOFILE, + .p.priv_class = &farbfeld_mux_class, + .priv_data_size = sizeof(FarbfeldMuxContext), + .init = farbfeld_init, + .write_packet = farbfeld_write_packet, + .flags_internal = FF_OFMT_FLAG_MAX_ONE_OF_EACH, +}; diff --git a/libavformat/version.h b/libavformat/version.h index af7d0a1024..e2634b85ae 100644 --- a/libavformat/version.h +++ b/libavformat/version.h @@ -31,7 +31,7 @@ #include "version_major.h" -#define LIBAVFORMAT_VERSION_MINOR 4 +#define LIBAVFORMAT_VERSION_MINOR 5 #define LIBAVFORMAT_VERSION_MICRO 100 #define LIBAVFORMAT_VERSION_INT AV_VERSION_INT(LIBAVFORMAT_VERSION_MAJOR, \ -- 2.45.2

1 0

[PATCH 1/4] avfilter/avf_showcwt: Check av_parse_video_rate() for failure
by Michael Niedermayer 02 Jul '24

02 Jul '24

Fixes: CID1539147 Unused value Sponsored-by: Sovereign Tech Fund Signed-off-by: Michael Niedermayer <michael(a)niedermayer.cc> --- libavfilter/avf_showcwt.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/libavfilter/avf_showcwt.c b/libavfilter/avf_showcwt.c index 24d16d9075d..89a019a0d41 100644 --- a/libavfilter/avf_showcwt.c +++ b/libavfilter/avf_showcwt.c @@ -1028,6 +1028,8 @@ static int config_output(AVFilterLink *outlink) s->auto_frame_rate = av_make_q(inlink->sample_rate, s->hop_size); if (strcmp(s->rate_str, "auto")) { ret = av_parse_video_rate(&s->frame_rate, s->rate_str); + if (ret < 0) + return ret; } else { s->frame_rate = s->auto_frame_rate; } -- 2.45.2

2 6

[PATCH 1/5] avformat/mov: Check requested_sample before using it
by Michael Niedermayer 02 Jul '24

02 Jul '24

I am not sure the case described by coverity is possible but its more robust checking the argument first Fixes: CID1598441 Improper use of negative value Sponsored-by: Sovereign Tech Fund Signed-off-by: Michael Niedermayer <michael(a)niedermayer.cc> --- libavformat/mov.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libavformat/mov.c b/libavformat/mov.c index 9016cd5ad08..f571b0468ee 100644 --- a/libavformat/mov.c +++ b/libavformat/mov.c @@ -10161,7 +10161,7 @@ static int mov_seek_stream(AVFormatContext *s, AVStream *st, int64_t timestamp, // If we've reached a different sample trying to find a good pts to // seek to, give up searching because we'll end up seeking back to // sample 0 on every seek. - if (!can_seek_to_key_sample(st, requested_sample, next_ts) && sample != requested_sample) + if (sample != requested_sample && !can_seek_to_key_sample(st, requested_sample, next_ts)) break; timestamp = next_ts; -- 2.45.2

2 9

[PATCH v12 01/15] avcodec/vaapi_encode: introduce a base layer for vaapi encode
by tong1.wu＠intel.com 02 Jul '24

02 Jul '24

From: Tong Wu <tong1.wu(a)intel.com> Since VAAPI and future D3D12VA implementation may share some common parameters, a base layer encode context is introduced as vaapi context's base. Signed-off-by: Tong Wu <tong1.wu(a)intel.com> --- libavcodec/hw_base_encode.h | 56 +++++++++++++++++++++++++++++++++++++ libavcodec/vaapi_encode.h | 39 +++++--------------------- 2 files changed, 63 insertions(+), 32 deletions(-) create mode 100644 libavcodec/hw_base_encode.h diff --git a/libavcodec/hw_base_encode.h b/libavcodec/hw_base_encode.h new file mode 100644 index 0000000000..ffcb6bcbb2 --- /dev/null +++ b/libavcodec/hw_base_encode.h @@ -0,0 +1,56 @@ +/* + * 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_HW_BASE_ENCODE_H +#define AVCODEC_HW_BASE_ENCODE_H + +#define MAX_DPB_SIZE 16 +#define MAX_PICTURE_REFERENCES 2 +#define MAX_REORDER_DELAY 16 +#define MAX_ASYNC_DEPTH 64 +#define MAX_REFERENCE_LIST_NUM 2 + +enum { + PICTURE_TYPE_IDR = 0, + PICTURE_TYPE_I = 1, + PICTURE_TYPE_P = 2, + PICTURE_TYPE_B = 3, +}; + +enum { + // Codec supports controlling the subdivision of pictures into slices. + FLAG_SLICE_CONTROL = 1 << 0, + // Codec only supports constant quality (no rate control). + FLAG_CONSTANT_QUALITY_ONLY = 1 << 1, + // Codec is intra-only. + FLAG_INTRA_ONLY = 1 << 2, + // Codec supports B-pictures. + FLAG_B_PICTURES = 1 << 3, + // Codec supports referencing B-pictures. + FLAG_B_PICTURE_REFERENCES = 1 << 4, + // Codec supports non-IDR key pictures (that is, key pictures do + // not necessarily empty the DPB). + FLAG_NON_IDR_KEY_PICTURES = 1 << 5, +}; + +typedef struct FFHWBaseEncodeContext { + const AVClass *class; +} FFHWBaseEncodeContext; + +#endif /* AVCODEC_HW_BASE_ENCODE_H */ + diff --git a/libavcodec/vaapi_encode.h b/libavcodec/vaapi_encode.h index 0eed9691ca..cae7af8725 100644 --- a/libavcodec/vaapi_encode.h +++ b/libavcodec/vaapi_encode.h @@ -33,34 +33,27 @@ #include "avcodec.h" #include "hwconfig.h" +#include "hw_base_encode.h" struct VAAPIEncodeType; struct VAAPIEncodePicture; +// Codec output packet without timestamp delay, which means the +// output packet has same PTS and DTS. +#define FLAG_TIMESTAMP_NO_DELAY 1 << 6 + enum { MAX_CONFIG_ATTRIBUTES = 4, MAX_GLOBAL_PARAMS = 4, - MAX_DPB_SIZE = 16, - MAX_PICTURE_REFERENCES = 2, - MAX_REORDER_DELAY = 16, MAX_PARAM_BUFFER_SIZE = 1024, // A.4.1: table A.6 allows at most 22 tile rows for any level. MAX_TILE_ROWS = 22, // A.4.1: table A.6 allows at most 20 tile columns for any level. MAX_TILE_COLS = 20, - MAX_ASYNC_DEPTH = 64, - MAX_REFERENCE_LIST_NUM = 2, }; extern const AVCodecHWConfigInternal *const ff_vaapi_encode_hw_configs[]; -enum { - PICTURE_TYPE_IDR = 0, - PICTURE_TYPE_I = 1, - PICTURE_TYPE_P = 2, - PICTURE_TYPE_B = 3, -}; - typedef struct VAAPIEncodeSlice { int index; int row_start; @@ -193,7 +186,8 @@ typedef struct VAAPIEncodeRCMode { } VAAPIEncodeRCMode; typedef struct VAAPIEncodeContext { - const AVClass *class; + // Base context. + FFHWBaseEncodeContext base; // Codec-specific hooks. const struct VAAPIEncodeType *codec; @@ -397,25 +391,6 @@ typedef struct VAAPIEncodeContext { AVPacket *tail_pkt; } VAAPIEncodeContext; -enum { - // Codec supports controlling the subdivision of pictures into slices. - FLAG_SLICE_CONTROL = 1 << 0, - // Codec only supports constant quality (no rate control). - FLAG_CONSTANT_QUALITY_ONLY = 1 << 1, - // Codec is intra-only. - FLAG_INTRA_ONLY = 1 << 2, - // Codec supports B-pictures. - FLAG_B_PICTURES = 1 << 3, - // Codec supports referencing B-pictures. - FLAG_B_PICTURE_REFERENCES = 1 << 4, - // 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 { // List of supported profiles and corresponding VAAPI profiles. // (Must end with AV_PROFILE_UNKNOWN.) -- 2.41.0.windows.1

4 19

[PATCH v2] avformat/img2dec: assert no pipe on ts_from_file
by Michael Niedermayer 02 Jul '24

02 Jul '24

Help coverity with CID1500302 Uninitialized scalar variable Sponsored-by: Sovereign Tech Fund Signed-off-by: Michael Niedermayer <michael(a)niedermayer.cc> --- libavformat/img2dec.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/libavformat/img2dec.c b/libavformat/img2dec.c index ba523530745..20b1bc31f6a 100644 --- a/libavformat/img2dec.c +++ b/libavformat/img2dec.c @@ -25,6 +25,7 @@ #define _DEFAULT_SOURCE #define _BSD_SOURCE #include <sys/stat.h> +#include "libavutil/avassert.h" #include "libavutil/avstring.h" #include "libavutil/log.h" #include "libavutil/mem.h" @@ -504,6 +505,7 @@ int ff_img_read_packet(AVFormatContext *s1, AVPacket *pkt) pkt->flags |= AV_PKT_FLAG_KEY; if (s->ts_from_file) { struct stat img_stat; + av_assert0(!s->is_pipe); // The ts_from_file option is not supported by piped input demuxers if (stat(filename, &img_stat)) { res = AVERROR(EIO); goto fail; -- 2.45.2

1 1

[PATCH 1/7] avcodec/av1dec: bit_depth cannot be another values than 8, 10, 12
by Michael Niedermayer 02 Jul '24

02 Jul '24

Fixes: CID1544265 Logically dead code Sponsored-by: Sovereign Tech Fund Signed-off-by: Michael Niedermayer <michael(a)niedermayer.cc> --- libavcodec/av1dec.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/libavcodec/av1dec.c b/libavcodec/av1dec.c index 79a30a114da..4f9222cca27 100644 --- a/libavcodec/av1dec.c +++ b/libavcodec/av1dec.c @@ -493,7 +493,7 @@ static enum AVPixelFormat get_sw_pixel_format(void *logctx, else if (bit_depth == 12) pix_fmt = AV_PIX_FMT_YUV444P12; else - av_log(logctx, AV_LOG_WARNING, "Unknown AV1 pixel format.\n"); + av_assert0(0); } else if (seq->color_config.subsampling_x == 1 && seq->color_config.subsampling_y == 0) { if (bit_depth == 8) @@ -503,7 +503,7 @@ static enum AVPixelFormat get_sw_pixel_format(void *logctx, else if (bit_depth == 12) pix_fmt = AV_PIX_FMT_YUV422P12; else - av_log(logctx, AV_LOG_WARNING, "Unknown AV1 pixel format.\n"); + av_assert0(0); } else if (seq->color_config.subsampling_x == 1 && seq->color_config.subsampling_y == 1) { if (bit_depth == 8) @@ -513,7 +513,7 @@ static enum AVPixelFormat get_sw_pixel_format(void *logctx, else if (bit_depth == 12) pix_fmt = AV_PIX_FMT_YUV420P12; else - av_log(logctx, AV_LOG_WARNING, "Unknown AV1 pixel format.\n"); + av_assert0(0); } } else { if (bit_depth == 8) @@ -523,7 +523,7 @@ static enum AVPixelFormat get_sw_pixel_format(void *logctx, else if (bit_depth == 12) pix_fmt = AV_PIX_FMT_GRAY12; else - av_log(logctx, AV_LOG_WARNING, "Unknown AV1 pixel format.\n"); + av_assert0(0); } return pix_fmt; -- 2.43.2

4 23

[PATCH 01/10] fftools/ffmpeg_enc: simplify opaque_ref check
by Michael Niedermayer 02 Jul '24

02 Jul '24

Found-while-revieweing: CID1520670 Dereference after null check Sponsored-by: Sovereign Tech Fund Signed-off-by: Michael Niedermayer <michael(a)niedermayer.cc> --- fftools/ffmpeg_enc.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/fftools/ffmpeg_enc.c b/fftools/ffmpeg_enc.c index 618ba193ff5..863d1a43edd 100644 --- a/fftools/ffmpeg_enc.c +++ b/fftools/ffmpeg_enc.c @@ -476,7 +476,7 @@ void enc_stats_write(OutputStream *ost, EncStats *es, const FrameData *fd; - if ((frame && frame->opaque_ref) || (pkt && pkt->opaque_ref)) { + if (frame ? frame->opaque_ref : pkt->opaque_ref) { fd = (const FrameData*)(frame ? frame->opaque_ref->data : pkt->opaque_ref->data); tbi = fd->dec.tb; ptsi = fd->dec.pts; -- 2.43.2

1 13

[PATCH] swresample/swresample: Rectify invalid function in the documentation
by marszuo＠foxmail.com 02 Jul '24

02 Jul '24

From: Mars Zuo <marszuo(a)foxmail.com> The function av_opt_set_channel_layout has been removed since version 7.0, and the replacement is av_opt_set_chlayout. The documentation needs to be updated accordingly. --- libswresample/swresample.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/libswresample/swresample.h b/libswresample/swresample.h index 217e5461bf..0e1929b3ed 100644 --- a/libswresample/swresample.h +++ b/libswresample/swresample.h @@ -49,8 +49,8 @@ * matrix). This is using the swr_alloc() function. * @code * SwrContext *swr = swr_alloc(); - * av_opt_set_channel_layout(swr, "in_channel_layout", AV_CH_LAYOUT_5POINT1, 0); - * av_opt_set_channel_layout(swr, "out_channel_layout", AV_CH_LAYOUT_STEREO, 0); + * av_opt_set_chlayout(swr, "in_chlayout", &(AVChannelLayout)AV_CHANNEL_LAYOUT_5POINT1, 0); + * av_opt_set_chlayout(swr, "out_chlayout", &(AVChannelLayout)AV_CHANNEL_LAYOUT_STEREO, 0); * av_opt_set_int(swr, "in_sample_rate", 48000, 0); * av_opt_set_int(swr, "out_sample_rate", 44100, 0); * av_opt_set_sample_fmt(swr, "in_sample_fmt", AV_SAMPLE_FMT_FLTP, 0); -- 2.39.3 (Apple Git-146)

2 1

[PATCH] avcodec/avformat: Added codec_name to AVCodecContext and AVCodecParameters
by Bernardo Pilarz 02 Jul '24

02 Jul '24

Added the codec_name field, in which the unprocessed, not-interpreted codec name is stored. This is useful when codecs that are not handled by the libav (i.e. AV_CODEC_ID_NONE) are encountered, since the application might still want to handle them. Having this field allows the application to determine the codec type. As of this commit, the codec_name field is only filled when opening an RTSP stream, during the parsing of the SDP. Signed-off-by: bpilarz <bernardo.pilarz(a)aitek.it> --- libavcodec/avcodec.h | 10 ++++++++++ libavcodec/codec_par.c | 19 +++++++++++++++++++ libavcodec/codec_par.h | 10 ++++++++++ libavcodec/options.c | 1 + libavformat/rtsp.c | 5 +++++ 5 files changed, 45 insertions(+) diff --git a/libavcodec/avcodec.h b/libavcodec/avcodec.h index 2da63c87ea..464b4078fc 100644 --- a/libavcodec/avcodec.h +++ b/libavcodec/avcodec.h @@ -451,6 +451,16 @@ typedef struct AVCodecContext { int log_level_offset; enum AVMediaType codec_type; /* see AVMEDIA_TYPE_xxx */ + /** + * Generic codec name of the encoded data. + * + * Null-terminated string, can be NULL. + * Contents may vary depending on the source of the data stream. + * This is typically the string that's interpreted to determine 'codec_id'. + * Must be allocated with av_malloc() or av_strdup() and will be freed by + * avcodec_free_context(). + */ + char *codec_name; const struct AVCodec *codec; enum AVCodecID codec_id; /* see AV_CODEC_ID_xxx */ diff --git a/libavcodec/codec_par.c b/libavcodec/codec_par.c index 790ea01d10..27d9880b53 100644 --- a/libavcodec/codec_par.c +++ b/libavcodec/codec_par.c @@ -31,6 +31,7 @@ static void codec_parameters_reset(AVCodecParameters *par) { + av_freep(&par->codec_name); av_freep(&par->extradata); av_channel_layout_uninit(&par->ch_layout); av_packet_side_data_free(&par->coded_side_data, &par->nb_coded_side_data); @@ -110,6 +111,13 @@ int avcodec_parameters_copy(AVCodecParameters *dst, const AVCodecParameters *src codec_parameters_reset(dst); memcpy(dst, src, sizeof(*dst)); + dst->codec_name = NULL; + if (src->codec_name) { + dst->codec_name = av_strdup(src->codec_name); + if (!dst->codec_name) + return AVERROR(ENOMEM); + } + dst->ch_layout = (AVChannelLayout){0}; dst->extradata = NULL; dst->extradata_size = 0; @@ -142,6 +150,11 @@ int avcodec_parameters_from_context(AVCodecParameters *par, codec_parameters_reset(par); par->codec_type = codec->codec_type; + if (codec->codec_name) { + par->codec_name = av_strdup(codec->codec_name); + if (!par->codec_name) + return AVERROR(ENOMEM); + } par->codec_id = codec->codec_id; par->codec_tag = codec->codec_tag; @@ -206,6 +219,12 @@ int avcodec_parameters_to_context(AVCodecContext *codec, int ret; codec->codec_type = par->codec_type; + av_freep(&codec->codec_name); + if (par->codec_name) { + codec->codec_name = av_strdup(par->codec_name); + if (!codec->codec_name) + return AVERROR(ENOMEM); + } codec->codec_id = par->codec_id; codec->codec_tag = par->codec_tag; diff --git a/libavcodec/codec_par.h b/libavcodec/codec_par.h index f4b9bb5c06..196ef1fc66 100644 --- a/libavcodec/codec_par.h +++ b/libavcodec/codec_par.h @@ -49,6 +49,16 @@ typedef struct AVCodecParameters { * General type of the encoded data. */ enum AVMediaType codec_type; + /** + * Generic codec name of the encoded data. + * + * Null-terminated string, can be NULL. + * Contents may vary depending on the source of the data stream. + * This is typically the string that's interpreted to determine 'codec_id'. + * Must be allocated with av_malloc() or av_strdup() and will be freed by + * avcodec_parameters_free(). + */ + char *codec_name; /** * Specific type of the encoded data (the codec used). */ diff --git a/libavcodec/options.c b/libavcodec/options.c index f60c41bdc3..c107f4efbd 100644 --- a/libavcodec/options.c +++ b/libavcodec/options.c @@ -170,6 +170,7 @@ void avcodec_free_context(AVCodecContext **pavctx) ff_codec_close(avctx); + av_freep(&avctx->codec_name); av_freep(&avctx->extradata); av_freep(&avctx->subtitle_header); av_freep(&avctx->intra_matrix); diff --git a/libavformat/rtsp.c b/libavformat/rtsp.c index db78735c7a..56363caeda 100644 --- a/libavformat/rtsp.c +++ b/libavformat/rtsp.c @@ -317,6 +317,11 @@ static int sdp_parse_rtpmap(AVFormatContext *s, par->codec_id = ff_rtp_codec_id(buf, par->codec_type); } + /* Copy the codec name, regardless of whether we can handle it. + * Applications might handle unknown codecs on their own. */ + av_freep(&par->codec_name); + par->codec_name = av_strdup(buf); + desc = avcodec_descriptor_get(par->codec_id); if (desc && desc->name) c_name = desc->name; -- 2.43.0 -- This message has been scanned for viruses and dangerous content by MailScanner, and is believed to be clean.

1 0

[PATCH v13 01/15] avcodec/vaapi_encode: introduce a base layer for vaapi encode
by tong1.wu＠intel.com 02 Jul '24

02 Jul '24

From: Tong Wu <tong1.wu(a)intel.com> Since VAAPI and future D3D12VA implementation may share some common parameters, a base layer encode context is introduced as vaapi context's base. Signed-off-by: Tong Wu <tong1.wu(a)intel.com> --- libavcodec/hw_base_encode.h | 56 +++++++++++++++++++++++++++++++++++++ libavcodec/vaapi_encode.h | 39 +++++--------------------- 2 files changed, 63 insertions(+), 32 deletions(-) create mode 100644 libavcodec/hw_base_encode.h diff --git a/libavcodec/hw_base_encode.h b/libavcodec/hw_base_encode.h new file mode 100644 index 0000000000..ffcb6bcbb2 --- /dev/null +++ b/libavcodec/hw_base_encode.h @@ -0,0 +1,56 @@ +/* + * 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_HW_BASE_ENCODE_H +#define AVCODEC_HW_BASE_ENCODE_H + +#define MAX_DPB_SIZE 16 +#define MAX_PICTURE_REFERENCES 2 +#define MAX_REORDER_DELAY 16 +#define MAX_ASYNC_DEPTH 64 +#define MAX_REFERENCE_LIST_NUM 2 + +enum { + PICTURE_TYPE_IDR = 0, + PICTURE_TYPE_I = 1, + PICTURE_TYPE_P = 2, + PICTURE_TYPE_B = 3, +}; + +enum { + // Codec supports controlling the subdivision of pictures into slices. + FLAG_SLICE_CONTROL = 1 << 0, + // Codec only supports constant quality (no rate control). + FLAG_CONSTANT_QUALITY_ONLY = 1 << 1, + // Codec is intra-only. + FLAG_INTRA_ONLY = 1 << 2, + // Codec supports B-pictures. + FLAG_B_PICTURES = 1 << 3, + // Codec supports referencing B-pictures. + FLAG_B_PICTURE_REFERENCES = 1 << 4, + // Codec supports non-IDR key pictures (that is, key pictures do + // not necessarily empty the DPB). + FLAG_NON_IDR_KEY_PICTURES = 1 << 5, +}; + +typedef struct FFHWBaseEncodeContext { + const AVClass *class; +} FFHWBaseEncodeContext; + +#endif /* AVCODEC_HW_BASE_ENCODE_H */ + diff --git a/libavcodec/vaapi_encode.h b/libavcodec/vaapi_encode.h index 0eed9691ca..cae7af8725 100644 --- a/libavcodec/vaapi_encode.h +++ b/libavcodec/vaapi_encode.h @@ -33,34 +33,27 @@ #include "avcodec.h" #include "hwconfig.h" +#include "hw_base_encode.h" struct VAAPIEncodeType; struct VAAPIEncodePicture; +// Codec output packet without timestamp delay, which means the +// output packet has same PTS and DTS. +#define FLAG_TIMESTAMP_NO_DELAY 1 << 6 + enum { MAX_CONFIG_ATTRIBUTES = 4, MAX_GLOBAL_PARAMS = 4, - MAX_DPB_SIZE = 16, - MAX_PICTURE_REFERENCES = 2, - MAX_REORDER_DELAY = 16, MAX_PARAM_BUFFER_SIZE = 1024, // A.4.1: table A.6 allows at most 22 tile rows for any level. MAX_TILE_ROWS = 22, // A.4.1: table A.6 allows at most 20 tile columns for any level. MAX_TILE_COLS = 20, - MAX_ASYNC_DEPTH = 64, - MAX_REFERENCE_LIST_NUM = 2, }; extern const AVCodecHWConfigInternal *const ff_vaapi_encode_hw_configs[]; -enum { - PICTURE_TYPE_IDR = 0, - PICTURE_TYPE_I = 1, - PICTURE_TYPE_P = 2, - PICTURE_TYPE_B = 3, -}; - typedef struct VAAPIEncodeSlice { int index; int row_start; @@ -193,7 +186,8 @@ typedef struct VAAPIEncodeRCMode { } VAAPIEncodeRCMode; typedef struct VAAPIEncodeContext { - const AVClass *class; + // Base context. + FFHWBaseEncodeContext base; // Codec-specific hooks. const struct VAAPIEncodeType *codec; @@ -397,25 +391,6 @@ typedef struct VAAPIEncodeContext { AVPacket *tail_pkt; } VAAPIEncodeContext; -enum { - // Codec supports controlling the subdivision of pictures into slices. - FLAG_SLICE_CONTROL = 1 << 0, - // Codec only supports constant quality (no rate control). - FLAG_CONSTANT_QUALITY_ONLY = 1 << 1, - // Codec is intra-only. - FLAG_INTRA_ONLY = 1 << 2, - // Codec supports B-pictures. - FLAG_B_PICTURES = 1 << 3, - // Codec supports referencing B-pictures. - FLAG_B_PICTURE_REFERENCES = 1 << 4, - // 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 { // List of supported profiles and corresponding VAAPI profiles. // (Must end with AV_PROFILE_UNKNOWN.) -- 2.41.0.windows.1

5 27