November 2022 - ffmpeg-cvslog

avcodec/cfhdenc: readjust packet allocation
by Paul B Mahol 30 Nov '22

30 Nov '22

ffmpeg | branch: master | Paul B Mahol <onemda(a)gmail.com> | Thu Dec 1 00:39:05 2022 +0100| [f52963b48e14e4c1e1762a71b9f0bf257d5e78d1] | committer: Paul B Mahol avcodec/cfhdenc: readjust packet allocation > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=f52963b48e14e4c1e… --- libavcodec/cfhdenc.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libavcodec/cfhdenc.c b/libavcodec/cfhdenc.c index 0fca46ef3a..29e6aa1280 100644 --- a/libavcodec/cfhdenc.c +++ b/libavcodec/cfhdenc.c @@ -548,7 +548,7 @@ static int cfhd_encode_frame(AVCodecContext *avctx, AVPacket *pkt, width, height * 2); } - ret = ff_alloc_packet(avctx, pkt, 64LL + s->planes * (2LL * avctx->width * avctx->height + 1000LL)); + ret = ff_alloc_packet(avctx, pkt, 256LL + s->planes * (2LL * avctx->width * (avctx->height + 15) + 2048LL)); if (ret < 0) return ret;

1 0

avcodec/smcenc: fix encoding of width not multiple of 4
by Paul B Mahol 30 Nov '22

30 Nov '22

