February 2024 - ffmpeg-devel - lists.ffmpeg.org

[PATCH v6 1/9] avcodec/vaapi_encode: move pic->input_surface initialization to encode_alloc
by tong1.wu＠intel.com 13 Mar '24

13 Mar '24

From: Tong Wu <tong1.wu(a)intel.com> When allocating the VAAPIEncodePicture, pic->input_surface can be initialized right in the place. This movement simplifies the send_frame logic and is the preparation for moving vaapi_encode_send_frame to the base layer. Signed-off-by: Tong Wu <tong1.wu(a)intel.com> --- libavcodec/vaapi_encode.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/libavcodec/vaapi_encode.c b/libavcodec/vaapi_encode.c index 808b79c0c7..bd29dbf0b4 100644 --- a/libavcodec/vaapi_encode.c +++ b/libavcodec/vaapi_encode.c @@ -878,7 +878,8 @@ static int vaapi_encode_discard(AVCodecContext *avctx, return 0; } -static VAAPIEncodePicture *vaapi_encode_alloc(AVCodecContext *avctx) +static VAAPIEncodePicture *vaapi_encode_alloc(AVCodecContext *avctx, + const AVFrame *frame) { VAAPIEncodeContext *ctx = avctx->priv_data; VAAPIEncodePicture *pic; @@ -895,7 +896,7 @@ static VAAPIEncodePicture *vaapi_encode_alloc(AVCodecContext *avctx) } } - pic->input_surface = VA_INVALID_ID; + pic->input_surface = (VASurfaceID)(uintptr_t)frame->data[3]; pic->recon_surface = VA_INVALID_ID; pic->output_buffer = VA_INVALID_ID; @@ -1331,7 +1332,7 @@ static int vaapi_encode_send_frame(AVCodecContext *avctx, AVFrame *frame) if (err < 0) return err; - pic = vaapi_encode_alloc(avctx); + pic = vaapi_encode_alloc(avctx, frame); if (!pic) return AVERROR(ENOMEM); @@ -1344,7 +1345,6 @@ static int vaapi_encode_send_frame(AVCodecContext *avctx, AVFrame *frame) if (ctx->input_order == 0 || frame->pict_type == AV_PICTURE_TYPE_I) pic->force_idr = 1; - pic->input_surface = (VASurfaceID)(uintptr_t)frame->data[3]; pic->pts = frame->pts; pic->duration = frame->duration; -- 2.41.0.windows.1

3 11

[PATCH] avcodec/parser: Check next against buffer index
by Michael Niedermayer 13 Mar '24

13 Mar '24

Fixes: out of array access Fixes: crash-0d640731c7da52415670eb47a2af701cbe2e1a3b Found-by: Catena cyber <contact(a)catenacyber.fr> Signed-off-by: Michael Niedermayer <michael(a)niedermayer.cc> --- libavcodec/parser.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libavcodec/parser.c b/libavcodec/parser.c index efc28b8918..db39e698ab 100644 --- a/libavcodec/parser.c +++ b/libavcodec/parser.c @@ -214,7 +214,7 @@ int ff_combine_frame(ParseContext *pc, int next, for (; pc->overread > 0; pc->overread--) pc->buffer[pc->index++] = pc->buffer[pc->overread_index++]; - if (next > *buf_size) + if (next > *buf_size || (next < -pc->index && next != END_NOT_FOUND)) return AVERROR(EINVAL); /* flush remaining if EOF */ -- 2.17.1

4 5

[PATCH] avformat/webvttdec: Skip more parts of header to let parsing continue
by Kristoffer Brånemyr 12 Mar '24

12 Mar '24

Hi, Here is a short patch to skip more parts of the header for the WebVTT subtitle format. Without this the parser seems to stop and no subtitles are produced for the user.You can find the WebVTT specification here: WebVTT: The Web Video Text Tracks Format | | | | | | | | | | | WebVTT: The Web Video Text Tracks Format | | | I attach an example file using the STYLE header part. I verified that with this change, I can see the subtitles using mpv. I tried to run fate, but even without my changes it seems to fail? -- /Kristoffer Brånemyr

2 2

Fwd: patch for 44.1/32 khz pcm input in pcm dvd encoder
by Andrew Randrianasulu 11 Mar '24

11 Mar '24

---------- Forwarded message --------- От: Andrew Randrianasulu <randrianasulu(a)gmail.com> Date: вс, 21 янв. 2024 г., 06:49 Subject: patch for 44.1/32 khz pcm input in pcm dvd encoder To: FFmpeg user questions <ffmpeg-user(a)ffmpeg.org>, Cinelerra.GG < cin(a)lists.cinelerra-gg.org> relative to ffmpeg.git commit 6c4388b468bf92c0c1e7733c6cfe4ff3f9ca9723 lightly tested with mpv and mediainfo like this: ./ffmpeg -i ~/f9518976.mp4 -target pal-dvd -ar 44100 -c:a pcm_dvd -f dvd t.mpg mpv plays sound correctly, mediainfo does not know those frequencies and display 0khz. ;) ==== forwarded to ffmpeg-devel as requested.

