October 2021 - ffmpeg-cvslog - lists.ffmpeg.org

avformat/mpegts: Fix for the DOVI video stream descriptor
by Limin Wang 28 Oct '21

28 Oct '21

ffmpeg | branch: master | Limin Wang <lance.lmwang(a)gmail.com> | Thu Oct 14 19:28:57 2021 +0800| [08c688e64dce81d202bf228291eb128eec83a392] | committer: Limin Wang avformat/mpegts: Fix for the DOVI video stream descriptor By <<Dolby Vision Streams Within the MPEG-2 Transport Stream Format v1.2>> Signed-off-by: Limin Wang <lance.lmwang(a)gmail.com> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=08c688e64dce81d20… --- libavformat/mpegts.c | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/libavformat/mpegts.c b/libavformat/mpegts.c index d8cbaa8ced..29a267436f 100644 --- a/libavformat/mpegts.c +++ b/libavformat/mpegts.c @@ -2179,6 +2179,8 @@ int ff_parse_mpeg2_descriptor(AVFormatContext *fc, AVStream *st, int stream_type AVDOVIDecoderConfigurationRecord *dovi; size_t dovi_size; int ret; + int dependency_pid; + if (desc_end - *pp < 4) // (8 + 8 + 7 + 6 + 1 + 1 + 1) / 8 return AVERROR_INVALIDDATA; @@ -2194,7 +2196,11 @@ int ff_parse_mpeg2_descriptor(AVFormatContext *fc, AVStream *st, int stream_type dovi->rpu_present_flag = (buf >> 2) & 0x01; // 1 bit dovi->el_present_flag = (buf >> 1) & 0x01; // 1 bit dovi->bl_present_flag = buf & 0x01; // 1 bit - if (desc_end - *pp >= 20) { // 4 + 4 * 4 + if (!dovi->bl_present_flag && desc_end - *pp >= 2) { + buf = get16(pp, desc_end); + dependency_pid = buf >> 3; // 13 bits + } + if (desc_end - *pp >= 1) { // 8 bits buf = get8(pp, desc_end); dovi->dv_bl_signal_compatibility_id = (buf >> 4) & 0x0f; // 4 bits } else { @@ -2211,12 +2217,13 @@ int ff_parse_mpeg2_descriptor(AVFormatContext *fc, AVStream *st, int stream_type } av_log(fc, AV_LOG_TRACE, "DOVI, version: %d.%d, profile: %d, level: %d, " - "rpu flag: %d, el flag: %d, bl flag: %d, compatibility id: %d\n", + "rpu flag: %d, el flag: %d, bl flag: %d, dependency_pid: %d, compatibility id: %d\n", dovi->dv_version_major, dovi->dv_version_minor, dovi->dv_profile, dovi->dv_level, dovi->rpu_present_flag, dovi->el_present_flag, dovi->bl_present_flag, + dependency_pid, dovi->dv_bl_signal_compatibility_id); } break;

1 0

avformat/movenc: support dvwC box for Dolby Vision
by Limin Wang 28 Oct '21

28 Oct '21

ffmpeg | branch: master | Limin Wang <lance.lmwang(a)gmail.com> | Thu Oct 14 19:47:32 2021 +0800| [c0edfb514bbadd9ce525ed7e1b7ae1cdd65e0df8] | committer: Limin Wang avformat/movenc: support dvwC box for Dolby Vision By <<Dolby Vision Streams Within the ISO Base Media File Format Version 2.2>> Signed-off-by: Limin Wang <lance.lmwang(a)gmail.com> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=c0edfb514bbadd9ce… --- libavformat/movenc.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/libavformat/movenc.c b/libavformat/movenc.c index d43a086f4b..37d4403f7a 100644 --- a/libavformat/movenc.c +++ b/libavformat/movenc.c @@ -1912,7 +1912,9 @@ static int mov_write_sv3d_tag(AVFormatContext *s, AVIOContext *pb, AVSphericalMa static int mov_write_dvcc_dvvc_tag(AVFormatContext *s, AVIOContext *pb, AVDOVIDecoderConfigurationRecord *dovi) { avio_wb32(pb, 32); /* size = 8 + 24 */ - if (dovi->dv_profile > 7) + if (dovi->dv_profile > 10) + ffio_wfourcc(pb, "dvwC"); + else if (dovi->dv_profile > 7) ffio_wfourcc(pb, "dvvC"); else ffio_wfourcc(pb, "dvcC"); @@ -1926,7 +1928,7 @@ static int mov_write_dvcc_dvvc_tag(AVFormatContext *s, AVIOContext *pb, AVDOVIDe ffio_fill(pb, 0, 4 * 4); /* reserved */ av_log(s, AV_LOG_DEBUG, "DOVI in %s box, version: %d.%d, profile: %d, level: %d, " "rpu flag: %d, el flag: %d, bl flag: %d, compatibility id: %d\n", - dovi->dv_profile > 7 ? "dvvC" : "dvcC", + dovi->dv_profile > 10 ? "dvwC" : (dovi->dv_profile > 7 ? "dvvC" : "dvcC"), dovi->dv_version_major, dovi->dv_version_minor, dovi->dv_profile, dovi->dv_level, dovi->rpu_present_flag,

1 0

avformat/mov: support dvwC box for Dolby Vision
by Limin Wang 28 Oct '21

28 Oct '21

ffmpeg | branch: master | Limin Wang <lance.lmwang(a)gmail.com> | Thu Oct 14 19:33:54 2021 +0800| [3c3ef41593821aa8386e4467fb0397e16c928d29] | committer: Limin Wang avformat/mov: support dvwC box for Dolby Vision By <<Dolby Vision Streams Within the ISO Base Media File Format Version 2.2>> Signed-off-by: Limin Wang <lance.lmwang(a)gmail.com> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=3c3ef41593821aa83… --- libavformat/mov.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/libavformat/mov.c b/libavformat/mov.c index 263d605c41..3fcb1dc908 100644 --- a/libavformat/mov.c +++ b/libavformat/mov.c @@ -7074,7 +7074,7 @@ static int mov_read_dvcc_dvvc(MOVContext *c, AVIOContext *pb, MOVAtom atom) return ret; } - av_log(c, AV_LOG_TRACE, "DOVI in dvcC/dvvC box, version: %d.%d, profile: %d, level: %d, " + av_log(c, AV_LOG_TRACE, "DOVI in dvcC/dvvC/dvwC box, version: %d.%d, profile: %d, level: %d, " "rpu flag: %d, el flag: %d, bl flag: %d, compatibility id: %d\n", dovi->dv_version_major, dovi->dv_version_minor, dovi->dv_profile, dovi->dv_level, @@ -7273,6 +7273,7 @@ static const MOVParseTableEntry mov_default_parse_table[] = { { MKTAG('c','l','l','i'), mov_read_clli }, { MKTAG('d','v','c','C'), mov_read_dvcc_dvvc }, { MKTAG('d','v','v','C'), mov_read_dvcc_dvvc }, +{ MKTAG('d','v','w','C'), mov_read_dvcc_dvvc }, { MKTAG('k','i','n','d'), mov_read_kind }, { 0, NULL } };

1 0

avfilter/vf_histogram: add more color modes
by Paul B Mahol 27 Oct '21

27 Oct '21

ffmpeg | branch: master | Paul B Mahol <onemda(a)gmail.com> | Wed Oct 27 11:23:37 2021 +0200| [148c0303952e6478004a765119e1622b9fb7eb1c] | committer: Paul B Mahol avfilter/vf_histogram: add more color modes > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=148c0303952e64780… --- doc/filters.texi | 3 +++ libavfilter/vf_histogram.c | 54 ++++++++++++++++++++++++++++++++++++++++++++-- 2 files changed, 55 insertions(+), 2 deletions(-) diff --git a/doc/filters.texi b/doc/filters.texi index 90e805279c..ae6cb3aafd 100644 --- a/doc/filters.texi +++ b/doc/filters.texi @@ -13515,6 +13515,9 @@ It accepts the following values: @item coloronblack @item coloronwhite @item colorongray +@item blackoncolor +@item whiteoncolor +@item grayoncolor @end table Default is @code{whiteonblack}. @end table diff --git a/libavfilter/vf_histogram.c b/libavfilter/vf_histogram.c index fe13cb231b..bf80b2c4fc 100644 --- a/libavfilter/vf_histogram.c +++ b/libavfilter/vf_histogram.c @@ -85,8 +85,8 @@ static const AVOption histogram_options[] = { { "f", "set foreground opacity", OFFSET(fgopacity), AV_OPT_TYPE_FLOAT, {.dbl=0.7}, 0, 1, FLAGS}, { "bgopacity", "set background opacity", OFFSET(bgopacity), AV_OPT_TYPE_FLOAT, {.dbl=0.5}, 0, 1, FLAGS}, { "b", "set background opacity", OFFSET(bgopacity), AV_OPT_TYPE_FLOAT, {.dbl=0.5}, 0, 1, FLAGS}, - { "colors_mode", "set colors mode", OFFSET(colors_mode), AV_OPT_TYPE_INT, {.i64=0}, 0, 6, FLAGS, "colors_mode"}, - { "l", "set colors mode", OFFSET(colors_mode), AV_OPT_TYPE_INT, {.i64=0}, 0, 6, FLAGS, "colors_mode"}, + { "colors_mode", "set colors mode", OFFSET(colors_mode), AV_OPT_TYPE_INT, {.i64=0}, 0, 9, FLAGS, "colors_mode"}, + { "l", "set colors mode", OFFSET(colors_mode), AV_OPT_TYPE_INT, {.i64=0}, 0, 9, FLAGS, "colors_mode"}, { "whiteonblack", NULL, 0, AV_OPT_TYPE_CONST, {.i64=0}, 0, 0, FLAGS, "colors_mode" }, { "blackonwhite", NULL, 0, AV_OPT_TYPE_CONST, {.i64=1}, 0, 0, FLAGS, "colors_mode" }, { "whiteongray", NULL, 0, AV_OPT_TYPE_CONST, {.i64=2}, 0, 0, FLAGS, "colors_mode" }, @@ -94,6 +94,9 @@ static const AVOption histogram_options[] = { { "coloronblack", NULL, 0, AV_OPT_TYPE_CONST, {.i64=4}, 0, 0, FLAGS, "colors_mode" }, { "coloronwhite", NULL, 0, AV_OPT_TYPE_CONST, {.i64=5}, 0, 0, FLAGS, "colors_mode" }, { "colorongray" , NULL, 0, AV_OPT_TYPE_CONST, {.i64=6}, 0, 0, FLAGS, "colors_mode" }, + { "blackoncolor", NULL, 0, AV_OPT_TYPE_CONST, {.i64=7}, 0, 0, FLAGS, "colors_mode" }, + { "whiteoncolor", NULL, 0, AV_OPT_TYPE_CONST, {.i64=8}, 0, 0, FLAGS, "colors_mode" }, + { "grayoncolor" , NULL, 0, AV_OPT_TYPE_CONST, {.i64=9}, 0, 0, FLAGS, "colors_mode" }, { NULL } }; @@ -312,6 +315,41 @@ static int config_input(AVFilterLink *inlink) memcpy(s->fg_color[1], blue_yuva_color, 4); memcpy(s->fg_color[2], red_yuva_color, 4); } + } else if (s->colors_mode == 7) { + for (int i = 0; i < 4; i++) + for (int j = 0; j < 4; j++) + FFSWAP(uint8_t, s->fg_color[i][j], s->bg_color[i][j]); + if (rgb) { + memcpy(s->bg_color[0], red_gbrp_color, 4); + memcpy(s->bg_color[1], green_gbrp_color, 4); + memcpy(s->bg_color[2], blue_gbrp_color, 4); + } else { + memcpy(s->bg_color[0], green_yuva_color, 4); + memcpy(s->bg_color[1], blue_yuva_color, 4); + memcpy(s->bg_color[2], red_yuva_color, 4); + } + } else if (s->colors_mode == 8) { + if (rgb) { + memcpy(s->bg_color[0], red_gbrp_color, 4); + memcpy(s->bg_color[1], green_gbrp_color, 4); + memcpy(s->bg_color[2], blue_gbrp_color, 4); + } else { + memcpy(s->bg_color[0], igreen_yuva_color,4); + memcpy(s->bg_color[1], blue_yuva_color, 4); + memcpy(s->bg_color[2], red_yuva_color, 4); + } + } else if (s->colors_mode == 9) { + for (int i = 0; i < 4; i++) + memcpy(s->fg_color[i], gray_color, 4); + if (rgb) { + memcpy(s->bg_color[0], red_gbrp_color, 4); + memcpy(s->bg_color[1], green_gbrp_color, 4); + memcpy(s->bg_color[2], blue_gbrp_color, 4); + } else { + memcpy(s->bg_color[0], igreen_yuva_color,4); + memcpy(s->bg_color[1], blue_yuva_color, 4); + memcpy(s->bg_color[2], red_yuva_color, 4); + } } } @@ -517,6 +555,12 @@ static int filter_frame(AVFilterLink *inlink, AVFrame *in) out->data[p][(j + starty) * out->linesize[p] + startx + i] = 255; } } + if (s->display_mode) { + for (j = col_height - 1; j >= 0; j--) { + for (l = 0; l < s->dncomp; l++) + out->data[l][(j + starty) * out->linesize[l] + startx + i] = s->bg_color[p][l]; + } + } for (j = s->level_height + s->scale_height - 1; j >= s->level_height; j--) for (l = 0; l < s->dncomp; l++) out->data[l][(j + starty) * out->linesize[l] + startx + i] = p == l ? i : mid; @@ -531,6 +575,12 @@ static int filter_frame(AVFilterLink *inlink, AVFrame *in) AV_WN16(out->data[p] + (j + starty) * out->linesize[p] + startx * 2 + i * 2, 255 * mult); } } + if (s->display_mode) { + for (j = col_height - 1; j >= 0; j--) { + for (l = 0; l < s->dncomp; l++) + AV_WN16(out->data[l] + (j + starty) * out->linesize[l] + startx * 2 + i * 2, s->bg_color[p][l] * mult); + } + } for (j = s->level_height + s->scale_height - 1; j >= s->level_height; j--) for (l = 0; l < s->dncomp; l++) AV_WN16(out->data[l] + (j + starty) * out->linesize[l] + startx * 2 + i * 2, p == l ? i : mid * mult);

