September 2021 - ffmpeg-cvslog

avfilter/vf_codecview: added new options for block
by Limin Wang 30 Sep '21

30 Sep '21

ffmpeg | branch: master | Limin Wang <lance.lmwang(a)gmail.com> | Tue Aug 17 18:46:41 2021 +0800| [da5497a1a22d06d6979a888d2ded79521c428d29] | committer: Limin Wang avfilter/vf_codecview: added new options for block Signed-off-by: Limin Wang <lance.lmwang(a)gmail.com> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=da5497a1a22d06d69… --- doc/filters.texi | 3 +++ libavfilter/version.h | 2 +- libavfilter/vf_codecview.c | 35 +++++++++++++++++++++++++++++++++++ 3 files changed, 39 insertions(+), 1 deletion(-) diff --git a/doc/filters.texi b/doc/filters.texi index 6328a8c563..5465d019e4 100644 --- a/doc/filters.texi +++ b/doc/filters.texi @@ -8184,6 +8184,9 @@ means. For example, some MPEG based codecs export motion vectors through the The filter accepts the following option: @table @option +@item block +Display block partition structure using the luma plane. + @item mv Set motion vectors to visualize. diff --git a/libavfilter/version.h b/libavfilter/version.h index ab5eb14634..61e2c4d61c 100644 --- a/libavfilter/version.h +++ b/libavfilter/version.h @@ -31,7 +31,7 @@ #define LIBAVFILTER_VERSION_MAJOR 8 #define LIBAVFILTER_VERSION_MINOR 10 -#define LIBAVFILTER_VERSION_MICRO 100 +#define LIBAVFILTER_VERSION_MICRO 101 #define LIBAVFILTER_VERSION_INT AV_VERSION_INT(LIBAVFILTER_VERSION_MAJOR, \ diff --git a/libavfilter/vf_codecview.c b/libavfilter/vf_codecview.c index dc3d3acd82..4a2766afd9 100644 --- a/libavfilter/vf_codecview.c +++ b/libavfilter/vf_codecview.c @@ -32,6 +32,7 @@ #include "libavutil/imgutils.h" #include "libavutil/motion_vector.h" #include "libavutil/opt.h" +#include "libavutil/video_enc_params.h" #include "avfilter.h" #include "qp_table.h" #include "internal.h" @@ -52,6 +53,7 @@ typedef struct CodecViewContext { unsigned mv_type; int hsub, vsub; int qp; + int block; } CodecViewContext; #define OFFSET(x) offsetof(CodecViewContext, x) @@ -73,6 +75,7 @@ static const AVOption codecview_options[] = { CONST("if", "I-frames", FRAME_TYPE_I, "frame_type"), CONST("pf", "P-frames", FRAME_TYPE_P, "frame_type"), CONST("bf", "B-frames", FRAME_TYPE_B, "frame_type"), + { "block", "set block partitioning structure to visualize", OFFSET(block), AV_OPT_TYPE_BOOL, {.i64=0}, 0, 1, FLAGS }, { NULL } }; @@ -210,6 +213,21 @@ static void draw_arrow(uint8_t *buf, int sx, int sy, int ex, draw_line(buf, sx, sy, ex, ey, w, h, stride, color); } +static void draw_block_rectangle(uint8_t *buf, int sx, int sy, int w, int h, int stride, int color) +{ + for (int x = sx; x < sx + w; x++) + buf[x] = color; + + for (int y = sy; y < sy + h; y++) { + buf[sx] = color; + buf[sx + w - 1] = color; + buf += stride; + } + + for (int x = sx; x < sx + w; x++) + buf[x] = color; +} + static int filter_frame(AVFilterLink *inlink, AVFrame *frame) { AVFilterContext *ctx = inlink->dst; @@ -247,6 +265,23 @@ static int filter_frame(AVFilterLink *inlink, AVFrame *frame) av_freep(&qp_table); } + if (s->block) { + AVFrameSideData *sd = av_frame_get_side_data(frame, AV_FRAME_DATA_VIDEO_ENC_PARAMS); + if (sd) { + AVVideoEncParams *par = (AVVideoEncParams*)sd->data; + const int stride = frame->linesize[0]; + + if (par->nb_blocks) { + for (int block_idx = 0; block_idx < par->nb_blocks; block_idx++) { + AVVideoBlockParams *b = av_video_enc_params_block(par, block_idx); + uint8_t *buf = frame->data[0] + b->src_y * stride; + + draw_block_rectangle(buf, b->src_x, b->src_y, b->w, b->h, stride, 100); + } + } + } + } + if (s->mv || s->mv_type) { AVFrameSideData *sd = av_frame_get_side_data(frame, AV_FRAME_DATA_MOTION_VECTORS); if (sd) {

1 0

swscale/swscale_internal: Avoid unsigned for slice parameters
by Michael Niedermayer 30 Sep '21

30 Sep '21