2 7

[PATCH v3 0/4] Fix some active sequences in subtitles
by Oneric 11 Mar '24

11 Mar '24

Changes from v2: - rebased ontop of the recently pushed eol normalisation. As a result no more CRLFs in here and Patchwork should be happy - added a fourth cosmetic commit adjusting explicit linebreaks to the new normalisation Changes from v1: - ff_ass_bprint_text_event now only inserts a word-joiner if there isn’t already one anyway - added a third commit improving the handling of curly brackets for standard ASS renderers Oneric (4): avcodec/webvttdec: honour bidi marks avcodec/{ass,webvttdec}: fix handling of backslashes avcodec/{ass,webvttdec}: more portable curly brace escapes avocdec/ass: simplify linebreaks libavcodec/ass.c | 47 +++++++++++++++++++++++--------------- libavcodec/webvttdec.c | 4 ++-- tests/ref/fate/sub-webvtt | 2 +- tests/ref/fate/sub-webvtt2 | 2 +- 4 files changed, 33 insertions(+), 22 deletions(-) -- 2.39.2

2 5

[PATCH 1/2] MAINTAINERS: remove inactive developer
by J. Dekker 10 Mar '24

10 Mar '24

Inactive since 2007. Signed-off-by: J. Dekker <jdek(a)itanimul.li> --- MAINTAINERS | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/MAINTAINERS b/MAINTAINERS index cc7f564f48..ace58f02a1 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -148,7 +148,6 @@ Codecs: cinepak.c Roberto Togni cinepakenc.c Rl / Aetey G.T. AB ccaption_dec.c Anshul Maheshwari, Aman Gupta - cljr Alex Beregszaszi cpia.c Stephan Hilb cscd.c Reimar Doeffinger cuviddec.c Timo Rothenpieler @@ -230,13 +229,12 @@ Codecs: rv10.c Michael Niedermayer smc.c Mike Melanson snow* Michael Niedermayer, Loren Merritt - sonic.c Alex Beregszaszi speedhq.c Steinar H. Gunderson srt* Aurelien Jacobs sunrast.c Ivo van Poorten svq3.c Michael Niedermayer truemotion1* Mike Melanson - tta.c Alex Beregszaszi, Jaikrishnan Menon + tta.c Jaikrishnan Menon txd.c Ivo van Poorten v4l2_* Jorge Ramirez-Ortiz vc2* Rostislav Pehlivanov @@ -446,7 +444,6 @@ Muxers/Demuxers: spdif* Anssi Hannula srtdec.c Aurelien Jacobs swf.c Baptiste Coudurier - tta.c Alex Beregszaszi txd.c Ivo van Poorten voc.c Aurelien Jacobs wav.c Michael Niedermayer @@ -493,7 +490,7 @@ Mac OS X / PowerPC Romain Dolbeau, Guillaume Poirier Amiga / PowerPC Colin Ward Linux / PowerPC Lauri Kasanen RISC-V Rémi Denis-Courmont -Windows MinGW Alex Beregszaszi, Ramiro Polla +Windows MinGW Ramiro Polla Windows Cygwin Victor Paesa Windows MSVC Hendrik Leppkes ADI/Blackfin DSP Marc Hoffman -- 2.43.2

13 25

[PATCH] avcodec/proresenc_kostya: Remove bug similarity text
by Michael Niedermayer 10 Mar '24

10 Mar '24

According to kostya, it is not based on Wassermans encoder CC: Kostya Shishkov <kostya.shishkov(a)gmail.com> CC: Anatoliy Wasserman <anatoliy.wasserman(a)yandex.ru> Signed-off-by: Michael Niedermayer <michael(a)niedermayer.cc> --- libavcodec/proresenc_kostya.c | 3 --- 1 file changed, 3 deletions(-) diff --git a/libavcodec/proresenc_kostya.c b/libavcodec/proresenc_kostya.c index 45385213ac..90cc87e388 100644 --- a/libavcodec/proresenc_kostya.c +++ b/libavcodec/proresenc_kostya.c @@ -4,9 +4,6 @@ * Copyright (c) 2011 Anatoliy Wasserman * Copyright (c) 2012 Konstantin Shishkov * - * This encoder appears to be based on Anatoliy Wassermans considering - * similarities in the bugs. - * * This file is part of FFmpeg. * * FFmpeg is free software; you can redistribute it and/or -- 2.17.1

