January 2022 - ffmpeg-cvslog - lists.ffmpeg.org

lavf/imfdec: mark as experimental
by Anton Khirnov 03 Jan '22

03 Jan '22

ffmpeg | branch: master | Anton Khirnov <anton(a)khirnov.net> | Sun Jan 2 18:40:09 2022 +0100| [70f318e6b6c1551dff4d8571b8158f9d1cf05827] | committer: Anton Khirnov lavf/imfdec: mark as experimental People have expressed concerns about its safety, so prevent it from being auto-selected without explicit user indication. > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=70f318e6b6c1551df… --- libavformat/imfdec.c | 1 + 1 file changed, 1 insertion(+) diff --git a/libavformat/imfdec.c b/libavformat/imfdec.c index f17064cfcd..228ba494ae 100644 --- a/libavformat/imfdec.c +++ b/libavformat/imfdec.c @@ -889,6 +889,7 @@ static const AVClass imf_class = { const AVInputFormat ff_imf_demuxer = { .name = "imf", .long_name = NULL_IF_CONFIG_SMALL("IMF (Interoperable Master Format)"), + .flags = AVFMT_EXPERIMENTAL, .flags_internal = FF_FMT_INIT_CLEANUP, .priv_class = &imf_class, .priv_data_size = sizeof(IMFContext),

1 0

lavf: add a flag for experimental (de)muxers
by Anton Khirnov 03 Jan '22

03 Jan '22

ffmpeg | branch: master | Anton Khirnov <anton(a)khirnov.net> | Sun Jan 2 18:38:02 2022 +0100| [be97d2a825a12c9c01a61b985d44eb7424628fd6] | committer: Anton Khirnov lavf: add a flag for experimental (de)muxers > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=be97d2a825a12c9c0… --- doc/APIchanges | 3 +++ libavformat/avformat.h | 7 +++++++ libavformat/format.c | 2 ++ libavformat/version.h | 2 +- 4 files changed, 13 insertions(+), 1 deletion(-) diff --git a/doc/APIchanges b/doc/APIchanges index 670a59329e..29c235630e 100644 --- a/doc/APIchanges +++ b/doc/APIchanges @@ -14,6 +14,9 @@ libavutil: 2021-04-27 API changes, most recent first: +2022-01-xx - xxxxxxxxxx - lavf 59.13.100 - avformat.h + Add AVFMT_EXPERIMENTAL flag. + 2021-12-xx - xxxxxxxxxx - lavu 57.13.100 - hwcontext_videotoolbox.h Add av_vt_pixbuf_set_attachments diff --git a/libavformat/avformat.h b/libavformat/avformat.h index 70b36d7682..6ce367e854 100644 --- a/libavformat/avformat.h +++ b/libavformat/avformat.h @@ -463,6 +463,13 @@ typedef struct AVProbeData { /// Demuxer will use avio_open, no opened file should be provided by the caller. #define AVFMT_NOFILE 0x0001 #define AVFMT_NEEDNUMBER 0x0002 /**< Needs '%d' in filename. */ +/** + * The muxer/demuxer is experimental and should be used with caution. + * + * - demuxers: will not be selected automatically by probing, must be specified + * explicitly. + */ +#define AVFMT_EXPERIMENTAL 0x0004 #define AVFMT_SHOW_IDS 0x0008 /**< Show format stream IDs numbers. */ #define AVFMT_GLOBALHEADER 0x0040 /**< Format wants global header. */ #define AVFMT_NOTIMESTAMPS 0x0080 /**< Format does not need / have any timestamps. */ diff --git a/libavformat/format.c b/libavformat/format.c index 387627009e..52b85c16a2 100644 --- a/libavformat/format.c +++ b/libavformat/format.c @@ -158,6 +158,8 @@ const AVInputFormat *av_probe_input_format3(const AVProbeData *pd, } while ((fmt1 = av_demuxer_iterate(&i))) { + if (fmt1->flags & AVFMT_EXPERIMENTAL) + continue; if (!is_opened == !(fmt1->flags & AVFMT_NOFILE) && strcmp(fmt1->name, "image2")) continue; score = 0; diff --git a/libavformat/version.h b/libavformat/version.h index f372380dcf..79eb22c230 100644 --- a/libavformat/version.h +++ b/libavformat/version.h @@ -32,7 +32,7 @@ // Major bumping may affect Ticket5467, 5421, 5451(compatibility with Chromium) // Also please add any ticket numbers that you believe might be affected here #define LIBAVFORMAT_VERSION_MAJOR 59 -#define LIBAVFORMAT_VERSION_MINOR 12 +#define LIBAVFORMAT_VERSION_MINOR 13 #define LIBAVFORMAT_VERSION_MICRO 100 #define LIBAVFORMAT_VERSION_INT AV_VERSION_INT(LIBAVFORMAT_VERSION_MAJOR, \

1 0

libavcodec/pthread_frame: remove duplicate pointers
by Yu Yang 03 Jan '22

03 Jan '22

ffmpeg | branch: master | Yu Yang <yuyang14(a)kuaishou.com> | Wed Dec 15 10:17:02 2021 +0800| [5e2a1f1e7db630d547e89988414499ea788bd68e] | committer: Anton Khirnov libavcodec/pthread_frame: remove duplicate pointers '*src' and '*avctx' point to the same memory. It is enough to keep one of them. Signed-off-by: Yu Yang <yuyang14(a)kuaishou.com> Signed-off-by: Anton Khirnov <anton(a)khirnov.net> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=5e2a1f1e7db630d54… --- libavcodec/pthread_frame.c | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/libavcodec/pthread_frame.c b/libavcodec/pthread_frame.c index 73b1b7d7d9..85a6bc98c1 100644 --- a/libavcodec/pthread_frame.c +++ b/libavcodec/pthread_frame.c @@ -765,14 +765,14 @@ void ff_frame_thread_free(AVCodecContext *avctx, int thread_count) static av_cold int init_thread(PerThreadContext *p, int *threads_to_free, FrameThreadContext *fctx, AVCodecContext *avctx, - AVCodecContext *src, const AVCodec *codec, int first) + const AVCodec *codec, int first) { AVCodecContext *copy; int err; atomic_init(&p->state, STATE_INPUT_READY); - copy = av_memdup(src, sizeof(*src)); + copy = av_memdup(avctx, sizeof(*avctx)); if (!copy) return AVERROR(ENOMEM); copy->priv_data = NULL; @@ -784,7 +784,7 @@ static av_cold int init_thread(PerThreadContext *p, int *threads_to_free, p->parent = fctx; p->avctx = copy; - copy->internal = av_memdup(src->internal, sizeof(*src->internal)); + copy->internal = av_memdup(avctx->internal, sizeof(*avctx->internal)); if (!copy->internal) return AVERROR(ENOMEM); copy->internal->thread_ctx = p; @@ -798,7 +798,7 @@ static av_cold int init_thread(PerThreadContext *p, int *threads_to_free, if (codec->priv_class) { *(const AVClass **)copy->priv_data = codec->priv_class; - err = av_opt_copy(copy->priv_data, src->priv_data); + err = av_opt_copy(copy->priv_data, avctx->priv_data); if (err < 0) return err; } @@ -843,7 +843,6 @@ int ff_frame_thread_init(AVCodecContext *avctx) { int thread_count = avctx->thread_count; const AVCodec *codec = avctx->codec; - AVCodecContext *src = avctx; FrameThreadContext *fctx; int err, i = 0; @@ -876,7 +875,7 @@ int ff_frame_thread_init(AVCodecContext *avctx) fctx->delaying = 1; if (codec->type == AVMEDIA_TYPE_VIDEO) - avctx->delay = src->thread_count - 1; + avctx->delay = avctx->thread_count - 1; fctx->threads = av_calloc(thread_count, sizeof(*fctx->threads)); if (!fctx->threads) { @@ -888,7 +887,7 @@ int ff_frame_thread_init(AVCodecContext *avctx) PerThreadContext *p = &fctx->threads[i]; int first = !i; - err = init_thread(p, &i, fctx, avctx, src, codec, first); + err = init_thread(p, &i, fctx, avctx, codec, first); if (err < 0) goto error; }

1 0

configure: Make IMF demuxer require MXF demuxer
by Andreas Rheinhardt 03 Jan '22

03 Jan '22

ffmpeg | branch: master | Andreas Rheinhardt <andreas.rheinhardt(a)outlook.com> | Mon Jan 3 07:12:45 2022 +0100| [064ab95cc78249c95d0257db249483bb38b59829] | committer: Andreas Rheinhardt configure: Make IMF demuxer require MXF demuxer The former is useless without the latter. Reviewed-by: Zane van Iperen <zane(a)zanevaniperen.com> Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt(a)outlook.com> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=064ab95cc78249c95… --- configure | 1 + 1 file changed, 1 insertion(+) diff --git a/configure b/configure index 6ad70b9f7b..e2ea473565 100755 --- a/configure +++ b/configure @@ -3416,6 +3416,7 @@ hls_muxer_suggest="gcrypt openssl" image2_alias_pix_demuxer_select="image2_demuxer" image2_brender_pix_demuxer_select="image2_demuxer" imf_demuxer_deps="libxml2" +imf_demuxer_select="mxf_demuxer" ipod_muxer_select="mov_muxer" ismv_muxer_select="mov_muxer" ivf_muxer_select="av1_metadata_bsf vp9_superframe_bsf"

1 0

fate/libswcale: add missing samples dependency to sws-slice tests
by James Almer 03 Jan '22

03 Jan '22

ffmpeg | branch: master | James Almer <jamrial(a)gmail.com> | Fri Dec 31 14:15:29 2021 -0300| [a670cad2c43de442afeeefde0fb57d74b1a03acb] | committer: James Almer fate/libswcale: add missing samples dependency to sws-slice tests Signed-off-by: James Almer <jamrial(a)gmail.com> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=a670cad2c43de442a… --- tests/fate/libswscale.mak | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/tests/fate/libswscale.mak b/tests/fate/libswscale.mak index 599d27b0a5..cf9319ec44 100644 --- a/tests/fate/libswscale.mak +++ b/tests/fate/libswscale.mak @@ -15,8 +15,10 @@ fate-sws-slice-bgr0-nv12: CMD = run tools/scale_slice_test$(EXESUF) $(TARGET_SAM fate-sws-slice: $(SWS_SLICE_TEST-yes) $(SWS_SLICE_TEST-yes): tools/scale_slice_test$(EXESUF) $(SWS_SLICE_TEST-yes): REF = /dev/null -FATE_LIBSWSCALE += $(SWS_SLICE_TEST-yes) +FATE_LIBSWSCALE_SAMPLES += $(SWS_SLICE_TEST-yes) FATE_LIBSWSCALE += $(FATE_LIBSWSCALE-yes) +FATE_LIBSWSCALE_SAMPLES += $(FATE_LIBSWSCALE_SAMPLES-yes) FATE-$(CONFIG_SWSCALE) += $(FATE_LIBSWSCALE) -fate-libswscale: $(FATE_LIBSWSCALE) +FATE_EXTERN-$(CONFIG_SWSCALE) += $(FATE_LIBSWSCALE_SAMPLES) +fate-libswscale: $(FATE_LIBSWSCALE) $(FATE_LIBSWSCALE_SAMPLES)

1 0

avfilter/vf_scale_vulkan: align struct ScaleVulkanContext
by Wu Jianhua 03 Jan '22

03 Jan '22

ffmpeg | branch: master | Wu Jianhua <jianhua.wu-at-intel.com(a)ffmpeg.org> | Sun Jan 2 22:51:40 2022 +0800| [68d0a7e446e0620e7eb9c8e1d93c4ed42f8c8a0a] | committer: Lynne avfilter/vf_scale_vulkan: align struct ScaleVulkanContext On 64 bit Operating System, sizeof(ScaleVulkanContext): reduce from 2400 to 2392 on Linux reduce from 2416 to 2408 on Windows Signed-off-by: Wu Jianhua <jianhua.wu(a)intel.com> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=68d0a7e446e0620e7… --- libavfilter/vf_scale_vulkan.c | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/libavfilter/vf_scale_vulkan.c b/libavfilter/vf_scale_vulkan.c index cfce5ab1f8..c87a8d7e2e 100644 --- a/libavfilter/vf_scale_vulkan.c +++ b/libavfilter/vf_scale_vulkan.c @@ -35,7 +35,6 @@ enum ScalerFunc { typedef struct ScaleVulkanContext { FFVulkanContext vkctx; - int initialized; FFVkQueueFamilyCtx qf; FFVkExecContext *exec; FFVulkanPipeline *pl; @@ -46,11 +45,14 @@ typedef struct ScaleVulkanContext { VkDescriptorImageInfo output_images[3]; VkDescriptorBufferInfo params_desc; - enum ScalerFunc scaler; char *out_format_string; - enum AVColorRange out_range; char *w_expr; char *h_expr; + + enum ScalerFunc scaler; + enum AVColorRange out_range; + + int initialized; } ScaleVulkanContext; static const char scale_bilinear[] = {

1 0

transpose_vulkan: add passthrough option
by Wu Jianhua 03 Jan '22

03 Jan '22

ffmpeg | branch: master | Wu Jianhua <jianhua.wu-at-intel.com(a)ffmpeg.org> | Sun Jan 2 22:51:39 2022 +0800| [c7c37a8f226cd6ed699c242358d0441faabc80f9] | committer: Lynne transpose_vulkan: add passthrough option The following command is on how to apply passthrough option: ffmpeg -init_hw_device vulkan -i input.264 -vf hwupload=extra_hw_frames=16,transpose_vulkan=passthrough=landscape,hwdownload,format=yuv420p output.264 Signed-off-by: Wu Jianhua <jianhua.wu(a)intel.com> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=c7c37a8f226cd6ed6… --- libavfilter/vf_transpose_vulkan.c | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+) diff --git a/libavfilter/vf_transpose_vulkan.c b/libavfilter/vf_transpose_vulkan.c index ce83cf0fd7..30d052e08c 100644 --- a/libavfilter/vf_transpose_vulkan.c +++ b/libavfilter/vf_transpose_vulkan.c @@ -35,6 +35,7 @@ typedef struct TransposeVulkanContext { VkDescriptorImageInfo output_images[3]; int dir; + int passthrough; int initialized; } TransposeVulkanContext; @@ -222,6 +223,9 @@ static int filter_frame(AVFilterLink *inlink, AVFrame *in) TransposeVulkanContext *s = ctx->priv; AVFilterLink *outlink = ctx->outputs[0]; + if (s->passthrough) + return ff_filter_frame(outlink, in); + out = ff_get_video_buffer(outlink, outlink->w, outlink->h); if (!out) { err = AVERROR(ENOMEM); @@ -267,6 +271,17 @@ static int config_props_output(AVFilterLink *outlink) FFVulkanContext *vkctx = &s->vkctx; AVFilterLink *inlink = avctx->inputs[0]; + if ((inlink->w >= inlink->h && s->passthrough == TRANSPOSE_PT_TYPE_LANDSCAPE) || + (inlink->w <= inlink->h && s->passthrough == TRANSPOSE_PT_TYPE_PORTRAIT)) { + av_log(avctx, AV_LOG_VERBOSE, + "w:%d h:%d -> w:%d h:%d (passthrough mode)\n", + inlink->w, inlink->h, inlink->w, inlink->h); + outlink->hw_frames_ctx = av_buffer_ref(inlink->hw_frames_ctx); + return outlink->hw_frames_ctx ? 0 : AVERROR(ENOMEM); + } else { + s->passthrough = TRANSPOSE_PT_TYPE_NONE; + } + vkctx->output_width = inlink->h; vkctx->output_height = inlink->w; @@ -288,6 +303,13 @@ static const AVOption transpose_vulkan_options[] = { { "clock", "rotate clockwise", 0, AV_OPT_TYPE_CONST, { .i64 = TRANSPOSE_CLOCK }, .flags=FLAGS, .unit = "dir" }, { "cclock", "rotate counter-clockwise", 0, AV_OPT_TYPE_CONST, { .i64 = TRANSPOSE_CCLOCK }, .flags=FLAGS, .unit = "dir" }, { "clock_flip", "rotate clockwise with vertical flip", 0, AV_OPT_TYPE_CONST, { .i64 = TRANSPOSE_CLOCK_FLIP }, .flags=FLAGS, .unit = "dir" }, + + { "passthrough", "do not apply transposition if the input matches the specified geometry", + OFFSET(passthrough), AV_OPT_TYPE_INT, {.i64=TRANSPOSE_PT_TYPE_NONE}, 0, INT_MAX, FLAGS, "passthrough" }, + { "none", "always apply transposition", 0, AV_OPT_TYPE_CONST, {.i64=TRANSPOSE_PT_TYPE_NONE}, INT_MIN, INT_MAX, FLAGS, "passthrough" }, + { "portrait", "preserve portrait geometry", 0, AV_OPT_TYPE_CONST, {.i64=TRANSPOSE_PT_TYPE_PORTRAIT}, INT_MIN, INT_MAX, FLAGS, "passthrough" }, + { "landscape", "preserve landscape geometry", 0, AV_OPT_TYPE_CONST, {.i64=TRANSPOSE_PT_TYPE_LANDSCAPE}, INT_MIN, INT_MAX, FLAGS, "passthrough" }, + { NULL } };

1 0

hwcontext_vulkan: remove VK_EXT_hdr_metadata from autoloaded extensions list
by Lynne 03 Jan '22

03 Jan '22

ffmpeg | branch: master | Lynne <dev(a)lynne.ee> | Sun Jan 2 23:57:41 2022 +0100| [b84ce56589755ec290b8564a5d69c5cb1b2adec6] | committer: Lynne hwcontext_vulkan: remove VK_EXT_hdr_metadata from autoloaded extensions list We don't use it. Was copied from libplacebo's recommended defaults. Creates problems with validation on Intel devices, where the driver still advertizes it, even though it's not usable without a swapchain. > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=b84ce56589755ec29… --- libavutil/hwcontext_vulkan.c | 1 - 1 file changed, 1 deletion(-) diff --git a/libavutil/hwcontext_vulkan.c b/libavutil/hwcontext_vulkan.c index 83a7527198..e90edea111 100644 --- a/libavutil/hwcontext_vulkan.c +++ b/libavutil/hwcontext_vulkan.c @@ -341,7 +341,6 @@ static const VulkanOptExtension optional_instance_exts[] = { static const VulkanOptExtension optional_device_exts[] = { /* Misc or required by other extensions */ { VK_KHR_PUSH_DESCRIPTOR_EXTENSION_NAME, FF_VK_EXT_NO_FLAG }, - { VK_EXT_HDR_METADATA_EXTENSION_NAME, FF_VK_EXT_NO_FLAG }, { VK_KHR_SAMPLER_YCBCR_CONVERSION_EXTENSION_NAME, FF_VK_EXT_NO_FLAG }, { VK_KHR_SYNCHRONIZATION_2_EXTENSION_NAME, FF_VK_EXT_NO_FLAG },

1 0

avcodec/speexdec: Consider mode in frame size check
by Michael Niedermayer 01 Jan '22

01 Jan '22

ffmpeg | branch: master | Michael Niedermayer <michael(a)niedermayer.cc> | Sun Dec 26 11:18:51 2021 +0100| [d6b2357eddca392ee137cb2a92ff178a0a7d0cce] | committer: Michael Niedermayer avcodec/speexdec: Consider mode in frame size check No speex samples with non default frame sizes are known (to me) the official speexenc seems to only generate the 3 default ones. Thus it may be that the fuzzer samples where the first non default values encountered by the decoder. Possibly the "<" should be "!=" Fixes: out of array access Fixes: 42821/clusterfuzz-testcase-minimized-ffmpeg_AV_CODEC_ID_SPEEX_fuzzer-5640695772217344 Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg Signed-off-by: Michael Niedermayer <michael(a)niedermayer.cc> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=d6b2357eddca392ee… --- libavcodec/speexdec.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libavcodec/speexdec.c b/libavcodec/speexdec.c index 1c33607db2..dcbdf5e010 100644 --- a/libavcodec/speexdec.c +++ b/libavcodec/speexdec.c @@ -1419,7 +1419,7 @@ static int parse_speex_extradata(AVCodecContext *avctx, return AVERROR_INVALIDDATA; s->bitrate = bytestream_get_le32(&buf); s->frame_size = bytestream_get_le32(&buf); - if (s->frame_size < NB_FRAME_SIZE) + if (s->frame_size < NB_FRAME_SIZE << s->mode) return AVERROR_INVALIDDATA; s->vbr = bytestream_get_le32(&buf); s->frames_per_packet = bytestream_get_le32(&buf);

1 0

lavc/{av1, h264, h265}_metadata_bsf: fix description of tick_rate
by Zhao Zhili 01 Jan '22

01 Jan '22

ffmpeg | branch: master | Zhao Zhili <quinkblack(a)foxmail.com> | Fri Aug 27 15:13:42 2021 +0800| [c41761676276968b9f2f33c5c62357cde3a51dbc] | committer: Jun Zhao lavc/{av1, h264, h265}_metadata_bsf: fix description of tick_rate Users may take the description literally which leads to inverted results. Signed-off-by: Zhao Zhili <zhilizhao(a)tencent.com> Reviewed-by: Jun Zhao <barryjzhao(a)tencent.com > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=c41761676276968b9… --- doc/bitstream_filters.texi | 8 ++++---- libavcodec/av1_metadata_bsf.c | 2 +- libavcodec/h264_metadata_bsf.c | 2 +- libavcodec/h265_metadata_bsf.c | 2 +- 4 files changed, 7 insertions(+), 7 deletions(-) diff --git a/doc/bitstream_filters.texi b/doc/bitstream_filters.texi index 1900eb4352..6051dc28d2 100644 --- a/doc/bitstream_filters.texi +++ b/doc/bitstream_filters.texi @@ -81,7 +81,7 @@ Top-left position. @end table @item tick_rate -Set the tick rate (@emph{num_units_in_display_tick / time_scale}) in +Set the tick rate (@emph{time_scale / num_units_in_display_tick}) in the timing info in the sequence header. @item num_ticks_per_picture Set the number of ticks in each picture, to indicate that the stream @@ -244,7 +244,7 @@ Set the chroma sample location in the stream (see H.264 section E.2.1 and figure E-1). @item tick_rate -Set the tick rate (num_units_in_tick / time_scale) in the VUI +Set the tick rate (time_scale / num_units_in_tick) in the VUI parameters. This is the smallest time unit representable in the stream, and in many cases represents the field rate of the stream (double the frame rate). @@ -352,8 +352,8 @@ Set the chroma sample location in the stream (see H.265 section E.3.1 and figure E.1). @item tick_rate -Set the tick rate in the VPS and VUI parameters (num_units_in_tick / -time_scale). Combined with @option{num_ticks_poc_diff_one}, this can +Set the tick rate in the VPS and VUI parameters (time_scale / +num_units_in_tick). Combined with @option{num_ticks_poc_diff_one}, this can set a constant framerate in the stream. Note that it is likely to be overridden by container parameters when the stream is in a container. diff --git a/libavcodec/av1_metadata_bsf.c b/libavcodec/av1_metadata_bsf.c index 1fb85d88b7..c52673bf6a 100644 --- a/libavcodec/av1_metadata_bsf.c +++ b/libavcodec/av1_metadata_bsf.c @@ -194,7 +194,7 @@ static const AVOption av1_metadata_options[] = { { "colocated", "Top-left chroma sample position", 0, AV_OPT_TYPE_CONST, { .i64 = AV1_CSP_COLOCATED }, .flags = FLAGS, .unit = "csp" }, - { "tick_rate", "Set display tick rate (num_units_in_display_tick / time_scale)", + { "tick_rate", "Set display tick rate (time_scale / num_units_in_display_tick)", OFFSET(tick_rate), AV_OPT_TYPE_RATIONAL, { .dbl = 0.0 }, 0, UINT_MAX, FLAGS }, { "num_ticks_per_picture", "Set display ticks per picture for CFR streams", diff --git a/libavcodec/h264_metadata_bsf.c b/libavcodec/h264_metadata_bsf.c index 8c5d19c5a8..9df99cbae3 100644 --- a/libavcodec/h264_metadata_bsf.c +++ b/libavcodec/h264_metadata_bsf.c @@ -626,7 +626,7 @@ static const AVOption h264_metadata_options[] = { OFFSET(chroma_sample_loc_type), AV_OPT_TYPE_INT, { .i64 = -1 }, -1, 6, FLAGS }, - { "tick_rate", "Set VUI tick rate (num_units_in_tick / time_scale)", + { "tick_rate", "Set VUI tick rate (time_scale / num_units_in_tick)", OFFSET(tick_rate), AV_OPT_TYPE_RATIONAL, { .dbl = 0.0 }, 0, UINT_MAX, FLAGS }, { "fixed_frame_rate_flag", "Set VUI fixed frame rate flag", diff --git a/libavcodec/h265_metadata_bsf.c b/libavcodec/h265_metadata_bsf.c index d841839762..e5f70cfbc1 100644 --- a/libavcodec/h265_metadata_bsf.c +++ b/libavcodec/h265_metadata_bsf.c @@ -439,7 +439,7 @@ static const AVOption h265_metadata_options[] = { { .i64 = -1 }, -1, 6, FLAGS }, { "tick_rate", - "Set VPS and VUI tick rate (num_units_in_tick / time_scale)", + "Set VPS and VUI tick rate (time_scale / num_units_in_tick)", OFFSET(tick_rate), AV_OPT_TYPE_RATIONAL, { .dbl = 0.0 }, 0, UINT_MAX, FLAGS }, { "num_ticks_poc_diff_one",

1 0