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

[PATCH] avcodec/av1_vaapi: Enable AV1Profile2 VAAPI support.
by David (Ming Qiang) Wu 12 Aug '24

12 Aug '24

AV1Profile2 VAAPI is supported and tested on AMD VCN5. Signed-off-by: David (Ming Qiang) Wu <David.Wu3(a)amd.com> --- libavcodec/av1dec.c | 3 +++ libavcodec/vaapi_decode.c | 3 +++ 2 files changed, 6 insertions(+) diff --git a/libavcodec/av1dec.c b/libavcodec/av1dec.c index 1d5b9ef4f4..77f63661a0 100644 --- a/libavcodec/av1dec.c +++ b/libavcodec/av1dec.c @@ -599,6 +599,9 @@ static int get_pixel_format(AVCodecContext *avctx) case AV_PIX_FMT_YUV420P12: #if CONFIG_AV1_VULKAN_HWACCEL *fmtp++ = AV_PIX_FMT_VULKAN; +#endif +#if CONFIG_AV1_VAAPI_HWACCEL + *fmtp++ = AV_PIX_FMT_VAAPI; #endif break; case AV_PIX_FMT_YUV422P: diff --git a/libavcodec/vaapi_decode.c b/libavcodec/vaapi_decode.c index a59194340f..a077e47326 100644 --- a/libavcodec/vaapi_decode.c +++ b/libavcodec/vaapi_decode.c @@ -448,6 +448,9 @@ static const struct { MAP(AV1, AV1_MAIN, AV1Profile0), MAP(AV1, AV1_HIGH, AV1Profile1), #endif +#if VA_CHECK_VERSION(1, 23, 0) + MAP(AV1, AV1_PROFESSIONAL, AV1Profile2), +#endif #undef MAP }; -- 2.34.1

5 5

[PATCH 01/17] avcodec/dxva2: Initialize dxva_size and check it
by Michael Niedermayer 11 Aug '24

11 Aug '24