1 0

avfilter: split negate filter from lut filter
by Paul B Mahol 27 Oct '21

27 Oct '21

ffmpeg | branch: master | Paul B Mahol <onemda(a)gmail.com> | Tue Oct 26 12:34:30 2021 +0200| [97b5b9dbea2fd51861218416dafc46984e286826] | committer: Paul B Mahol avfilter: split negate filter from lut filter Using luts for negating is suboptimal. FATE test changes because filter no longer clips values into limited color range. > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=97b5b9dbea2fd5186… --- doc/filters.texi | 13 ++ libavfilter/Makefile | 2 +- libavfilter/vf_lut.c | 28 ---- libavfilter/vf_negate.c | 375 +++++++++++++++++++++++++++++++++++++++++++ tests/ref/fate/filter-negate | 100 ++++++------ 5 files changed, 439 insertions(+), 79 deletions(-) diff --git a/doc/filters.texi b/doc/filters.texi index 93eadda45d..90e805279c 100644 --- a/doc/filters.texi +++ b/doc/filters.texi @@ -15551,6 +15551,19 @@ Negate (invert) the input video. It accepts the following option: @table @option +@item components +Set components to negate. + +Available values for components are: +@table @samp +@item y +@item u +@item v +@item a +@item r +@item g +@item b +@end table @item negate_alpha With value 1, it negates the alpha component, if present. Default value is 0. diff --git a/libavfilter/Makefile b/libavfilter/Makefile index 94772576b1..e24f419834 100644 --- a/libavfilter/Makefile +++ b/libavfilter/Makefile @@ -350,7 +350,7 @@ OBJS-$(CONFIG_MIX_FILTER) += vf_mix.o framesync.o OBJS-$(CONFIG_MONOCHROME_FILTER) += vf_monochrome.o OBJS-$(CONFIG_MORPHO_FILTER) += vf_morpho.o OBJS-$(CONFIG_MPDECIMATE_FILTER) += vf_mpdecimate.o -OBJS-$(CONFIG_NEGATE_FILTER) += vf_lut.o +OBJS-$(CONFIG_NEGATE_FILTER) += vf_negate.o OBJS-$(CONFIG_NLMEANS_FILTER) += vf_nlmeans.o OBJS-$(CONFIG_NLMEANS_OPENCL_FILTER) += vf_nlmeans_opencl.o opencl.o opencl/nlmeans.o OBJS-$(CONFIG_NNEDI_FILTER) += vf_nnedi.o diff --git a/libavfilter/vf_lut.c b/libavfilter/vf_lut.c index 64668039d1..fd5b364797 100644 --- a/libavfilter/vf_lut.c +++ b/libavfilter/vf_lut.c @@ -69,7 +69,6 @@ typedef struct LutContext { int is_planar; int is_16bit; int step; - int negate_alpha; /* only used by negate */ } LutContext; #define Y 0 @@ -642,30 +641,3 @@ static av_cold int lutrgb_init(AVFilterContext *ctx) DEFINE_LUT_FILTER(lutrgb, "Compute and apply a lookup table to the RGB input video.", lut); #endif - -#if CONFIG_NEGATE_FILTER - -static const AVOption negate_options[] = { - { "negate_alpha", NULL, OFFSET(negate_alpha), AV_OPT_TYPE_BOOL, { .i64 = 0 }, 0, 1, FLAGS }, - { NULL } -}; - -AVFILTER_DEFINE_CLASS(negate); - -static av_cold int negate_init(AVFilterContext *ctx) -{ - LutContext *s = ctx->priv; - - for (int i = 0; i < 4; i++) { - s->comp_expr_str[i] = av_strdup((i == 3 && !s->negate_alpha) ? - "val" : "negval"); - if (!s->comp_expr_str[i]) - return AVERROR(ENOMEM); - } - - return 0; -} - -DEFINE_LUT_FILTER(negate, "Negate input video.", negate); - -#endif diff --git a/libavfilter/vf_negate.c b/libavfilter/vf_negate.c new file mode 100644 index 0000000000..d782e63d3a --- /dev/null +++ b/libavfilter/vf_negate.c @@ -0,0 +1,375 @@ +/* + * This file is part of FFmpeg. + * + * FFmpeg is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * FFmpeg is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with FFmpeg; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + */ + +#include "libavutil/attributes.h" +#include "libavutil/common.h" +#include "libavutil/imgutils.h" +#include "libavutil/opt.h" +#include "libavutil/pixdesc.h" +#include "avfilter.h" +#include "drawutils.h" +#include "formats.h" +#include "internal.h" +#include "video.h" + +#define COMP_R 0x01 +#define COMP_G 0x02 +#define COMP_B 0x04 +#define COMP_A 0x08 +#define COMP_Y 0x10 +#define COMP_U 0x20 +#define COMP_V 0x40 + +typedef struct ThreadData { + AVFrame *in; + AVFrame *out; +} ThreadData; + +typedef struct NegateContext { + const AVClass *class; + int negate_alpha; + int max; + int requested_components; + int components; + int planes; + int step; + int nb_planes; + int linesize[4]; + int width[4]; + int height[4]; + uint8_t rgba_map[4]; + + void (*negate)(const uint8_t *src, uint8_t *dst, + ptrdiff_t slinesize, ptrdiff_t dlinesize, + int w, int h, int max, int step, + int components); +} NegateContext; + +#define OFFSET(x) offsetof(NegateContext, x) +#define FLAGS AV_OPT_FLAG_FILTERING_PARAM|AV_OPT_FLAG_VIDEO_PARAM|AV_OPT_FLAG_RUNTIME_PARAM + +static const AVOption negate_options[] = { + { "components", "set components to negate", OFFSET(requested_components), AV_OPT_TYPE_FLAGS, {.i64=0x77}, 1, 0xff, FLAGS, "flags"}, + { "y", "set luma component", 0, AV_OPT_TYPE_CONST, {.i64=COMP_Y}, 0, 0, FLAGS, "flags"}, + { "u", "set u component", 0, AV_OPT_TYPE_CONST, {.i64=COMP_U}, 0, 0, FLAGS, "flags"}, + { "v", "set v component", 0, AV_OPT_TYPE_CONST, {.i64=COMP_V}, 0, 0, FLAGS, "flags"}, + { "r", "set red component", 0, AV_OPT_TYPE_CONST, {.i64=COMP_R}, 0, 0, FLAGS, "flags"}, + { "g", "set green component", 0, AV_OPT_TYPE_CONST, {.i64=COMP_G}, 0, 0, FLAGS, "flags"}, + { "b", "set blue component", 0, AV_OPT_TYPE_CONST, {.i64=COMP_B}, 0, 0, FLAGS, "flags"}, + { "a", "set alpha component", 0, AV_OPT_TYPE_CONST, {.i64=COMP_A}, 0, 0, FLAGS, "flags"}, + { "negate_alpha", NULL, OFFSET(negate_alpha), AV_OPT_TYPE_BOOL, {.i64=0}, 0, 1, FLAGS }, + { NULL } +}; + +AVFILTER_DEFINE_CLASS(negate); + +static const enum AVPixelFormat pix_fmts[] = { + AV_PIX_FMT_YUV444P, AV_PIX_FMT_YUV422P, AV_PIX_FMT_YUV420P, + AV_PIX_FMT_YUV411P, AV_PIX_FMT_YUV410P, AV_PIX_FMT_YUV440P, + AV_PIX_FMT_YUVA420P, AV_PIX_FMT_YUVA422P, AV_PIX_FMT_YUVA444P, + AV_PIX_FMT_YUVJ444P, AV_PIX_FMT_YUVJ422P, AV_PIX_FMT_YUVJ420P, + AV_PIX_FMT_YUVJ440P, + AV_PIX_FMT_YUV444P9, AV_PIX_FMT_YUV422P9, AV_PIX_FMT_YUV420P9, + AV_PIX_FMT_YUV444P10, AV_PIX_FMT_YUV422P10, AV_PIX_FMT_YUV420P10, AV_PIX_FMT_YUV440P10, + AV_PIX_FMT_YUV444P12, AV_PIX_FMT_YUV422P12, AV_PIX_FMT_YUV420P12, AV_PIX_FMT_YUV440P12, + AV_PIX_FMT_YUV444P14, AV_PIX_FMT_YUV422P14, AV_PIX_FMT_YUV420P14, + AV_PIX_FMT_YUV444P16, AV_PIX_FMT_YUV422P16, AV_PIX_FMT_YUV420P16, + AV_PIX_FMT_YUVA444P16, AV_PIX_FMT_YUVA422P16, AV_PIX_FMT_YUVA420P16, + AV_PIX_FMT_ARGB, AV_PIX_FMT_RGBA, + AV_PIX_FMT_ABGR, AV_PIX_FMT_BGRA, + AV_PIX_FMT_RGB24, AV_PIX_FMT_BGR24, + AV_PIX_FMT_RGB48, AV_PIX_FMT_RGBA64, + AV_PIX_FMT_BGR48, AV_PIX_FMT_BGRA64, + AV_PIX_FMT_GBRP, AV_PIX_FMT_GBRAP, + AV_PIX_FMT_GBRP9, AV_PIX_FMT_GBRP10, + AV_PIX_FMT_GBRAP10, + AV_PIX_FMT_GBRP12, AV_PIX_FMT_GBRP14, + AV_PIX_FMT_GBRP16, AV_PIX_FMT_GBRAP12, + AV_PIX_FMT_GBRAP16, + AV_PIX_FMT_GRAY8, AV_PIX_FMT_GRAY9, AV_PIX_FMT_GRAY10, + AV_PIX_FMT_GRAY12, AV_PIX_FMT_GRAY14, AV_PIX_FMT_GRAY16, + AV_PIX_FMT_NONE +}; + +static void negate8(const uint8_t *src, uint8_t *dst, + ptrdiff_t slinesize, ptrdiff_t dlinesize, + int w, int h, int max, int step, + int components) +{ + for (int y = 0; y < h; y++) { + for (int x = 0; x < w; x++) + dst[x] = 255 - src[x]; + + dst += dlinesize; + src += slinesize; + } +} + +static void negate_packed8(const uint8_t *ssrc, uint8_t *ddst, + ptrdiff_t slinesize, ptrdiff_t dlinesize, + int w, int h, int max, int step, + int components) +{ + for (int y = 0; y < h; y++) { + const uint8_t *src = ssrc + y * slinesize; + uint8_t *dst = ddst + y * dlinesize; + + for (int x = 0; x < w; x++) { + switch (step) { + case 4: dst[3] = components & 8 ? 255 - src[3] : src[3]; + case 3: dst[2] = components & 4 ? 255 - src[2] : src[2]; + case 2: dst[1] = components & 2 ? 255 - src[1] : src[1]; + default: dst[0] = components & 1 ? 255 - src[0] : src[0]; + } + + src += step; + dst += step; + } + } +} + +static void negate16(const uint8_t *ssrc, uint8_t *ddst, + ptrdiff_t slinesize, ptrdiff_t dlinesize, + int w, int h, int max, int step, + int components) +{ + const uint16_t *src = (const uint16_t *)ssrc; + uint16_t *dst = (uint16_t *)ddst; + + dlinesize /= 2; + slinesize /= 2; + + for (int y = 0; y < h; y++) { + for (int x = 0; x < w; x++) + dst[x] = max - src[x]; + + dst += dlinesize; + src += slinesize; + } +} + +static void negate_packed16(const uint8_t *ssrc, uint8_t *ddst, + ptrdiff_t slinesize, ptrdiff_t dlinesize, + int w, int h, int max, int step, + int components) +{ + for (int y = 0; y < h; y++) { + const uint16_t *src = (const uint16_t *)(ssrc + y * slinesize); + uint16_t *dst = (uint16_t *)(ddst + y * dlinesize); + + for (int x = 0; x < w; x++) { + switch (step) { + case 4: dst[3] = components & 8 ? max - src[3] : src[3]; + case 3: dst[2] = components & 4 ? max - src[2] : src[2]; + case 2: dst[1] = components & 2 ? max - src[1] : src[1]; + default: dst[0] = components & 1 ? max - src[0] : src[0]; + } + + src += step; + dst += step; + } + } +} + +static int config_input(AVFilterLink *inlink) +{ + AVFilterContext *ctx = inlink->dst; + NegateContext *s = ctx->priv; + const AVPixFmtDescriptor *desc = av_pix_fmt_desc_get(inlink->format); + int depth, vsub, hsub, ret, is_packed; + int comp_avail; + + s->planes = s->negate_alpha ? 0xF : 0x7; + is_packed = !(desc->flags & AV_PIX_FMT_FLAG_PLANAR) && + (desc->nb_components > 1); + if (s->requested_components != 0x77) { + comp_avail = ((desc->flags & AV_PIX_FMT_FLAG_RGB) ? COMP_R|COMP_G|COMP_B : + COMP_Y | + ((desc->nb_components > 2) ? COMP_U|COMP_V : 0)) | + ((desc->flags & AV_PIX_FMT_FLAG_ALPHA) ? COMP_A : 0); + if (s->requested_components & ~comp_avail) { + av_log(ctx, AV_LOG_ERROR, "Requested components not available.\n"); + return AVERROR(EINVAL); + } + + s->planes = 0; + if (!(desc->flags & AV_PIX_FMT_FLAG_RGB)) { + if (s->requested_components & COMP_Y) + s->planes |= 1; + if (s->requested_components & COMP_U) + s->planes |= 2; + if (s->requested_components & COMP_V) + s->planes |= 4; + if (s->requested_components & COMP_A) + s->planes |= 8; + } else { + if (s->requested_components & COMP_R) + s->planes |= 4; + if (s->requested_components & COMP_G) + s->planes |= 1; + if (s->requested_components & COMP_B) + s->planes |= 2; + if (s->requested_components & COMP_A) + s->planes |= 8; + } + } + s->nb_planes = av_pix_fmt_count_planes(inlink->format); + + s->components = 0; + if (desc->flags & AV_PIX_FMT_FLAG_RGB) { + ff_fill_rgba_map(s->rgba_map, inlink->format); + + if (s->requested_components & COMP_R) + s->components |= 1 << s->rgba_map[0]; + if (s->requested_components & COMP_G) + s->components |= 1 << s->rgba_map[1]; + if (s->requested_components & COMP_B) + s->components |= 1 << s->rgba_map[2]; + if (s->requested_components & COMP_A) + s->components |= 1 << s->rgba_map[3]; + } + + if ((ret = av_image_fill_linesizes(s->linesize, inlink->format, inlink->w)) < 0) + return ret; + + depth = desc->comp[0].depth; + hsub = desc->log2_chroma_w; + vsub = desc->log2_chroma_h; + s->height[1] = s->height[2] = AV_CEIL_RSHIFT(inlink->h, vsub); + s->height[0] = s->height[3] = inlink->h; + s->width[1] = s->width[2] = AV_CEIL_RSHIFT(inlink->w, hsub); + s->width[0] = s->width[3] = inlink->w; + + s->negate = depth <= 8 ? negate8 : negate16; + if (is_packed) { + s->negate = depth <= 8 ? negate_packed8 : negate_packed16; + s->planes = 1; + } + s->max = (1 << depth) - 1; + s->step = av_get_bits_per_pixel(desc) >> 3; + if (depth > 8) + s->step = s->step >> 1; + + return 0; +} + +static int filter_slice(AVFilterContext *ctx, void *arg, int jobnr, int nb_jobs) +{ + NegateContext *s = ctx->priv; + ThreadData *td = arg; + AVFrame *in = td->in; + AVFrame *out = td->out; + + for (int p = 0; p < s->nb_planes; p++) { + const int h = s->height[p]; + const int slice_start = (h * jobnr) / nb_jobs; + const int slice_end = (h * (jobnr+1)) / nb_jobs; + + if (!((1 << p) & s->planes)) { + if (out != in) + av_image_copy_plane(out->data[p] + slice_start * out->linesize[p], + out->linesize[p], + in->data[p] + slice_start * in->linesize[p], + in->linesize[p], + s->linesize[p], slice_end - slice_start); + continue; + } + + s->negate(in->data[p] + slice_start * in->linesize[p], + out->data[p] + slice_start * out->linesize[p], + in->linesize[p], out->linesize[p], + s->width[p], slice_end - slice_start, + s->max, s->step, s->components); + } + + return 0; +} + +static int filter_frame(AVFilterLink *inlink, AVFrame *in) +{ + AVFilterContext *ctx = inlink->dst; + NegateContext *s = ctx->priv; + AVFilterLink *outlink = ctx->outputs[0]; + ThreadData td; + AVFrame *out; + + 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); + } + + td.out = out; + td.in = in; + ff_filter_execute(ctx, filter_slice, &td, NULL, + FFMIN(s->height[2], ff_filter_get_nb_threads(ctx))); + if (out != 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) +{ + NegateContext *s = ctx->priv; + int old_planes = s->planes; + int ret; + + ret = ff_filter_process_command(ctx, cmd, args, res, res_len, flags); + if (ret < 0) + return ret; + + ret = config_input(ctx->inputs[0]); + if (ret < 0) + s->planes = old_planes; + return ret; +} + +static const AVFilterPad inputs[] = { + { + .name = "default", + .type = AVMEDIA_TYPE_VIDEO, + .filter_frame = filter_frame, + .config_props = config_input, + }, +}; + +static const AVFilterPad outputs[] = { + { + .name = "default", + .type = AVMEDIA_TYPE_VIDEO, + }, +}; + +const AVFilter ff_vf_negate = { + .name = "negate", + .description = NULL_IF_CONFIG_SMALL("Negate input video."), + .priv_size = sizeof(NegateContext), + .priv_class = &negate_class, + FILTER_INPUTS(inputs), + FILTER_OUTPUTS(outputs), + FILTER_PIXFMTS_ARRAY(pix_fmts), + .flags = AVFILTER_FLAG_SUPPORT_TIMELINE_GENERIC | AVFILTER_FLAG_SLICE_THREADS, + .process_command = process_command, +}; diff --git a/tests/ref/fate/filter-negate b/tests/ref/fate/filter-negate index 88d04718ae..aa9a820c0d 100644 --- a/tests/ref/fate/filter-negate +++ b/tests/ref/fate/filter-negate @@ -3,53 +3,53 @@ #codec_id 0: rawvideo #dimensions 0: 352x288 #sar 0: 0/1 -0, 0, 0, 1, 152064, 0xef20e1ec -0, 1, 1, 1, 152064, 0x899606ec -0, 2, 2, 1, 152064, 0xaea175d2 -0, 3, 3, 1, 152064, 0x5201eb55 -0, 4, 4, 1, 152064, 0xf02bb525 -0, 5, 5, 1, 152064, 0x99fdc305 -0, 6, 6, 1, 152064, 0x3a8fefe7 -0, 7, 7, 1, 152064, 0x005edfbf -0, 8, 8, 1, 152064, 0xe37aea50 -0, 9, 9, 1, 152064, 0xa5ad32f9 -0, 10, 10, 1, 152064, 0xb1e52485 -0, 11, 11, 1, 152064, 0x55b06e56 -0, 12, 12, 1, 152064, 0xdfb7be97 -0, 13, 13, 1, 152064, 0x191bca13 -0, 14, 14, 1, 152064, 0xa554dd3c -0, 15, 15, 1, 152064, 0x36075b77 -0, 16, 16, 1, 152064, 0xbf6b1cbd -0, 17, 17, 1, 152064, 0xf33432b6 -0, 18, 18, 1, 152064, 0x5d7100c3 -0, 19, 19, 1, 152064, 0x376f8f0c -0, 20, 20, 1, 152064, 0x07ca75fa -0, 21, 21, 1, 152064, 0xe3984704 -0, 22, 22, 1, 152064, 0xa8fb4e4c -0, 23, 23, 1, 152064, 0xe8e102d8 -0, 24, 24, 1, 152064, 0xcc6771c9 -0, 25, 25, 1, 152064, 0xf646d238 -0, 26, 26, 1, 152064, 0xa52cd41e -0, 27, 27, 1, 152064, 0x536d92c2 -0, 28, 28, 1, 152064, 0x7058c6a1 -0, 29, 29, 1, 152064, 0xcc6c05d0 -0, 30, 30, 1, 152064, 0x1fc2ffb8 -0, 31, 31, 1, 152064, 0x041ea59c -0, 32, 32, 1, 152064, 0xfc006e07 -0, 33, 33, 1, 152064, 0x0246efe1 -0, 34, 34, 1, 152064, 0x079428e5 -0, 35, 35, 1, 152064, 0x64d9d773 -0, 36, 36, 1, 152064, 0x914d3454 -0, 37, 37, 1, 152064, 0xef69686e -0, 38, 38, 1, 152064, 0x3c91129f -0, 39, 39, 1, 152064, 0x2a611ca7 -0, 40, 40, 1, 152064, 0xaf56124f -0, 41, 41, 1, 152064, 0xce48cd45 -0, 42, 42, 1, 152064, 0x75feac29 -0, 43, 43, 1, 152064, 0xfd2b4b5b -0, 44, 44, 1, 152064, 0x8d2f675c -0, 45, 45, 1, 152064, 0x1573ed3b -0, 46, 46, 1, 152064, 0xb0fc17ca -0, 47, 47, 1, 152064, 0x53e5a654 -0, 48, 48, 1, 152064, 0xe0cbb786 -0, 49, 49, 1, 152064, 0xcaa092fe +0, 0, 0, 1, 152064, 0xdb0946b2 +0, 1, 1, 1, 152064, 0x950c6b50 +0, 2, 2, 1, 152064, 0x42e3da48 +0, 3, 3, 1, 152064, 0xb63d4ff1 +0, 4, 4, 1, 152064, 0x92dd1a4f +0, 5, 5, 1, 152064, 0xf2fc27bb +0, 6, 6, 1, 152064, 0xfea2547e +0, 7, 7, 1, 152064, 0x860b44f5 +0, 8, 8, 1, 152064, 0xc1a5507b +0, 9, 9, 1, 152064, 0x4f89978c +0, 10, 10, 1, 152064, 0xde8c8941 +0, 11, 11, 1, 152064, 0xafcbd3bd +0, 12, 12, 1, 152064, 0x19af2340 +0, 13, 13, 1, 152064, 0xbbd42e7e +0, 14, 14, 1, 152064, 0x8e1c42c4 +0, 15, 15, 1, 152064, 0x37a4c19c +0, 16, 16, 1, 152064, 0x528a8289 +0, 17, 17, 1, 152064, 0x2f6397d9 +0, 18, 18, 1, 152064, 0xee5265d5 +0, 19, 19, 1, 152064, 0xed64f493 +0, 20, 20, 1, 152064, 0xe436db22 +0, 21, 21, 1, 152064, 0x42f9ac8f +0, 22, 22, 1, 152064, 0x9c63b348 +0, 23, 23, 1, 152064, 0xb19967b2 +0, 24, 24, 1, 152064, 0x12b7d6bc +0, 25, 25, 1, 152064, 0x4b69376b +0, 26, 26, 1, 152064, 0x9ce939ec +0, 27, 27, 1, 152064, 0x0940f80b +0, 28, 28, 1, 152064, 0x69ee2c4c +0, 29, 29, 1, 152064, 0x72fd6b93 +0, 30, 30, 1, 152064, 0xd12365d7 +0, 31, 31, 1, 152064, 0xfe1c0b83 +0, 32, 32, 1, 152064, 0x095ad405 +0, 33, 33, 1, 152064, 0xfe825671 +0, 34, 34, 1, 152064, 0x60d68d29 +0, 35, 35, 1, 152064, 0xe6243ba6 +0, 36, 36, 1, 152064, 0x942998f6 +0, 37, 37, 1, 152064, 0x3bb3cea9 +0, 38, 38, 1, 152064, 0xd5b97755 +0, 39, 39, 1, 152064, 0x584d81c4 +0, 40, 40, 1, 152064, 0x0e4d777c +0, 41, 41, 1, 152064, 0x0bdc3299 +0, 42, 42, 1, 152064, 0xbff210f8 +0, 43, 43, 1, 152064, 0x8964afb5 +0, 44, 44, 1, 152064, 0xe361cc30 +0, 45, 45, 1, 152064, 0x7f0c522e +0, 46, 46, 1, 152064, 0xd6d17ca2 +0, 47, 47, 1, 152064, 0x72380adf +0, 48, 48, 1, 152064, 0x25391c1e +0, 49, 49, 1, 152064, 0x9506f7a8

