July 2023 - ffmpeg-cvslog - lists.ffmpeg.org

lavfi/vf_vpp_qsv: fix duration in pass-through mode
by Haihao Xiang 31 Jul '23

31 Jul '23

ffmpeg | branch: master | Haihao Xiang <haihao.xiang(a)intel.com> | Mon Jul 24 10:36:51 2023 +0800| [567e78b28320939c18e16acbdbeb2b77d24e2c03] | committer: Haihao Xiang lavfi/vf_vpp_qsv: fix duration in pass-through mode Signed-off-by: Haihao Xiang <haihao.xiang(a)intel.com> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=567e78b28320939c1… --- libavfilter/vf_vpp_qsv.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/libavfilter/vf_vpp_qsv.c b/libavfilter/vf_vpp_qsv.c index 334a86551b..be9bf54743 100644 --- a/libavfilter/vf_vpp_qsv.c +++ b/libavfilter/vf_vpp_qsv.c @@ -582,6 +582,11 @@ static int activate(AVFilterContext *ctx) if (in->pts != AV_NOPTS_VALUE) in->pts = av_rescale_q(in->pts, inlink->time_base, outlink->time_base); + if (outlink->frame_rate.num && outlink->frame_rate.den) + in->duration = av_rescale_q(1, av_inv_q(outlink->frame_rate), outlink->time_base); + else + in->duration = 0; + ret = ff_filter_frame(outlink, in); if (ret < 0) return ret;

1 0

lavu/hwcontext_qsv: silence the warning
by Haihao Xiang 31 Jul '23

31 Jul '23