ffmpeg | branch: master | Paul B Mahol <onemda(a)gmail.com> | Wed Nov 30 22:55:43 2022 +0100| [6a7c70fd8b6a5b26801ec4a3dc26c015786824d7] | committer: Paul B Mahol avcodec/smcenc: fix encoding of width not multiple of 4 > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=6a7c70fd8b6a5b268… --- libavcodec/smcenc.c | 54 +++++++++++++++++++++++++++++++++++------------------ 1 file changed, 36 insertions(+), 18 deletions(-) diff --git a/libavcodec/smcenc.c b/libavcodec/smcenc.c index a2d224bd09..39abf2407b 100644 --- a/libavcodec/smcenc.c +++ b/libavcodec/smcenc.c @@ -57,11 +57,13 @@ typedef struct SMCContext { { \ for (int block = 0; block < nb_blocks && pixel_ptr && row_ptr; block++) { \ pixel_ptr += 4; \ + cur_x += 4; \ if (pixel_ptr - row_ptr >= width) \ { \ row_ptr += stride * 4; \ pixel_ptr = row_ptr; \ cur_y += 4; \ + cur_x = 0; \ } \ } \ } @@ -121,7 +123,6 @@ static void smc_encode_stream(SMCContext *s, const AVFrame *frame, const uint8_t *pixel_ptr, *row_ptr; const int height = frame->height; const int width = frame->width; - uint8_t block_values[16]; int block_counter = 0; int color_pair_index = 0; int color_quad_index = 0; @@ -129,6 +130,7 @@ static void smc_encode_stream(SMCContext *s, const AVFrame *frame, int color_table_index; /* indexes to color pair, quad, or octet tables */ int total_blocks; int cur_y = 0; + int cur_x = 0; memset(s->color_pairs, 0, sizeof(s->color_pairs)); memset(s->color_quads, 0, sizeof(s->color_quads)); @@ -150,16 +152,18 @@ static void smc_encode_stream(SMCContext *s, const AVFrame *frame, int distinct = 0; int blocks = 0; int frame_y = cur_y; + int frame_x = cur_x; while (prev_pixels && s->key_frame == 0 && block_counter + inter_skip_blocks < total_blocks) { const int y_size = FFMIN(4, height - cur_y); + const int x_size = FFMIN(4, width - cur_x); int compare = 0; for (int y = 0; y < y_size; y++) { const ptrdiff_t offset = pixel_ptr - row_ptr; const uint8_t *prev_pixel_ptr = prev_pixels + cur_y * prev_stride + offset; - compare |= memcmp(prev_pixel_ptr + y * prev_stride, pixel_ptr + y * stride, 4); + compare |= memcmp(prev_pixel_ptr + y * prev_stride, pixel_ptr + y * stride, x_size); if (compare) break; } @@ -177,9 +181,11 @@ static void smc_encode_stream(SMCContext *s, const AVFrame *frame, pixel_ptr = xpixel_ptr; row_ptr = xrow_ptr; cur_y = frame_y; + cur_x = frame_x; while (block_counter > 0 && block_counter + intra_skip_blocks < total_blocks) { const int y_size = FFMIN(4, height - cur_y); + const int x_size = FFMIN(4, width - cur_x); const ptrdiff_t offset = pixel_ptr - src_pixels; const int sy = offset / stride; const int sx = offset % stride; @@ -189,7 +195,7 @@ static void smc_encode_stream(SMCContext *s, const AVFrame *frame, int compare = 0; for (int y = 0; y < y_size; y++) { - compare |= memcmp(old_pixel_ptr + y * stride, pixel_ptr + y * stride, 4); + compare |= memcmp(old_pixel_ptr + y * stride, pixel_ptr + y * stride, x_size); if (compare) break; } @@ -206,14 +212,18 @@ static void smc_encode_stream(SMCContext *s, const AVFrame *frame, pixel_ptr = xpixel_ptr; row_ptr = xrow_ptr; cur_y = frame_y; + cur_x = frame_x; while (block_counter + coded_blocks < total_blocks && coded_blocks < 256) { const int y_size = FFMIN(4, height - cur_y); + const int x_size = FFMIN(4, width - cur_y); + const int nb_elements = x_size * y_size; + uint8_t block_values[16] = { 0 }; for (int y = 0; y < y_size; y++) - memcpy(block_values + y * 4, pixel_ptr + y * stride, 4); + memcpy(block_values + y * x_size, pixel_ptr + y * stride, x_size); - qsort(block_values, 16, sizeof(block_values[0]), smc_cmp_values); - s->next_nb_distinct = count_distinct_items(block_values, s->next_distinct_values, 16); + qsort(block_values, nb_elements, sizeof(block_values[0]), smc_cmp_values); + s->next_nb_distinct = count_distinct_items(block_values, s->next_distinct_values, nb_elements); if (coded_blocks == 0) { memcpy(distinct_values, s->next_distinct_values, sizeof(s->distinct_values)); s->nb_distinct = s->next_nb_distinct; @@ -235,30 +245,27 @@ static void smc_encode_stream(SMCContext *s, const AVFrame *frame, pixel_ptr = xpixel_ptr; row_ptr = xrow_ptr; cur_y = frame_y; + cur_x = frame_x; blocks = coded_blocks; distinct = coded_distinct; - if (intra_skip_blocks > 0 && intra_skip_blocks >= inter_skip_blocks && - intra_skip_blocks > 0) { + if (intra_skip_blocks > 0 && intra_skip_blocks >= inter_skip_blocks) { distinct = 17; blocks = intra_skip_blocks; } - if (intra_skip_blocks > 16 && intra_skip_blocks >= inter_skip_blocks && - intra_skip_blocks > 0) { + if (intra_skip_blocks > 16 && intra_skip_blocks >= inter_skip_blocks) { distinct = 18; blocks = intra_skip_blocks; } - if (inter_skip_blocks > 0 && inter_skip_blocks > intra_skip_blocks && - inter_skip_blocks > 0) { + if (inter_skip_blocks > 0 && inter_skip_blocks > intra_skip_blocks) { distinct = 19; blocks = inter_skip_blocks; } - if (inter_skip_blocks > 16 && inter_skip_blocks > intra_skip_blocks && - inter_skip_blocks > 0) { + if (inter_skip_blocks > 16 && inter_skip_blocks > intra_skip_blocks) { distinct = 20; blocks = inter_skip_blocks; } @@ -304,15 +311,17 @@ static void smc_encode_stream(SMCContext *s, const AVFrame *frame, for (int i = 0; i < blocks; i++) { const int y_size = FFMIN(4, height - cur_y); + const int x_size = FFMIN(4, width - cur_x); uint8_t value = s->color_pairs[color_table_index][1]; uint16_t flags = 0; int shift = 15; for (int y = 0; y < y_size; y++) { - for (int x = 0; x < 4; x++) { + for (int x = 0; x < x_size; x++) { flags |= (value == pixel_ptr[x + y * stride]) << shift; shift--; } + shift -= 4 - x_size; } bytestream2_put_be16(pb, flags); @@ -353,6 +362,7 @@ static void smc_encode_stream(SMCContext *s, const AVFrame *frame, for (int i = 0; i < blocks; i++) { const int y_size = FFMIN(4, height - cur_y); + const int x_size = FFMIN(4, width - cur_x); uint32_t flags = 0; uint8_t quad[4]; int shift = 30; @@ -361,7 +371,7 @@ static void smc_encode_stream(SMCContext *s, const AVFrame *frame, quad[k] = s->color_quads[color_table_index][k]; for (int y = 0; y < y_size; y++) { - for (int x = 0; x < 4; x++) { + for (int x = 0; x < x_size; x++) { int pixel = pixel_ptr[x + y * stride]; uint32_t idx = 0; @@ -375,6 +385,8 @@ static void smc_encode_stream(SMCContext *s, const AVFrame *frame, flags |= idx << shift; shift -= 2; } + + shift -= 2 * (4 - x_size); } bytestream2_put_be32(pb, flags); @@ -421,6 +433,7 @@ static void smc_encode_stream(SMCContext *s, const AVFrame *frame, for (int i = 0; i < blocks; i++) { const int y_size = FFMIN(4, height - cur_y); + const int x_size = FFMIN(4, width - cur_x); uint64_t flags = 0; uint8_t octet[8]; int shift = 45; @@ -429,7 +442,7 @@ static void smc_encode_stream(SMCContext *s, const AVFrame *frame, octet[k] = s->color_octets[color_table_index][k]; for (int y = 0; y < y_size; y++) { - for (int x = 0; x < 4; x++) { + for (int x = 0; x < x_size; x++) { int pixel = pixel_ptr[x + y * stride]; uint64_t idx = 0; @@ -443,6 +456,8 @@ static void smc_encode_stream(SMCContext *s, const AVFrame *frame, flags |= idx << shift; shift -= 3; } + + shift -= 3 * (4 - x_size); } bytestream2_put_be16(pb, ((flags >> 32) & 0xFFF0) | ((flags >> 8) & 0xF)); @@ -456,9 +471,12 @@ static void smc_encode_stream(SMCContext *s, const AVFrame *frame, bytestream2_put_byte(pb, 0xE0 | (blocks - 1)); for (int i = 0; i < blocks; i++) { const int y_size = FFMIN(4, height - cur_y); + const int x_size = FFMIN(4, width - cur_x); for (int y = 0; y < y_size; y++) { - for (int x = 0; x < 4; x++) + for (int x = 0; x < x_size; x++) bytestream2_put_byte(pb, pixel_ptr[x + y * stride]); + for (int x = x_size; x < 4; x++) + bytestream2_put_byte(pb, 0); } for (int y = y_size; y < 4; y++) {

1 0

avfilter/af_astats: do not give output for 0 samples
by Paul B Mahol 30 Nov '22

30 Nov '22

ffmpeg | branch: master | Paul B Mahol <onemda(a)gmail.com> | Wed Nov 30 21:18:20 2022 +0100| [14e6ca17e1a8dd267ec276d9354bd2b6a7b2e04e] | committer: Paul B Mahol avfilter/af_astats: do not give output for 0 samples > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=14e6ca17e1a8dd267… --- libavfilter/af_astats.c | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/libavfilter/af_astats.c b/libavfilter/af_astats.c index d59640a3fd..306a6603a2 100644 --- a/libavfilter/af_astats.c +++ b/libavfilter/af_astats.c @@ -668,6 +668,9 @@ static void print_stats(AVFilterContext *ctx) for (c = 0; c < s->nb_channels; c++) { ChannelStats *p = &s->chstats[c]; + if (p->nb_samples == 0) + continue; + if (p->nb_samples < s->tc_samples) p->min_sigma_x2 = p->max_sigma_x2 = p->sigma_x2 / p->nb_samples; @@ -754,6 +757,9 @@ static void print_stats(AVFilterContext *ctx) av_log(ctx, AV_LOG_INFO, "Number of denormals: %"PRId64"\n", p->nb_denormals); } + if (nb_samples == 0) + return; + if (s->measure_overall != MEASURE_NONE) av_log(ctx, AV_LOG_INFO, "Overall\n"); if (s->measure_overall & MEASURE_DC_OFFSET)

1 0

avfilter/avf_showcwt: add yet another mode variant
by Paul B Mahol 30 Nov '22

30 Nov '22

ffmpeg | branch: master | Paul B Mahol <onemda(a)gmail.com> | Wed Nov 30 19:55:17 2022 +0100| [569b1a24cd8f06683396d1fbef236b22b1592138] | committer: Paul B Mahol avfilter/avf_showcwt: add yet another mode variant > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=569b1a24cd8f06683… --- doc/filters.texi | 2 ++ libavfilter/avf_showcwt.c | 26 +++++++++++++++++++++++++- 2 files changed, 27 insertions(+), 1 deletion(-) diff --git a/doc/filters.texi b/doc/filters.texi index d64ce1734b..4ed6d50750 100644 --- a/doc/filters.texi +++ b/doc/filters.texi @@ -29343,6 +29343,8 @@ Show combination of magnitude and phase. Magnitude is mapped to brightness and phase to color. @item channel Show unique color per channel magnitude. +@item stereo +Show unique color per stereo difference. @end table Default value is @code{magnitude}. diff --git a/libavfilter/avf_showcwt.c b/libavfilter/avf_showcwt.c index 5e09ee5d04..b5a4ed0554 100644 --- a/libavfilter/avf_showcwt.c +++ b/libavfilter/avf_showcwt.c @@ -132,11 +132,12 @@ static const AVOption showcwt_options[] = { { "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 }, { "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, 3, FLAGS, "mode" }, + { "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" }, { "phase", "phase", 0, AV_OPT_TYPE_CONST,{.i64=1}, 0, 0, FLAGS, "mode" }, { "magphase", "magnitude+phase", 0, AV_OPT_TYPE_CONST,{.i64=2}, 0, 0, FLAGS, "mode" }, { "channel", "color per channel", 0, AV_OPT_TYPE_CONST,{.i64=3}, 0, 0, FLAGS, "mode" }, + { "stereo", "stereo difference", 0, AV_OPT_TYPE_CONST,{.i64=4}, 0, 0, FLAGS, "mode" }, { "slide", "set slide mode", OFFSET(slide), AV_OPT_TYPE_INT, {.i64=0}, 0, NB_SLIDE-1, FLAGS, "slide" }, { "replace", "replace", 0, AV_OPT_TYPE_CONST,{.i64=SLIDE_REPLACE},0, 0, FLAGS, "slide" }, { "scroll", "scroll", 0, AV_OPT_TYPE_CONST,{.i64=SLIDE_SCROLL}, 0, 0, FLAGS, "slide" }, @@ -360,6 +361,29 @@ 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[FFMAX(1, s->nb_channels - 1)]) + + y * ihop_size + ihop_index; + float z, u, v; + + z = hypotf(src[0].re + src2[0].re, src[0].im + src2[0].im); + 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); + + Y = z; + U = 0.5f + z * sinf((v - u) * M_PI_2); + V = 0.5f + z * sinf((u - v) * M_PI_2); + + dstY[0] = av_clip_uint8(lrintf(Y * 255.f)); + dstU[0] = av_clip_uint8(lrintf(U * 255.f)); + dstV[0] = av_clip_uint8(lrintf(V * 255.f)); + } + break; case 3: { const int nb_channels = s->nb_channels;

1 0

avfilter/avf_showcwt: add frame slide mode
by Paul B Mahol 30 Nov '22

30 Nov '22

ffmpeg | branch: master | Paul B Mahol <onemda(a)gmail.com> | Wed Nov 30 18:03:00 2022 +0100| [7d20635aeb4e6dc51549424d1999e44c86b38e11] | committer: Paul B Mahol avfilter/avf_showcwt: add frame slide mode > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=7d20635aeb4e6dc51… --- doc/filters.texi | 1 + libavfilter/avf_showcwt.c | 113 ++++++++++++++++++++++++++++++++++++++++------ 2 files changed, 99 insertions(+), 15 deletions(-) diff --git a/doc/filters.texi b/doc/filters.texi index c25d7aaecc..d64ce1734b 100644 --- a/doc/filters.texi +++ b/doc/filters.texi @@ -29353,6 +29353,7 @@ Set the output slide method. Allowed values are: @table @option @item replace @item scroll +@item frame @end table @item direction diff --git a/libavfilter/avf_showcwt.c b/libavfilter/avf_showcwt.c index db94a490bc..5e09ee5d04 100644 --- a/libavfilter/avf_showcwt.c +++ b/libavfilter/avf_showcwt.c @@ -54,6 +54,7 @@ enum DirectionMode { enum SlideMode { SLIDE_REPLACE, SLIDE_SCROLL, + SLIDE_FRAME, NB_SLIDE }; @@ -94,6 +95,7 @@ typedef struct ShowCWTContext { int pps; int eof; int slide; + int new_frame; int direction; int hop_size; int hop_index; @@ -138,6 +140,7 @@ static const AVOption showcwt_options[] = { { "slide", "set slide mode", OFFSET(slide), AV_OPT_TYPE_INT, {.i64=0}, 0, NB_SLIDE-1, FLAGS, "slide" }, { "replace", "replace", 0, AV_OPT_TYPE_CONST,{.i64=SLIDE_REPLACE},0, 0, FLAGS, "slide" }, { "scroll", "scroll", 0, AV_OPT_TYPE_CONST,{.i64=SLIDE_SCROLL}, 0, 0, FLAGS, "slide" }, + { "frame", "frame", 0, AV_OPT_TYPE_CONST,{.i64=SLIDE_FRAME}, 0, 0, FLAGS, "slide" }, { "direction", "set direction mode", OFFSET(direction), AV_OPT_TYPE_INT, {.i64=0}, 0, NB_DIRECTION-1, FLAGS, "direction" }, { "lr", "left to right", 0, AV_OPT_TYPE_CONST,{.i64=DIRECTION_LR}, 0, 0, FLAGS, "direction" }, { "rl", "right to left", 0, AV_OPT_TYPE_CONST,{.i64=DIRECTION_RL}, 0, 0, FLAGS, "direction" }, @@ -330,6 +333,7 @@ static int draw(AVFilterContext *ctx, void *arg, int jobnr, int nb_jobs) switch (s->slide) { case SLIDE_REPLACE: + case SLIDE_FRAME: /* nothing to do here */ break; case SLIDE_SCROLL: @@ -515,6 +519,7 @@ static int config_output(AVFilterLink *outlink) break; } + s->new_frame = 1; s->nb_threads = FFMIN(s->frequency_band_count, ff_filter_get_nb_threads(ctx)); s->nb_channels = inlink->ch_layout.nb_channels; s->old_pts = AV_NOPTS_VALUE; @@ -675,7 +680,6 @@ static int output_frame(AVFilterContext *ctx) AVFilterLink *outlink = ctx->outputs[0]; AVFilterLink *inlink = ctx->inputs[0]; ShowCWTContext *s = ctx->priv; - int64_t pts_offset; int ret; switch (s->slide) { @@ -709,35 +713,37 @@ static int output_frame(AVFilterContext *ctx) ff_filter_execute(ctx, draw, NULL, NULL, s->nb_threads); - pts_offset = av_rescale(s->ihop_index, s->hop_size, s->ihop_size); - s->outpicref->pts = av_rescale_q(s->in_pts + pts_offset, inlink->time_base, outlink->time_base); - - s->ihop_index++; - if (s->ihop_index >= s->ihop_size) - s->ihop_index = 0; - switch (s->slide) { case SLIDE_REPLACE: + case SLIDE_FRAME: switch (s->direction) { case DIRECTION_LR: s->pos++; - if (s->pos >= s->w) + if (s->pos >= s->w) { s->pos = 0; + s->new_frame = 1; + } break; case DIRECTION_RL: s->pos--; - if (s->pos < 0) + if (s->pos < 0) { s->pos = s->w - 1; + s->new_frame = 1; + } break; case DIRECTION_UD: s->pos++; - if (s->pos >= s->h) + if (s->pos >= s->h) { s->pos = 0; + s->new_frame = 1; + } break; case DIRECTION_DU: s->pos--; - if (s->pos < 0) + if (s->pos < 0) { s->pos = s->h - 1; + s->new_frame = 1; + } break; } break; @@ -757,6 +763,77 @@ static int output_frame(AVFilterContext *ctx) break; } + if (s->slide == SLIDE_FRAME && s->eof) { + switch (s->direction) { + case DIRECTION_LR: + for (int p = 0; p < 3; p++) { + ptrdiff_t linesize = s->outpicref->linesize[p]; + const int size = s->w - s->pos; + const int fill = p ? 128 : 0; + const int x = s->pos; + + for (int y = 0; y < s->h; y++) { + uint8_t *dst = s->outpicref->data[p] + y * linesize + x; + + memset(dst, fill, size); + } + } + break; + case DIRECTION_RL: + for (int p = 0; p < 3; p++) { + ptrdiff_t linesize = s->outpicref->linesize[p]; + const int size = s->w - s->pos; + const int fill = p ? 128 : 0; + + for (int y = 0; y < s->h; y++) { + uint8_t *dst = s->outpicref->data[p] + y * linesize; + + memset(dst, fill, size); + } + } + break; + case DIRECTION_UD: + for (int p = 0; p < 3; p++) { + ptrdiff_t linesize = s->outpicref->linesize[p]; + const int fill = p ? 128 : 0; + + for (int y = s->pos; y < s->h; y++) { + uint8_t *dst = s->outpicref->data[p] + y * linesize; + + memset(dst, fill, s->w); + } + } + break; + case DIRECTION_DU: + for (int p = 0; p < 3; p++) { + ptrdiff_t linesize = s->outpicref->linesize[p]; + const int fill = p ? 128 : 0; + + for (int y = s->h - s->pos; y >= 0; y--) { + uint8_t *dst = s->outpicref->data[p] + y * linesize; + + memset(dst, fill, s->w); + } + } + break; + } + } + + s->new_frame = s->slide == SLIDE_FRAME && (s->new_frame || s->eof); + + if (s->slide != SLIDE_FRAME || s->new_frame == 1) { + int64_t pts_offset = s->new_frame ? 0LL : av_rescale(s->ihop_index, s->hop_size, s->ihop_size); + + s->outpicref->pts = av_rescale_q(s->in_pts + pts_offset, inlink->time_base, outlink->time_base); + } + + s->ihop_index++; + if (s->ihop_index >= s->ihop_size) + s->ihop_index = 0; + + if (s->slide == SLIDE_FRAME && s->new_frame == 0) + return 1; + if (s->old_pts < s->outpicref->pts) { AVFrame *out = ff_get_video_buffer(outlink, outlink->w, outlink->h); if (!out) @@ -768,6 +845,7 @@ static int output_frame(AVFilterContext *ctx) if (ret < 0) goto fail; s->old_pts = s->outpicref->pts; + s->new_frame = 0; ret = ff_filter_frame(outlink, out); if (ret <= 0) return ret; @@ -816,8 +894,10 @@ static int activate(AVFilterContext *ctx) ff_filter_execute(ctx, run_channels_cwt_prepare, fin, NULL, FFMIN(s->nb_threads, s->nb_channels)); if (fin) { - if (s->hop_index == 0) + if ((s->hop_index == 0 && s->slide != SLIDE_FRAME) || s->new_frame) { s->in_pts = fin->pts; + s->new_frame = 0; + } s->hop_index += fin->nb_samples; av_frame_free(&fin); } else { @@ -843,9 +923,12 @@ static int activate(AVFilterContext *ctx) } } - if (s->eof && s->eof_pts != AV_NOPTS_VALUE && s->old_pts + 1 >= s->eof_pts) { + if (s->eof && s->eof_pts != AV_NOPTS_VALUE && + (s->old_pts + 1 >= s->eof_pts || (s->slide == SLIDE_FRAME))) { + if (s->slide == SLIDE_FRAME) + ret = output_frame(ctx); ff_outlink_set_status(outlink, AVERROR_EOF, s->eof_pts); - return 0; + return ret; } if (!s->eof && ff_inlink_acknowledge_status(inlink, &status, &pts)) {

1 0

avfilter/avf_showcwt: add some small optimizations
by Paul B Mahol 30 Nov '22

30 Nov '22

ffmpeg | branch: master | Paul B Mahol <onemda(a)gmail.com> | Wed Nov 30 16:36:30 2022 +0100| [bcb5ef667d202a55d903d075bfafe4ced93b7c96] | committer: Paul B Mahol avfilter/avf_showcwt: add some small optimizations > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=bcb5ef667d202a55d… --- libavfilter/avf_showcwt.c | 56 ++++++++++++++++++++++------------------------- 1 file changed, 26 insertions(+), 30 deletions(-) diff --git a/libavfilter/avf_showcwt.c b/libavfilter/avf_showcwt.c index d2a5fe2dbd..db94a490bc 100644 --- a/libavfilter/avf_showcwt.c +++ b/libavfilter/avf_showcwt.c @@ -81,7 +81,7 @@ typedef struct ShowCWTContext { unsigned *index; int *kernel_start; int *kernel_stop; - AVFrame *overlap; + AVFrame *cache[2]; AVFrame *outpicref; AVFrame *fft_in; AVFrame *fft_out; @@ -158,7 +158,8 @@ static av_cold void uninit(AVFilterContext *ctx) av_freep(&s->index); av_frame_free(&s->kernel); - av_frame_free(&s->overlap); + av_frame_free(&s->cache[0]); + av_frame_free(&s->cache[1]); av_frame_free(&s->outpicref); av_frame_free(&s->fft_in); av_frame_free(&s->fft_out); @@ -243,12 +244,6 @@ static void frequency_band(float *frequency_band, } } -#define cmul(operator, index) { \ - const float ff = kernel[index]; \ - isrc[n].re operator ff*dst[index].re; \ - isrc[n].im operator ff*dst[index].im; \ -} - static float remap_log(float value, float log_factor) { float sign = (0 < value) - (value < 0); @@ -261,36 +256,33 @@ static float remap_log(float value, float log_factor) static int run_channel_cwt_prepare(AVFilterContext *ctx, void *arg, int jobnr, int ch) { ShowCWTContext *s = ctx->priv; + const int hop_size = s->hop_size; AVFrame *fin = arg; - float *overlap = (float *)s->overlap->extended_data[ch]; + float *cache0 = (float *)s->cache[0]->extended_data[ch]; + float *cache = (float *)s->cache[1]->extended_data[ch]; AVComplexFloat *src = (AVComplexFloat *)s->fft_in->extended_data[ch]; AVComplexFloat *dst = (AVComplexFloat *)s->fft_out->extended_data[ch]; - const int nb_consumed_samples = s->nb_consumed_samples; - const int input_padding_size = s->input_padding_size; if (fin) { - const int hop_size = fin->nb_samples; - const int offset = input_padding_size - hop_size; + const int offset = s->hop_index; const float *input = (const float *)fin->extended_data[ch]; - memmove(overlap, &overlap[hop_size], offset * sizeof(float)); - memcpy(&overlap[offset], input, + memcpy(&cache[offset], input, fin->nb_samples * sizeof(float)); } if (fin == NULL) { - const int hop_size = s->hop_size; - - memmove(overlap, &overlap[hop_size], hop_size * sizeof(float)); - memset(&overlap[s->hop_index], 0, + memset(&cache[s->hop_index], 0, (hop_size - s->hop_index) * sizeof(float)); - } else if (s->hop_index + fin->nb_samples < s->hop_size) { + } else if (s->hop_index + fin->nb_samples < hop_size) { return 0; } - for (int n = 0; n < nb_consumed_samples; n++) { - src[n].re = overlap[n]; + for (int n = 0; n < hop_size; n++) { + src[n].re = cache0[n]; src[n].im = 0.f; + src[n + hop_size].re = cache[n]; + src[n + hop_size].im = 0.f; } s->tx_fn(s->fft[jobnr], dst, src, sizeof(*src)); @@ -442,15 +434,15 @@ static int run_channel_cwt(AVFilterContext *ctx, void *arg, int jobnr, int nb_jo memset(isrc, 0, sizeof(*isrc) * output_sample_count); for (int i = kernel_start; i < kernel_stop; i++) { const unsigned n = index[i]; - cmul(+=, i); + const float ff = kernel[i]; + + isrc[n].re += ff * dst[i].re; + isrc[n].im += ff * dst[i].im; } s->itx_fn(s->ifft[jobnr], idst, isrc, sizeof(*isrc)); - for (int i = 0; i < ihop_size; i++) { - chout[i].re = idst[ioffset + i].re; - chout[i].im = idst[ioffset + i].im; - } + memcpy(chout, idst + ioffset, sizeof(*chout) * ihop_size); } return 0; @@ -572,7 +564,8 @@ static int config_output(AVFilterLink *outlink) s->outpicref = ff_get_video_buffer(outlink, outlink->w, outlink->h); s->fft_in = ff_get_audio_buffer(inlink, s->fft_in_size * 2); s->fft_out = ff_get_audio_buffer(inlink, s->fft_out_size * 2); - s->overlap = ff_get_audio_buffer(inlink, s->input_padding_size); + s->cache[0] = ff_get_audio_buffer(inlink, s->hop_size); + s->cache[1] = 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->ifft_in = av_frame_alloc(); s->ifft_out = av_frame_alloc(); @@ -582,7 +575,7 @@ static int config_output(AVFilterLink *outlink) s->kernel_stop = av_calloc(s->frequency_band_count, sizeof(*s->kernel_stop)); if (!s->outpicref || !s->fft_in || !s->fft_out || !s->ifft_in || !s->ifft_out || !s->kernel_start || !s->kernel_stop || - !s->frequency_band || !s->kernel || !s->overlap || !s->index) + !s->frequency_band || !s->kernel || !s->cache[0] || !s->cache[1] || !s->index) return AVERROR(ENOMEM); s->ifft_in->format = inlink->format; @@ -834,7 +827,10 @@ static int activate(AVFilterContext *ctx) } if (s->hop_index >= s->hop_size || s->ihop_index > 0) { - s->hop_index = 0; + if (s->hop_index) { + FFSWAP(AVFrame *, s->cache[0], s->cache[1]); + s->hop_index = 0; + } for (int ch = 0; ch < s->nb_channels && s->ihop_index == 0; ch++) { ff_filter_execute(ctx, run_channel_cwt, (void *)&ch, NULL,

1 0

avfilter/avf_showcwt: add thread jobs for forward fft per channel
by Paul B Mahol 29 Nov '22

29 Nov '22

ffmpeg | branch: master | Paul B Mahol <onemda(a)gmail.com> | Tue Nov 29 14:39:18 2022 +0100| [d7a5f068c237e61e5a1a45f64a7fb1224401986f] | committer: Paul B Mahol avfilter/avf_showcwt: add thread jobs for forward fft per channel > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=d7a5f068c237e61e5… --- libavfilter/avf_showcwt.c | 44 ++++++++++++++++++++++++++++++++++---------- 1 file changed, 34 insertions(+), 10 deletions(-) diff --git a/libavfilter/avf_showcwt.c b/libavfilter/avf_showcwt.c index 3a8db51831..d2a5fe2dbd 100644 --- a/libavfilter/avf_showcwt.c +++ b/libavfilter/avf_showcwt.c @@ -64,7 +64,7 @@ typedef struct ShowCWTContext { char *rate_str; AVRational auto_frame_rate; AVRational frame_rate; - AVTXContext *fft; + AVTXContext **fft; AVTXContext **ifft; av_tx_fn tx_fn; av_tx_fn itx_fn; @@ -165,11 +165,17 @@ static av_cold void uninit(AVFilterContext *ctx) av_frame_free(&s->ifft_in); av_frame_free(&s->ifft_out); av_frame_free(&s->ch_out); - av_tx_uninit(&s->fft); + + if (s->fft) { + for (int n = 0; n < s->nb_threads; n++) + av_tx_uninit(&s->fft[n]); + av_freep(&s->fft); + } if (s->ifft) { for (int n = 0; n < s->nb_threads; n++) av_tx_uninit(&s->ifft[n]); + av_freep(&s->ifft); } } @@ -252,7 +258,7 @@ static float remap_log(float value, float log_factor) return 1.f - av_clipf(value, 0.f, 1.f); } -static int run_channel_cwt_prepare(AVFilterContext *ctx, void *arg, int ch) +static int run_channel_cwt_prepare(AVFilterContext *ctx, void *arg, int jobnr, int ch) { ShowCWTContext *s = ctx->priv; AVFrame *fin = arg; @@ -287,7 +293,7 @@ static int run_channel_cwt_prepare(AVFilterContext *ctx, void *arg, int ch) src[n].im = 0.f; } - s->tx_fn(s->fft, dst, src, sizeof(*src)); + s->tx_fn(s->fft[jobnr], dst, src, sizeof(*src)); return 0; } @@ -541,9 +547,15 @@ static int config_output(AVFilterLink *outlink) s->ifft_out_size = FFALIGN(s->output_padding_size, av_cpu_max_align()); s->ihop_size = s->output_padding_size >> 1; - ret = av_tx_init(&s->fft, &s->tx_fn, AV_TX_FLOAT_FFT, 0, s->input_padding_size, &scale, 0); - if (ret < 0) - return ret; + s->fft = av_calloc(s->nb_threads, sizeof(*s->fft)); + if (!s->fft) + return AVERROR(ENOMEM); + + for (int n = 0; n < s->nb_threads; n++) { + ret = av_tx_init(&s->fft[n], &s->tx_fn, AV_TX_FLOAT_FFT, 0, s->input_padding_size, &scale, 0); + if (ret < 0) + return ret; + } s->ifft = av_calloc(s->nb_threads, sizeof(*s->ifft)); if (!s->ifft) @@ -774,6 +786,19 @@ fail: return 1; } +static int run_channels_cwt_prepare(AVFilterContext *ctx, void *arg, int jobnr, int nb_jobs) +{ + ShowCWTContext *s = ctx->priv; + const int count = s->nb_channels; + const int start = (count * jobnr) / nb_jobs; + const int end = (count * (jobnr+1)) / nb_jobs; + + for (int ch = start; ch < end; ch++) + run_channel_cwt_prepare(ctx, arg, jobnr, ch); + + return 0; +} + static int activate(AVFilterContext *ctx) { AVFilterLink *inlink = ctx->inputs[0]; @@ -795,9 +820,8 @@ static int activate(AVFilterContext *ctx) } if (ret > 0 || s->eof) { - for (int ch = 0; ch < s->nb_channels; ch++) - run_channel_cwt_prepare(ctx, fin, ch); - + ff_filter_execute(ctx, run_channels_cwt_prepare, fin, NULL, + FFMIN(s->nb_threads, s->nb_channels)); if (fin) { if (s->hop_index == 0) s->in_pts = fin->pts;

1 0

avfilter/avf_showcwt: flush frames at EOF
by Paul B Mahol 29 Nov '22

29 Nov '22

ffmpeg | branch: master | Paul B Mahol <onemda(a)gmail.com> | Tue Nov 29 14:03:34 2022 +0100| [9d717cb846f27f0619724e70a40c44a660233b0c] | committer: Paul B Mahol avfilter/avf_showcwt: flush frames at EOF > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=9d717cb846f27f061… --- libavfilter/avf_showcwt.c | 72 +++++++++++++++++++++++++++++++---------------- 1 file changed, 47 insertions(+), 25 deletions(-) diff --git a/libavfilter/avf_showcwt.c b/libavfilter/avf_showcwt.c index 12a97ffaf3..3a8db51831 100644 --- a/libavfilter/avf_showcwt.c +++ b/libavfilter/avf_showcwt.c @@ -75,6 +75,7 @@ typedef struct ShowCWTContext { int pos; int64_t in_pts; int64_t old_pts; + int64_t eof_pts; float *frequency_band; AVFrame *kernel; unsigned *index; @@ -91,6 +92,7 @@ typedef struct ShowCWTContext { int nb_channels; int nb_consumed_samples; int pps; + int eof; int slide; int direction; int hop_size; @@ -250,26 +252,32 @@ static float remap_log(float value, float log_factor) return 1.f - av_clipf(value, 0.f, 1.f); } -static int run_channel_cwt_prepare(AVFilterContext *ctx, void *arg, int ch, int eof) +static int run_channel_cwt_prepare(AVFilterContext *ctx, void *arg, int ch) { ShowCWTContext *s = ctx->priv; AVFrame *fin = arg; - const float *input = (const float *)fin->extended_data[ch]; float *overlap = (float *)s->overlap->extended_data[ch]; AVComplexFloat *src = (AVComplexFloat *)s->fft_in->extended_data[ch]; AVComplexFloat *dst = (AVComplexFloat *)s->fft_out->extended_data[ch]; const int nb_consumed_samples = s->nb_consumed_samples; const int input_padding_size = s->input_padding_size; - const int hop_size = eof ? s->hop_size : fin->nb_samples; - const int offset = input_padding_size - hop_size; - memmove(overlap, &overlap[hop_size], offset * sizeof(float)); - memcpy(&overlap[offset], input, - fin->nb_samples * sizeof(float)); + if (fin) { + const int hop_size = fin->nb_samples; + const int offset = input_padding_size - hop_size; + const float *input = (const float *)fin->extended_data[ch]; - if (eof) { - memset(&overlap[offset + fin->nb_samples], 0, - (hop_size - fin->nb_samples) * sizeof(float)); + memmove(overlap, &overlap[hop_size], offset * sizeof(float)); + memcpy(&overlap[offset], input, + fin->nb_samples * sizeof(float)); + } + + if (fin == NULL) { + const int hop_size = s->hop_size; + + memmove(overlap, &overlap[hop_size], hop_size * sizeof(float)); + memset(&overlap[s->hop_index], 0, + (hop_size - s->hop_index) * sizeof(float)); } else if (s->hop_index + fin->nb_samples < s->hop_size) { return 0; } @@ -512,6 +520,7 @@ static int config_output(AVFilterLink *outlink) s->nb_threads = FFMIN(s->frequency_band_count, ff_filter_get_nb_threads(ctx)); s->nb_channels = inlink->ch_layout.nb_channels; s->old_pts = AV_NOPTS_VALUE; + s->eof_pts = AV_NOPTS_VALUE; s->nb_consumed_samples = 65536; s->input_sample_count = s->nb_consumed_samples; @@ -776,21 +785,27 @@ static int activate(AVFilterContext *ctx) FF_FILTER_FORWARD_STATUS_BACK(outlink, inlink); if (s->outpicref) { - AVFrame *fin; + AVFrame *fin = NULL; if (s->ihop_index == 0) { - ret = ff_inlink_consume_samples(inlink, 1, s->hop_size - s->hop_index, &fin); - if (ret < 0) - return ret; - if (ret > 0) { - for (int ch = 0; ch < s->nb_channels; ch++) - run_channel_cwt_prepare(ctx, fin, ch, - ff_outlink_get_status(inlink)); + if (!s->eof) { + ret = ff_inlink_consume_samples(inlink, 1, s->hop_size - s->hop_index, &fin); + if (ret < 0) + return ret; + } - if (s->hop_index == 0) - s->in_pts = fin->pts; - s->hop_index += fin->nb_samples; - av_frame_free(&fin); + if (ret > 0 || s->eof) { + for (int ch = 0; ch < s->nb_channels; ch++) + run_channel_cwt_prepare(ctx, fin, ch); + + if (fin) { + if (s->hop_index == 0) + s->in_pts = fin->pts; + s->hop_index += fin->nb_samples; + av_frame_free(&fin); + } else { + s->hop_index = s->hop_size; + } } } @@ -808,15 +823,22 @@ static int activate(AVFilterContext *ctx) } } - if (ff_inlink_acknowledge_status(inlink, &status, &pts)) { + if (s->eof && s->eof_pts != AV_NOPTS_VALUE && s->old_pts + 1 >= s->eof_pts) { + ff_outlink_set_status(outlink, AVERROR_EOF, s->eof_pts); + return 0; + } + + if (!s->eof && ff_inlink_acknowledge_status(inlink, &status, &pts)) { if (status == AVERROR_EOF) { - ff_outlink_set_status(outlink, status, s->old_pts); + s->eof = 1; + ff_filter_set_ready(ctx, 10); + s->eof_pts = av_rescale_q(pts, inlink->time_base, outlink->time_base); return 0; } } if (ff_inlink_queued_samples(inlink) > 0 || s->ihop_index || - s->hop_index >= s->hop_size) { + s->hop_index >= s->hop_size || s->eof) { ff_filter_set_ready(ctx, 10); return 0; }

1 0

avfilter/avf_showcwt: refactor code into function
by Paul B Mahol 29 Nov '22

29 Nov '22

ffmpeg | branch: master | Paul B Mahol <onemda(a)gmail.com> | Tue Nov 29 11:04:08 2022 +0100| [a08a50810548a2238fc6579be349472d0b98b9fa] | committer: Paul B Mahol avfilter/avf_showcwt: refactor code into function > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=a08a50810548a2238… --- libavfilter/avf_showcwt.c | 216 ++++++++++++++++++++++++---------------------- 1 file changed, 114 insertions(+), 102 deletions(-) diff --git a/libavfilter/avf_showcwt.c b/libavfilter/avf_showcwt.c index 002a68a9a2..12a97ffaf3 100644 --- a/libavfilter/avf_showcwt.c +++ b/libavfilter/avf_showcwt.c @@ -656,6 +656,115 @@ static int config_output(AVFilterLink *outlink) return 0; } +static int output_frame(AVFilterContext *ctx) +{ + AVFilterLink *outlink = ctx->outputs[0]; + AVFilterLink *inlink = ctx->inputs[0]; + ShowCWTContext *s = ctx->priv; + int64_t pts_offset; + int ret; + + switch (s->slide) { + case SLIDE_SCROLL: + switch (s->direction) { + case DIRECTION_UD: + for (int p = 0; p < 3; p++) { + ptrdiff_t linesize = s->outpicref->linesize[p]; + + for (int y = s->h - 1; y > 0; y--) { + uint8_t *dst = s->outpicref->data[p] + y * linesize; + + memmove(dst, dst - linesize, s->w); + } + } + break; + case DIRECTION_DU: + for (int p = 0; p < 3; p++) { + ptrdiff_t linesize = s->outpicref->linesize[p]; + + for (int y = 0; y < s->h - 1; y++) { + uint8_t *dst = s->outpicref->data[p] + y * linesize; + + memmove(dst, dst + linesize, s->w); + } + } + break; + } + break; + } + + ff_filter_execute(ctx, draw, NULL, NULL, s->nb_threads); + + pts_offset = av_rescale(s->ihop_index, s->hop_size, s->ihop_size); + s->outpicref->pts = av_rescale_q(s->in_pts + pts_offset, inlink->time_base, outlink->time_base); + + s->ihop_index++; + if (s->ihop_index >= s->ihop_size) + s->ihop_index = 0; + + switch (s->slide) { + case SLIDE_REPLACE: + switch (s->direction) { + case DIRECTION_LR: + s->pos++; + if (s->pos >= s->w) + s->pos = 0; + break; + case DIRECTION_RL: + s->pos--; + if (s->pos < 0) + s->pos = s->w - 1; + break; + case DIRECTION_UD: + s->pos++; + if (s->pos >= s->h) + s->pos = 0; + break; + case DIRECTION_DU: + s->pos--; + if (s->pos < 0) + s->pos = s->h - 1; + break; + } + break; + case SLIDE_SCROLL: + switch (s->direction) { + case DIRECTION_UD: + case DIRECTION_LR: + s->pos = 0; + break; + case DIRECTION_RL: + s->pos = s->w - 1; + break; + case DIRECTION_DU: + s->pos = s->h - 1; + break; + } + break; + } + + if (s->old_pts < s->outpicref->pts) { + AVFrame *out = ff_get_video_buffer(outlink, outlink->w, outlink->h); + if (!out) + return AVERROR(ENOMEM); + ret = av_frame_copy_props(out, s->outpicref); + if (ret < 0) + goto fail; + ret = av_frame_copy(out, s->outpicref); + if (ret < 0) + goto fail; + s->old_pts = s->outpicref->pts; + ret = ff_filter_frame(outlink, out); + if (ret <= 0) + return ret; +fail: + av_frame_free(&out); + return ret; + } + + return 1; +} + static int activate(AVFilterContext *ctx) { AVFilterLink *inlink = ctx->inputs[0]; @@ -686,125 +795,28 @@ static int activate(AVFilterContext *ctx) } if (s->hop_index >= s->hop_size || s->ihop_index > 0) { - int64_t pts_offset; - s->hop_index = 0; - switch (s->slide) { - case SLIDE_SCROLL: - switch (s->direction) { - case DIRECTION_UD: - for (int p = 0; p < 3; p++) { - ptrdiff_t linesize = s->outpicref->linesize[p]; - - for (int y = s->h - 1; y > 0; y--) { - uint8_t *dst = s->outpicref->data[p] + y * linesize; - - memmove(dst, dst - linesize, s->w); - } - } - break; - case DIRECTION_DU: - for (int p = 0; p < 3; p++) { - ptrdiff_t linesize = s->outpicref->linesize[p]; - - for (int y = 0; y < s->h - 1; y++) { - uint8_t *dst = s->outpicref->data[p] + y * linesize; - - memmove(dst, dst + linesize, s->w); - } - } - break; - } - break; - } - for (int ch = 0; ch < s->nb_channels && s->ihop_index == 0; ch++) { ff_filter_execute(ctx, run_channel_cwt, (void *)&ch, NULL, s->nb_threads); } - ff_filter_execute(ctx, draw, NULL, NULL, s->nb_threads); - - pts_offset = av_rescale(s->ihop_index, s->hop_size, s->ihop_size); - s->outpicref->pts = av_rescale_q(s->in_pts + pts_offset, inlink->time_base, outlink->time_base); - - s->ihop_index++; - if (s->ihop_index >= s->ihop_size) - s->ihop_index = 0; - - switch (s->slide) { - case SLIDE_REPLACE: - switch (s->direction) { - case DIRECTION_LR: - s->pos++; - if (s->pos >= s->w) - s->pos = 0; - break; - case DIRECTION_RL: - s->pos--; - if (s->pos < 0) - s->pos = s->w - 1; - break; - case DIRECTION_UD: - s->pos++; - if (s->pos >= s->h) - s->pos = 0; - break; - case DIRECTION_DU: - s->pos--; - if (s->pos < 0) - s->pos = s->h - 1; - break; - } - break; - case SLIDE_SCROLL: - switch (s->direction) { - case DIRECTION_LR: - s->pos = 0; - break; - case DIRECTION_RL: - s->pos = s->w - 1; - break; - case DIRECTION_UD: - s->pos = 0; - break; - case DIRECTION_DU: - s->pos = s->h - 1; - break; - } - break; - } - - if (s->old_pts < s->outpicref->pts) { - AVFrame *out = ff_get_video_buffer(outlink, outlink->w, outlink->h); - if (!out) - return AVERROR(ENOMEM); - ret = av_frame_copy_props(out, s->outpicref); - if (ret < 0) - goto fail; - ret = av_frame_copy(out, s->outpicref); - if (ret < 0) - goto fail; - s->old_pts = s->outpicref->pts; - ret = ff_filter_frame(outlink, out); - if (ret <= 0) - return ret; -fail: - av_frame_free(&out); + ret = output_frame(ctx); + if (ret != 1) return ret; - } } } if (ff_inlink_acknowledge_status(inlink, &status, &pts)) { if (status == AVERROR_EOF) { - ff_outlink_set_status(outlink, status, pts); + ff_outlink_set_status(outlink, status, s->old_pts); return 0; } } - if (ff_inlink_queued_samples(inlink) > 0 || s->ihop_index || s->hop_index >= s->hop_size) { + if (ff_inlink_queued_samples(inlink) > 0 || s->ihop_index || + s->hop_index >= s->hop_size) { ff_filter_set_ready(ctx, 10); return 0; }

1 0

avfilter/avf_showcwt: always consume some available samples
by Paul B Mahol 29 Nov '22

29 Nov '22

ffmpeg | branch: master | Paul B Mahol <onemda(a)gmail.com> | Tue Nov 29 00:27:14 2022 +0100| [634e29f3c0dafe7bb17a3f92d009486cd59c2565] | committer: Paul B Mahol avfilter/avf_showcwt: always consume some available samples Stop waiting for big cache of samples. > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=634e29f3c0dafe7bb… --- libavfilter/avf_showcwt.c | 33 +++++++++++++++++++++------------ 1 file changed, 21 insertions(+), 12 deletions(-) diff --git a/libavfilter/avf_showcwt.c b/libavfilter/avf_showcwt.c index 0574d9b4d8..002a68a9a2 100644 --- a/libavfilter/avf_showcwt.c +++ b/libavfilter/avf_showcwt.c @@ -73,7 +73,6 @@ typedef struct ShowCWTContext { int ifft_in_size; int ifft_out_size; int pos; - int in_nb_samples; int64_t in_pts; int64_t old_pts; float *frequency_band; @@ -95,6 +94,7 @@ typedef struct ShowCWTContext { int slide; int direction; int hop_size; + int hop_index; int ihop_size; int ihop_index; int input_padding_size; @@ -250,7 +250,7 @@ static float remap_log(float value, float log_factor) return 1.f - av_clipf(value, 0.f, 1.f); } -static int run_channel_cwt_prepare(AVFilterContext *ctx, void *arg, int ch) +static int run_channel_cwt_prepare(AVFilterContext *ctx, void *arg, int ch, int eof) { ShowCWTContext *s = ctx->priv; AVFrame *fin = arg; @@ -260,14 +260,19 @@ static int run_channel_cwt_prepare(AVFilterContext *ctx, void *arg, int ch) AVComplexFloat *dst = (AVComplexFloat *)s->fft_out->extended_data[ch]; const int nb_consumed_samples = s->nb_consumed_samples; const int input_padding_size = s->input_padding_size; - const int hop_size = s->hop_size; + const int hop_size = eof ? s->hop_size : fin->nb_samples; const int offset = input_padding_size - hop_size; memmove(overlap, &overlap[hop_size], offset * sizeof(float)); memcpy(&overlap[offset], input, fin->nb_samples * sizeof(float)); - memset(&overlap[offset + fin->nb_samples], 0, - (hop_size - fin->nb_samples) * sizeof(float)); + + if (eof) { + memset(&overlap[offset + fin->nb_samples], 0, + (hop_size - fin->nb_samples) * sizeof(float)); + } else if (s->hop_index + fin->nb_samples < s->hop_size) { + return 0; + } for (int n = 0; n < nb_consumed_samples; n++) { src[n].re = overlap[n]; @@ -665,22 +670,26 @@ static int activate(AVFilterContext *ctx) AVFrame *fin; if (s->ihop_index == 0) { - ret = ff_inlink_consume_samples(inlink, s->hop_size, s->hop_size, &fin); + ret = ff_inlink_consume_samples(inlink, 1, s->hop_size - s->hop_index, &fin); if (ret < 0) return ret; if (ret > 0) { for (int ch = 0; ch < s->nb_channels; ch++) - run_channel_cwt_prepare(ctx, fin, ch); + run_channel_cwt_prepare(ctx, fin, ch, + ff_outlink_get_status(inlink)); - s->in_pts = fin->pts; - s->in_nb_samples = fin->nb_samples; + if (s->hop_index == 0) + s->in_pts = fin->pts; + s->hop_index += fin->nb_samples; av_frame_free(&fin); } } - if (ret > 0 || s->ihop_index > 0) { + if (s->hop_index >= s->hop_size || s->ihop_index > 0) { int64_t pts_offset; + s->hop_index = 0; + switch (s->slide) { case SLIDE_SCROLL: switch (s->direction) { @@ -717,7 +726,7 @@ static int activate(AVFilterContext *ctx) ff_filter_execute(ctx, draw, NULL, NULL, s->nb_threads); - pts_offset = av_rescale_q(s->ihop_index, av_make_q(1, s->ihop_size), av_make_q(1, s->in_nb_samples)); + pts_offset = av_rescale(s->ihop_index, s->hop_size, s->ihop_size); s->outpicref->pts = av_rescale_q(s->in_pts + pts_offset, inlink->time_base, outlink->time_base); s->ihop_index++; @@ -795,7 +804,7 @@ fail: } } - if (ff_inlink_queued_samples(inlink) >= s->hop_size || s->ihop_index) { + if (ff_inlink_queued_samples(inlink) > 0 || s->ihop_index || s->hop_index >= s->hop_size) { ff_filter_set_ready(ctx, 10); return 0; }

1 0