1 0

avfilter/vf_owdenoise: relicense my code
by Michael Niedermayer 25 Oct '21

25 Oct '21

ffmpeg | branch: master | Michael Niedermayer <michael(a)niedermayer.cc> | Sat Oct 23 15:24:37 2021 +0200| [069f7831a2bd1545080121fb6d0773191cd61d70] | committer: Michael Niedermayer avfilter/vf_owdenoise: relicense my code Signed-off-by: Michael Niedermayer <michael(a)niedermayer.cc> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=069f7831a2bd15450… --- libavfilter/vf_owdenoise.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/libavfilter/vf_owdenoise.c b/libavfilter/vf_owdenoise.c index f15baf7e08..bb99e8f33c 100644 --- a/libavfilter/vf_owdenoise.c +++ b/libavfilter/vf_owdenoise.c @@ -19,6 +19,11 @@ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ +// The code written by Michael Niedermayer in 70024b6b47b9eacfe01e8f92349ca9bf1ccd7d5a:libavfilter/vf_owdenoise.c +// can also be used under the LGPL due to: +// <michaelni> durandal_1707, if you do all the "todo" points from vf_owdenoise.c that are in that file since 2013 then sure i would be more than happy to relicense my part of it to LGPL +// <durandal_1707> michaelni: first relicense than work + /** * @todo try to change to int * @todo try lifting based implementation