Fixes: CID1591878 Uninitialized scalar variable Fixes: CID1591928 Uninitialized pointer read Sponsored-by: Sovereign Tech Fund Signed-off-by: Michael Niedermayer <michael(a)niedermayer.cc> --- libavcodec/dxva2.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/libavcodec/dxva2.c b/libavcodec/dxva2.c index 6eb66c02e40..75ca84d0fe0 100644 --- a/libavcodec/dxva2.c +++ b/libavcodec/dxva2.c @@ -806,7 +806,7 @@ int ff_dxva2_commit_buffer(AVCodecContext *avctx, unsigned type, const void *data, unsigned size, unsigned mb_count) { - void *dxva_data; + void *dxva_data = NULL; unsigned dxva_size; int result; HRESULT hr = 0; @@ -828,7 +828,7 @@ int ff_dxva2_commit_buffer(AVCodecContext *avctx, type, (unsigned)hr); return -1; } - if (size <= dxva_size) { + if (dxva_data && size <= dxva_size) { memcpy(dxva_data, data, size); #if CONFIG_D3D11VA -- 2.45.1

4 31

[PATCH 1/6] avfilter/vf_tiltandshift: Free dst on error
by Michael Niedermayer 11 Aug '24

11 Aug '24

Fixes: CID1559901 Resource leak Sponsored-by: Sovereign Tech Fund Signed-off-by: Michael Niedermayer <michael(a)niedermayer.cc> --- libavfilter/vf_tiltandshift.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/libavfilter/vf_tiltandshift.c b/libavfilter/vf_tiltandshift.c index b49a713339d..08bcb062473 100644 --- a/libavfilter/vf_tiltandshift.c +++ b/libavfilter/vf_tiltandshift.c @@ -237,8 +237,10 @@ static int output_frame(AVFilterLink *outlink) // set correct timestamps and props as long as there is proper input ret = av_frame_copy_props(dst, s->input); - if (ret < 0) + if (ret < 0) { + av_frame_free(&dst); return ret; + } // discard frame at the top of the list since it has been fully processed list_remove_head(s); -- 2.45.2

2 8

[PATCH v2] avfilter/af_surround: Check output format
by Michael Niedermayer 11 Aug '24

11 Aug '24

Fixes: CID1516994 Out-of-bounds access Fixes: CID1516996 Out-of-bounds access Fixes: CID1516999 Out-of-bounds access Sponsored-by: Sovereign Tech Fund Signed-off-by: Michael Niedermayer <michael(a)niedermayer.cc> --- libavfilter/af_surround.c | 25 +++++++++++++++++++++++++ 1 file changed, 25 insertions(+) diff --git a/libavfilter/af_surround.c b/libavfilter/af_surround.c index e37dddc3614..d42a23b8ad2 100644 --- a/libavfilter/af_surround.c +++ b/libavfilter/af_surround.c @@ -1123,6 +1123,31 @@ static av_cold int init(AVFilterContext *ctx) s->create_lfe = av_channel_layout_index_from_channel(&s->out_ch_layout, AV_CHAN_LOW_FREQUENCY) >= 0; + switch (out_channel_layout) { + case AV_CH_LAYOUT_MONO: + case AV_CH_LAYOUT_STEREO: + case AV_CH_LAYOUT_2POINT1: + case AV_CH_LAYOUT_2_1: + case AV_CH_LAYOUT_2_2: + case AV_CH_LAYOUT_SURROUND: + case AV_CH_LAYOUT_3POINT1: + case AV_CH_LAYOUT_QUAD: + case AV_CH_LAYOUT_4POINT0: + case AV_CH_LAYOUT_4POINT1: + case AV_CH_LAYOUT_5POINT0: + case AV_CH_LAYOUT_5POINT1: + case AV_CH_LAYOUT_5POINT0_BACK: + case AV_CH_LAYOUT_5POINT1_BACK: + case AV_CH_LAYOUT_6POINT0: + case AV_CH_LAYOUT_6POINT1: + case AV_CH_LAYOUT_7POINT0: + case AV_CH_LAYOUT_7POINT1: + case AV_CH_LAYOUT_OCTAGONAL: + break; + default: + goto fail; + } + switch (in_channel_layout) { case AV_CH_LAYOUT_STEREO: s->filter = filter_stereo; -- 2.45.2

1 1

[PATCH 1/3] avformat/lmlm4: Move subtraction after check
by Michael Niedermayer 11 Aug '24

11 Aug '24

This is not a bugfix in code but coverity only, it does look a little nicer though Fixes: CID732224 Sponsored-by: Sovereign Tech Fund Signed-off-by: Michael Niedermayer <michael(a)niedermayer.cc> --- libavformat/lmlm4.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libavformat/lmlm4.c b/libavformat/lmlm4.c index 209b544ccd8..c8355e7a8d6 100644 --- a/libavformat/lmlm4.c +++ b/libavformat/lmlm4.c @@ -91,7 +91,6 @@ static int lmlm4_read_packet(AVFormatContext *s, AVPacket *pkt) frame_type = avio_rb16(pb); packet_size = avio_rb32(pb); padding = -packet_size & 511; - frame_size = packet_size - 8; if (frame_type > LMLM4_MPEG1L2 || frame_type == LMLM4_INVALID) { av_log(s, AV_LOG_ERROR, "invalid or unsupported frame_type\n"); @@ -102,6 +101,7 @@ static int lmlm4_read_packet(AVFormatContext *s, AVPacket *pkt) return AVERROR(EIO); } + frame_size = packet_size - 8; if ((ret = av_get_packet(pb, pkt, frame_size)) <= 0) return AVERROR(EIO); -- 2.45.2

1 3

[PATCH 1/3] lavu/hwcontext_vaapi: Add option to allow to specify vendor id when init hw device
by fei.w.wang＠intel.com 09 Aug '24

09 Aug '24

From: Fei Wang <fei.w.wang(a)intel.com> Vendor id will help to select desired device in case of kernel driver is unknow or unsupported, for vendor may support different kernel driver on different platforms. Signed-off-by: Fei Wang <fei.w.wang(a)intel.com> --- doc/ffmpeg.texi | 8 ++++++++ libavutil/hwcontext_vaapi.c | 29 +++++++++++++++++++++++++++++ libavutil/version.h | 2 +- 3 files changed, 38 insertions(+), 1 deletion(-) diff --git a/doc/ffmpeg.texi b/doc/ffmpeg.texi index 877edae3b3..842e92ad1a 100644 --- a/doc/ffmpeg.texi +++ b/doc/ffmpeg.texi @@ -1458,6 +1458,11 @@ The following options are recognized: When @var{device} is not specified, use this option to specify the name of the kernel driver associated with the desired device. This option is available only when the hardware acceleration method @emph{drm} and @emph{vaapi} are enabled. +@item vendor_id +When @var{device} and @var{kernel_driver} are not specified, use this option to specify +the vendor id associated with the desired device. This option is available only when the +hardware acceleration method @emph{drm} and @emph{vaapi} are enabled and @emph{kernel_driver} +is not specified. @end table Examples: @@ -1473,6 +1478,9 @@ Create a vaapi device on DirectX adapter 1. @item -init_hw_device vaapi:,kernel_driver=i915 Create a vaapi device on a device associated with kernel driver @samp{i915}. + +@item -init_hw_device vaapi:,vendor_id=0x8086 +Create a vaapi device on a device associated with vendor id @samp{0x8086}. @end table @item vdpau diff --git a/libavutil/hwcontext_vaapi.c b/libavutil/hwcontext_vaapi.c index 4cb25dd032..014541752a 100644 --- a/libavutil/hwcontext_vaapi.c +++ b/libavutil/hwcontext_vaapi.c @@ -1748,7 +1748,9 @@ static int vaapi_device_create(AVHWDeviceContext *ctx, const char *device, #if CONFIG_LIBDRM drmVersion *info; const AVDictionaryEntry *kernel_driver; + const AVDictionaryEntry *vendor_id; kernel_driver = av_dict_get(opts, "kernel_driver", NULL, 0); + vendor_id = av_dict_get(opts, "vendor_id", NULL, 0); #endif for (n = 0; n < max_devices; n++) { snprintf(path, sizeof(path), @@ -1803,6 +1805,33 @@ static int vaapi_device_create(AVHWDeviceContext *ctx, const char *device, close(priv->drm_fd); priv->drm_fd = -1; continue; + } else if (vendor_id) { + drmDevicePtr device; + char drm_vendor[8]; + if (drmGetDevice(priv->drm_fd, &device)) { + av_log(ctx, AV_LOG_VERBOSE, + "Failed to get DRM device info for device %d.\n", n); + close(priv->drm_fd); + priv->drm_fd = -1; + continue; + } + + snprintf(drm_vendor, sizeof(drm_vendor), "0x%x", device->deviceinfo.pci->vendor_id); + if (strcmp(vendor_id->value, drm_vendor)) { + av_log(ctx, AV_LOG_VERBOSE, "Ignoring device %d " + "with non-matching vendor id (%s).\n", + n, vendor_id->value); + drmFreeDevice(&device); + close(priv->drm_fd); + priv->drm_fd = -1; + continue; + } + av_log(ctx, AV_LOG_VERBOSE, "Trying to use " + "DRM render node for device %d, " + "with matching vendor id (%s).\n", + n, vendor_id->value); + drmFreeDevice(&device); + break; } drmFreeVersion(info); #endif diff --git a/libavutil/version.h b/libavutil/version.h index 814892a4d5..852eeef1d6 100644 --- a/libavutil/version.h +++ b/libavutil/version.h @@ -79,7 +79,7 @@ */ #define LIBAVUTIL_VERSION_MAJOR 59 -#define LIBAVUTIL_VERSION_MINOR 28 +#define LIBAVUTIL_VERSION_MINOR 29 #define LIBAVUTIL_VERSION_MICRO 100 #define LIBAVUTIL_VERSION_INT AV_VERSION_INT(LIBAVUTIL_VERSION_MAJOR, \ -- 2.34.1

2 4

[PATCH] add tools/target_swr_fuzzer
by Michael Niedermayer 07 Aug '24

07 Aug '24

Signed-off-by: Michael Niedermayer <michael(a)niedermayer.cc> --- Makefile | 2 + tools/Makefile | 3 + tools/target_swr_fuzzer.c | 161 ++++++++++++++++++++++++++++++++++++++ 3 files changed, 166 insertions(+) create mode 100644 tools/target_swr_fuzzer.c diff --git a/Makefile b/Makefile index 4c3af09fec4..b350d7748f5 100644 --- a/Makefile +++ b/Makefile @@ -70,6 +70,8 @@ tools/target_io_dem_fuzzer$(EXESUF): tools/target_io_dem_fuzzer.o $(FF_DEP_LIBS) tools/target_sws_fuzzer$(EXESUF): tools/target_sws_fuzzer.o $(FF_DEP_LIBS) $(LD) $(LDFLAGS) $(LDEXEFLAGS) $(LD_O) $^ $(ELIBS) $(FF_EXTRALIBS) $(LIBFUZZER_PATH) +tools/target_swr_fuzzer$(EXESUF): tools/target_swr_fuzzer.o $(FF_DEP_LIBS) + $(LD) $(LDFLAGS) $(LDEXEFLAGS) $(LD_O) $^ $(ELIBS) $(FF_EXTRALIBS) $(LIBFUZZER_PATH) tools/enum_options$(EXESUF): ELIBS = $(FF_EXTRALIBS) tools/enum_options$(EXESUF): $(FF_DEP_LIBS) diff --git a/tools/Makefile b/tools/Makefile index 2a11fa0ae62..7ae6e3cb75d 100644 --- a/tools/Makefile +++ b/tools/Makefile @@ -23,6 +23,9 @@ tools/target_io_dem_fuzzer.o: tools/target_dem_fuzzer.c tools/target_sws_fuzzer.o: tools/target_sws_fuzzer.c $(COMPILE_C) +tools/target_swr_fuzzer.o: tools/target_swr_fuzzer.c + $(COMPILE_C) + tools/enc_recon_frame_test$(EXESUF): tools/decode_simple.o tools/venc_data_dump$(EXESUF): tools/decode_simple.o tools/scale_slice_test$(EXESUF): tools/decode_simple.o diff --git a/tools/target_swr_fuzzer.c b/tools/target_swr_fuzzer.c new file mode 100644 index 00000000000..f235b5453ec --- /dev/null +++ b/tools/target_swr_fuzzer.c @@ -0,0 +1,161 @@ +/* + * Copyright (c) 2024 Michael Niedermayer <michael-ffmpeg(a)niedermayer.cc> + * + * 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 "config.h" +#include "libavutil/avassert.h" +#include "libavutil/avstring.h" +#include "libavutil/cpu.h" +#include "libavutil/imgutils.h" +#include "libavutil/intreadwrite.h" +#include "libavutil/mem.h" +#include "libavutil/opt.h" + +#include "libavcodec/bytestream.h" + +#include "libswresample/swresample.h" + +#define SWR_CH_MAX 32 + +int LLVMFuzzerTestOneInput(const uint8_t *data, size_t size); + +static const enum AVSampleFormat formats[] = { + AV_SAMPLE_FMT_U8, + AV_SAMPLE_FMT_U8P, + AV_SAMPLE_FMT_S16, + AV_SAMPLE_FMT_S16P, + AV_SAMPLE_FMT_S32, + AV_SAMPLE_FMT_S32P, + AV_SAMPLE_FMT_FLT, + AV_SAMPLE_FMT_FLTP, + AV_SAMPLE_FMT_DBL, + AV_SAMPLE_FMT_DBLP, +}; + +static const AVChannelLayout layouts[]={ + AV_CHANNEL_LAYOUT_MONO , + AV_CHANNEL_LAYOUT_STEREO , + AV_CHANNEL_LAYOUT_2_1 , + AV_CHANNEL_LAYOUT_SURROUND , + AV_CHANNEL_LAYOUT_4POINT0 , + AV_CHANNEL_LAYOUT_2_2 , + AV_CHANNEL_LAYOUT_QUAD , + AV_CHANNEL_LAYOUT_5POINT0 , + AV_CHANNEL_LAYOUT_5POINT1 , + AV_CHANNEL_LAYOUT_5POINT0_BACK , + AV_CHANNEL_LAYOUT_5POINT1_BACK , + AV_CHANNEL_LAYOUT_7POINT0 , + AV_CHANNEL_LAYOUT_7POINT1 , + AV_CHANNEL_LAYOUT_7POINT1_WIDE , +}; + +static void setup_array(uint8_t *out[SWR_CH_MAX], uint8_t *in, enum AVSampleFormat format, int samples){ + if(av_sample_fmt_is_planar(format)){ + int i; + int plane_size= av_get_bytes_per_sample(format&0xFF)*samples; + format&=0xFF; + for(i=0; i<SWR_CH_MAX; i++){ + out[i]= in + i*plane_size; + } + }else{ + out[0]= in; + } +} + +int LLVMFuzzerTestOneInput(const uint8_t *data, size_t size) { + const uint8_t *end = data + size; + struct SwrContext * swr= NULL; + AVChannelLayout in_ch_layout = { 0 }, out_ch_layout = { 0 }; + enum AVSampleFormat in_sample_fmt = AV_SAMPLE_FMT_S16P; + enum AVSampleFormat out_sample_fmt = AV_SAMPLE_FMT_S16P; + int in_sample_rate = 44100; + int out_sample_rate = 44100; + int in_ch_count, out_ch_count; + char in_layout_string[256]; + char out_layout_string[256]; + uint8_t * ain[SWR_CH_MAX]; + uint8_t *aout[SWR_CH_MAX]; + uint8_t *out_data; + int in_sample_nb; + int out_sample_nb = size; + int count; + + if (size > 128) { + GetByteContext gbc; + int64_t flags64; + + size -= 128; + bytestream2_init(&gbc, data + size, 128); + in_sample_rate = bytestream2_get_le16(&gbc) + 1; + out_sample_rate = bytestream2_get_le16(&gbc) + 1; + in_sample_fmt = formats[bytestream2_get_byte(&gbc) % FF_ARRAY_ELEMS(formats)]; + out_sample_fmt = formats[bytestream2_get_byte(&gbc) % FF_ARRAY_ELEMS(formats)]; + av_channel_layout_copy(& in_ch_layout, &layouts[bytestream2_get_byte(&gbc) % FF_ARRAY_ELEMS(layouts)]); + av_channel_layout_copy(&out_ch_layout, &layouts[bytestream2_get_byte(&gbc) % FF_ARRAY_ELEMS(layouts)]); + + out_sample_nb = bytestream2_get_le32(&gbc); + + flags64 = bytestream2_get_le64(&gbc); + if (flags64 & 0x10) + av_force_cpu_flags(0); + } else { + av_channel_layout_copy(& in_ch_layout, &layouts[0]); + av_channel_layout_copy(&out_ch_layout, &layouts[0]); + } + + in_ch_count= in_ch_layout.nb_channels; + out_ch_count= out_ch_layout.nb_channels; + av_channel_layout_describe(& in_ch_layout, in_layout_string, sizeof( in_layout_string)); + av_channel_layout_describe(&out_ch_layout, out_layout_string, sizeof(out_layout_string)); + + fprintf(stderr, "%s %d %s -> %s %d %s\n", + av_get_sample_fmt_name( in_sample_fmt), in_sample_rate, in_layout_string, + av_get_sample_fmt_name(out_sample_fmt), out_sample_rate, out_layout_string); + + if (swr_alloc_set_opts2(&swr, &out_ch_layout, out_sample_fmt, out_sample_rate, + &in_ch_layout, in_sample_fmt, in_sample_rate, + 0, 0) < 0) { + fprintf(stderr, "Failed swr_alloc_set_opts2()\n"); + goto end; + } + + if(swr_init(swr) < 0) { + fprintf(stderr, "Failed swr_init()\n"); + goto end; + } + + in_sample_nb = size / (in_ch_count * av_get_bytes_per_sample(in_sample_fmt)); + out_sample_nb = out_sample_nb % (av_rescale(in_sample_nb, 2*out_sample_rate, in_sample_rate) + 1); + + out_data = av_malloc(out_sample_nb * out_ch_count * av_get_bytes_per_sample(out_sample_fmt)); + if (!out_data) + goto end; + + setup_array(ain , (uint8_t*)data, in_sample_fmt, in_sample_nb); + setup_array(aout, out_data, out_sample_fmt, out_sample_nb); + + count = swr_convert(swr, aout, out_sample_nb, (const uint8_t **)ain, in_sample_nb); + + av_freep(&out_data); + +end: + swr_free(&swr); + + return 0; +} -- 2.45.2

2 2

[PATCH] avcodec/nvenc: Rework on DTS generation
by Zhao Zhili 07 Aug '24

07 Aug '24

From: Zhao Zhili <zhilizhao(a)tencent.com> Before the patch, the method to generate DTS only works with timebase equal to 1/fps. With timebase like 1/1000 ./ffmpeg -i foo.mp4 -an -c:v h264_nvenc -enc_time_base 1/1000 bar.mp4 pts 0 dts -3 pts 160 dts 37 pts 80 dts 77 pts 40 dts 117 <-- invalid pts 120 dts 157 pts 320 dts 197 pts 240 dts 237 pts 200 dts 277 <-- invalid pts 280 dts 317 <-- invalid The generated DTS can be larger than PTS, since it only reorder the input PTS and minus the number of frame delay, which doesn't take timebase into account. It should minus the "time" of frame delay. 9a245bd trying to fix the issue, but the implementation is incomplete, which only use time_base.num. Then it got reverted by ac7c265b33b. After this patch: pts 0 dts -120 pts 160 dts -80 pts 80 dts -40 pts 40 dts 0 pts 120 dts 40 pts 320 dts 80 pts 240 dts 120 pts 200 dts 160 pts 280 dts 200 --- libavcodec/nvenc.c | 62 ++++++++++++++++++++++++++++++++++++++-------- libavcodec/nvenc.h | 3 +++ 2 files changed, 55 insertions(+), 10 deletions(-) diff --git a/libavcodec/nvenc.c b/libavcodec/nvenc.c index ab92395ed6..34448462f0 100644 --- a/libavcodec/nvenc.c +++ b/libavcodec/nvenc.c @@ -1893,7 +1893,8 @@ static av_cold int nvenc_setup_surfaces(AVCodecContext *avctx) if (!ctx->frame_data_array) return AVERROR(ENOMEM); - ctx->timestamp_list = av_fifo_alloc2(ctx->nb_surfaces, sizeof(int64_t), 0); + ctx->timestamp_list = av_fifo_alloc2(ctx->nb_surfaces + ctx->encode_config.frameIntervalP, + sizeof(int64_t), 0); if (!ctx->timestamp_list) return AVERROR(ENOMEM); @@ -2347,26 +2348,65 @@ static inline int64_t timestamp_queue_dequeue(AVFifo *queue) return timestamp; } +static inline int64_t timestamp_queue_peek(AVFifo *queue, size_t index) +{ + int64_t timestamp = AV_NOPTS_VALUE; + av_fifo_peek(queue, &timestamp, 1, index); + + return timestamp; +} + static int nvenc_set_timestamp(AVCodecContext *avctx, NV_ENC_LOCK_BITSTREAM *params, AVPacket *pkt) { NvencContext *ctx = avctx->priv_data; + int delay; + int64_t delay_time; pkt->pts = params->outputTimeStamp; - if (avctx->codec_descriptor->props & AV_CODEC_PROP_REORDER) { -FF_DISABLE_DEPRECATION_WARNINGS - pkt->dts = timestamp_queue_dequeue(ctx->timestamp_list) - -#if FF_API_TICKS_PER_FRAME - FFMAX(avctx->ticks_per_frame, 1) * -#endif - FFMAX(ctx->encode_config.frameIntervalP - 1, 0); -FF_ENABLE_DEPRECATION_WARNINGS - } else { + if (!(avctx->codec_descriptor->props & AV_CODEC_PROP_REORDER)) { pkt->dts = pkt->pts; + return 0; + } + + // This can be more than necessary, but we don't know the real reorder delay. + delay = FFMAX(ctx->encode_config.frameIntervalP - 1, 0); + if (ctx->output_frame_num >= delay) { + pkt->dts = timestamp_queue_dequeue(ctx->timestamp_list); + ctx->output_frame_num++; + return 0; } + delay_time = ctx->initial_delay_time; + if (!delay_time) { + int64_t t1, t2, t3; + t1 = timestamp_queue_peek(ctx->timestamp_list, delay); + t2 = timestamp_queue_peek(ctx->timestamp_list, 0); + t3 = (delay > 1) ? timestamp_queue_peek(ctx->timestamp_list, 1) : t1; + + if (t1 != AV_NOPTS_VALUE) { + delay_time = t1 - t2; + } else if (avctx->framerate.num > 0 && avctx->framerate.den > 0) { + delay_time = av_rescale_q(delay, (AVRational) {avctx->framerate.den, avctx->framerate.num}, + avctx->time_base); + } else if (t3 != AV_NOPTS_VALUE) { + delay_time = delay * (t3 - t2); + } else { + delay_time = delay; + } + ctx->initial_delay_time = delay_time; + } + + /* The following method is simple, but doesn't guarantee monotonic with VFR + * when delay_time isn't accurate (that is, t1 == AV_NOPTS_VALUE) + * + * dts = timestamp_queue_peek(ctx->timestamp_list, ctx->output_frame_num) - delay_time + */ + pkt->dts = timestamp_queue_peek(ctx->timestamp_list, 0) - delay_time * (delay - ctx->output_frame_num) / delay; + ctx->output_frame_num++; + return 0; } @@ -2902,4 +2942,6 @@ av_cold void ff_nvenc_encode_flush(AVCodecContext *avctx) nvenc_send_frame(avctx, NULL); av_fifo_reset2(ctx->timestamp_list); + ctx->output_frame_num = 0; + ctx->initial_delay_time = 0; } diff --git a/libavcodec/nvenc.h b/libavcodec/nvenc.h index 09de00badc..dc7fe41951 100644 --- a/libavcodec/nvenc.h +++ b/libavcodec/nvenc.h @@ -206,6 +206,9 @@ typedef struct NvencContext AVFifo *output_surface_queue; AVFifo *output_surface_ready_queue; AVFifo *timestamp_list; + // This is for DTS calculating, reset after flush + int64_t output_frame_num; + int64_t initial_delay_time; NV_ENC_SEI_PAYLOAD *sei_data; int sei_data_size; -- 2.25.1

4 6

[PATCH] avformat/rtpproto: free ip filters on open error
by Kacper Michajłow 06 Aug '24

06 Aug '24

Found by OSS-Fuzz. Signed-off-by: Kacper Michajłow <kasper93(a)gmail.com> --- libavformat/rtpproto.c | 1 + 1 file changed, 1 insertion(+) diff --git a/libavformat/rtpproto.c b/libavformat/rtpproto.c index b1cdf061f0..15d0050936 100644 --- a/libavformat/rtpproto.c +++ b/libavformat/rtpproto.c @@ -379,6 +379,7 @@ static int rtp_open(URLContext *h, const char *uri, int flags) return 0; fail: + ff_ip_reset_filters(&s->filters); ffurl_closep(&s->rtp_hd); ffurl_closep(&s->rtcp_hd); ffurl_closep(&s->fec_hd); -- 2.43.0

2 1

[PATCH] avformat/srtpproto: pass options to nested protocol
by Kacper Michajłow 06 Aug '24

06 Aug '24

This fixes passing options dict. Fixes some timeouts found by OSS-Fuzz. Signed-off-by: Kacper Michajłow <kasper93(a)gmail.com> --- libavformat/srtpproto.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/libavformat/srtpproto.c b/libavformat/srtpproto.c index 61669e05ad..02cf156327 100644 --- a/libavformat/srtpproto.c +++ b/libavformat/srtpproto.c @@ -61,7 +61,7 @@ static int srtp_close(URLContext *h) return 0; } -static int srtp_open(URLContext *h, const char *uri, int flags) +static int srtp_open(URLContext *h, const char *uri, int flags, AVDictionary **options) { SRTPProtoContext *s = h->priv_data; char hostname[256], buf[1024], path[1024]; @@ -78,7 +78,7 @@ static int srtp_open(URLContext *h, const char *uri, int flags) path, sizeof(path), uri); ff_url_join(buf, sizeof(buf), "rtp", NULL, hostname, rtp_port, "%s", path); if ((ret = ffurl_open_whitelist(&s->rtp_hd, buf, flags, &h->interrupt_callback, - NULL, h->protocol_whitelist, h->protocol_blacklist, h)) < 0) + options, h->protocol_whitelist, h->protocol_blacklist, h)) < 0) goto fail; h->max_packet_size = FFMIN(s->rtp_hd->max_packet_size, @@ -131,7 +131,7 @@ static int srtp_get_multi_file_handle(URLContext *h, int **handles, const URLProtocol ff_srtp_protocol = { .name = "srtp", - .url_open = srtp_open, + .url_open2 = srtp_open, .url_read = srtp_read, .url_write = srtp_write, .url_close = srtp_close, -- 2.43.0

2 1