ffmpeg | branch: master | Haihao Xiang <haihao.xiang(a)intel.com> | Mon Jul 24 10:41:06 2023 +0800| [e63d9ba007cb628653c7e9349eafc98654fba49e] | committer: Haihao Xiang lavu/hwcontext_qsv: silence the warning libavutil/hwcontext_qsv.c: In function ‘qsv_map_to’: libavutil/hwcontext_qsv.c:1905:47: warning: cast from pointer to integer of different size [-Wpointer-to-int-cast] Signed-off-by: Haihao Xiang <haihao.xiang(a)intel.com> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=e63d9ba007cb62865… --- libavutil/hwcontext_qsv.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libavutil/hwcontext_qsv.c b/libavutil/hwcontext_qsv.c index d4b564ba2d..1bfda9e69b 100644 --- a/libavutil/hwcontext_qsv.c +++ b/libavutil/hwcontext_qsv.c @@ -1902,7 +1902,7 @@ static int qsv_map_to(AVHWFramesContext *dst_ctx, case AV_PIX_FMT_VAAPI: { mfxHDLPair *pair = (mfxHDLPair*)hwctx->surfaces[i].Data.MemId; - if (*(VASurfaceID*)pair->first == (VASurfaceID)src->data[3]) { + if (*(VASurfaceID*)pair->first == (VASurfaceID)(uintptr_t)src->data[3]) { index = i; break; }

1 0

avcodec/cbs: Add specialization for ff_cbs_(read|write)_unsigned()
by Andreas Rheinhardt 30 Jul '23

30 Jul '23

ffmpeg | branch: master | Andreas Rheinhardt <andreas.rheinhardt(a)outlook.com> | Fri Jul 1 11:44:36 2022 +0200| [a105b11a9d1d8be33cd9ba29da41314c1abf7c82] | committer: Andreas Rheinhardt avcodec/cbs: Add specialization for ff_cbs_(read|write)_unsigned() These functions allow not only to read and write unsigned values, but also to check ranges and to emit trace output which can be beautified when processing arrays (indices like "[i]" are replaced by their actual numbers). Yet lots of callers actually only need something simpler: Their range is only implicitly restricted by the amount of bits used and they are not part of arrays, hence don't need this beautification. This commit adds specializations for these callers; this is very beneficial size-wise (it reduced the size of .text by 23312 bytes here), as a call is now cheaper. Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt(a)outlook.com> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=a105b11a9d1d8be33… --- libavcodec/cbs.c | 34 ++++++++++++++++++++++++++++++---- libavcodec/cbs_av1.c | 28 +++++++++++++++++++--------- libavcodec/cbs_h2645.c | 15 +++++++++++++-- libavcodec/cbs_internal.h | 11 ++++++++++- libavcodec/cbs_mpeg2.c | 15 +++++++++++++-- libavcodec/cbs_vp9.c | 14 ++++++++++++-- 6 files changed, 97 insertions(+), 20 deletions(-) diff --git a/libavcodec/cbs.c b/libavcodec/cbs.c index 13a01bef51..3ec8285e21 100644 --- a/libavcodec/cbs.c +++ b/libavcodec/cbs.c @@ -546,10 +546,13 @@ void ff_cbs_trace_syntax_element(CodedBitstreamContext *ctx, int position, position, name, pad, bits, value); } -int ff_cbs_read_unsigned(CodedBitstreamContext *ctx, GetBitContext *gbc, - int width, const char *name, - const int *subscripts, uint32_t *write_to, - uint32_t range_min, uint32_t range_max) +static av_always_inline int cbs_read_unsigned(CodedBitstreamContext *ctx, + GetBitContext *gbc, + int width, const char *name, + const int *subscripts, + uint32_t *write_to, + uint32_t range_min, + uint32_t range_max) { uint32_t value; int position; @@ -589,6 +592,22 @@ int ff_cbs_read_unsigned(CodedBitstreamContext *ctx, GetBitContext *gbc, return 0; } +int ff_cbs_read_unsigned(CodedBitstreamContext *ctx, GetBitContext *gbc, + int width, const char *name, + const int *subscripts, uint32_t *write_to, + uint32_t range_min, uint32_t range_max) +{ + return cbs_read_unsigned(ctx, gbc, width, name, subscripts, + write_to, range_min, range_max); +} + +int ff_cbs_read_simple_unsigned(CodedBitstreamContext *ctx, GetBitContext *gbc, + int width, const char *name, uint32_t *write_to) +{ + return cbs_read_unsigned(ctx, gbc, width, name, NULL, + write_to, 0, UINT32_MAX); +} + int ff_cbs_write_unsigned(CodedBitstreamContext *ctx, PutBitContext *pbc, int width, const char *name, const int *subscripts, uint32_t value, @@ -625,6 +644,13 @@ int ff_cbs_write_unsigned(CodedBitstreamContext *ctx, PutBitContext *pbc, return 0; } +int ff_cbs_write_simple_unsigned(CodedBitstreamContext *ctx, PutBitContext *pbc, + int width, const char *name, uint32_t value) +{ + return ff_cbs_write_unsigned(ctx, pbc, width, name, NULL, + value, 0, MAX_UINT_BITS(width)); +} + int ff_cbs_read_signed(CodedBitstreamContext *ctx, GetBitContext *gbc, int width, const char *name, const int *subscripts, int32_t *write_to, diff --git a/libavcodec/cbs_av1.c b/libavcodec/cbs_av1.c index 8788fee099..452e022b36 100644 --- a/libavcodec/cbs_av1.c +++ b/libavcodec/cbs_av1.c @@ -412,9 +412,8 @@ static int cbs_av1_read_subexp(CodedBitstreamContext *ctx, GetBitContext *gbc, } if (len < max_len) { - err = ff_cbs_read_unsigned(ctx, gbc, range_bits, - "subexp_bits", NULL, &value, - 0, MAX_UINT_BITS(range_bits)); + err = ff_cbs_read_simple_unsigned(ctx, gbc, range_bits, + "subexp_bits", &value); if (err < 0) return err; @@ -476,10 +475,9 @@ static int cbs_av1_write_subexp(CodedBitstreamContext *ctx, PutBitContext *pbc, return err; if (len < max_len) { - err = ff_cbs_write_unsigned(ctx, pbc, range_bits, - "subexp_bits", NULL, - value - range_offset, - 0, MAX_UINT_BITS(range_bits)); + err = ff_cbs_write_simple_unsigned(ctx, pbc, range_bits, + "subexp_bits", + value - range_offset); if (err < 0) return err; @@ -546,8 +544,6 @@ static size_t cbs_av1_get_payload_bytes_left(GetBitContext *gbc) #define SUBSCRIPTS(subs, ...) (subs > 0 ? ((int[subs + 1]){ subs, __VA_ARGS__ }) : NULL) -#define fb(width, name) \ - xf(width, name, current->name, 0, MAX_UINT_BITS(width), 0, ) #define fc(width, name, range_min, range_max) \ xf(width, name, current->name, range_min, range_max, 0, ) #define flag(name) fb(1, name) @@ -573,6 +569,13 @@ static size_t cbs_av1_get_payload_bytes_left(GetBitContext *gbc) #define READWRITE read #define RWContext GetBitContext +#define fb(width, name) do { \ + uint32_t value; \ + CHECK(ff_cbs_read_simple_unsigned(ctx, rw, width, \ + #name, &value)); \ + current->name = value; \ + } while (0) + #define xf(width, name, var, range_min, range_max, subs, ...) do { \ uint32_t value; \ CHECK(ff_cbs_read_unsigned(ctx, rw, width, #name, \ @@ -645,6 +648,7 @@ static size_t cbs_av1_get_payload_bytes_left(GetBitContext *gbc) #undef READ #undef READWRITE #undef RWContext +#undef fb #undef xf #undef xsu #undef uvlc @@ -661,6 +665,11 @@ static size_t cbs_av1_get_payload_bytes_left(GetBitContext *gbc) #define READWRITE write #define RWContext PutBitContext +#define fb(width, name) do { \ + CHECK(ff_cbs_write_simple_unsigned(ctx, rw, width, #name, \ + current->name)); \ + } while (0) + #define xf(width, name, var, range_min, range_max, subs, ...) do { \ CHECK(ff_cbs_write_unsigned(ctx, rw, width, #name, \ SUBSCRIPTS(subs, __VA_ARGS__), \ @@ -723,6 +732,7 @@ static size_t cbs_av1_get_payload_bytes_left(GetBitContext *gbc) #undef WRITE #undef READWRITE #undef RWContext +#undef fb #undef xf #undef xsu #undef uvlc diff --git a/libavcodec/cbs_h2645.c b/libavcodec/cbs_h2645.c index 21c8bc76d5..318c997d94 100644 --- a/libavcodec/cbs_h2645.c +++ b/libavcodec/cbs_h2645.c @@ -264,8 +264,6 @@ static int cbs_h265_payload_extension_present(GetBitContext *gbc, uint32_t paylo #define u(width, name, range_min, range_max) \ xu(width, name, current->name, range_min, range_max, 0, ) -#define ub(width, name) \ - xu(width, name, current->name, 0, MAX_UINT_BITS(width), 0, ) #define flag(name) ub(1, name) #define ue(name, range_min, range_max) \ xue(name, current->name, range_min, range_max, 0, ) @@ -301,6 +299,12 @@ static int cbs_h265_payload_extension_present(GetBitContext *gbc, uint32_t paylo #define READWRITE read #define RWContext GetBitContext +#define ub(width, name) do { \ + uint32_t value; \ + CHECK(ff_cbs_read_simple_unsigned(ctx, rw, width, #name, \ + &value)); \ + current->name = value; \ + } while (0) #define xu(width, name, var, range_min, range_max, subs, ...) do { \ uint32_t value; \ CHECK(ff_cbs_read_unsigned(ctx, rw, width, #name, \ @@ -379,6 +383,7 @@ static int cbs_h2645_read_more_rbsp_data(GetBitContext *gbc) #undef READ #undef READWRITE #undef RWContext +#undef ub #undef xu #undef xi #undef xue @@ -394,6 +399,11 @@ static int cbs_h2645_read_more_rbsp_data(GetBitContext *gbc) #define READWRITE write #define RWContext PutBitContext +#define ub(width, name) do { \ + uint32_t value = current->name; \ + CHECK(ff_cbs_write_simple_unsigned(ctx, rw, width, #name, \ + value)); \ + } while (0) #define xu(width, name, var, range_min, range_max, subs, ...) do { \ uint32_t value = var; \ CHECK(ff_cbs_write_unsigned(ctx, rw, width, #name, \ @@ -461,6 +471,7 @@ static int cbs_h2645_read_more_rbsp_data(GetBitContext *gbc) #undef WRITE #undef READWRITE #undef RWContext +#undef ub #undef xu #undef xi #undef xue diff --git a/libavcodec/cbs_internal.h b/libavcodec/cbs_internal.h index b752d64684..da84697a29 100644 --- a/libavcodec/cbs_internal.h +++ b/libavcodec/cbs_internal.h @@ -163,18 +163,27 @@ void ff_cbs_trace_syntax_element(CodedBitstreamContext *ctx, int position, // Helper functions for read/write of common bitstream elements, including -// generation of trace output. +// generation of trace output. The simple functions are equivalent to +// their non-simple counterparts except that their range is unrestricted +// (i.e. only limited by the amount of bits used) and they lack +// the ability to use subscripts. int ff_cbs_read_unsigned(CodedBitstreamContext *ctx, GetBitContext *gbc, int width, const char *name, const int *subscripts, uint32_t *write_to, uint32_t range_min, uint32_t range_max); +int ff_cbs_read_simple_unsigned(CodedBitstreamContext *ctx, GetBitContext *gbc, + int width, const char *name, uint32_t *write_to); + int ff_cbs_write_unsigned(CodedBitstreamContext *ctx, PutBitContext *pbc, int width, const char *name, const int *subscripts, uint32_t value, uint32_t range_min, uint32_t range_max); +int ff_cbs_write_simple_unsigned(CodedBitstreamContext *ctx, PutBitContext *pbc, + int width, const char *name, uint32_t value); + int ff_cbs_read_signed(CodedBitstreamContext *ctx, GetBitContext *gbc, int width, const char *name, const int *subscripts, int32_t *write_to, diff --git a/libavcodec/cbs_mpeg2.c b/libavcodec/cbs_mpeg2.c index 04b0c7f87d..37fc28a4e6 100644 --- a/libavcodec/cbs_mpeg2.c +++ b/libavcodec/cbs_mpeg2.c @@ -40,8 +40,6 @@ #define SUBSCRIPTS(subs, ...) (subs > 0 ? ((int[subs + 1]){ subs, __VA_ARGS__ }) : NULL) -#define ui(width, name) \ - xui(width, name, current->name, 0, MAX_UINT_BITS(width), 0, ) #define uir(width, name) \ xui(width, name, current->name, 1, MAX_UINT_BITS(width), 0, ) #define uis(width, name, subs, ...) \ @@ -65,6 +63,12 @@ #define READWRITE read #define RWContext GetBitContext +#define ui(width, name) do { \ + uint32_t value; \ + CHECK(ff_cbs_read_simple_unsigned(ctx, rw, width, #name, \ + &value)); \ + current->name = value; \ + } while (0) #define xuia(width, string, var, range_min, range_max, subs, ...) do { \ uint32_t value; \ CHECK(ff_cbs_read_unsigned(ctx, rw, width, string, \ @@ -95,6 +99,7 @@ #undef READ #undef READWRITE #undef RWContext +#undef ui #undef xuia #undef xsi #undef nextbits @@ -105,6 +110,11 @@ #define READWRITE write #define RWContext PutBitContext +#define ui(width, name) do { \ + CHECK(ff_cbs_write_simple_unsigned(ctx, rw, width, #name, \ + current->name)); \ + } while (0) + #define xuia(width, string, var, range_min, range_max, subs, ...) do { \ CHECK(ff_cbs_write_unsigned(ctx, rw, width, string, \ SUBSCRIPTS(subs, __VA_ARGS__), \ @@ -134,6 +144,7 @@ #undef WRITE #undef READWRITE #undef RWContext +#undef ui #undef xuia #undef xsi #undef nextbits diff --git a/libavcodec/cbs_vp9.c b/libavcodec/cbs_vp9.c index 184fdcade6..b0d5bd8763 100644 --- a/libavcodec/cbs_vp9.c +++ b/libavcodec/cbs_vp9.c @@ -251,8 +251,6 @@ static int cbs_vp9_write_le(CodedBitstreamContext *ctx, PutBitContext *pbc, #define SUBSCRIPTS(subs, ...) (subs > 0 ? ((int[subs + 1]){ subs, __VA_ARGS__ }) : NULL) -#define f(width, name) \ - xf(width, name, current->name, 0, ) #define s(width, name) \ xs(width, name, current->name, 0, ) #define fs(width, name, subs, ...) \ @@ -264,6 +262,12 @@ static int cbs_vp9_write_le(CodedBitstreamContext *ctx, PutBitContext *pbc, #define READWRITE read #define RWContext GetBitContext +#define f(width, name) do { \ + uint32_t value; \ + CHECK(ff_cbs_read_simple_unsigned(ctx, rw, width, #name, \ + &value)); \ + current->name = value; \ + } while (0) #define xf(width, name, var, subs, ...) do { \ uint32_t value; \ CHECK(ff_cbs_read_unsigned(ctx, rw, width, #name, \ @@ -329,6 +333,7 @@ static int cbs_vp9_write_le(CodedBitstreamContext *ctx, PutBitContext *pbc, #undef READ #undef READWRITE #undef RWContext +#undef f #undef xf #undef xs #undef increment @@ -344,6 +349,10 @@ static int cbs_vp9_write_le(CodedBitstreamContext *ctx, PutBitContext *pbc, #define READWRITE write #define RWContext PutBitContext +#define f(width, name) do { \ + CHECK(ff_cbs_write_simple_unsigned(ctx, rw, width, #name, \ + current->name)); \ + } while (0) #define xf(width, name, var, subs, ...) do { \ CHECK(ff_cbs_write_unsigned(ctx, rw, width, #name, \ SUBSCRIPTS(subs, __VA_ARGS__), \ @@ -396,6 +405,7 @@ static int cbs_vp9_write_le(CodedBitstreamContext *ctx, PutBitContext *pbc, #undef WRITE #undef READWRITE #undef RWContext +#undef f #undef xf #undef xs #undef increment

1 0

avcodec/h264_slice: Remove always-false check
by Andreas Rheinhardt 30 Jul '23

30 Jul '23

ffmpeg | branch: master | Andreas Rheinhardt <andreas.rheinhardt(a)outlook.com> | Wed Sep 21 00:23:59 2022 +0200| [b85557b231782f3bc89746c86512d81f777dab1b] | committer: Andreas Rheinhardt avcodec/h264_slice: Remove always-false check The H.264 decoder, the only codec with which this code is ever called, does not set AVCodec.pix_fmts. Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt(a)outlook.com> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=b85557b231782f3bc… --- libavcodec/h264_slice.c | 14 +++++--------- 1 file changed, 5 insertions(+), 9 deletions(-) diff --git a/libavcodec/h264_slice.c b/libavcodec/h264_slice.c index e576bcb070..790ba644cd 100644 --- a/libavcodec/h264_slice.c +++ b/libavcodec/h264_slice.c @@ -786,8 +786,6 @@ static enum AVPixelFormat get_pixel_format(H264Context *h, int force_callback) CONFIG_H264_VDPAU_HWACCEL + \ CONFIG_H264_VULKAN_HWACCEL) enum AVPixelFormat pix_fmts[HWACCEL_MAX + 2], *fmt = pix_fmts; - const enum AVPixelFormat *choices = pix_fmts; - int i; switch (h->ps.sps->bit_depth_luma) { case 9: @@ -888,9 +886,7 @@ static enum AVPixelFormat get_pixel_format(H264Context *h, int force_callback) #if CONFIG_H264_VAAPI_HWACCEL *fmt++ = AV_PIX_FMT_VAAPI; #endif - if (h->avctx->codec->pix_fmts) - choices = h->avctx->codec->pix_fmts; - else if (h->avctx->color_range == AVCOL_RANGE_JPEG) + if (h->avctx->color_range == AVCOL_RANGE_JPEG) *fmt++ = AV_PIX_FMT_YUVJ420P; else *fmt++ = AV_PIX_FMT_YUV420P; @@ -904,10 +900,10 @@ static enum AVPixelFormat get_pixel_format(H264Context *h, int force_callback) *fmt = AV_PIX_FMT_NONE; - for (i=0; choices[i] != AV_PIX_FMT_NONE; i++) - if (choices[i] == h->avctx->pix_fmt && !force_callback) - return choices[i]; - return ff_thread_get_format(h->avctx, choices); + for (int i = 0; pix_fmts[i] != AV_PIX_FMT_NONE; i++) + if (pix_fmts[i] == h->avctx->pix_fmt && !force_callback) + return pix_fmts[i]; + return ff_thread_get_format(h->avctx, pix_fmts); } /* export coded and cropped frame dimensions to AVCodecContext */

1 0

avfilter/avf_showcwt: improve range detection for morlet scales
by Paul B Mahol 30 Jul '23

30 Jul '23

ffmpeg | branch: master | Paul B Mahol <onemda(a)gmail.com> | Sun Jul 30 19:57:50 2023 +0200| [8bbaecb5de9bac41f7e3a4179ec803ce89ac2d09] | committer: Paul B Mahol avfilter/avf_showcwt: improve range detection for morlet scales > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=8bbaecb5de9bac41f… --- libavfilter/avf_showcwt.c | 21 +++++++++++++-------- 1 file changed, 13 insertions(+), 8 deletions(-) diff --git a/libavfilter/avf_showcwt.c b/libavfilter/avf_showcwt.c index 9f6265f105..8bf64cfe66 100644 --- a/libavfilter/avf_showcwt.c +++ b/libavfilter/avf_showcwt.c @@ -152,7 +152,7 @@ static const AVOption showcwt_options[] = { { "min", "set minimum frequency", OFFSET(minimum_frequency), AV_OPT_TYPE_FLOAT, {.dbl = 20.}, 1, 192000, FLAGS }, { "max", "set maximum frequency", OFFSET(maximum_frequency), AV_OPT_TYPE_FLOAT, {.dbl = 20000.}, 1, 192000, FLAGS }, { "logb", "set logarithmic basis", OFFSET(logarithmic_basis), AV_OPT_TYPE_FLOAT, {.dbl = 0.0001}, 0, 1, FLAGS }, - { "deviation", "set frequency deviation", OFFSET(deviation), AV_OPT_TYPE_FLOAT, {.dbl = 1.}, 0, 10, FLAGS }, + { "deviation", "set frequency deviation", OFFSET(deviation), AV_OPT_TYPE_FLOAT, {.dbl = 1.}, 0, 100, FLAGS }, { "pps", "set pixels per second", OFFSET(pps), AV_OPT_TYPE_INT, {.i64 = 64}, 1, 1024, FLAGS }, { "mode", "set output mode", OFFSET(mode), AV_OPT_TYPE_INT, {.i64=0}, 0, 4, FLAGS, "mode" }, { "magnitude", "magnitude", 0, AV_OPT_TYPE_CONST,{.i64=0}, 0, 0, FLAGS, "mode" }, @@ -701,13 +701,13 @@ static int compute_kernel(AVFilterContext *ctx) for (int y = 0; y < fsize; y++) { AVComplexFloat *kernel = s->kernel[y]; - int start = 0, stop = 0; + int start = INT_MIN, stop = INT_MAX; const float frequency = s->frequency_band[y*2] * correction; const float deviation = 1.f / (s->frequency_band[y*2+1] * output_sample_count * correction); - const int range = 8.f*M_PI*sqrtf(1.f/deviation); - const int a = floorf(frequency-range); - const int b = ceilf(frequency+range); + const int a = FFMAX(frequency-12.f*sqrtf(1.f/deviation)-0.5f, -size); + const int b = FFMIN(frequency+12.f*sqrtf(1.f/deviation)-0.5f, size+a); + const int range = -a; memset(tkernel, 0, size * sizeof(*tkernel)); for (int n = a; n < b; n++) { @@ -720,7 +720,7 @@ static int compute_kernel(AVFilterContext *ctx) for (int n = a; n < b; n++) { if (tkernel[n+range] != 0.f) { if (tkernel[n+range] > FLT_MIN) - av_log(ctx, AV_LOG_DEBUG, "out of range kernel\n"); + av_log(ctx, AV_LOG_DEBUG, "out of range kernel %g\n", tkernel[n+range]); start = n; break; } @@ -729,16 +729,21 @@ static int compute_kernel(AVFilterContext *ctx) for (int n = b; n >= a; n--) { if (tkernel[n+range] != 0.f) { if (tkernel[n+range] > FLT_MIN) - av_log(ctx, AV_LOG_DEBUG, "out of range kernel\n"); + av_log(ctx, AV_LOG_DEBUG, "out of range kernel %g\n", tkernel[n+range]); stop = n; break; } } + if (start == INT_MIN || stop == INT_MAX) { + ret = AVERROR(EINVAL); + break; + } + kernel_start[y] = start; kernel_stop[y] = stop; - kernel = av_calloc(FFALIGN(stop - start + 1+range, 16), sizeof(*kernel)); + kernel = av_calloc(FFALIGN(stop-start+1, 16), sizeof(*kernel)); if (!kernel) { ret = AVERROR(ENOMEM); break;

1 0

avfilter/avf_showcwt: rename option value
by Paul B Mahol 30 Jul '23

30 Jul '23

ffmpeg | branch: master | Paul B Mahol <onemda(a)gmail.com> | Sun Jul 30 17:40:07 2023 +0200| [48cd5561e18967285f82afed117bae2175fd4451] | committer: Paul B Mahol avfilter/avf_showcwt: rename option value > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=48cd5561e18967285… --- libavfilter/avf_showcwt.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/libavfilter/avf_showcwt.c b/libavfilter/avf_showcwt.c index 51a89706ab..9f6265f105 100644 --- a/libavfilter/avf_showcwt.c +++ b/libavfilter/avf_showcwt.c @@ -37,7 +37,7 @@ enum FrequencyScale { FSCALE_LINEAR, - FSCALE_LOG2, + FSCALE_LOG, FSCALE_BARK, FSCALE_MEL, FSCALE_ERBS, @@ -136,7 +136,7 @@ static const AVOption showcwt_options[] = { { "r", "set video rate", OFFSET(rate_str), AV_OPT_TYPE_STRING, {.str = "25"}, 0, 0, FLAGS }, { "scale", "set frequency scale", OFFSET(frequency_scale), AV_OPT_TYPE_INT, {.i64=0}, 0, NB_FSCALE-1, FLAGS, "scale" }, { "linear", "linear", 0, AV_OPT_TYPE_CONST,{.i64=FSCALE_LINEAR}, 0, 0, FLAGS, "scale" }, - { "log2", "logarithmic", 0, AV_OPT_TYPE_CONST,{.i64=FSCALE_LOG2}, 0, 0, FLAGS, "scale" }, + { "log", "logarithmic", 0, AV_OPT_TYPE_CONST,{.i64=FSCALE_LOG}, 0, 0, FLAGS, "scale" }, { "bark", "bark", 0, AV_OPT_TYPE_CONST,{.i64=FSCALE_BARK}, 0, 0, FLAGS, "scale" }, { "mel", "mel", 0, AV_OPT_TYPE_CONST,{.i64=FSCALE_MEL}, 0, 0, FLAGS, "scale" }, { "erbs", "erbs", 0, AV_OPT_TYPE_CONST,{.i64=FSCALE_ERBS}, 0, 0, FLAGS, "scale" }, @@ -259,7 +259,7 @@ static void frequency_band(float *frequency_band, float frequency_derivative = frequency_range / frequency_band_count; switch (frequency_scale) { - case FSCALE_LOG2: + case FSCALE_LOG: frequency = powf(2.f, frequency); frequency_derivative *= logf(2.f) * frequency; break; @@ -919,7 +919,7 @@ static int config_output(AVFilterLink *outlink) maximum_frequency *= factor; switch (s->frequency_scale) { - case FSCALE_LOG2: + case FSCALE_LOG: minimum_frequency = logf(minimum_frequency) / logf(2.f); maximum_frequency = logf(maximum_frequency) / logf(2.f); break;

1 0

avfilter/avf_showcwt: add iscale option
by Paul B Mahol 30 Jul '23

30 Jul '23

ffmpeg | branch: master | Paul B Mahol <onemda(a)gmail.com> | Sun Jul 30 17:36:50 2023 +0200| [bd23b1d0acb7664e76734ea3b2a07eb5029764b8] | committer: Paul B Mahol avfilter/avf_showcwt: add iscale option > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=bd23b1d0acb7664e7… --- doc/filters.texi | 12 +++++++++++ libavfilter/avf_showcwt.c | 55 +++++++++++++++++++++++++++++++++++++++-------- 2 files changed, 58 insertions(+), 9 deletions(-) diff --git a/doc/filters.texi b/doc/filters.texi index 6f47428aa0..4c2ce6a44c 100644 --- a/doc/filters.texi +++ b/doc/filters.texi @@ -30793,6 +30793,18 @@ Set the frequency scale used. Allowed values are: @end table Default value is @code{linear}. +@item iscale +Set the intensity scale used. Allowed values are: + +@table @option +@item linear +@item log +@item sqrt +@item cbrt +@item qdrt +@end table +Default value is @code{log}. + @item min Set the minimum frequency that will be used in output. Default is @code{20} Hz. diff --git a/libavfilter/avf_showcwt.c b/libavfilter/avf_showcwt.c index ea78a83d3e..51a89706ab 100644 --- a/libavfilter/avf_showcwt.c +++ b/libavfilter/avf_showcwt.c @@ -47,6 +47,15 @@ enum FrequencyScale { NB_FSCALE }; +enum IntensityScale { + ISCALE_LOG, + ISCALE_LINEAR, + ISCALE_SQRT, + ISCALE_CBRT, + ISCALE_QDRT, + NB_ISCALE +}; + enum DirectionMode { DIRECTION_LR, DIRECTION_RL, @@ -106,6 +115,7 @@ typedef struct ShowCWTContext { int input_sample_count, output_sample_count; int frequency_band_count; float logarithmic_basis; + int intensity_scale; int frequency_scale; float minimum_frequency, maximum_frequency; float deviation; @@ -133,6 +143,12 @@ static const AVOption showcwt_options[] = { { "sqrt", "sqrt", 0, AV_OPT_TYPE_CONST,{.i64=FSCALE_SQRT}, 0, 0, FLAGS, "scale" }, { "cbrt", "cbrt", 0, AV_OPT_TYPE_CONST,{.i64=FSCALE_CBRT}, 0, 0, FLAGS, "scale" }, { "qdrt", "qdrt", 0, AV_OPT_TYPE_CONST,{.i64=FSCALE_QDRT}, 0, 0, FLAGS, "scale" }, + { "iscale", "set intensity scale", OFFSET(intensity_scale),AV_OPT_TYPE_INT, {.i64=0}, 0, NB_ISCALE-1, FLAGS, "iscale" }, + { "linear", "linear", 0, AV_OPT_TYPE_CONST,{.i64=ISCALE_LINEAR}, 0, 0, FLAGS, "iscale" }, + { "log", "logarithmic", 0, AV_OPT_TYPE_CONST,{.i64=ISCALE_LOG}, 0, 0, FLAGS, "iscale" }, + { "sqrt", "sqrt", 0, AV_OPT_TYPE_CONST,{.i64=ISCALE_SQRT}, 0, 0, FLAGS, "iscale" }, + { "cbrt", "cbrt", 0, AV_OPT_TYPE_CONST,{.i64=ISCALE_CBRT}, 0, 0, FLAGS, "iscale" }, + { "qdrt", "qdrt", 0, AV_OPT_TYPE_CONST,{.i64=ISCALE_QDRT}, 0, 0, FLAGS, "iscale" }, { "min", "set minimum frequency", OFFSET(minimum_frequency), AV_OPT_TYPE_FLOAT, {.dbl = 20.}, 1, 192000, FLAGS }, { "max", "set maximum frequency", OFFSET(maximum_frequency), AV_OPT_TYPE_FLOAT, {.dbl = 20000.}, 1, 192000, FLAGS }, { "logb", "set logarithmic basis", OFFSET(logarithmic_basis), AV_OPT_TYPE_FLOAT, {.dbl = 0.0001}, 0, 1, FLAGS }, @@ -278,11 +294,31 @@ static void frequency_band(float *frequency_band, } } -static float remap_log(float value, float log_factor) +static float remap_log(float value, int iscale, float log_factor) { - value = logf(value) * log_factor; + float ret; + + switch (iscale) { + case ISCALE_LINEAR: + ret = value * 20.f*expf(log_factor); + break; + case ISCALE_LOG: + value = logf(value) * log_factor; - return 1.f - av_clipf(value, 0.f, 1.f); + ret = 1.f - av_clipf(value, 0.f, 1.f); + break; + case ISCALE_SQRT: + ret = sqrtf(value * 20.f*expf(log_factor)); + break; + case ISCALE_CBRT: + ret = cbrtf(value * 20.f*expf(log_factor)); + break; + case ISCALE_QDRT: + ret = powf(value * 20.f*expf(log_factor), 0.25f); + break; + } + + return ret; } static int run_channel_cwt_prepare(AVFilterContext *ctx, void *arg, int jobnr, int ch) @@ -403,6 +439,7 @@ static int draw(AVFilterContext *ctx, void *arg, int jobnr, int nb_jobs) const int start = (count * jobnr) / nb_jobs; const int end = (count * (jobnr+1)) / nb_jobs; const int nb_channels = s->nb_channels; + const int iscale = s->intensity_scale; const int ihop_index = s->ihop_index; const int ihop_size = s->ihop_size; const float rotation = s->rotation; @@ -479,9 +516,9 @@ static int draw(AVFilterContext *ctx, void *arg, int jobnr, int nb_jobs) u = hypotf(src[0].re, src[0].im); v = hypotf(src2[0].re, src2[0].im); - z = remap_log(z, log_factor); - u = remap_log(u, log_factor); - v = remap_log(v, log_factor); + z = remap_log(z, iscale, log_factor); + u = remap_log(u, iscale, log_factor); + v = remap_log(v, iscale, log_factor); Y = z; U = sinf((v - u) * M_PI_2); @@ -515,7 +552,7 @@ static int draw(AVFilterContext *ctx, void *arg, int jobnr, int nb_jobs) float z; z = hypotf(srcn[0].re, srcn[0].im); - z = remap_log(z, log_factor); + z = remap_log(z, iscale, log_factor); Y += z * yf; U += z * yf * sinf(2.f * M_PI * (ch * yf + rotation)); @@ -534,7 +571,7 @@ static int draw(AVFilterContext *ctx, void *arg, int jobnr, int nb_jobs) break; case 2: Y = hypotf(src[0].re, src[0].im); - Y = remap_log(Y, log_factor); + Y = remap_log(Y, iscale, log_factor); U = atan2f(src[0].im, src[0].re); U = 0.5f + 0.5f * U * Y / M_PI; V = 1.f - U; @@ -559,7 +596,7 @@ static int draw(AVFilterContext *ctx, void *arg, int jobnr, int nb_jobs) break; case 0: Y = hypotf(src[0].re, src[0].im); - Y = remap_log(Y, log_factor); + Y = remap_log(Y, iscale, log_factor); dstY[0] = av_clip_uint8(lrintf(Y * 255.f)); if (dstA)

1 0

avfilter/avf_showcwt: improve caching of some arrays
by Paul B Mahol 30 Jul '23

30 Jul '23

ffmpeg | branch: master | Paul B Mahol <onemda(a)gmail.com> | Sun Jul 30 15:11:53 2023 +0200| [6f552b9c5eb0c8c37a5c636ff1daa4ce3d45ebe4] | committer: Paul B Mahol avfilter/avf_showcwt: improve caching of some arrays > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=6f552b9c5eb0c8c37… --- libavfilter/avf_showcwt.c | 26 ++++++++++++++++---------- 1 file changed, 16 insertions(+), 10 deletions(-) diff --git a/libavfilter/avf_showcwt.c b/libavfilter/avf_showcwt.c index 6ee5b0116d..ea78a83d3e 100644 --- a/libavfilter/avf_showcwt.c +++ b/libavfilter/avf_showcwt.c @@ -402,6 +402,7 @@ static int draw(AVFilterContext *ctx, void *arg, int jobnr, int nb_jobs) const int count = s->frequency_band_count; const int start = (count * jobnr) / nb_jobs; const int end = (count * (jobnr+1)) / nb_jobs; + const int nb_channels = s->nb_channels; const int ihop_index = s->ihop_index; const int ihop_size = s->ihop_size; const float rotation = s->rotation; @@ -414,8 +415,8 @@ static int draw(AVFilterContext *ctx, void *arg, int jobnr, int nb_jobs) float Y, U, V; for (int y = start; y < end; y++) { - const AVComplexFloat *src = ((const AVComplexFloat *)s->ch_out->extended_data[0]) + - y * ihop_size + ihop_index; + const AVComplexFloat *src = ((const AVComplexFloat *)s->ch_out->extended_data[y]) + + 0 * ihop_size + ihop_index; switch (direction) { case DIRECTION_LR: @@ -471,8 +472,7 @@ static int draw(AVFilterContext *ctx, void *arg, int jobnr, int nb_jobs) switch (mode) { case 4: { - const AVComplexFloat *src2 = ((const AVComplexFloat *)s->ch_out->extended_data[FFMIN(1, s->nb_channels - 1)]) + - y * ihop_size + ihop_index; + const AVComplexFloat *src2 = (nb_channels > 1) ? src + ihop_size: src; float z, u, v; z = hypotf(src[0].re + src2[0].re, src[0].im + src2[0].im); @@ -511,11 +511,10 @@ static int draw(AVFilterContext *ctx, void *arg, int jobnr, int nb_jobs) Y = 0.f; U = V = 0.5f; for (int ch = 0; ch < nb_channels; ch++) { - const AVComplexFloat *src = ((const AVComplexFloat *)s->ch_out->extended_data[ch]) + - y * ihop_size + ihop_index; + const AVComplexFloat *srcn = src + ihop_size * ch; float z; - z = hypotf(src[0].re, src[0].im); + z = hypotf(srcn[0].re, srcn[0].im); z = remap_log(z, log_factor); Y += z * yf; @@ -591,7 +590,7 @@ static int run_channel_cwt(AVFilterContext *ctx, void *arg, int jobnr, int nb_jo const int end = (count * (jobnr+1)) / nb_jobs; for (int y = start; y < end; y++) { - AVComplexFloat *chout = ((AVComplexFloat *)s->ch_out->extended_data[ch]) + y * ihop_size; + AVComplexFloat *chout = ((AVComplexFloat *)s->ch_out->extended_data[y]) + ch * ihop_size; AVComplexFloat *over = ((AVComplexFloat *)s->over->extended_data[ch]) + y * ihop_size; AVComplexFloat *dstx = (AVComplexFloat *)s->dst_x->extended_data[jobnr]; AVComplexFloat *srcx = (AVComplexFloat *)s->src_x->extended_data[jobnr]; @@ -720,7 +719,7 @@ static int compute_kernel(AVFilterContext *ctx) } for (int n = 0; n < size; n++) - index[n] = n % s->output_padding_size; + index[n] = n & (s->output_padding_size - 1); av_log(ctx, AV_LOG_DEBUG, "range_min: %d\n", range_min); av_log(ctx, AV_LOG_DEBUG, "range_max: %d\n", range_max); @@ -818,11 +817,11 @@ static int config_output(AVFilterLink *outlink) s->src_x = av_frame_alloc(); s->kernel = av_calloc(s->frequency_band_count, sizeof(*s->kernel)); s->cache = ff_get_audio_buffer(inlink, s->hop_size); - s->ch_out = ff_get_audio_buffer(inlink, s->frequency_band_count * 2 * s->ihop_size); s->over = ff_get_audio_buffer(inlink, s->frequency_band_count * 2 * s->ihop_size); s->bh_out = ff_get_audio_buffer(inlink, s->frequency_band_count); s->ifft_in = av_frame_alloc(); s->ifft_out = av_frame_alloc(); + s->ch_out = av_frame_alloc(); s->index = av_calloc(s->input_padding_size, sizeof(*s->index)); s->kernel_start = av_calloc(s->frequency_band_count, sizeof(*s->kernel_start)); s->kernel_stop = av_calloc(s->frequency_band_count, sizeof(*s->kernel_stop)); @@ -831,6 +830,13 @@ static int config_output(AVFilterLink *outlink) !s->frequency_band || !s->cache || !s->index || !s->bh_out || !s->kernel) return AVERROR(ENOMEM); + s->ch_out->format = inlink->format; + s->ch_out->nb_samples = 2 * s->ihop_size * inlink->ch_layout.nb_channels; + s->ch_out->ch_layout.nb_channels = s->frequency_band_count; + ret = av_frame_get_buffer(s->ch_out, 0); + if (ret < 0) + return ret; + s->ifft_in->format = inlink->format; s->ifft_in->nb_samples = s->ifft_in_size * 2; s->ifft_in->ch_layout.nb_channels = s->nb_threads;

1 0

avfilter/avf_showcwt: reduce excessive operations
by Paul B Mahol 30 Jul '23

30 Jul '23

ffmpeg | branch: master | Paul B Mahol <onemda(a)gmail.com> | Sun Jul 30 13:16:46 2023 +0200| [4f8b0beeba22f4be0c070a7fda29edf350cae8e0] | committer: Paul B Mahol avfilter/avf_showcwt: reduce excessive operations > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=4f8b0beeba22f4be0… --- libavfilter/avf_showcwt.c | 44 +++++++++++++++++++++++--------------------- 1 file changed, 23 insertions(+), 21 deletions(-) diff --git a/libavfilter/avf_showcwt.c b/libavfilter/avf_showcwt.c index ba3ba1efc8..6ee5b0116d 100644 --- a/libavfilter/avf_showcwt.c +++ b/libavfilter/avf_showcwt.c @@ -655,8 +655,8 @@ static int compute_kernel(AVFilterContext *ctx) int *kernel_start = s->kernel_start; int *kernel_stop = s->kernel_stop; unsigned *index = s->index; - int kernel_min = INT_MAX; - int kernel_max = 0, ret = 0; + int range_min = INT_MAX; + int range_max = 0, ret = 0; float *tkernel; tkernel = av_malloc_array(size, sizeof(*tkernel)); @@ -670,58 +670,60 @@ static int compute_kernel(AVFilterContext *ctx) const float deviation = 1.f / (s->frequency_band[y*2+1] * output_sample_count * correction); const int range = 8.f*M_PI*sqrtf(1.f/deviation); + const int a = floorf(frequency-range); + const int b = ceilf(frequency+range); memset(tkernel, 0, size * sizeof(*tkernel)); - for (int n = -range; n < size-range; n++) { + for (int n = a; n < b; n++) { float ff, f = n+0.5f-frequency; ff = expf(-f*f*deviation); tkernel[n+range] = ff; } - for (int n = 0; n < size; n++) { - if (tkernel[n] != 0.f) { - if (tkernel[n] > FLT_MIN) + for (int n = a; n < b; n++) { + if (tkernel[n+range] != 0.f) { + if (tkernel[n+range] > FLT_MIN) av_log(ctx, AV_LOG_DEBUG, "out of range kernel\n"); start = n; - kernel_min = FFMIN(start, kernel_min); break; } } - for (int n = 0; n < size; n++) { - if (tkernel[size - n - 1] != 0.f) { - if (tkernel[size - n - 1] > FLT_MIN) + for (int n = b; n >= a; n--) { + if (tkernel[n+range] != 0.f) { + if (tkernel[n+range] > FLT_MIN) av_log(ctx, AV_LOG_DEBUG, "out of range kernel\n"); - stop = size - n - 1; - kernel_max = FFMAX(stop, kernel_max); + stop = n; break; } } - kernel_start[y] = start - range; - kernel_stop[y] = stop - range; + kernel_start[y] = start; + kernel_stop[y] = stop; - kernel = av_calloc(FFALIGN(stop - start + 1, 16), sizeof(*kernel)); + kernel = av_calloc(FFALIGN(stop - start + 1+range, 16), sizeof(*kernel)); if (!kernel) { ret = AVERROR(ENOMEM); break; } - for (int n = start; n <= stop; n++) { - kernel[n - start].re = tkernel[n]; - kernel[n - start].im = tkernel[n]; + for (int n = 0; n <= stop - start; n++) { + kernel[n].re = tkernel[n+range+start]; + kernel[n].im = tkernel[n+range+start]; } + range_min = FFMIN(range_min, stop+1-start); + range_max = FFMAX(range_max, stop+1-start); + s->kernel[y] = kernel; } for (int n = 0; n < size; n++) index[n] = n % s->output_padding_size; - av_log(ctx, AV_LOG_DEBUG, "kernel_min: %d\n", kernel_min); - av_log(ctx, AV_LOG_DEBUG, "kernel_max: %d\n", kernel_max); - av_log(ctx, AV_LOG_DEBUG, "kernel_range: %d\n", kernel_max - kernel_min); + av_log(ctx, AV_LOG_DEBUG, "range_min: %d\n", range_min); + av_log(ctx, AV_LOG_DEBUG, "range_max: %d\n", range_max); av_freep(&tkernel);

1 0

avformat/lrcdec: Fix declaration-after-statement warning
by Andreas Rheinhardt 29 Jul '23

29 Jul '23

ffmpeg | branch: master | Andreas Rheinhardt <andreas.rheinhardt(a)outlook.com> | Sat Jul 29 17:58:58 2023 +0200| [bf9f6a5e559c901453b484a606e27af54d7e93d5] | committer: Andreas Rheinhardt avformat/lrcdec: Fix declaration-after-statement warning Happens since c0f867bf503e79eba8ee52e1ac53322f88ec2929. Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt(a)outlook.com> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=bf9f6a5e559c90145… --- libavformat/lrcdec.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/libavformat/lrcdec.c b/libavformat/lrcdec.c index 83bb4a4b75..f43e9dccf5 100644 --- a/libavformat/lrcdec.c +++ b/libavformat/lrcdec.c @@ -170,10 +170,11 @@ static int lrc_read_header(AVFormatContext *s) av_bprint_init(&line, 0, AV_BPRINT_SIZE_UNLIMITED); while(!avio_feof(s->pb)) { - int64_t pos = read_line(&line, s->pb); + int64_t header_offset, pos = read_line(&line, s->pb); + if (!av_bprint_is_complete(&line)) goto err_nomem_out; - int64_t header_offset = find_header(line.str); + header_offset = find_header(line.str); if(header_offset >= 0) { char *comma_offset = strchr(line.str, ':'); if(comma_offset) {

1 0