1 1

[PATCH 1/2] avcodec/vvc/vvcdec: allow vvc_decode_close() on failed open
by Michael Niedermayer 10 Mar '24

10 Mar '24

Fixes: division by 0 Fixes: 67008/clusterfuzz-testcase-minimized-ffmpeg_AV_CODEC_ID_VVC_fuzzer-5873503163187200 Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg Signed-off-by: Michael Niedermayer <michael(a)niedermayer.cc> --- libavcodec/vvc/vvcdec.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/libavcodec/vvc/vvcdec.c b/libavcodec/vvc/vvcdec.c index f024cbd067..570e2aa513 100644 --- a/libavcodec/vvc/vvcdec.c +++ b/libavcodec/vvc/vvcdec.c @@ -950,13 +950,14 @@ static av_cold void vvc_decode_flush(AVCodecContext *avctx) { VVCContext *s = avctx->priv_data; int got_output = 0; - VVCFrameContext *last; while (s->nb_delayed) wait_delayed_frame(s, NULL, &got_output); - last = get_frame_context(s, s->fcs, s->nb_frames - 1); - ff_vvc_flush_dpb(last); + if (s->fcs) { + VVCFrameContext *last = get_frame_context(s, s->fcs, s->nb_frames - 1); + ff_vvc_flush_dpb(last); + } s->eos = 1; } -- 2.17.1

2 3

[PATCH 1/2] avcodec/8bps: Consider width in the minimal size check
by Michael Niedermayer 10 Mar '24

10 Mar '24

