November 2021 - ffmpeg-cvslog

avfilter/vf_chromanr: improve filtering results
by Paul B Mahol 03 Nov '21

03 Nov '21

ffmpeg | branch: master | Paul B Mahol <onemda(a)gmail.com> | Wed Nov 3 11:25:04 2021 +0100| [bf9950446d73e4c380bdc0ea8241bbd0f86d7983] | committer: Paul B Mahol avfilter/vf_chromanr: improve filtering results > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=bf9950446d73e4c38… --- doc/filters.texi | 8 ++++---- libavfilter/vf_chromanr.c | 32 ++++++++++++++++++-------------- 2 files changed, 22 insertions(+), 18 deletions(-) diff --git a/doc/filters.texi b/doc/filters.texi index 177f0774fc..62a580a245 100644 --- a/doc/filters.texi +++ b/doc/filters.texi @@ -8048,7 +8048,7 @@ Set threshold for averaging chrominance values. Sum of absolute difference of Y, U and V pixel components of current pixel and neighbour pixels lower than this threshold will be used in averaging. Luma component is left unchanged and is copied to output. -Default value is 30. Allowed range is from 1 to 5000. +Default value is 30. Allowed range is from 1 to 200. @item sizew Set horizontal radius of rectangle used for averaging. @@ -8072,19 +8072,19 @@ Mostly useful to speed-up filtering. Set Y threshold for averaging chrominance values. Set finer control for max allowed difference between Y components of current pixel and neigbour pixels. -Default value is 5000. Allowed range is from 1 to 5000. +Default value is 200. Allowed range is from 1 to 200. @item threu Set U threshold for averaging chrominance values. Set finer control for max allowed difference between U components of current pixel and neigbour pixels. -Default value is 5000. Allowed range is from 1 to 5000. +Default value is 200. Allowed range is from 1 to 200. @item threv Set V threshold for averaging chrominance values. Set finer control for max allowed difference between V components of current pixel and neigbour pixels. -Default value is 5000. Allowed range is from 1 to 5000. +Default value is 200. Allowed range is from 1 to 200. @item distance Set distance type used in calculations. diff --git a/libavfilter/vf_chromanr.c b/libavfilter/vf_chromanr.c index 9c36e02c00..63ec8ff075 100644 --- a/libavfilter/vf_chromanr.c +++ b/libavfilter/vf_chromanr.c @@ -72,7 +72,8 @@ static const enum AVPixelFormat pix_fmts[] = { AV_PIX_FMT_NONE }; -#define SQR(x) ((x)*(x)) +#define MANHATTAN_DISTANCE(x, y, z) ((x) + (y) + (z)) +#define EUCLIDEAN_DISTANCE(x, y, z) (sqrtf((x)*(x) + (y)*(y) + (z)*(z))) #define FILTER_FUNC(distance, name, ctype, type, fun) \ static int distance ## _slice##name(AVFilterContext *ctx, void *arg, \ @@ -136,19 +137,22 @@ static int distance ## _slice##name(AVFilterContext *ctx, void *arg, int sv = cv; \ int cn = 1; \ \ - for (int yy = FFMAX(0, y - sizeh); yy < FFMIN(y + sizeh, h); yy += steph) { \ + for (int yy = FFMAX(0, y - sizeh); yy <= FFMIN(y + sizeh, h - 1); yy += steph) { \ const type *in_yptr = (const type *)(in->data[0] + yy * chroma_h * in_ylinesize); \ const type *in_uptr = (const type *)(in->data[1] + yy * in_ulinesize); \ const type *in_vptr = (const type *)(in->data[2] + yy * in_vlinesize); \ \ - for (int xx = FFMAX(0, x - sizew); xx < FFMIN(x + sizew, w); xx += stepw) { \ + for (int xx = FFMAX(0, x - sizew); xx <= FFMIN(x + sizew, w - 1); xx += stepw) { \ const ctype Y = in_yptr[xx * chroma_w]; \ const ctype U = in_uptr[xx]; \ const ctype V = in_vptr[xx]; \ + const ctype cyY = FFABS(cy - Y); \ + const ctype cuU = FFABS(cu - U); \ + const ctype cvV = FFABS(cv - V); \ \ - if (fun(cu - U) + fun(cv - V) + fun(cy - Y) < thres && \ - fun(cu - U) < thres_u && fun(cv - V) < thres_v && \ - fun(cy - Y) < thres_y && \ + if (fun(cyY, cuU, cvV) < thres && \ + cuU < thres_u && cvV < thres_v && \ + cyY < thres_y && \ xx != x && yy != y) { \ su += U; \ sv += V; \ @@ -168,11 +172,11 @@ static int distance ## _slice##name(AVFilterContext *ctx, void *arg, return 0; \ } -FILTER_FUNC(manhattan, 8, int, uint8_t, FFABS) -FILTER_FUNC(manhattan, 16, int, uint16_t, FFABS) +FILTER_FUNC(manhattan, 8, int, uint8_t, MANHATTAN_DISTANCE) +FILTER_FUNC(manhattan, 16, int, uint16_t, MANHATTAN_DISTANCE) -FILTER_FUNC(euclidean, 8, int, uint8_t, SQR) -FILTER_FUNC(euclidean, 16, int64_t, uint16_t, SQR) +FILTER_FUNC(euclidean, 8, int, uint8_t, EUCLIDEAN_DISTANCE) +FILTER_FUNC(euclidean, 16, int64_t, uint16_t, EUCLIDEAN_DISTANCE) static int filter_frame(AVFilterLink *inlink, AVFrame *in) { @@ -238,14 +242,14 @@ static int config_input(AVFilterLink *inlink) #define VF AV_OPT_FLAG_VIDEO_PARAM | AV_OPT_FLAG_FILTERING_PARAM | AV_OPT_FLAG_RUNTIME_PARAM static const AVOption chromanr_options[] = { - { "thres", "set y+u+v threshold", OFFSET(threshold), AV_OPT_TYPE_FLOAT, {.dbl=30}, 1, 5000, VF }, + { "thres", "set y+u+v threshold", OFFSET(threshold), AV_OPT_TYPE_FLOAT, {.dbl=30}, 1, 200, VF }, { "sizew", "set horizontal size", OFFSET(sizew), AV_OPT_TYPE_INT, {.i64=5}, 1, 100, VF }, { "sizeh", "set vertical size", OFFSET(sizeh), AV_OPT_TYPE_INT, {.i64=5}, 1, 100, VF }, { "stepw", "set horizontal step", OFFSET(stepw), AV_OPT_TYPE_INT, {.i64=1}, 1, 50, VF }, { "steph", "set vertical step", OFFSET(steph), AV_OPT_TYPE_INT, {.i64=1}, 1, 50, VF }, - { "threy", "set y threshold", OFFSET(threshold_y), AV_OPT_TYPE_FLOAT, {.dbl=5000},1, 5000, VF }, - { "threu", "set u threshold", OFFSET(threshold_u), AV_OPT_TYPE_FLOAT, {.dbl=5000},1, 5000, VF }, - { "threv", "set v threshold", OFFSET(threshold_v), AV_OPT_TYPE_FLOAT, {.dbl=5000},1, 5000, VF }, + { "threy", "set y threshold", OFFSET(threshold_y), AV_OPT_TYPE_FLOAT, {.dbl=200},1, 200, VF }, + { "threu", "set u threshold", OFFSET(threshold_u), AV_OPT_TYPE_FLOAT, {.dbl=200},1, 200, VF }, + { "threv", "set v threshold", OFFSET(threshold_v), AV_OPT_TYPE_FLOAT, {.dbl=200},1, 200, VF }, { "distance", "set distance type", OFFSET(distance), AV_OPT_TYPE_INT, {.i64=0}, 0, 1, VF, "distance" }, { "manhattan", "", 0, AV_OPT_TYPE_CONST, {.i64=0}, 0, 0, VF, "distance" }, { "euclidean", "", 0, AV_OPT_TYPE_CONST, {.i64=1}, 0, 0, VF, "distance" },