1 0

swscale/swscale: Improve *ColorspaceDetails() doxy
by Michael Niedermayer 25 Oct '21

25 Oct '21

ffmpeg | branch: master | Michael Niedermayer <michael(a)niedermayer.cc> | Sat Oct 23 10:06:09 2021 +0200| [8316b2a15f5e3c0f8da43fa1e43bb5717b56b48a] | committer: Michael Niedermayer swscale/swscale: Improve *ColorspaceDetails() doxy Signed-off-by: Michael Niedermayer <michael(a)niedermayer.cc> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=8316b2a15f5e3c0f8… --- libswscale/swscale.h | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/libswscale/swscale.h b/libswscale/swscale.h index 59610d0342..daa53dc01e 100644 --- a/libswscale/swscale.h +++ b/libswscale/swscale.h @@ -318,14 +318,22 @@ unsigned int sws_receive_slice_alignment(const struct SwsContext *c); * @param brightness 16.16 fixed point brightness correction * @param contrast 16.16 fixed point contrast correction * @param saturation 16.16 fixed point saturation correction +#if LIBSWSCALE_VERSION_MAJOR > 6 + * @return negative error code on error, non negative otherwise +#else * @return -1 if not supported +#endif */ int sws_setColorspaceDetails(struct SwsContext *c, const int inv_table[4], int srcRange, const int table[4], int dstRange, int brightness, int contrast, int saturation); /** +#if LIBSWSCALE_VERSION_MAJOR > 6 + * @return negative error code on error, non negative otherwise +#else * @return -1 if not supported +#endif */ int sws_getColorspaceDetails(struct SwsContext *c, int **inv_table, int *srcRange, int **table, int *dstRange,

