February 2022 - ffmpeg-devel - lists.ffmpeg.org

[PATCH v2 1/4] avformat/imf: open resources only when first needed
by pal＠sandflow.com 02 Feb '22

02 Feb '22

From: Pierre-Anthony Lemieux <pal(a)palemieux.com> IMF CPLs can reference thousands of files, which can result in system limits for the number of open files to be exceeded. The following patch opens and closes files as needed. Addresses https://trac.ffmpeg.org/ticket/9623 --- libavformat/imfdec.c | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/libavformat/imfdec.c b/libavformat/imfdec.c index d67c9b8898..e6a1020ecc 100644 --- a/libavformat/imfdec.c +++ b/libavformat/imfdec.c @@ -103,10 +103,11 @@ typedef struct IMFVirtualTrackPlaybackCtx { int32_t index; /**< Track index in playlist */ AVRational current_timestamp; /**< Current temporal position */ AVRational duration; /**< Overall duration */ - uint32_t resource_count; /**< Number of resources */ + uint32_t resource_count; /**< Number of resources (<= INT32_MAX) */ unsigned int resources_alloc_sz; /**< Size of the buffer holding the resource */ IMFVirtualTrackResourcePlaybackCtx *resources; /**< Buffer holding the resources */ - uint32_t current_resource_index; /**< Current resource */ + int32_t current_resource_index; /**< Index of the current resource in resources, + or < 0 if a current resource has yet to be selected */ int64_t last_pts; /**< Last timestamp */ } IMFVirtualTrackPlaybackCtx; @@ -435,7 +436,6 @@ static int open_track_file_resource(AVFormatContext *s, IMFContext *c = s->priv_data; IMFAssetLocator *asset_locator; void *tmp; - int ret; asset_locator = find_asset_map_locator(&c->asset_locator_map, track_file_resource->track_file_uuid); if (!asset_locator) { @@ -452,7 +452,7 @@ static int open_track_file_resource(AVFormatContext *s, UID_ARG(asset_locator->uuid), asset_locator->absolute_uri); - if (track->resource_count > UINT32_MAX - track_file_resource->base.repeat_count + if (track->resource_count > INT32_MAX - track_file_resource->base.repeat_count || (track->resource_count + track_file_resource->base.repeat_count) > INT_MAX / sizeof(IMFVirtualTrackResourcePlaybackCtx)) return AVERROR(ENOMEM); @@ -470,8 +470,6 @@ static int open_track_file_resource(AVFormatContext *s, vt_ctx.locator = asset_locator; vt_ctx.resource = track_file_resource; vt_ctx.ctx = NULL; - if ((ret = open_track_resource_context(s, &vt_ctx)) != 0) - return ret; track->resources[track->resource_count++] = vt_ctx; track->duration = av_add_q(track->duration, av_make_q((int)track_file_resource->base.duration @@ -501,6 +499,7 @@ static int open_virtual_track(AVFormatContext *s, if (!(track = av_mallocz(sizeof(IMFVirtualTrackPlaybackCtx)))) return AVERROR(ENOMEM); + track->current_resource_index = -1; track->index = track_index; track->duration = av_make_q(0, 1); @@ -551,6 +550,7 @@ static int set_context_streams_from_tracks(AVFormatContext *s) AVStream *first_resource_stream; /* Open the first resource of the track to get stream information */ + open_track_resource_context(s, &c->tracks[i]->resources[0]); first_resource_stream = c->tracks[i]->resources[0].ctx->streams[0]; av_log(s, AV_LOG_DEBUG, "Open the first resource of track %d\n", c->tracks[i]->index); @@ -741,7 +741,8 @@ static IMFVirtualTrackResourcePlaybackCtx *get_resource_context_for_timestamp(AV track->index); if (open_track_resource_context(s, &(track->resources[i])) != 0) return NULL; - avformat_close_input(&(track->resources[track->current_resource_index].ctx)); + if (track->current_resource_index > 0) + avformat_close_input(&track->resources[track->current_resource_index].ctx); track->current_resource_index = i; } -- 2.17.1

1 3

[PATCH] hwcontext_vulkan: use VkPhysicalDeviceTimelineSemaphoreFeatures to check for timeline semaphore supporting
by Zhao Zhili 01 Feb '22

01 Feb '22