1 0

avformat/aiffdec: "-1" -> AVERROR_INVALIDDATA
by Michael Niedermayer 01 Nov '21

01 Nov '21

ffmpeg | branch: master | Michael Niedermayer <michael(a)niedermayer.cc> | Mon Nov 1 18:37:26 2021 +0100| [2171f97cc88fc5a73409c6785a961f11113f8e9b] | committer: Michael Niedermayer avformat/aiffdec: "-1" -> AVERROR_INVALIDDATA Signed-off-by: Michael Niedermayer <michael(a)niedermayer.cc> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=2171f97cc88fc5a73… --- libavformat/aiffdec.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/libavformat/aiffdec.c b/libavformat/aiffdec.c index 7a995c00a6..7afadeb085 100644 --- a/libavformat/aiffdec.c +++ b/libavformat/aiffdec.c @@ -310,7 +310,7 @@ static int aiff_read_header(AVFormatContext *s) break; case MKTAG('w', 'a', 'v', 'e'): if ((uint64_t)size > (1<<30)) - return -1; + return AVERROR_INVALIDDATA; if ((ret = ff_get_extradata(s, st->codecpar, pb, size)) < 0) return ret; if ( (st->codecpar->codec_id == AV_CODEC_ID_QDMC || st->codecpar->codec_id == AV_CODEC_ID_QDM2) @@ -372,7 +372,7 @@ got_sound: st->codecpar->block_align = 35; } else if (st->codecpar->block_align <= 0) { av_log(s, AV_LOG_ERROR, "could not find COMM tag or invalid block_align value\n"); - return -1; + return AVERROR_INVALIDDATA; } /* Now positioned, get the sound data start and end */

1 0

avformat/aiffdec: Use av_rescale() for bitrate
by Michael Niedermayer 01 Nov '21

01 Nov '21