Fixes: Timeout Fixes: 64479/clusterfuzz-testcase-minimized-ffmpeg_AV_CODEC_ID_EIGHTBPS_fuzzer-5434435386081280 Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg Signed-off-by: Michael Niedermayer <michael(a)niedermayer.cc> --- libavcodec/8bps.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libavcodec/8bps.c b/libavcodec/8bps.c index 11b9f526b7..0060c46d09 100644 --- a/libavcodec/8bps.c +++ b/libavcodec/8bps.c @@ -63,7 +63,7 @@ static int decode_frame(AVCodecContext *avctx, AVFrame *frame, unsigned int planes = c->planes; int ret; - if (buf_size < planes * height * 2) + if (buf_size < planes * height * (2 + 2*((avctx->width+128)/129))) return AVERROR_INVALIDDATA; if ((ret = ff_get_buffer(avctx, frame, 0)) < 0) -- 2.17.1

1 2

[PATCH] avfilter/fifo: Remove (a)fifo filters
by Andreas Rheinhardt 09 Mar '24

09 Mar '24

Obsolete since 4ca1fb9d2a91757c8c4c34dd456abf340e3f765f. Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt(a)outlook.com> --- doc/filters.texi | 9 --- libavfilter/Makefile | 1 - libavfilter/allfilters.c | 2 - libavfilter/fifo.c | 165 --------------------------------------- 4 files changed, 177 deletions(-) delete mode 100644 libavfilter/fifo.c diff --git a/doc/filters.texi b/doc/filters.texi index b9b539acee..e0436a5755 100644 --- a/doc/filters.texi +++ b/doc/filters.texi @@ -14122,15 +14122,6 @@ For example: ffmpeg -i in.vob -vf "fieldorder=bff" out.dv @end example -@section fifo, afifo - -Buffer input images and send them when they are requested. - -It is mainly useful when auto-inserted by the libavfilter -framework. - -It does not take parameters. - @section fillborders Fill borders of the input video, without changing video stream dimensions. diff --git a/libavfilter/Makefile b/libavfilter/Makefile index bba0219876..f6c1d641d6 100644 --- a/libavfilter/Makefile +++ b/libavfilter/Makefile @@ -16,7 +16,6 @@ OBJS = allfilters.o \ colorspace.o \ ccfifo.o \ drawutils.o \ - fifo.o \ formats.o \ framepool.o \ framequeue.o \ diff --git a/libavfilter/allfilters.c b/libavfilter/allfilters.c index af84aa3d97..149bf50997 100644 --- a/libavfilter/allfilters.c +++ b/libavfilter/allfilters.c @@ -611,8 +611,6 @@ extern const AVFilter ff_asrc_abuffer; extern const AVFilter ff_vsrc_buffer; extern const AVFilter ff_asink_abuffer; extern const AVFilter ff_vsink_buffer; -extern const AVFilter ff_af_afifo; -extern const AVFilter ff_vf_fifo; #include "libavfilter/filter_list.c" diff --git a/libavfilter/fifo.c b/libavfilter/fifo.c deleted file mode 100644 index 1c7be88ae1..0000000000 --- a/libavfilter/fifo.c +++ /dev/null @@ -1,165 +0,0 @@ -/* - * Copyright (c) 2007 Bobby Bingham - * - * 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 - */ - -/** - * @file - * FIFO buffering filter - */ - -#include "libavutil/common.h" -#include "libavutil/mathematics.h" - -#include "audio.h" -#include "avfilter.h" -#include "internal.h" - -typedef struct Buf { - AVFrame *frame; - struct Buf *next; -} Buf; - -typedef struct FifoContext { - Buf root; - Buf *last; ///< last buffered frame - - /** - * When a specific number of output samples is requested, the partial - * buffer is stored here - */ - AVFrame *out; - int allocated_samples; ///< number of samples out was allocated for -} FifoContext; - -static av_cold int init(AVFilterContext *ctx) -{ - FifoContext *s = ctx->priv; - s->last = &s->root; - - return 0; -} - -static av_cold void uninit(AVFilterContext *ctx) -{ - FifoContext *s = ctx->priv; - Buf *buf, *tmp; - - for (buf = s->root.next; buf; buf = tmp) { - tmp = buf->next; - av_frame_free(&buf->frame); - av_free(buf); - } - - av_frame_free(&s->out); -} - -static int add_to_queue(AVFilterLink *inlink, AVFrame *frame) -{ - FifoContext *s = inlink->dst->priv; - - s->last->next = av_mallocz(sizeof(Buf)); - if (!s->last->next) { - av_frame_free(&frame); - return AVERROR(ENOMEM); - } - - s->last = s->last->next; - s->last->frame = frame; - - return 0; -} - -static void queue_pop(FifoContext *s) -{ - Buf *tmp = s->root.next->next; - if (s->last == s->root.next) - s->last = &s->root; - av_freep(&s->root.next); - s->root.next = tmp; -} - -static int request_frame(AVFilterLink *outlink) -{ - FifoContext *s = outlink->src->priv; - int ret = 0; - - if (!s->root.next) { - if ((ret = ff_request_frame(outlink->src->inputs[0])) < 0) - return ret; - if (!s->root.next) - return 0; - } - ret = ff_filter_frame(outlink, s->root.next->frame); - queue_pop(s); - return ret; -} - -static const AVFilterPad avfilter_vf_fifo_inputs[] = { - { - .name = "default", - .type = AVMEDIA_TYPE_VIDEO, - .filter_frame = add_to_queue, - }, -}; - -static const AVFilterPad avfilter_vf_fifo_outputs[] = { - { - .name = "default", - .type = AVMEDIA_TYPE_VIDEO, - .request_frame = request_frame, - }, -}; - -const AVFilter ff_vf_fifo = { - .name = "fifo", - .description = NULL_IF_CONFIG_SMALL("Buffer input images and send them when they are requested."), - .init = init, - .uninit = uninit, - .priv_size = sizeof(FifoContext), - .flags = AVFILTER_FLAG_METADATA_ONLY, - FILTER_INPUTS(avfilter_vf_fifo_inputs), - FILTER_OUTPUTS(avfilter_vf_fifo_outputs), -}; - -static const AVFilterPad avfilter_af_afifo_inputs[] = { - { - .name = "default", - .type = AVMEDIA_TYPE_AUDIO, - .filter_frame = add_to_queue, - }, -}; - -static const AVFilterPad avfilter_af_afifo_outputs[] = { - { - .name = "default", - .type = AVMEDIA_TYPE_AUDIO, - .request_frame = request_frame, - }, -}; - -const AVFilter ff_af_afifo = { - .name = "afifo", - .description = NULL_IF_CONFIG_SMALL("Buffer input frames and send them when they are requested."), - .init = init, - .uninit = uninit, - .priv_size = sizeof(FifoContext), - .flags = AVFILTER_FLAG_METADATA_ONLY, - FILTER_INPUTS(avfilter_af_afifo_inputs), - FILTER_OUTPUTS(avfilter_af_afifo_outputs), -}; -- 2.34.1

3 12