VkPhysicalDeviceVulkan12Features isn't implemented on MoltenVK yet. VkPhysicalDeviceTimelineSemaphoreFeatures is less versatile but simple. None of device_features_1_1 nor device_features_1_2 has real usage yet, keep the code for future. --- libavutil/hwcontext_vulkan.c | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/libavutil/hwcontext_vulkan.c b/libavutil/hwcontext_vulkan.c index ae19fc2ab6..2e219511c9 100644 --- a/libavutil/hwcontext_vulkan.c +++ b/libavutil/hwcontext_vulkan.c @@ -1321,8 +1321,16 @@ static int vulkan_device_create_internal(AVHWDeviceContext *ctx, VulkanDevicePriv *p = ctx->internal->priv; FFVulkanFunctions *vk = &p->vkfn; AVVulkanDeviceContext *hwctx = ctx->hwctx; + /* VkPhysicalDeviceVulkan12Features has a timelineSemaphore field, but + * MoltenVK doesn't implement VkPhysicalDeviceVulkan12Features yet, so we + * use VkPhysicalDeviceTimelineSemaphoreFeatures directly. + */ + VkPhysicalDeviceTimelineSemaphoreFeatures timeline_features = { + .sType = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_TIMELINE_SEMAPHORE_FEATURES, + }; VkPhysicalDeviceVulkan12Features dev_features_1_2 = { .sType = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_VULKAN_1_2_FEATURES, + .pNext = &timeline_features, }; VkPhysicalDeviceVulkan11Features dev_features_1_1 = { .sType = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_VULKAN_1_1_FEATURES, @@ -1366,7 +1374,7 @@ static int vulkan_device_create_internal(AVHWDeviceContext *ctx, #undef COPY_FEATURE /* We require timeline semaphores */ - if (!dev_features_1_2.timelineSemaphore) { + if (!timeline_features.timelineSemaphore) { av_log(ctx, AV_LOG_ERROR, "Device does not support timeline semaphores!\n"); err = AVERROR(ENOSYS); goto end; -- 2.31.1

2 1

[PATCH] libavformat/mov: Expose Quicktime poster_time value as metadata TAG.
by Bryce Newman 01 Feb '22

01 Feb '22

I need the ability to derive the poster time found in the mvhd, so I can use that value to create a thumbnail from ffmpeg. More details can be found here https://www.mail-archive.com/ffmpeg-user@ffmpeg.org/msg30003.html Signed-off-by: Bryce Chester Newman <bryce.newman(a)gettyimages.com> --- libavformat/mov.c | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/libavformat/mov.c b/libavformat/mov.c index a80fcc1606..4d4854c09e 100644 --- a/libavformat/mov.c +++ b/libavformat/mov.c @@ -1525,12 +1525,21 @@ static int mov_read_mvhd(MOVContext *c, AVIOContext *pb, MOVAtom atom) avio_rb32(pb); /* preview time */ avio_rb32(pb); /* preview duration */ - avio_rb32(pb); /* poster time */ + int32_t poster_time = avio_rb32(pb); /* poster time */ avio_rb32(pb); /* selection time */ avio_rb32(pb); /* selection duration */ avio_rb32(pb); /* current time */ avio_rb32(pb); /* next track ID */ + av_log(c->fc, AV_LOG_TRACE, "poster_time = %i, time_scale = %i\n", poster_time, c->time_scale); + if(poster_time && c->time_scale && c->time_scale > 0) { + char buffer[32]; + float poster_time_location = (float)poster_time / c->time_scale; + snprintf(buffer, sizeof(buffer), "%.2f", poster_time_location); + /* This will appear as a TAG in the format section of FFProbe output using -show_format */ + av_dict_set(&c->fc->metadata, "poster_time", buffer, 0); + } + return 0; } -- 2.35.1 Bryce Chester Newman | Principal Developer p: +12069255045 |

1 0

[PATCH] avcodec/libdav1d: free the Dav1dData packet on dav1d_send_data() failure
by James Almer 01 Feb '22

01 Feb '22

We still own it on failure, and there's no point trying to feed it again. Signed-off-by: James Almer <jamrial(a)gmail.com> --- libavcodec/libdav1d.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/libavcodec/libdav1d.c b/libavcodec/libdav1d.c index 29fa4f9c3d..872e60e000 100644 --- a/libavcodec/libdav1d.c +++ b/libavcodec/libdav1d.c @@ -347,8 +347,10 @@ static int libdav1d_receive_frame(AVCodecContext *c, AVFrame *frame) if (res < 0) { if (res == AVERROR(EINVAL)) res = AVERROR_INVALIDDATA; - if (res != AVERROR(EAGAIN)) + if (res != AVERROR(EAGAIN)) { + dav1d_data_unref(data); return res; + } } res = dav1d_get_picture(dav1d->c, p); -- 2.34.1

2 2

[PATCH 1/2] avcodec/cfhd: Avoid signed integer overflow in coeff
by Michael Niedermayer 01 Feb '22

01 Feb '22

Fixes: signed integer overflow: 15244032 * 256 cannot be represented in type 'int' Fixes: 43504/clusterfuzz-testcase-minimized-ffmpeg_AV_CODEC_ID_CFHD_fuzzer-4865014842916864 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/cfhd.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/libavcodec/cfhd.c b/libavcodec/cfhd.c index 008a6360b6..ac7826250f 100644 --- a/libavcodec/cfhd.c +++ b/libavcodec/cfhd.c @@ -838,7 +838,7 @@ static int cfhd_decode(AVCodecContext *avctx, void *data, int *got_frame, const uint16_t q = s->quantisation; for (i = 0; i < run; i++) { - *coeff_data |= coeff * 256; + *coeff_data |= coeff * 256U; *coeff_data++ *= q; } } else { @@ -869,7 +869,7 @@ static int cfhd_decode(AVCodecContext *avctx, void *data, int *got_frame, const uint16_t q = s->quantisation; for (i = 0; i < run; i++) { - *coeff_data |= coeff * 256; + *coeff_data |= coeff * 256U; *coeff_data++ *= q; } } else { -- 2.17.1

1 2

[PATCH] fftools/cmdutils: add an option to append to the report file
by Dan Zwell 01 Feb '22

01 Feb '22

There are times when we want ffmpeg to log, but we don't want it to overwrite the log file. In addition to the use case described in the ticket, a third party tool that invokes ffmpeg may write additional information to the log file, such as why the encoding options were chosen. I made the error checking nonfatal for future compatibility, because this feature is aimed at scripts and ffmpeg frontends. This implements: https://trac.ffmpeg.org/ticket/3059 Note: unknown keys are ignored, so adding a new "append" key does not break backward compatibility. Signed-off-by: Dan Zwell <devel(a)zwell.net> --- doc/fftools-common-opts.texi | 3 +++ fftools/cmdutils.c | 13 ++++++++++++- 2 files changed, 15 insertions(+), 1 deletion(-) diff --git a/doc/fftools-common-opts.texi b/doc/fftools-common-opts.texi index d9145704d6..a9a8eda417 100644 --- a/doc/fftools-common-opts.texi +++ b/doc/fftools-common-opts.texi @@ -270,6 +270,9 @@ of the program, @code{%t} is expanded to a timestamp, @code{%%} is expanded to a plain @code{%} @item level set the log verbosity level using a numerical value (see @code{-loglevel}). +@item append +@code{append=1} tells ffmpeg to append to a report file if it exists instead of +overwriting it. @code{append=0} is the default @end table For example, to output a report to a file named @file{ffreport.log} diff --git a/fftools/cmdutils.c b/fftools/cmdutils.c index 4b50e15eef..08aec489cb 100644 --- a/fftools/cmdutils.c +++ b/fftools/cmdutils.c @@ -983,6 +983,7 @@ static int init_report(const char *env) time_t now; struct tm *tm; AVBPrint filename; + int append = 0; if (report_file) /* already opened */ return 0; @@ -1012,6 +1013,13 @@ static int init_report(const char *env) exit_program(1); } envlevel = 1; + } else if (!strcmp(key, "append")) { + char *tail; + append = strtol(val, &tail, 10); + if (*val == '\0' || *tail || (append != 0 && append != 1)) { + av_log(NULL, AV_LOG_ERROR, "Invalid append value '%s' (should be 0 or 1)\n", val); + append = 0; + } } else { av_log(NULL, AV_LOG_ERROR, "Unknown key '%s' in FFREPORT\n", key); } @@ -1032,7 +1040,10 @@ static int init_report(const char *env) if (!envlevel) report_file_level = FFMAX(report_file_level, prog_loglevel); - report_file = fopen(filename.str, "w"); + if (append) + report_file = fopen(filename.str, "a"); + else + report_file = fopen(filename.str, "w"); if (!report_file) { int ret = AVERROR(errno); av_log(NULL, AV_LOG_ERROR, "Failed to open report \"%s\": %s\n", -- 2.25.1

1 0

[PATCH] fftools/cmdutils: add an option to append to the report file
by Dan Zwell 01 Feb '22

01 Feb '22

There are times when we want ffmpeg to log, but we don't want it to overwrite the log file. In addition to the use case described in the ticket, a third party tool that invokes ffmpeg may write additional information to the log file, such as why the encoding options were chosen. This implements: https://trac.ffmpeg.org/ticket/3059 Note: unknown keys are ignored, so adding a new "append" key does not break backward compatibility. Signed-off-by: Dan Zwell <devel(a)zwell.net> --- doc/fftools-common-opts.texi | 3 +++ fftools/cmdutils.c | 8 +++++++- 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/doc/fftools-common-opts.texi b/doc/fftools-common-opts.texi index d9145704d6..4c6c297315 100644 --- a/doc/fftools-common-opts.texi +++ b/doc/fftools-common-opts.texi @@ -270,6 +270,9 @@ of the program, @code{%t} is expanded to a timestamp, @code{%%} is expanded to a plain @code{%} @item level set the log verbosity level using a numerical value (see @code{-loglevel}). +@item append +@code{append=1} tells ffmpeg to append to a report file if it exists instead +of overwriting it. @end table For example, to output a report to a file named @file{ffreport.log} diff --git a/fftools/cmdutils.c b/fftools/cmdutils.c index 4b50e15eef..350329ee8b 100644 --- a/fftools/cmdutils.c +++ b/fftools/cmdutils.c @@ -983,6 +983,7 @@ static int init_report(const char *env) time_t now; struct tm *tm; AVBPrint filename; + int append = 0; if (report_file) /* already opened */ return 0; @@ -1012,6 +1013,8 @@ static int init_report(const char *env) exit_program(1); } envlevel = 1; + } else if (!strcmp(key, "append")) { + append = strtol(val, NULL, 10); } else { av_log(NULL, AV_LOG_ERROR, "Unknown key '%s' in FFREPORT\n", key); } @@ -1032,7 +1035,10 @@ static int init_report(const char *env) if (!envlevel) report_file_level = FFMAX(report_file_level, prog_loglevel); - report_file = fopen(filename.str, "w"); + if (append) + report_file = fopen(filename.str, "a"); + else + report_file = fopen(filename.str, "w"); if (!report_file) { int ret = AVERROR(errno); av_log(NULL, AV_LOG_ERROR, "Failed to open report \"%s\": %s\n", -- 2.25.1

2 1

Re: [FFmpeg-devel] avformat/mkv: add mkv tags for AVS2 and AVS3 codecs.
by Ze Yuan 01 Feb '22

01 Feb '22

From: Andreas Rheinhardt Sent: Tuesday, February 1, 2022 12:43 PM To: ffmpeg-devel(a)ffmpeg.org Subject: Re: [FFmpeg-devel] avformat/mkv: add mkv tags for AVS2 and AVS3 codecs. >Ze Yuan: >> From babcceafbd30eff677b2366a0c470d31c503bed1 Mon Sep 17 00:00:00 2001 >> From: TianBo Zheng <naturalwalker(a)hotmail.com> >> Date: Mon, 10 Jan 2022 11:18:56 +0000 >> Subject: [PATCH] avformat/mkv: add mkv tags for AVS2 and AVS3 codecs. >> >> MKV codec mappings: >> V_AVS2 and V_AVS3 (https://github.com/ietf-wg-cellar/matroska-specification/blob/master/codec_…) >> >> Encoding tool: >> Ffmpeg with AVS2/AVS3 enabled: https://github.com/xatabhk/FFmpeg-avs2-avs3/releases >> Command line: >> >> ffmpeg -i xxxx.mp4 -vcodec avs2 -acodec copy xxxx_avs2.mkv >> ffmpeg -i xxxx.mp4 -vcodec avs2 -speed_level 4 -acodec copy xxxx_avs2.mkv` >> >> Players: >> (1) Ffmpeg with avs2/avs3 enabled: (https://github.com/xatabhk/FFmpeg-avs2-avs3/releases) >> Command line: >> >> ffplay xxxx_avs2.mkv >> ffplay xxxx_avs3.mkv >> (2) VLC 3.0.x with AVS2/AVS3 enabled: https://github.com/xatabhk/vlc-3.0-avs2-avs3/releases >> (3) Mpc-hc 1.9.x with AVS2/AVS3 enabled: https://gitee.com/zhengtianbo/cavs-avs2-avs3_decoder_added_to_mpc_hc/releas… >> >> AVS2/AVS3 MKV samples: >> https://github.com/xatabhk/avs2-avs3-video-samples >> Signed-off-by: TianBo Zheng naturalwalker(a)hotmail.com >> --- >> libavformat/matroska.c | 2 ++ >> 1 file changed, 2 insertions(+) >> >> diff --git a/libavformat/matroska.c b/libavformat/matroska.c >> index 7c56aba403..90d94b65bf 100644 >> --- a/libavformat/matroska.c >> +++ b/libavformat/matroska.c >> @@ -78,6 +78,8 @@ const CodecTags ff_mkv_codec_tags[]={ >> {"S_HDMV/TEXTST" , AV_CODEC_ID_HDMV_TEXT_SUBTITLE}, >> >> {"V_AV1" , AV_CODEC_ID_AV1}, >> + {"V_AVS2" , AV_CODEC_ID_AVS2}, >> + {"V_AVS3" , AV_CODEC_ID_AVS3}, >> {"V_DIRAC" , AV_CODEC_ID_DIRAC}, >> {"V_FFV1" , AV_CODEC_ID_FFV1}, >> {"V_MJPEG" , AV_CODEC_ID_MJPEG}, > -- >> 2.19.1 >Sorry for having ignored this for so long. > actually wanted to merge your AVS2 patch long ago (see >https://github.com/mkver/FFmpeg/commit/18c52e7493b1c1f11de059fbcbf9d17635e5…) >but I remember that your mails were weird and I managed to recreate a >Chinese name out of them, but I was unsure if this was the correct one >(namely 郑天波). So I didn't apply it. If it is correct, then please >tell me if you prefer this name or TianBo Zheng. >- Andreas I think both work for me. _______________________________________________ ffmpeg-devel mailing list ffmpeg-devel(a)ffmpeg.org https://ffmpeg.org/mailman/listinfo/ffmpeg-devel To unsubscribe, visit link above, or email ffmpeg-devel-request(a)ffmpeg.org with subject "unsubscribe".

1 0

avformat/mkv: add mkv tags for AVS2 and AVS3 codecs.
by Ze Yuan 01 Feb '22

01 Feb '22

>From babcceafbd30eff677b2366a0c470d31c503bed1 Mon Sep 17 00:00:00 2001 From: TianBo Zheng <naturalwalker(a)hotmail.com> Date: Mon, 10 Jan 2022 11:18:56 +0000 Subject: [PATCH] avformat/mkv: add mkv tags for AVS2 and AVS3 codecs. MKV codec mappings: V_AVS2 and V_AVS3 (https://github.com/ietf-wg-cellar/matroska-specification/blob/master/codec_…) Encoding tool: Ffmpeg with AVS2/AVS3 enabled: https://github.com/xatabhk/FFmpeg-avs2-avs3/releases Command line: ffmpeg -i xxxx.mp4 -vcodec avs2 -acodec copy xxxx_avs2.mkv ffmpeg -i xxxx.mp4 -vcodec avs2 -speed_level 4 -acodec copy xxxx_avs2.mkv` Players: (1) Ffmpeg with avs2/avs3 enabled: (https://github.com/xatabhk/FFmpeg-avs2-avs3/releases) Command line: ffplay xxxx_avs2.mkv ffplay xxxx_avs3.mkv (2) VLC 3.0.x with AVS2/AVS3 enabled: https://github.com/xatabhk/vlc-3.0-avs2-avs3/releases (3) Mpc-hc 1.9.x with AVS2/AVS3 enabled: https://gitee.com/zhengtianbo/cavs-avs2-avs3_decoder_added_to_mpc_hc/releas… AVS2/AVS3 MKV samples: https://github.com/xatabhk/avs2-avs3-video-samples Signed-off-by: TianBo Zheng naturalwalker(a)hotmail.com --- libavformat/matroska.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/libavformat/matroska.c b/libavformat/matroska.c index 7c56aba403..90d94b65bf 100644 --- a/libavformat/matroska.c +++ b/libavformat/matroska.c @@ -78,6 +78,8 @@ const CodecTags ff_mkv_codec_tags[]={ {"S_HDMV/TEXTST" , AV_CODEC_ID_HDMV_TEXT_SUBTITLE}, {"V_AV1" , AV_CODEC_ID_AV1}, + {"V_AVS2" , AV_CODEC_ID_AVS2}, + {"V_AVS3" , AV_CODEC_ID_AVS3}, {"V_DIRAC" , AV_CODEC_ID_DIRAC}, {"V_FFV1" , AV_CODEC_ID_FFV1}, {"V_MJPEG" , AV_CODEC_ID_MJPEG}, -- 2.19.1

2 1