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

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

03 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.

3 5

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

03 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 | 209 ++++++++++++++++++++++++++++++++++++++ libavformat/farbfeldenc.c | 153 ++++++++++++++++++++++++++++ libavformat/version.h | 2 +- 7 files changed, 372 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..3d2815c771 --- /dev/null +++ b/libavformat/farbfelddec.c @@ -0,0 +1,209 @@ +/* + * Image format + * + * Modified by Marcus B Spencer to suit the farbfeld demuxer on 2 July 2024 + * + * 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" + +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_filename2(buf, sizeof(buf), path, first_index, + AV_FRAME_FILENAME_FLAGS_MULTIPLE) < 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_filename2(buf, sizeof(buf), path, + last_index + range1, AV_FRAME_FILENAME_FLAGS_MULTIPLE) < 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..3e6571f3a9 --- /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 2 July 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

2 1

[PATCH] fftools/ffmpeg_opt: add mixxing codec type to some options
by James Almer 03 Jul '24

03 Jul '24

Signed-off-by: James Almer <jamrial(a)gmail.com> --- fftools/ffmpeg_opt.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/fftools/ffmpeg_opt.c b/fftools/ffmpeg_opt.c index 910e4a336b..b0dae46beb 100644 --- a/fftools/ffmpeg_opt.c +++ b/fftools/ffmpeg_opt.c @@ -1495,9 +1495,6 @@ const OptionDef options[] = { { "bitexact", OPT_TYPE_BOOL, OPT_EXPERT | OPT_OFFSET | OPT_OUTPUT | OPT_INPUT, { .off = OFFSET(bitexact) }, "bitexact mode" }, - { "apad", OPT_TYPE_STRING, OPT_PERSTREAM | OPT_EXPERT | OPT_OUTPUT, - { .off = OFFSET(apad) }, - "audio pad", "" }, { "dts_delta_threshold", OPT_TYPE_FLOAT, OPT_EXPERT, { &dts_delta_threshold }, "timestamp discontinuity delta threshold", "threshold" }, @@ -1726,10 +1723,10 @@ const OptionDef options[] = { { "hwaccels", OPT_TYPE_FUNC, OPT_EXIT | OPT_EXPERT, { .func_arg = show_hwaccels }, "show available HW acceleration methods" }, - { "autorotate", OPT_TYPE_BOOL, OPT_PERSTREAM | OPT_EXPERT | OPT_INPUT, + { "autorotate", OPT_TYPE_BOOL, OPT_VIDEO | OPT_PERSTREAM | OPT_EXPERT | OPT_INPUT, { .off = OFFSET(autorotate) }, "automatically insert correct rotate filters" }, - { "autoscale", OPT_TYPE_BOOL, OPT_PERSTREAM | OPT_EXPERT | OPT_OUTPUT, + { "autoscale", OPT_TYPE_BOOL, OPT_VIDEO | OPT_PERSTREAM | OPT_EXPERT | OPT_OUTPUT, { .off = OFFSET(autoscale) }, "automatically insert a scale filter at the end of the filter graph" }, { "fix_sub_duration_heartbeat", OPT_TYPE_BOOL, OPT_VIDEO | OPT_EXPERT | OPT_PERSTREAM | OPT_OUTPUT, @@ -1762,6 +1759,9 @@ const OptionDef options[] = { { "ab", OPT_TYPE_FUNC, OPT_AUDIO | OPT_FUNC_ARG | OPT_PERFILE | OPT_OUTPUT, { .func_arg = opt_bitrate }, "alias for -b:a (select bitrate for audio streams)", "bitrate" }, + { "apad", OPT_TYPE_STRING, OPT_AUDIO | OPT_PERSTREAM | OPT_EXPERT | OPT_OUTPUT, + { .off = OFFSET(apad) }, + "audio pad", "" }, { "atag", OPT_TYPE_FUNC, OPT_AUDIO | OPT_FUNC_ARG | OPT_EXPERT | OPT_PERFILE | OPT_OUTPUT | OPT_HAS_CANON, { .func_arg = opt_old2new }, "force audio tag/fourcc", "fourcc/tag", -- 2.45.2

2 1

[PATCH] avcodec/aaccoder_twoloop: remove unread max scaler
by Yotam Ofek 03 Jul '24

03 Jul '24

--- libavcodec/aaccoder_twoloop.h | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/libavcodec/aaccoder_twoloop.h b/libavcodec/aaccoder_twoloop.h index c1dcdbb5ed..c56abc68a7 100644 --- a/libavcodec/aaccoder_twoloop.h +++ b/libavcodec/aaccoder_twoloop.h @@ -101,7 +101,7 @@ static void search_for_quantizers_twoloop(AVCodecContext *avctx, */ float sfoffs = av_clipf(log2f(120.0f / lambda) * 4.0f, -5, 10); - int fflag, minscaler, maxscaler, nminscaler; + int fflag, minscaler, nminscaler; int its = 0; int maxits = 30; int allz = 0; @@ -572,12 +572,10 @@ static void search_for_quantizers_twoloop(AVCodecContext *avctx, } minscaler = SCALE_MAX_POS; - maxscaler = 0; for (w = 0; w < sce->ics.num_windows; w += sce->ics.group_len[w]) { for (g = 0; g < sce->ics.num_swb; g++) { if (!sce->zeroes[w*16+g]) { minscaler = FFMIN(minscaler, sce->sf_idx[w*16+g]); - maxscaler = FFMAX(maxscaler, sce->sf_idx[w*16+g]); } } } -- 2.40.1