ffmpeg | branch: master | Michael Niedermayer <michael(a)niedermayer.cc> | Sun Oct 31 00:11:23 2021 +0200| [905588df975071c03c00b2e923c311b4de65a8f4] | committer: Michael Niedermayer avformat/aiffdec: Use av_rescale() for bitrate Fixes: integer overflow Fixes: 40313/clusterfuzz-testcase-minimized-ffmpeg_dem_AIFF_fuzzer-4814761406103552 Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg 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=905588df975071c03… --- libavformat/aiffdec.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/libavformat/aiffdec.c b/libavformat/aiffdec.c index 648f231a52..7a995c00a6 100644 --- a/libavformat/aiffdec.c +++ b/libavformat/aiffdec.c @@ -185,8 +185,10 @@ static int get_aiff_header(AVFormatContext *s, int size, par->block_align = (av_get_bits_per_sample(par->codec_id) * par->channels) >> 3; if (aiff->block_duration) { - par->bit_rate = (int64_t)par->sample_rate * (par->block_align << 3) / - aiff->block_duration; + par->bit_rate = av_rescale(par->sample_rate, par->block_align * 8LL, + aiff->block_duration); + if (par->bit_rate < 0) + par->bit_rate = 0; } /* Chunk is over */

1 0

avformat/aiffdec: sanity check block_align
by Michael Niedermayer 01 Nov '21

01 Nov '21

ffmpeg | branch: master | Michael Niedermayer <michael(a)niedermayer.cc> | Sun Oct 31 00:10:39 2021 +0200| [93f7776921ed8c5219732210067016c3457e864d] | committer: Michael Niedermayer avformat/aiffdec: sanity check block_align 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=93f7776921ed8c521… --- libavformat/aiffdec.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libavformat/aiffdec.c b/libavformat/aiffdec.c index 1406347426..648f231a52 100644 --- a/libavformat/aiffdec.c +++ b/libavformat/aiffdec.c @@ -368,7 +368,7 @@ got_sound: if (!st->codecpar->block_align && st->codecpar->codec_id == AV_CODEC_ID_QCELP) { av_log(s, AV_LOG_WARNING, "qcelp without wave chunk, assuming full rate\n"); st->codecpar->block_align = 35; - } else if (!st->codecpar->block_align) { + } else if (st->codecpar->block_align <= 0) { av_log(s, AV_LOG_ERROR, "could not find COMM tag or invalid block_align value\n"); return -1; }

1 0

avformat/aiffdec: Check sample_rate
by Michael Niedermayer 01 Nov '21

01 Nov '21

ffmpeg | branch: master | Michael Niedermayer <michael(a)niedermayer.cc> | Sun Oct 31 00:02:04 2021 +0200| [1b04836dff9958e8bfdbed2746b8c40b1e119ecc] | committer: Michael Niedermayer avformat/aiffdec: Check sample_rate 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=1b04836dff9958e8b… --- libavformat/aiffdec.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/libavformat/aiffdec.c b/libavformat/aiffdec.c index a826bc998a..1406347426 100644 --- a/libavformat/aiffdec.c +++ b/libavformat/aiffdec.c @@ -120,6 +120,9 @@ static int get_aiff_header(AVFormatContext *s, int size, sample_rate = val << exp; else sample_rate = (val + (1ULL<<(-exp-1))) >> -exp; + if (sample_rate <= 0) + return AVERROR_INVALIDDATA; + par->sample_rate = sample_rate; if (size < 18) return AVERROR_INVALIDDATA;

1 0

avcodec/libaomdec: use intermediate arrays for plane pointers and strides
by James Almer 01 Nov '21

01 Nov '21

ffmpeg | branch: master | James Almer <jamrial(a)gmail.com> | Sat Oct 30 10:56:26 2021 -0300| [28fac45bde9fd38599a9c2896b58573d8e7303ff] | committer: James Almer avcodec/libaomdec: use intermediate arrays for plane pointers and strides Fixes -Wstringop-overflow warnings with libaom >= 2.0.0, where the unused alpha plane was removed from aom_image. Reviewed-by: James Zern <jzern(a)google.com> Signed-off-by: James Almer <jamrial(a)gmail.com> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=28fac45bde9fd3859… --- libavcodec/libaomdec.c | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/libavcodec/libaomdec.c b/libavcodec/libaomdec.c index d6b822fda2..64a627ed1c 100644 --- a/libavcodec/libaomdec.c +++ b/libavcodec/libaomdec.c @@ -224,9 +224,13 @@ static int aom_decode(AVCodecContext *avctx, void *data, int *got_frame, if ((img->fmt & AOM_IMG_FMT_HIGHBITDEPTH) && img->bit_depth == 8) image_copy_16_to_8(picture, img); - else - av_image_copy(picture->data, picture->linesize, (const uint8_t **)img->planes, - img->stride, avctx->pix_fmt, img->d_w, img->d_h); + else { + const uint8_t *planes[4] = { img->planes[0], img->planes[1], img->planes[2] }; + const int stride[4] = { img->stride[0], img->stride[1], img->stride[2] }; + + av_image_copy(picture->data, picture->linesize, planes, + stride, avctx->pix_fmt, img->d_w, img->d_h); + } *got_frame = 1; } return avpkt->size;

1 0