ffmpeg | branch: master | Michael Niedermayer <michael(a)niedermayer.cc> | Thu Sep 30 17:52:53 2021 +0200| [9f40b5badbead0f454f195e88b4dc7950b40f665] | committer: Michael Niedermayer swscale/swscale_internal: Avoid unsigned for slice parameters Mixing unsigned and signed often leads to unexpected arithmetic results. Fixes: out of array write Found-by: Paul B Mahol <onemda(a)gmail.com> Reviewed-by: Paul B Mahol <onemda(a)gmail.com> Signed-off-by: Michael Niedermayer <michael(a)niedermayer.cc> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=9f40b5badbead0f45… --- libswscale/swscale_internal.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/libswscale/swscale_internal.h b/libswscale/swscale_internal.h index e6e7b934b6..708facba67 100644 --- a/libswscale/swscale_internal.h +++ b/libswscale/swscale_internal.h @@ -311,8 +311,8 @@ typedef struct SwsContext { int nb_slice_ctx; // values passed to current sws_receive_slice() call - unsigned int dst_slice_start; - unsigned int dst_slice_height; + int dst_slice_start; + int dst_slice_height; /** * Note that src, dst, srcStride, dstStride will be copied in the

1 0

libavformat/asfdec: Add braces to define
by Soft Works 30 Sep '21

30 Sep '21

ffmpeg | branch: master | Soft Works <softworkz(a)hotmail.com> | Thu Sep 30 02:59:03 2021 +0000| [35d784aca98fbb626cd0675cde52b739ddeffce8] | committer: Michael Niedermayer libavformat/asfdec: Add braces to define Signed-off-by: softworkz <softworkz(a)hotmail.com> Signed-off-by: Michael Niedermayer <michael(a)niedermayer.cc> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=35d784aca98fbb626… --- libavformat/asfdec_f.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libavformat/asfdec_f.c b/libavformat/asfdec_f.c index 95063cbc14..a8f36ed286 100644 --- a/libavformat/asfdec_f.c +++ b/libavformat/asfdec_f.c @@ -149,7 +149,7 @@ static const ff_asf_guid asf_audio_conceal_none = { }; #define PRINT_IF_GUID(g, cmp) \ - if (!ff_guidcmp(g, &cmp)) \ + if (!ff_guidcmp(g, &(cmp))) \ av_log(NULL, AV_LOG_TRACE, "(GUID: %s) ", # cmp) static void print_guid(ff_asf_guid *g)

1 0

libavformat/asfdec: Use predefined constants
by Soft Works 30 Sep '21

30 Sep '21

ffmpeg | branch: master | Soft Works <softworkz(a)hotmail.com> | Thu Sep 30 02:58:56 2021 +0000| [c8cdf641c73899eceb785d95da95a827aedff713] | committer: Michael Niedermayer libavformat/asfdec: Use predefined constants Signed-off-by: softworkz <softworkz(a)hotmail.com> Signed-off-by: Michael Niedermayer <michael(a)niedermayer.cc> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=c8cdf641c73899ece… --- libavformat/asfdec_f.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/libavformat/asfdec_f.c b/libavformat/asfdec_f.c index 72ba8b32a0..95063cbc14 100644 --- a/libavformat/asfdec_f.c +++ b/libavformat/asfdec_f.c @@ -205,13 +205,13 @@ static int asf_probe(const AVProbeData *pd) static int get_value(AVIOContext *pb, int type, int type2_size) { switch (type) { - case 2: + case ASF_BOOL: return (type2_size == 32) ? avio_rl32(pb) : avio_rl16(pb); - case 3: + case ASF_DWORD: return avio_rl32(pb); - case 4: + case ASF_QWORD: return avio_rl64(pb); - case 5: + case ASF_WORD: return avio_rl16(pb); default: return INT_MIN;

1 0

doc/filters: note values for afftflt window function
by Arif Driessen 30 Sep '21

30 Sep '21

ffmpeg | branch: master | Arif Driessen <arifd86(a)gmail.com> | Tue Sep 28 10:35:43 2021 +0200| [3ee45027536c8a085b02844dd7469c9122bdc9ef] | committer: Gyan Doshi doc/filters: note values for afftflt window function > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=3ee45027536c8a085… --- doc/filters.texi | 27 ++++++++++++++++++++++++++- 1 file changed, 26 insertions(+), 1 deletion(-) diff --git a/doc/filters.texi b/doc/filters.texi index cbec749ce8..6328a8c563 100644 --- a/doc/filters.texi +++ b/doc/filters.texi @@ -1325,7 +1325,32 @@ Set window size. Allowed range is from 16 to 131072. Default is @code{4096} @item win_func -Set window function. Default is @code{hann}. +Set window function. + +It accepts the following values: +@table @samp +@item rect +@item bartlett +@item hann, hanning +@item hamming +@item blackman +@item welch +@item flattop +@item bharris +@item bnuttall +@item bhann +@item sine +@item nuttall +@item lanczos +@item gauss +@item tukey +@item dolph +@item cauchy +@item parzen +@item poisson +@item bohman +@end table +Default is @code{hann}. @item overlap Set window overlap. If set to 1, the recommended overlap for selected

1 0

avfilter/vf_avgblur: switch to faster algorithm
by Paul B Mahol 29 Sep '21

29 Sep '21

ffmpeg | branch: master | Paul B Mahol <onemda(a)gmail.com> | Fri Sep 24 16:28:51 2021 +0200| [a7fc78c1a638a32c3695c06f727774c740d675c2] | committer: Paul B Mahol avfilter/vf_avgblur: switch to faster algorithm > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=a7fc78c1a638a32c3… --- libavfilter/vf_avgblur.c | 311 +++++++++++++++++++--------------- tests/ref/fate/filter-refcmp-psnr-yuv | 80 ++++----- 2 files changed, 211 insertions(+), 180 deletions(-) diff --git a/libavfilter/vf_avgblur.c b/libavfilter/vf_avgblur.c index 3e222a43fa..a838285bb4 100644 --- a/libavfilter/vf_avgblur.c +++ b/libavfilter/vf_avgblur.c @@ -20,6 +20,7 @@ * SOFTWARE. */ +#include "libavutil/avassert.h" #include "libavutil/imgutils.h" #include "libavutil/opt.h" #include "libavutil/pixdesc.h" @@ -36,13 +37,15 @@ typedef struct AverageBlurContext { int planes; int depth; + int max; + int area; int planewidth[4]; int planeheight[4]; - float *buffer; + void *buffer; + uint16_t lut[256 * 256 * 256]; int nb_planes; - int (*filter_horizontally)(AVFilterContext *ctx, void *arg, int jobnr, int nb_jobs); - int (*filter_vertically)(AVFilterContext *ctx, void *arg, int jobnr, int nb_jobs); + int (*filter[2])(AVFilterContext *ctx, void *arg, int jobnr, int nb_jobs); } AverageBlurContext; #define OFFSET(x) offsetof(AverageBlurContext, x) @@ -60,124 +63,138 @@ AVFILTER_DEFINE_CLASS(avgblur); typedef struct ThreadData { int height; int width; - uint8_t *ptr; - int linesize; + const void *ptr; + void *dptr; + int linesize, dlinesize; } ThreadData; -#define HORIZONTAL_FILTER(name, type) \ -static int filter_horizontally_##name(AVFilterContext *ctx, void *arg, int jobnr, int nb_jobs)\ -{ \ - AverageBlurContext *s = ctx->priv; \ - ThreadData *td = arg; \ - const int height = td->height; \ - const int width = td->width; \ - const int slice_start = (height * jobnr ) / nb_jobs; \ - const int slice_end = (height * (jobnr+1)) / nb_jobs; \ - const int radius = FFMIN(s->radius, width / 2); \ - const int linesize = td->linesize / sizeof(type); \ - float *buffer = s->buffer; \ - const type *src; \ - float *ptr; \ - int y, x; \ - \ - /* Filter horizontally along each row */ \ - for (y = slice_start; y < slice_end; y++) { \ - float acc = 0; \ - int count = 0; \ - \ - src = (const type *)td->ptr + linesize * y; \ - ptr = buffer + width * y; \ - \ - for (x = 0; x < radius; x++) { \ - acc += src[x]; \ - } \ - count += radius; \ - \ - for (x = 0; x <= radius; x++) { \ - acc += src[x + radius]; \ - count++; \ - ptr[x] = acc / count; \ - } \ - \ - for (; x < width - radius; x++) { \ - acc += src[x + radius] - src[x - radius - 1]; \ - ptr[x] = acc / count; \ - } \ - \ - for (; x < width; x++) { \ - acc -= src[x - radius]; \ - count--; \ - ptr[x] = acc / count; \ - } \ - } \ - \ - return 0; \ +#define LUT_DIV(sum, area) (lut[(sum)]) +#define SLOW_DIV(sum, area) ((sum) / (area)) + +#define FILTER(name, type, btype, lutunused, areaunused, lutdiv) \ +static int filter_##name(AVFilterContext *ctx, void *arg, int jobnr, int nb_jobs) \ +{ \ + AverageBlurContext *s = ctx->priv; \ + ThreadData *td = arg; \ + areaunused const int area = s->area; \ + lutunused const uint16_t *lut = s->lut; \ + const int size_w = s->radius; \ + const int size_h = s->radiusV; \ + btype *col_sum = (btype *)s->buffer + size_w; \ + const int dlinesize = td->dlinesize / sizeof(type); \ + const int linesize = td->linesize / sizeof(type); \ + const int height = td->height; \ + const int width = td->width; \ + const type *src = td->ptr; \ + type *dst = td->dptr; \ + btype sum = 0; \ + \ + for (int x = -size_w; x < 0; x++) { \ + sum = src[0] * size_h; \ + for (int y = 0; y <= size_h; y++) \ + sum += src[y * linesize]; \ + av_assert2(sum >= 0); \ + col_sum[x] = sum; \ + } \ + \ + for (int x = 0; x < width; x++) { \ + sum = src[x] * size_h; \ + for (int y = 0; y <= size_h; y++) \ + sum += src[x + y * linesize]; \ + av_assert2(sum >= 0); \ + col_sum[x] = sum; \ + } \ + \ + for (int x = width; x < width + size_w; x++) { \ + sum = src[width - 1] * size_h; \ + for (int y = 0; y <= size_h; y++) \ + sum += src[width - 1 + y * linesize]; \ + av_assert2(sum >= 0); \ + col_sum[x] = sum; \ + } \ + \ + sum = 0; \ + for (int x = -size_w; x <= size_w; x++) \ + sum += col_sum[x]; \ + av_assert2(sum >= 0); \ + dst[0] = lutdiv(sum, area); \ + \ + for (int x = 1; x < width; x++) { \ + sum = sum - col_sum[x - size_w - 1] + col_sum[x + size_w]; \ + av_assert2(sum >= 0); \ + dst[x] = lutdiv(sum, area); \ + } \ + \ + src = td->ptr; \ + src += linesize; \ + dst += dlinesize; \ + \ + for (int y = 1; y < height; y++) { \ + const int syp = FFMIN(size_h, height - y - 1) * linesize; \ + const int syn = FFMIN(y, size_h + 1) * linesize; \ + \ + sum = 0; \ + \ + for (int x = -size_w; x < 0; x++) \ + col_sum[x] += src[0 + syp] - src[0 - syn]; \ + \ + for (int x = 0; x < width; x++) \ + col_sum[x] += src[x + syp] - src[x - syn]; \ + \ + for (int x = width; x < width + size_w; x++) \ + col_sum[x] += src[width - 1 + syp] - src[width - 1 - syn]; \ + \ + for (int x = -size_w; x <= size_w; x++) \ + sum += col_sum[x]; \ + av_assert2(sum >= 0); \ + dst[0] = lutdiv(sum, area); \ + \ + for (int x = 1; x < width; x++) { \ + sum = sum - col_sum[x - size_w - 1] + col_sum[x + size_w]; \ + av_assert2(sum >= 0); \ + dst[x] = lutdiv(sum, area); \ + } \ + \ + src += linesize; \ + dst += dlinesize; \ + } \ + \ + return 0; \ } -HORIZONTAL_FILTER(8, uint8_t) -HORIZONTAL_FILTER(16, uint16_t) - -#define VERTICAL_FILTER(name, type) \ -static int filter_vertically_##name(AVFilterContext *ctx, void *arg, int jobnr, int nb_jobs) \ -{ \ - AverageBlurContext *s = ctx->priv; \ - ThreadData *td = arg; \ - const int height = td->height; \ - const int width = td->width; \ - const int slice_start = (width * jobnr ) / nb_jobs; \ - const int slice_end = (width * (jobnr+1)) / nb_jobs; \ - const int radius = FFMIN(s->radiusV, height / 2); \ - const int linesize = td->linesize / sizeof(type); \ - type *buffer = (type *)td->ptr; \ - const float *src; \ - type *ptr; \ - int i, x; \ - \ - /* Filter vertically along each column */ \ - for (x = slice_start; x < slice_end; x++) { \ - float acc = 0; \ - int count = 0; \ - \ - src = s->buffer + x; \ - \ - for (i = 0; i < radius; i++) { \ - acc += src[0]; \ - src += width; \ - } \ - count += radius; \ - \ - src = s->buffer + x; \ - ptr = buffer + x; \ - for (i = 0; i + radius < height && i <= radius; i++) { \ - acc += src[(i + radius) * width]; \ - count++; \ - ptr[i * linesize] = acc / count; \ - } \ - \ - for (; i < height - radius; i++) { \ - acc += src[(i + radius) * width] - src[(i - radius - 1) * width]; \ - ptr[i * linesize] = acc / count; \ - } \ - \ - for (; i < height; i++) { \ - acc -= src[(i - radius) * width]; \ - count--; \ - ptr[i * linesize] = acc / count; \ - } \ - } \ - \ - return 0; \ -} +FILTER(lut8, uint8_t, int32_t, , av_unused, LUT_DIV) +FILTER(lut16, uint16_t, int64_t, , av_unused, LUT_DIV) + +FILTER(slow8, uint8_t, int32_t, av_unused, , SLOW_DIV) +FILTER(slow16, uint16_t, int64_t, av_unused, , SLOW_DIV) + +static void build_lut(AVFilterContext *ctx, int max) +{ + AverageBlurContext *s = ctx->priv; + const int area = (2 * s->radiusV + 1) * (2 * s->radius + 1); + + s->area = area; + if (max * area >= FF_ARRAY_ELEMS(s->lut)) + return; + + for (int i = 0, j = 0, k = 0; i < max * area; i++, j++) { + if (j == area) { + k++; + j = 0; + } -VERTICAL_FILTER(8, uint8_t) -VERTICAL_FILTER(16, uint16_t) + s->lut[i] = k; + } +} static int config_input(AVFilterLink *inlink) { + AVFilterContext *ctx = inlink->dst; const AVPixFmtDescriptor *desc = av_pix_fmt_desc_get(inlink->format); - AverageBlurContext *s = inlink->dst->priv; + AverageBlurContext *s = ctx->priv; s->depth = desc->comp[0].depth; + s->max = 1 << s->depth; s->planewidth[1] = s->planewidth[2] = AV_CEIL_RSHIFT(inlink->w, desc->log2_chroma_w); s->planewidth[0] = s->planewidth[3] = inlink->w; s->planeheight[1] = s->planeheight[2] = AV_CEIL_RSHIFT(inlink->h, desc->log2_chroma_h); @@ -185,21 +202,20 @@ static int config_input(AVFilterLink *inlink) s->nb_planes = av_pix_fmt_count_planes(inlink->format); - s->buffer = av_malloc_array(inlink->w, inlink->h * sizeof(*s->buffer)); + s->buffer = av_calloc(inlink->w + (1024 * 2 + 1), 4 * ((s->depth + 7) / 8)); if (!s->buffer) return AVERROR(ENOMEM); - if (s->radiusV <= 0) { + if (s->radiusV <= 0) s->radiusV = s->radius; - } - if (s->depth == 8) { - s->filter_horizontally = filter_horizontally_8; - s->filter_vertically = filter_vertically_8; - } else { - s->filter_horizontally = filter_horizontally_16; - s->filter_vertically = filter_vertically_16; - } + s->filter[0] = s->depth <= 8 ? filter_lut8 : filter_lut16; + s->filter[1] = s->depth <= 8 ? filter_slow8 : filter_slow16; + + s->radius = FFMIN(s->planewidth[1] / 2, s->radius); + s->radiusV = FFMIN(s->planeheight[1] / 2, s->radiusV); + + build_lut(ctx, s->max); return 0; } @@ -209,19 +225,16 @@ static void averageiir2d(AVFilterContext *ctx, AVFrame *in, AVFrame *out, int pl AverageBlurContext *s = ctx->priv; const int width = s->planewidth[plane]; const int height = s->planeheight[plane]; - const int nb_threads = ff_filter_get_nb_threads(ctx); + const int slow = (s->max * s->area) >= FF_ARRAY_ELEMS(s->lut); ThreadData td; td.width = width; td.height = height; td.ptr = in->data[plane]; td.linesize = in->linesize[plane]; - ff_filter_execute(ctx, s->filter_horizontally, &td, - NULL, FFMIN(height, nb_threads)); - td.ptr = out->data[plane]; - td.linesize = out->linesize[plane]; - ff_filter_execute(ctx, s->filter_vertically, &td, - NULL, FFMIN(width, nb_threads)); + td.dptr = out->data[plane]; + td.dlinesize = out->linesize[plane]; + s->filter[slow](ctx, &td, 0, 0); } static int query_formats(AVFilterContext *ctx) @@ -259,16 +272,12 @@ static int filter_frame(AVFilterLink *inlink, AVFrame *in) AVFrame *out; int plane; - if (av_frame_is_writable(in)) { - out = in; - } else { - out = ff_get_video_buffer(outlink, outlink->w, outlink->h); - if (!out) { - av_frame_free(&in); - return AVERROR(ENOMEM); - } - av_frame_copy_props(out, in); + out = ff_get_video_buffer(outlink, outlink->w, outlink->h); + if (!out) { + av_frame_free(&in); + return AVERROR(ENOMEM); } + av_frame_copy_props(out, in); for (plane = 0; plane < s->nb_planes; plane++) { const int height = s->planeheight[plane]; @@ -285,11 +294,33 @@ static int filter_frame(AVFilterLink *inlink, AVFrame *in) averageiir2d(ctx, in, out, plane); } - if (out != in) - av_frame_free(&in); + av_frame_free(&in); return ff_filter_frame(outlink, out); } +static int process_command(AVFilterContext *ctx, const char *cmd, const char *args, + char *res, int res_len, int flags) +{ + AverageBlurContext *s = ctx->priv; + const int area = s->area; + int ret; + + ret = ff_filter_process_command(ctx, cmd, args, res, res_len, flags); + if (ret < 0) + return ret; + + if (s->radiusV <= 0) + s->radiusV = s->radius; + + s->radius = FFMIN(s->planewidth[1] / 2, s->radius); + s->radiusV = FFMIN(s->planeheight[1] / 2, s->radiusV); + + if (area != (2 * s->radiusV + 1) * (2 * s->radius + 1)) + build_lut(ctx, s->max); + + return 0; +} + static av_cold void uninit(AVFilterContext *ctx) { AverageBlurContext *s = ctx->priv; @@ -322,6 +353,6 @@ const AVFilter ff_vf_avgblur = { .query_formats = query_formats, FILTER_INPUTS(avgblur_inputs), FILTER_OUTPUTS(avgblur_outputs), - .flags = AVFILTER_FLAG_SUPPORT_TIMELINE_GENERIC | AVFILTER_FLAG_SLICE_THREADS, - .process_command = ff_filter_process_command, + .flags = AVFILTER_FLAG_SUPPORT_TIMELINE_GENERIC, + .process_command = process_command, }; diff --git a/tests/ref/fate/filter-refcmp-psnr-yuv b/tests/ref/fate/filter-refcmp-psnr-yuv index 0e634ed0e4..196d3da74e 100644 --- a/tests/ref/fate/filter-refcmp-psnr-yuv +++ b/tests/ref/fate/filter-refcmp-psnr-yuv @@ -1,45 +1,45 @@ frame:0 pts:0 pts_time:0 -lavfi.psnr.mse.y=222.06 -lavfi.psnr.psnr.y=24.67 -lavfi.psnr.mse.u=339.38 -lavfi.psnr.psnr.u=22.82 -lavfi.psnr.mse.v=705.41 -lavfi.psnr.psnr.v=19.65 -lavfi.psnr.mse_avg=372.23 -lavfi.psnr.psnr_avg=22.42 +lavfi.psnr.mse.y=218.435333 +lavfi.psnr.psnr.y=24.737576 +lavfi.psnr.mse.u=336.693390 +lavfi.psnr.psnr.u=22.858458 +lavfi.psnr.mse.v=698.968384 +lavfi.psnr.psnr.v=19.686228 +lavfi.psnr.mse_avg=368.133118 +lavfi.psnr.psnr_avg=22.470755 frame:1 pts:1 pts_time:1 -lavfi.psnr.mse.y=236.74 -lavfi.psnr.psnr.y=24.39 -lavfi.psnr.mse.u=416.17 -lavfi.psnr.psnr.u=21.94 -lavfi.psnr.mse.v=704.98 -lavfi.psnr.psnr.v=19.65 -lavfi.psnr.mse_avg=398.66 -lavfi.psnr.psnr_avg=22.12 +lavfi.psnr.mse.y=232.656189 +lavfi.psnr.psnr.y=24.463657 +lavfi.psnr.mse.u=413.841064 +lavfi.psnr.psnr.u=21.962467 +lavfi.psnr.mse.v=693.103577 +lavfi.psnr.psnr.v=19.722822 +lavfi.psnr.mse_avg=393.064240 +lavfi.psnr.psnr_avg=22.186169 frame:2 pts:2 pts_time:2 -lavfi.psnr.mse.y=234.79 -lavfi.psnr.psnr.y=24.42 -lavfi.psnr.mse.u=435.72 -lavfi.psnr.psnr.u=21.74 -lavfi.psnr.mse.v=699.60 -lavfi.psnr.psnr.v=19.68 -lavfi.psnr.mse_avg=401.23 -lavfi.psnr.psnr_avg=22.10 +lavfi.psnr.mse.y=230.470032 +lavfi.psnr.psnr.y=24.504660 +lavfi.psnr.mse.u=433.524109 +lavfi.psnr.psnr.u=21.760672 +lavfi.psnr.mse.v=693.391174 +lavfi.psnr.psnr.v=19.721020 +lavfi.psnr.mse_avg=396.963837 +lavfi.psnr.psnr_avg=22.143293 frame:3 pts:3 pts_time:3 -lavfi.psnr.mse.y=250.88 -lavfi.psnr.psnr.y=24.14 -lavfi.psnr.mse.u=479.73 -lavfi.psnr.psnr.u=21.32 -lavfi.psnr.mse.v=707.55 -lavfi.psnr.psnr.v=19.63 -lavfi.psnr.mse_avg=422.26 -lavfi.psnr.psnr_avg=21.88 +lavfi.psnr.mse.y=247.346817 +lavfi.psnr.psnr.y=24.197741 +lavfi.psnr.mse.u=476.365723 +lavfi.psnr.psnr.u=21.351398 +lavfi.psnr.mse.v=700.987549 +lavfi.psnr.psnr.v=19.673700 +lavfi.psnr.mse_avg=418.011719 +lavfi.psnr.psnr_avg=21.918919 frame:4 pts:4 pts_time:4 -lavfi.psnr.mse.y=241.05 -lavfi.psnr.psnr.y=24.31 -lavfi.psnr.mse.u=505.04 -lavfi.psnr.psnr.u=21.10 -lavfi.psnr.mse.v=716.00 -lavfi.psnr.psnr.v=19.58 -lavfi.psnr.mse_avg=425.79 -lavfi.psnr.psnr_avg=21.84 +lavfi.psnr.mse.y=237.129654 +lavfi.psnr.psnr.y=24.380945 +lavfi.psnr.mse.u=503.722931 +lavfi.psnr.psnr.u=21.108887 +lavfi.psnr.mse.v=708.932678 +lavfi.psnr.psnr.v=19.624754 +lavfi.psnr.mse_avg=421.728729 +lavfi.psnr.psnr_avg=21.880472

1 0

avfilter/vf_blend: add few more modes
by Paul B Mahol 29 Sep '21

29 Sep '21

ffmpeg | branch: master | Paul B Mahol <onemda(a)gmail.com> | Thu Sep 30 01:20:18 2021 +0200| [a673761ce8bad005f2eb7b0dc584854a10b96e18] | committer: Paul B Mahol avfilter/vf_blend: add few more modes > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=a673761ce8bad005f… --- doc/filters.texi | 10 +++++++--- libavfilter/blend.h | 4 ++++ libavfilter/blend_modes.c | 4 ++++ libavfilter/vf_blend.c | 10 +++++++++- 4 files changed, 24 insertions(+), 4 deletions(-) diff --git a/doc/filters.texi b/doc/filters.texi index 0813232480..cbec749ce8 100644 --- a/doc/filters.texi +++ b/doc/filters.texi @@ -7531,24 +7531,27 @@ of @var{all_mode}. Default value is @code{normal}. Available values for component modes are: @table @samp @item addition -@item grainmerge @item and @item average +@item bleach @item burn @item darken @item difference -@item grainextract @item divide @item dodge -@item freeze @item exclusion @item extremity +@item freeze @item geometric @item glow +@item grainextract +@item grainmerge @item hardlight @item hardmix +@item hardoverlay @item harmonic @item heat +@item interpolate @item lighten @item linearlight @item multiply @@ -7563,6 +7566,7 @@ Available values for component modes are: @item screen @item softdifference @item softlight +@item stain @item subtract @item vividlight @item xor diff --git a/libavfilter/blend.h b/libavfilter/blend.h index 85c287a5d8..ff417650cf 100644 --- a/libavfilter/blend.h +++ b/libavfilter/blend.h @@ -62,6 +62,10 @@ enum BlendMode { BLEND_SOFTDIFFERENCE, BLEND_GEOMETRIC, BLEND_HARMONIC, + BLEND_BLEACH, + BLEND_STAIN, + BLEND_INTERPOLATE, + BLEND_HARDOVERLAY, BLEND_NB }; diff --git a/libavfilter/blend_modes.c b/libavfilter/blend_modes.c index 9ab2d4420a..64cd6e8a54 100644 --- a/libavfilter/blend_modes.c +++ b/libavfilter/blend_modes.c @@ -145,3 +145,7 @@ fn(linearlight,CLIP((B < HALF) ? B + 2 * A - MAX : B + 2 * (A - HALF))) fn(softdifference,CLIP((A > B) ? (B == MAX) ? 0 : (A - B) * MAX / (MAX - B) : (B == 0) ? 0 : (B - A) * MAX / B)) fn(geometric, GEOMETRIC(A, B)) fn(harmonic, A == 0 && B == 0 ? 0 : 2LL * A * B / (A + B)) +fn(bleach, (MAX - B) + (MAX - A) - MAX) +fn(stain, 2 * MAX - A - B) +fn(interpolate,lrintf(MAX * (2 - cosf(A * M_PI / MAX) - cosf(B * M_PI / MAX)) * 0.25f)) +fn(hardoverlay,A == MAX ? MAX : FFMIN(MAX, MAX * B / (2 * MAX - 2 * A) * (A > HALF) + 2 * A * B / MAX * (A <= HALF))) diff --git a/libavfilter/vf_blend.c b/libavfilter/vf_blend.c index 09a10ff0e0..ddfd6cf0f0 100644 --- a/libavfilter/vf_blend.c +++ b/libavfilter/vf_blend.c @@ -134,6 +134,10 @@ static const AVOption blend_options[] = { { "softdifference","", 0, AV_OPT_TYPE_CONST, {.i64=BLEND_SOFTDIFFERENCE}, 0, 0, FLAGS, "mode" }, { "geometric", "", 0, AV_OPT_TYPE_CONST, {.i64=BLEND_GEOMETRIC}, 0, 0, FLAGS, "mode" }, { "harmonic", "", 0, AV_OPT_TYPE_CONST, {.i64=BLEND_HARMONIC}, 0, 0, FLAGS, "mode" }, + { "bleach", "", 0, AV_OPT_TYPE_CONST, {.i64=BLEND_BLEACH}, 0, 0, FLAGS, "mode" }, + { "stain", "", 0, AV_OPT_TYPE_CONST, {.i64=BLEND_STAIN}, 0, 0, FLAGS, "mode" }, + { "interpolate","", 0, AV_OPT_TYPE_CONST, {.i64=BLEND_INTERPOLATE},0, 0, FLAGS, "mode" }, + { "hardoverlay","", 0, AV_OPT_TYPE_CONST, {.i64=BLEND_HARDOVERLAY},0, 0, FLAGS, "mode" }, { "c0_expr", "set color component #0 expression", OFFSET(params[0].expr_str), AV_OPT_TYPE_STRING, {.str=NULL}, 0, 0, FLAGS }, { "c1_expr", "set color component #1 expression", OFFSET(params[1].expr_str), AV_OPT_TYPE_STRING, {.str=NULL}, 0, 0, FLAGS }, { "c2_expr", "set color component #2 expression", OFFSET(params[2].expr_str), AV_OPT_TYPE_STRING, {.str=NULL}, 0, 0, FLAGS }, @@ -397,9 +401,13 @@ static av_cold void init_blend_func_##depth##_##nbits##bit(FilterParams *param) case BLEND_SUBTRACT: param->blend = blend_subtract_##depth##bit; break; \ case BLEND_VIVIDLIGHT: param->blend = blend_vividlight_##depth##bit; break; \ case BLEND_XOR: param->blend = blend_xor_##depth##bit; break; \ - case BLEND_SOFTDIFFERENCE:param->blend = blend_softdifference_##depth##bit; break;\ + case BLEND_SOFTDIFFERENCE:param->blend=blend_softdifference_##depth##bit;break; \ case BLEND_GEOMETRIC: param->blend = blend_geometric_##depth##bit; break; \ case BLEND_HARMONIC: param->blend = blend_harmonic_##depth##bit; break; \ + case BLEND_BLEACH: param->blend = blend_bleach_##depth##bit; break; \ + case BLEND_STAIN: param->blend = blend_stain_##depth##bit; break; \ + case BLEND_INTERPOLATE: param->blend = blend_interpolate_##depth##bit; break; \ + case BLEND_HARDOVERLAY: param->blend = blend_hardoverlay_##depth##bit; break; \ } \ } DEFINE_INIT_BLEND_FUNC(8, 8)

1 0

avcodec/siren: Improve the bits left threshold in decode_envelope()
by Michael Niedermayer 29 Sep '21

29 Sep '21

ffmpeg | branch: master | Michael Niedermayer <michael(a)niedermayer.cc> | Wed Sep 29 00:18:53 2021 +0200| [1ad4782d2a17d9fed38c0356f1c9f790973eec01] | committer: Michael Niedermayer avcodec/siren: Improve the bits left threshold in decode_envelope() Signed-off-by: Michael Niedermayer <michael(a)niedermayer.cc> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=1ad4782d2a17d9fed… --- libavcodec/siren.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libavcodec/siren.c b/libavcodec/siren.c index 6cbb3e3ba7..bdb249144b 100644 --- a/libavcodec/siren.c +++ b/libavcodec/siren.c @@ -447,7 +447,7 @@ static int decode_envelope(SirenContext *s, GetBitContext *gb, int index = 0; do { - if (get_bits_left(gb) < 4) + if (get_bits_left(gb) < 4 + number_of_regions - i + s->checksum_bits) return AVERROR_INVALIDDATA; index = differential_decoder_tree[i - 1][index][get_bits1(gb)]; } while (index > 0);

1 0

avcodec/siren: Check available bits in decode_envelope()
by Michael Niedermayer 29 Sep '21

29 Sep '21

ffmpeg | branch: master | Michael Niedermayer <michael(a)niedermayer.cc> | Tue Sep 28 00:25:20 2021 +0200| [109113b54f6fa7b880f66c797f7ab49d65dc7167] | committer: Michael Niedermayer avcodec/siren: Check available bits in decode_envelope() Fixes: Timeout Fixes: 39089/clusterfuzz-testcase-minimized-ffmpeg_AV_CODEC_ID_MSNSIREN_fuzzer-6677219854909440 Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg Suggested-by: James Almer <jamrial(a)gmail.com> Signed-off-by: Michael Niedermayer <michael(a)niedermayer.cc> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=109113b54f6fa7b88… --- libavcodec/siren.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/libavcodec/siren.c b/libavcodec/siren.c index 6909ebbf2e..6cbb3e3ba7 100644 --- a/libavcodec/siren.c +++ b/libavcodec/siren.c @@ -447,6 +447,8 @@ static int decode_envelope(SirenContext *s, GetBitContext *gb, int index = 0; do { + if (get_bits_left(gb) < 4) + return AVERROR_INVALIDDATA; index = differential_decoder_tree[i - 1][index][get_bits1(gb)]; } while (index > 0); @@ -724,9 +726,11 @@ static int siren_decode(AVCodecContext *avctx, void *data, skip_bits(gb, s->sample_rate_bits); - decode_envelope(s, gb, s->number_of_regions, + ret = decode_envelope(s, gb, s->number_of_regions, s->decoder_standard_deviation, s->absolute_region_power_index, s->esf_adjustment); + if (ret < 0) + return ret; rate_control = get_bits(gb, 4);

1 0

avfilter/vf_blend: add harmonic mode
by Paul B Mahol 29 Sep '21

29 Sep '21

ffmpeg | branch: master | Paul B Mahol <onemda(a)gmail.com> | Wed Sep 29 19:19:06 2021 +0200| [df163487d0a71d7f65f7602e4df6ab68e8fcc0fa] | committer: Paul B Mahol avfilter/vf_blend: add harmonic mode > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=df163487d0a71d7f6… --- doc/filters.texi | 1 + libavfilter/blend.h | 1 + libavfilter/blend_modes.c | 1 + libavfilter/vf_blend.c | 2 ++ 4 files changed, 5 insertions(+) diff --git a/doc/filters.texi b/doc/filters.texi index 9bac3feb33..0813232480 100644 --- a/doc/filters.texi +++ b/doc/filters.texi @@ -7547,6 +7547,7 @@ Available values for component modes are: @item glow @item hardlight @item hardmix +@item harmonic @item heat @item lighten @item linearlight diff --git a/libavfilter/blend.h b/libavfilter/blend.h index a955126687..85c287a5d8 100644 --- a/libavfilter/blend.h +++ b/libavfilter/blend.h @@ -61,6 +61,7 @@ enum BlendMode { BLEND_EXTREMITY, BLEND_SOFTDIFFERENCE, BLEND_GEOMETRIC, + BLEND_HARMONIC, BLEND_NB }; diff --git a/libavfilter/blend_modes.c b/libavfilter/blend_modes.c index 9236559d19..9ab2d4420a 100644 --- a/libavfilter/blend_modes.c +++ b/libavfilter/blend_modes.c @@ -144,3 +144,4 @@ fn(vividlight, (A < HALF) ? BURN(2 * A, B) : DODGE(2 * (A - HALF), B)) fn(linearlight,CLIP((B < HALF) ? B + 2 * A - MAX : B + 2 * (A - HALF))) fn(softdifference,CLIP((A > B) ? (B == MAX) ? 0 : (A - B) * MAX / (MAX - B) : (B == 0) ? 0 : (B - A) * MAX / B)) fn(geometric, GEOMETRIC(A, B)) +fn(harmonic, A == 0 && B == 0 ? 0 : 2LL * A * B / (A + B)) diff --git a/libavfilter/vf_blend.c b/libavfilter/vf_blend.c index c00fb12839..09a10ff0e0 100644 --- a/libavfilter/vf_blend.c +++ b/libavfilter/vf_blend.c @@ -133,6 +133,7 @@ static const AVOption blend_options[] = { { "xor", "", 0, AV_OPT_TYPE_CONST, {.i64=BLEND_XOR}, 0, 0, FLAGS, "mode" }, { "softdifference","", 0, AV_OPT_TYPE_CONST, {.i64=BLEND_SOFTDIFFERENCE}, 0, 0, FLAGS, "mode" }, { "geometric", "", 0, AV_OPT_TYPE_CONST, {.i64=BLEND_GEOMETRIC}, 0, 0, FLAGS, "mode" }, + { "harmonic", "", 0, AV_OPT_TYPE_CONST, {.i64=BLEND_HARMONIC}, 0, 0, FLAGS, "mode" }, { "c0_expr", "set color component #0 expression", OFFSET(params[0].expr_str), AV_OPT_TYPE_STRING, {.str=NULL}, 0, 0, FLAGS }, { "c1_expr", "set color component #1 expression", OFFSET(params[1].expr_str), AV_OPT_TYPE_STRING, {.str=NULL}, 0, 0, FLAGS }, { "c2_expr", "set color component #2 expression", OFFSET(params[2].expr_str), AV_OPT_TYPE_STRING, {.str=NULL}, 0, 0, FLAGS }, @@ -398,6 +399,7 @@ static av_cold void init_blend_func_##depth##_##nbits##bit(FilterParams *param) case BLEND_XOR: param->blend = blend_xor_##depth##bit; break; \ case BLEND_SOFTDIFFERENCE:param->blend = blend_softdifference_##depth##bit; break;\ case BLEND_GEOMETRIC: param->blend = blend_geometric_##depth##bit; break; \ + case BLEND_HARMONIC: param->blend = blend_harmonic_##depth##bit; break; \ } \ } DEFINE_INIT_BLEND_FUNC(8, 8)

1 0