1 0

swscale/utils: Improve return codes of sws_setColorspaceDetails()
by Michael Niedermayer 25 Oct '21

25 Oct '21

ffmpeg | branch: master | Michael Niedermayer <michael(a)niedermayer.cc> | Fri Oct 22 23:24:11 2021 +0200| [5f3a160b422e87e17d8fcd3aea51d478d0f05ba5] | committer: Michael Niedermayer swscale/utils: Improve return codes of sws_setColorspaceDetails() Signed-off-by: Michael Niedermayer <michael(a)niedermayer.cc> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=5f3a160b422e87e17… --- libswscale/utils.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/libswscale/utils.c b/libswscale/utils.c index 3752c3ec38..c726922527 100644 --- a/libswscale/utils.c +++ b/libswscale/utils.c @@ -995,7 +995,10 @@ int sws_setColorspaceDetails(struct SwsContext *c, const int inv_table[4], 0, 1 << 16, 1 << 16); return 0; } - return -1; + //We do not support this combination currently, we need to cascade more contexts to compensate + if (c->cascaded_context[0] && memcmp(c->dstColorspaceTable, c->srcColorspaceTable, sizeof(int) * 4)) + return -1; //AVERROR_PATCHWELCOME; + return 0; } if (!isYUV(c->dstFormat) && !isGray(c->dstFormat)) {