2 2

[PATCH] avcodec/aacdec_usac: Fix array size
by Marvin Scholz 03 Jul '24

03 Jul '24

The array in ff_aac_usac_mdst_filt_cur that is passed to that has a size of 7 elements, not 6 and the code in the function accesses the array at index 6, which would be out of bounds if the size was actually 6. Fixes: CID1603196 --- libavcodec/aac/aacdec_usac.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libavcodec/aac/aacdec_usac.c b/libavcodec/aac/aacdec_usac.c index 4856c1786b..32b3c534bf 100644 --- a/libavcodec/aac/aacdec_usac.c +++ b/libavcodec/aac/aacdec_usac.c @@ -1134,7 +1134,7 @@ static void complex_stereo_downmix_cur(AACDecContext *ac, ChannelElement *cpe, } } -static void complex_stereo_interpolate_imag(float *im, float *re, const float f[6], +static void complex_stereo_interpolate_imag(float *im, float *re, const float f[7], int len, int factor_even, int factor_odd) { int i = 0; base-commit: e783e45e29e78616debba7f6d1fe6e54dc336496 -- 2.39.3 (Apple Git-146)

2 1

[RFC] av_rescale() coverity
by Michael Niedermayer 02 Jul '24

02 Jul '24

Hi all coverity seems to have started to do a new thing. Namely if theres a return statement it assumes it can independant of everything occurr an example would be av_rescale() which on overflow returns INT64_MIN also with the right flags av_rescale() will pass INT64_MIN and INT64_MAX through from the input So coverity since a few days seems to treat every av_rescale() call as if it returns INT64_MIN and INT64_MAX. coverity doesnt care if that return statement is reachable or if the flags even include the execution path. An example is this: AVRational time_base_q = AV_TIME_BASE_Q; int64_t next_dts = av_rescale_q(ds->next_dts, time_base_q, av_inv_q(ist->framerate)); ds->next_dts = av_rescale_q(next_dts + 1, av_inv_q(ist->framerate), time_base_q); Here coverity as a initial statement claims next_dts is INT64_MAX and next_dts + 1 would overflow 8. function_return: Function av_rescale_q(ds->next_dts, time_base_q, av_inv_q(ist->framerate)) returns 9223372036854775807. 9. known_value_assign: next_dts = av_rescale_q(ds->next_dts, time_base_q, av_inv_q(ist->framerate)), its value is now 9223372036854775807. 331 int64_t next_dts = av_rescale_q(ds->next_dts, time_base_q, av_inv_q(ist->framerate)); CID 1604545: (#1 of 1): Overflowed constant (INTEGER_OVERFLOW) 10. overflow_const: Expression next_dts + 1LL, which is equal to -9223372036854775808, where next_dts is known to be equal to 9223372036854775807, overflows the type that receives it, a signed integer 64 bits wide. another example is this: #define AV_TIME_BASE 1000000 pts = av_rescale(ds->dts, 1000000, AV_TIME_BASE); coverity hallucinates pts as a tainted negative number here nothing says anything about the input ds->dts (and thats what would matter) In the past coverity provided a detailed list of steps on how a case is reached. One could then check these assumtions and mark things as false positive when one assumtion is wrong. (coverity was most of the time wrong) Now coverity just hallucinates claims out of the blue without any explanation how that can happen. Iam a bit at a loss how to deal with this and also why exactly this new behavior appeared. Has anyone changed any setting or anything in coverity ? The number of issues shot up to over 400 on the 22th june "194 new defect(s) introduced to FFmpeg/FFmpeg found with Coverity Scan." before this i thought iam mostly done with my coverity work. now truth is, the STF text speaks about 673 issues at the time and not what appears after the work started, but it makes me a bit sad if i categorize ~700+ issues and then fix the ones that are bugs just to find coverity hallucinate 200 new issues a month that ill have to leave open for future efforts. I did not expect that years of ignoring coverity accumulate 673 issues and then suddenly the rate of new issues to shoot up like this. I kind of expected that i can fix all new issues appearing during the work with insignificant extra effort thx -- Michael GnuPG fingerprint: 9FF2128B147EF6730BADF133611EC787040B0FAB Why not whip the teacher when the pupil misbehaves? -- Diogenes of Sinope

3 8

[PATCH v16] 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 | 208 ++++++++++++++++++++++++++++++++++++++ libavformat/farbfeldenc.c | 153 ++++++++++++++++++++++++++++ libavformat/version.h | 2 +- 7 files changed, 371 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..be63478afa --- /dev/null +++ b/libavformat/farbfelddec.c @@ -0,0 +1,208 @@ +/* + * Image format + * + * Modified by Marcus B Spencer to suit the farbfeld demuxer on 2 July 2024 + * + * 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" + +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..3e6571f3a9 --- /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 2 July 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

[GASPP PATCH 1/2] Translate .xword and .dword to .quad
by Martin Storsjö 02 Jul '24

02 Jul '24

--- gas-preprocessor.pl | 2 ++ 1 file changed, 2 insertions(+) diff --git a/gas-preprocessor.pl b/gas-preprocessor.pl index b0c343e..20b927f 100755 --- a/gas-preprocessor.pl +++ b/gas-preprocessor.pl @@ -1169,6 +1169,8 @@ sub handle_serialized_line { $line =~ s/\.syntax/$comm$&/x if $as_type =~ /armasm/; $line =~ s/\.hword/.short/x; + $line =~ s/\.xword/.quad/x; + $line =~ s/\.dword/.quad/x; if ($as_type =~ /^apple-/) { # the syntax for these is a little different -- 2.34.1

1 2

[PATCH] avcodec/aaccoder_twoloop: remove unused macro
by Yotam Ofek 02 Jul '24

02 Jul '24

seems the `sclip` macro was never used --- libavcodec/aaccoder_twoloop.h | 2 -- 1 file changed, 2 deletions(-) diff --git a/libavcodec/aaccoder_twoloop.h b/libavcodec/aaccoder_twoloop.h index 92dc2911a3..c1dcdbb5ed 100644 --- a/libavcodec/aaccoder_twoloop.h +++ b/libavcodec/aaccoder_twoloop.h @@ -53,8 +53,6 @@ /** Frequency in Hz for lower limit of noise substitution **/ #define NOISE_LOW_LIMIT 4000 -#define sclip(x) av_clip(x,60,218) - /* Reflects the cost to change codebooks */ static inline int ff_pns_bits(SingleChannelElement *sce, int w, int g) { -- 2.40.1

1 1

[PATCH v15] 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 | 209 ++++++++++++++++++++++++++++++++++++++ libavformat/farbfeldenc.c | 153 ++++++++++++++++++++++++++++ libavformat/version.h | 2 +- 7 files changed, 372 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..68e8c9c9dd --- /dev/null +++ b/libavformat/farbfelddec.c @@ -0,0 +1,209 @@ +/* + * Image format + * + * Modified by Marcus B Spencer to suit the farbfeld demuxer on 2 July 2024 + * + * 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..3e6571f3a9 --- /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 2 July 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