1 0

swscale/utils: Set all threads to the same colorspace even on failure
by Michael Niedermayer 25 Oct '21

25 Oct '21

ffmpeg | branch: master | Michael Niedermayer <michael(a)niedermayer.cc> | Fri Oct 22 23:15:59 2021 +0200| [c7699f95bb00cd7835aca4452d83320e42550a1d] | committer: Michael Niedermayer swscale/utils: Set all threads to the same colorspace even on failure Fixes: ./ffplay dav.y4m -vf "scale=hd1080:threads=4" Found-by: Paul Signed-off-by: Michael Niedermayer <michael(a)niedermayer.cc> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=c7699f95bb00cd783… --- libswscale/utils.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/libswscale/utils.c b/libswscale/utils.c index 367b0ea501..3752c3ec38 100644 --- a/libswscale/utils.c +++ b/libswscale/utils.c @@ -874,15 +874,16 @@ int sws_setColorspaceDetails(struct SwsContext *c, const int inv_table[4], int need_reinit = 0; if (c->nb_slice_ctx) { + int parent_ret = 0; for (int i = 0; i < c->nb_slice_ctx; i++) { int ret = sws_setColorspaceDetails(c->slice_ctx[i], inv_table, srcRange, table, dstRange, brightness, contrast, saturation); if (ret < 0) - return ret; + parent_ret = ret; } - return 0; + return parent_ret; } handle_formats(c);

1 0

[ffmpeg-web] branch master updated. e5d990b web/security: More CVE#s
by ffmpeg-git＠ffmpeg.org 25 Oct '21

25 Oct '21

The branch, master has been updated via e5d990bae4503b3016daa583182a8c32357b09e0 (commit) from e266f0f82fe9d5845790dbc6e6f0bc1de45d29de (commit) - Log ----------------------------------------------------------------- commit e5d990bae4503b3016daa583182a8c32357b09e0 Author: Michael Niedermayer <michael(a)niedermayer.cc> AuthorDate: Mon Oct 25 13:09:00 2021 +0200 Commit: Michael Niedermayer <michael(a)niedermayer.cc> CommitDate: Mon Oct 25 13:09:00 2021 +0200 web/security: More CVE#s Signed-off-by: Michael Niedermayer <michael(a)niedermayer.cc> diff --git a/src/security b/src/security index 72ed898..5d8434c 100644 --- a/src/security +++ b/src/security @@ -7,6 +7,11 @@ Fixes following vulnerabilities: </p> <pre> +CVE-2020-20446, 5828700d5c70aaec1f10c417975123c76262bd98 / 223b5e8ac9f6461bb13ed365419ec485c5b2b002, ticket/7995 +CVE-2020-20453, 05cca35df9df1fcbcd41a9fac77ab2fb70a6b9c7 / a7a7f32c8ad0179a1a85d0a8cff35924e6d90be8, ticket/8003 +CVE-2020-22015, 5f9f6894970b1c3e4157e695b9d1d7cd08f04be2 / 4c1afa292520329eecd1cc7631bc59a8cca95c46, ticket/8190 +CVE-2020-22019, cea03683b93c1569b33611d71233235933b3cbce / 82ad1b76751bcfad5005440db48c46a4de5d6f02, CVE-2020-22033, ticket/8241,ticket/8246 +CVE-2020-22021, 6e2b18a895ca3d3df9682bbb313d3d1eaf2d7d1f / 7971f62120a55c141ec437aa3f0bacc1c1a3526b, ticket/8240 CVE-2020-22037, 4254dbe20fea3e3e1897c82027f148c868d6c11e / 7bba0dd6382e30d646cb406034a66199e071d713, ticket/8281 CVE-2021-33815, 43bdf562c3f69261d742dd35dfe5147fb3c007d0 / 26d3c81bc5ef2f8c3f09d45eaeacfb4b1139a777 CVE-2021-38114, 46bbf194c44e49f08bbb028c5b933a901a84a7bd / 7150f9575671f898382c370acae35f9087a30ba1 @@ -40,7 +45,12 @@ CVE-2020-35965, b0a8b40294ea212c1938348ff112ef1b9bf16bb3 Fixes following vulnerabilities: </p> <pre> +CVE-2020-20446, ee5387471feca7b50535406d7c0c9b54eff56cbe / 223b5e8ac9f6461bb13ed365419ec485c5b2b002, ticket/7995 CVE-2020-20450, 3865b1952e5cf993b016d83ba78fe1deb63bbfad / 5400e4a50c61e53e1bc50b3e77201649bbe9c510, ticket/7993 +CVE-2020-20453, ff2159658a15dadb4e83980333f9df0215e43315 / a7a7f32c8ad0179a1a85d0a8cff35924e6d90be8, ticket/8003 +CVE-2020-22015, e1089a581b204667149635f36df5ef81f784c2b8 / 4c1afa292520329eecd1cc7631bc59a8cca95c46, ticket/8190 +CVE-2020-22019, a6a041676796668d3798665f2d8797df99af3453 / 82ad1b76751bcfad5005440db48c46a4de5d6f02, CVE-2020-22033, ticket/8241,ticket/8246, +CVE-2020-22021, bade86f6794b0b2b067d9ca741e1070322ff007c / 7971f62120a55c141ec437aa3f0bacc1c1a3526b, ticket/8240 CVE-2020-22037, c6e7b345f5fd261ade273ea2d0cfa51fc6b512ac / 7bba0dd6382e30d646cb406034a66199e071d713, ticket/8281 CVE-2020-22042, a23078a721682268caf03fc6d24a6ab202d309ae / 426c16d61a9b5056a157a1a2a057a4e4d13eef84, ticket/8267 CVE-2021-38114, 7c455ee86a79b54857361e2a6eaf8a23783eaf3b / 7150f9575671f898382c370acae35f9087a30ba1 @@ -109,6 +119,11 @@ CVE-2020-22044, 1d479300cbe0522c233b7d51148aea2b29bd29ad, ticket/8295 Fixes following vulnerabilities: </p> <pre> +CVE-2020-20446, e56ee5a3e4d5110d2ef718249613591ad9c6a8e0 / 223b5e8ac9f6461bb13ed365419ec485c5b2b002, ticket/7995 +CVE-2020-20453, c21762969e1e66870716d84c3ded81d866ab85b4 / a7a7f32c8ad0179a1a85d0a8cff35924e6d90be8, ticket/8003 +CVE-2020-22015, cf876bdef8ba66c66518aa2192fff2975ad02d0b / 4c1afa292520329eecd1cc7631bc59a8cca95c46, ticket/8190 +CVE-2020-22019, e6b5c7a5fccf7237b2aceb4334dec53f181e0149 / 82ad1b76751bcfad5005440db48c46a4de5d6f02, CVE-2020-22033, ticket/8241,ticket/8246 +CVE-2020-22021, 0ab6b4469caf11119546a58c538f7c55af77ab36 / 7971f62120a55c141ec437aa3f0bacc1c1a3526b, ticket/8240 CVE-2020-22037, 0f8a56d5aff8c6c8c414df4d938137131bbce32f / 7bba0dd6382e30d646cb406034a66199e071d713, ticket/8281 CVE-2020-35964, 955b471fbe77bdab4f007c43c65e71c596e212b5 / 27a99e2c7d450fef15594671eef4465c8a166bd7 CVE-2020-35965, 4810fe79363d196b87a73333d37d3baad6c04f49 / 3e5959b3457f7f1856d997261e6ac672bba49e8b @@ -189,6 +204,11 @@ CVE-2020-22036, d7490ef341e253294aa0abf1e4ed8381c1b0ea91 / 8c3166e1c302c3ba80d97 Fixes following vulnerabilities: </p> <pre> +CVE-2020-20446, b290d6b41e446aa0e56584bacf26317797bf643f / 223b5e8ac9f6461bb13ed365419ec485c5b2b002, ticket/7995 +CVE-2020-20453, e431babf71b620197bc7f642c0b030598bf99928 / a7a7f32c8ad0179a1a85d0a8cff35924e6d90be8, ticket/8003 +CVE-2020-22015, 14e172600e65817144be48a774c9b699b9563653 / 4c1afa292520329eecd1cc7631bc59a8cca95c46, ticket/8190 +CVE-2020-22019, c7da0dad1f17856a12c98135eae9824f771e8f3a / 82ad1b76751bcfad5005440db48c46a4de5d6f02, CVE-2020-22033, ticket/8241,ticket/8246 +CVE-2020-22021, b5ffefdd61c94eb98b1ca555b855e2c0bdd953d6 / 7971f62120a55c141ec437aa3f0bacc1c1a3526b, ticket/8240 CVE-2020-22037, 51292064a2ce71b2adfc090ed7302b0ed3f0eab9 / 7bba0dd6382e30d646cb406034a66199e071d713, ticket/8281 CVE-2020-35965, 40f056abed4e0b0bc8e037da8b56bcb93d5660f2 / 3e5959b3457f7f1856d997261e6ac672bba49e8b CVE-2021-38114, ff3ae6999959150ef488b170bbcc2fb6610b3572 / 7150f9575671f898382c370acae35f9087a30ba1 @@ -366,6 +386,11 @@ CVE-2018-10001, 47b7c68ae54560e2308bdb6be4fb076c73b93081 Fixes following vulnerabilities: </p> <pre> +CVE-2020-20446, f07177cb7165cba55abbf6426345524bf97c5ced / 223b5e8ac9f6461bb13ed365419ec485c5b2b002, ticket/7995 +CVE-2020-20453, 00446f74ad5d8b89202f5f5234b1720ed3b901a4 / a7a7f32c8ad0179a1a85d0a8cff35924e6d90be8, ticket/8003 +CVE-2020-22015, a4a70c156850dfbf1362736e5bc5ac07162a7129 / 4c1afa292520329eecd1cc7631bc59a8cca95c46, ticket/8190 +CVE-2020-22019, c2ae30188823e6c25183283607495c3bc1584a8e / 82ad1b76751bcfad5005440db48c46a4de5d6f02, CVE-2020-22033, ticket/8241,ticket/8246 +CVE-2020-22021, 1c5391ce1c34824d29794ee827aa6d5e984a14b6 / 7971f62120a55c141ec437aa3f0bacc1c1a3526b, ticket/8240 CVE-2020-22037, 071ecaddb9ce7a514f4fe8b0ab4bc363d4bb0a38 / 7bba0dd6382e30d646cb406034a66199e071d713, ticket/8281 CVE-2020-35965, 00115573e3030eff57847e1045ec18f0da5adb5c / 3e5959b3457f7f1856d997261e6ac672bba49e8b CVE-2021-38114, e61b25e2557394e640a5aae901473785a4b23db5 / 7150f9575671f898382c370acae35f9087a30ba1 @@ -611,7 +636,11 @@ CVE-2019-13390, 9b236547f480a012cab32f8cad2dfe02774537c1 / aef24efb0c1e65097ab77 CVE-2019-17542, 039c13f109a46f8f65adfb65cafa8bdb7123a2a7 / 02f909dc24b1f05cfbba75077c7707b905e63cd2 CVE-2020-13904, 8a2ef6d25dc79d472ea7b184c3b95b4658c99838 / b5e39880fb7269b1b3577cee288e06aa3dc1dfa2 CVE-2020-13904, f80106e256e051082e507496cdaed564adbd4da9 / 9dfb19baeb86a8bb02c53a441682c6e9a6e104cc +CVE-2020-20446, f5d0848098c7877905a841b796c4e0a0de28620c / 223b5e8ac9f6461bb13ed365419ec485c5b2b002, ticket/7995 CVE-2020-20448, e0983daf05d6c2f53a850619461e74a7392d9bd8 / 8802e329c8317ca5ceb929df48a23eb0f9e852b2, ticket/7990 +CVE-2020-20453, d6737266a9690975d0e1589295419c6781a4e7ac / a7a7f32c8ad0179a1a85d0a8cff35924e6d90be8, ticket/8003 +CVE-2020-22015, ef75363a438b1212abeb8b3cf8d4ec451dfb199b / 4c1afa292520329eecd1cc7631bc59a8cca95c46, ticket/8190 +CVE-2020-22021, a7c3cfd8ea15bee839da7fb21e41f58b8fb0db9f / 7971f62120a55c141ec437aa3f0bacc1c1a3526b, ticket/8240 </pre> <h3>3.2.14</h3> @@ -1054,6 +1083,7 @@ CVE-2018-15822, d8ecb335fe4852bbc172c7b79e66944d158b4d92 / 6b67d7f05918f7a1ee8fc CVE-2019-11338, 4bc3382780541ac0ccbb27bcb0a92c3887495040 / 54655623a82632e7624714d7b2a3e039dc5faa7e CVE-2019-12730, ef7bef2ba4c2f13bf89a28ff02c1c7352f028e7c / ed188f6dcdf0935c939ed813cf8745d50742014b CVE-2019-17542, 5818ae3cff3295185b3317065b4482e527623545 / 02f909dc24b1f05cfbba75077c7707b905e63cd2 +CVE-2020-20448, ef9340a9dc6e10ab96a111c44520a7016a38f5ad / 8802e329c8317ca5ceb929df48a23eb0f9e852b2, ticket/7990 </pre> <h3>2.8.15</h3> ----------------------------------------------------------------------- Summary of changes: src/security | 30 ++++++++++++++++++++++++++++++ 1 file changed, 30 insertions(+) hooks/post-receive --

1 0