January 2021 - ffmpeg-cvslog - lists.ffmpeg.org

avfilter/drawutils: Remove remnants of old API
by Andreas Rheinhardt 29 Jan '21

29 Jan '21

ffmpeg | branch: master | Andreas Rheinhardt <andreas.rheinhardt(a)gmail.com> | Thu Jan 28 23:49:13 2021 +0100| [124e2a79e2b75c8f4d215dd00ab51534caa04b6b] | committer: Andreas Rheinhardt avfilter/drawutils: Remove remnants of old API ff_fill_line_with_color and ff_draw_rectangle are unused since 19c8f2271423281c9b876b984076a6467c455904; ff_copy_rectangle is unused since 53b7a3fe081ec56c5706228eb6431bb943ad471a. Reviewed-by: Paul B Mahol <onemda(a)gmail.com> Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt(a)gmail.com> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=124e2a79e2b75c8f4… --- libavfilter/drawutils.c | 98 ------------------------------------------------- libavfilter/drawutils.h | 13 ------- 2 files changed, 111 deletions(-) diff --git a/libavfilter/drawutils.c b/libavfilter/drawutils.c index 5f4cb548f0..71fe25692c 100644 --- a/libavfilter/drawutils.c +++ b/libavfilter/drawutils.c @@ -77,104 +77,6 @@ int ff_fill_rgba_map(uint8_t *rgba_map, enum AVPixelFormat pix_fmt) return 0; } -int ff_fill_line_with_color(uint8_t *line[4], int pixel_step[4], int w, uint8_t dst_color[4], - enum AVPixelFormat pix_fmt, uint8_t rgba_color[4], - int *is_packed_rgba, uint8_t rgba_map_ptr[4]) -{ - uint8_t rgba_map[4] = {0}; - int i; - const AVPixFmtDescriptor *pix_desc = av_pix_fmt_desc_get(pix_fmt); - int hsub; - - av_assert0(pix_desc); - - hsub = pix_desc->log2_chroma_w; - - *is_packed_rgba = ff_fill_rgba_map(rgba_map, pix_fmt) >= 0; - - if (*is_packed_rgba) { - pixel_step[0] = (av_get_bits_per_pixel(pix_desc))>>3; - for (i = 0; i < 4; i++) - dst_color[rgba_map[i]] = rgba_color[i]; - - line[0] = av_malloc_array(w, pixel_step[0]); - if (!line[0]) - return AVERROR(ENOMEM); - for (i = 0; i < w; i++) - memcpy(line[0] + i * pixel_step[0], dst_color, pixel_step[0]); - if (rgba_map_ptr) - memcpy(rgba_map_ptr, rgba_map, sizeof(rgba_map[0]) * 4); - } else { - int plane; - - dst_color[0] = RGB_TO_Y_CCIR(rgba_color[0], rgba_color[1], rgba_color[2]); - dst_color[1] = RGB_TO_U_CCIR(rgba_color[0], rgba_color[1], rgba_color[2], 0); - dst_color[2] = RGB_TO_V_CCIR(rgba_color[0], rgba_color[1], rgba_color[2], 0); - dst_color[3] = rgba_color[3]; - - for (plane = 0; plane < 4; plane++) { - int line_size; - int hsub1 = (plane == 1 || plane == 2) ? hsub : 0; - - pixel_step[plane] = 1; - line_size = AV_CEIL_RSHIFT(w, hsub1) * pixel_step[plane]; - line[plane] = av_malloc(line_size); - if (!line[plane]) { - while(plane && line[plane-1]) - av_freep(&line[--plane]); - return AVERROR(ENOMEM); - } - memset(line[plane], dst_color[plane], line_size); - } - } - - return 0; -} - -void ff_draw_rectangle(uint8_t *dst[4], int dst_linesize[4], - uint8_t *src[4], int pixelstep[4], - int hsub, int vsub, int x, int y, int w, int h) -{ - int i, plane; - uint8_t *p; - - for (plane = 0; plane < 4 && dst[plane]; plane++) { - int hsub1 = plane == 1 || plane == 2 ? hsub : 0; - int vsub1 = plane == 1 || plane == 2 ? vsub : 0; - int width = AV_CEIL_RSHIFT(w, hsub1); - int height = AV_CEIL_RSHIFT(h, vsub1); - - p = dst[plane] + (y >> vsub1) * dst_linesize[plane]; - for (i = 0; i < height; i++) { - memcpy(p + (x >> hsub1) * pixelstep[plane], - src[plane], width * pixelstep[plane]); - p += dst_linesize[plane]; - } - } -} - -void ff_copy_rectangle(uint8_t *dst[4], int dst_linesize[4], - uint8_t *src[4], int src_linesize[4], int pixelstep[4], - int hsub, int vsub, int x, int y, int y2, int w, int h) -{ - int i, plane; - uint8_t *p; - - for (plane = 0; plane < 4 && dst[plane]; plane++) { - int hsub1 = plane == 1 || plane == 2 ? hsub : 0; - int vsub1 = plane == 1 || plane == 2 ? vsub : 0; - int width = AV_CEIL_RSHIFT(w, hsub1); - int height = AV_CEIL_RSHIFT(h, vsub1); - - p = dst[plane] + (y >> vsub1) * dst_linesize[plane]; - for (i = 0; i < height; i++) { - memcpy(p + (x >> hsub1) * pixelstep[plane], - src[plane] + src_linesize[plane]*(i+(y2>>vsub1)), width * pixelstep[plane]); - p += dst_linesize[plane]; - } - } -} - int ff_draw_init(FFDrawContext *draw, enum AVPixelFormat format, unsigned flags) { const AVPixFmtDescriptor *desc = av_pix_fmt_desc_get(format); diff --git a/libavfilter/drawutils.h b/libavfilter/drawutils.h index b999d70e55..2ca2475585 100644 --- a/libavfilter/drawutils.h +++ b/libavfilter/drawutils.h @@ -30,19 +30,6 @@ int ff_fill_rgba_map(uint8_t *rgba_map, enum AVPixelFormat pix_fmt); -int ff_fill_line_with_color(uint8_t *line[4], int pixel_step[4], int w, - uint8_t dst_color[4], - enum AVPixelFormat pix_fmt, uint8_t rgba_color[4], - int *is_packed_rgba, uint8_t rgba_map[4]); - -void ff_draw_rectangle(uint8_t *dst[4], int dst_linesize[4], - uint8_t *src[4], int pixelstep[4], - int hsub, int vsub, int x, int y, int w, int h); - -void ff_copy_rectangle(uint8_t *dst[4], int dst_linesize[4], - uint8_t *src[4], int src_linesize[4], int pixelstep[4], - int hsub, int vsub, int x, int y, int y2, int w, int h); - #define MAX_PLANES 4 typedef struct FFDrawContext {

1 0

avfilter/vf_blackdetect: add support for >8 depth formats
by Paul B Mahol 29 Jan '21

29 Jan '21

ffmpeg | branch: master | Paul B Mahol <onemda(a)gmail.com> | Fri Jan 29 14:34:36 2021 +0100| [27b793b0cf6dd905353bf3cd41f3dd1b45e02b13] | committer: Paul B Mahol avfilter/vf_blackdetect: add support for >8 depth formats > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=27b793b0cf6dd9053… --- libavfilter/vf_blackdetect.c | 46 ++++++++++++++++++++++++++++++++++++-------- 1 file changed, 38 insertions(+), 8 deletions(-) diff --git a/libavfilter/vf_blackdetect.c b/libavfilter/vf_blackdetect.c index ceea056d2e..5caf99af5c 100644 --- a/libavfilter/vf_blackdetect.c +++ b/libavfilter/vf_blackdetect.c @@ -26,6 +26,7 @@ #include <float.h> #include "libavutil/opt.h" +#include "libavutil/pixdesc.h" #include "libavutil/timestamp.h" #include "avfilter.h" #include "internal.h" @@ -45,6 +46,7 @@ typedef struct BlackDetectContext { unsigned int nb_black_pixels; ///< number of black pixels counted so far AVRational time_base; + int depth; } BlackDetectContext; #define OFFSET(x) offsetof(BlackDetectContext, x) @@ -78,6 +80,19 @@ static int query_formats(AVFilterContext *ctx) AV_PIX_FMT_YUV440P, AV_PIX_FMT_YUV444P, AV_PIX_FMT_NV12, AV_PIX_FMT_NV21, YUVJ_FORMATS, + AV_PIX_FMT_GRAY10, AV_PIX_FMT_GRAY12, AV_PIX_FMT_GRAY14, + AV_PIX_FMT_GRAY16, + AV_PIX_FMT_YUV420P9, AV_PIX_FMT_YUV422P9, AV_PIX_FMT_YUV444P9, + AV_PIX_FMT_YUV420P10, AV_PIX_FMT_YUV422P10, AV_PIX_FMT_YUV444P10, + 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_YUV420P16, AV_PIX_FMT_YUV422P16, AV_PIX_FMT_YUV444P16, + AV_PIX_FMT_YUVA420P, AV_PIX_FMT_YUVA422P, AV_PIX_FMT_YUVA444P, + AV_PIX_FMT_YUVA444P9, AV_PIX_FMT_YUVA444P10, AV_PIX_FMT_YUVA444P12, AV_PIX_FMT_YUVA444P16, + AV_PIX_FMT_YUVA422P9, AV_PIX_FMT_YUVA422P10, AV_PIX_FMT_YUVA422P12, AV_PIX_FMT_YUVA422P16, + AV_PIX_FMT_YUVA420P9, AV_PIX_FMT_YUVA420P10, AV_PIX_FMT_YUVA420P16, AV_PIX_FMT_NONE }; @@ -91,14 +106,19 @@ static int config_input(AVFilterLink *inlink) { AVFilterContext *ctx = inlink->dst; BlackDetectContext *s = ctx->priv; + const AVPixFmtDescriptor *desc = av_pix_fmt_desc_get(inlink->format); + const int depth = desc->comp[0].depth; + const int max = (1 << depth) - 1; + const int factor = (1 << (depth - 8)); + s->depth = depth; s->time_base = inlink->time_base; s->black_min_duration = s->black_min_duration_time / av_q2d(s->time_base); s->pixel_black_th_i = ff_fmt_is_in(inlink->format, yuvj_formats) ? // luminance_minimum_value + pixel_black_th * luminance_range_size - s->pixel_black_th * 255 : - 16 + s->pixel_black_th * (235 - 16); + s->pixel_black_th * max : + 16 * factor + s->pixel_black_th * (235 - 16) * factor; av_log(s, AV_LOG_VERBOSE, "black_min_duration:%s pixel_black_th:%f pixel_black_th_i:%d picture_black_ratio_th:%f\n", @@ -126,13 +146,23 @@ static int filter_frame(AVFilterLink *inlink, AVFrame *picref) AVFilterContext *ctx = inlink->dst; BlackDetectContext *s = ctx->priv; double picture_black_ratio = 0; - const uint8_t *p = picref->data[0]; - int x, i; - for (i = 0; i < inlink->h; i++) { - for (x = 0; x < inlink->w; x++) - s->nb_black_pixels += p[x] <= s->pixel_black_th_i; - p += picref->linesize[0]; + if (s->depth == 8) { + const uint8_t *p = picref->data[0]; + + for (int i = 0; i < inlink->h; i++) { + for (int x = 0; x < inlink->w; x++) + s->nb_black_pixels += p[x] <= s->pixel_black_th_i; + p += picref->linesize[0]; + } + } else { + const uint16_t *p = (const uint16_t *)picref->data[0]; + + for (int i = 0; i < inlink->h; i++) { + for (int x = 0; x < inlink->w; x++) + s->nb_black_pixels += p[x] <= s->pixel_black_th_i; + p += picref->linesize[0] / 2; + } } picture_black_ratio = (double)s->nb_black_pixels / (inlink->w * inlink->h);

1 0

avfilter/vf_blackdetect: fix bug when no final log would be displayed
by Paul B Mahol 29 Jan '21

29 Jan '21

ffmpeg | branch: master | Paul B Mahol <onemda(a)gmail.com> | Fri Jan 29 14:20:12 2021 +0100| [8248f7b902d91230f82ce34e6cb3ad0038bda3f4] | committer: Paul B Mahol avfilter/vf_blackdetect: fix bug when no final log would be displayed > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=8248f7b902d91230f… --- libavfilter/vf_blackdetect.c | 47 +++++++++++++++++++++----------------------- 1 file changed, 22 insertions(+), 25 deletions(-) diff --git a/libavfilter/vf_blackdetect.c b/libavfilter/vf_blackdetect.c index dac17a67c5..ceea056d2e 100644 --- a/libavfilter/vf_blackdetect.c +++ b/libavfilter/vf_blackdetect.c @@ -44,6 +44,7 @@ typedef struct BlackDetectContext { unsigned int pixel_black_th_i; unsigned int nb_black_pixels; ///< number of black pixels counted so far + AVRational time_base; } BlackDetectContext; #define OFFSET(x) offsetof(BlackDetectContext, x) @@ -91,7 +92,8 @@ static int config_input(AVFilterLink *inlink) AVFilterContext *ctx = inlink->dst; BlackDetectContext *s = ctx->priv; - s->black_min_duration = s->black_min_duration_time / av_q2d(inlink->time_base); + s->time_base = inlink->time_base; + s->black_min_duration = s->black_min_duration_time / av_q2d(s->time_base); s->pixel_black_th_i = ff_fmt_is_in(inlink->format, yuvj_formats) ? // luminance_minimum_value + pixel_black_th * luminance_range_size @@ -100,7 +102,7 @@ static int config_input(AVFilterLink *inlink) av_log(s, AV_LOG_VERBOSE, "black_min_duration:%s pixel_black_th:%f pixel_black_th_i:%d picture_black_ratio_th:%f\n", - av_ts2timestr(s->black_min_duration, &inlink->time_base), + av_ts2timestr(s->black_min_duration, &s->time_base), s->pixel_black_th, s->pixel_black_th_i, s->picture_black_ratio_th); return 0; @@ -109,32 +111,16 @@ static int config_input(AVFilterLink *inlink) static void check_black_end(AVFilterContext *ctx) { BlackDetectContext *s = ctx->priv; - AVFilterLink *inlink = ctx->inputs[0]; if ((s->black_end - s->black_start) >= s->black_min_duration) { av_log(s, AV_LOG_INFO, "black_start:%s black_end:%s black_duration:%s\n", - av_ts2timestr(s->black_start, &inlink->time_base), - av_ts2timestr(s->black_end, &inlink->time_base), - av_ts2timestr(s->black_end - s->black_start, &inlink->time_base)); + av_ts2timestr(s->black_start, &s->time_base), + av_ts2timestr(s->black_end, &s->time_base), + av_ts2timestr(s->black_end - s->black_start, &s->time_base)); } } -static int request_frame(AVFilterLink *outlink) -{ - AVFilterContext *ctx = outlink->src; - BlackDetectContext *s = ctx->priv; - AVFilterLink *inlink = ctx->inputs[0]; - int ret = ff_request_frame(inlink); - - if (ret == AVERROR_EOF && s->black_started) { - // FIXME: black_end should be set to last_picref_pts + last_picref_duration - s->black_end = s->last_picref_pts; - check_black_end(ctx); - } - return ret; -} - static int filter_frame(AVFilterLink *inlink, AVFrame *picref) { AVFilterContext *ctx = inlink->dst; @@ -154,7 +140,7 @@ static int filter_frame(AVFilterLink *inlink, AVFrame *picref) av_log(ctx, AV_LOG_DEBUG, "frame:%"PRId64" picture_black_ratio:%f pts:%s t:%s type:%c\n", inlink->frame_count_out, picture_black_ratio, - av_ts2str(picref->pts), av_ts2timestr(picref->pts, &inlink->time_base), + av_ts2str(picref->pts), av_ts2timestr(picref->pts, &s->time_base), av_get_picture_type_char(picref->pict_type)); if (picture_black_ratio >= s->picture_black_ratio_th) { @@ -163,7 +149,7 @@ static int filter_frame(AVFilterLink *inlink, AVFrame *picref) s->black_started = 1; s->black_start = picref->pts; av_dict_set(&picref->metadata, "lavfi.black_start", - av_ts2timestr(s->black_start, &inlink->time_base), 0); + av_ts2timestr(s->black_start, &s->time_base), 0); } } else if (s->black_started) { /* black ends here */ @@ -171,7 +157,7 @@ static int filter_frame(AVFilterLink *inlink, AVFrame *picref) s->black_end = picref->pts; check_black_end(ctx); av_dict_set(&picref->metadata, "lavfi.black_end", - av_ts2timestr(s->black_end, &inlink->time_base), 0); + av_ts2timestr(s->black_end, &s->time_base), 0); } s->last_picref_pts = picref->pts; @@ -179,6 +165,17 @@ static int filter_frame(AVFilterLink *inlink, AVFrame *picref) return ff_filter_frame(inlink->dst->outputs[0], picref); } +static av_cold void uninit(AVFilterContext *ctx) +{ + BlackDetectContext *s = ctx->priv; + + if (s->black_started) { + // FIXME: black_end should be set to last_picref_pts + last_picref_duration + s->black_end = s->last_picref_pts; + check_black_end(ctx); + } +} + static const AVFilterPad blackdetect_inputs[] = { { .name = "default", @@ -193,7 +190,6 @@ static const AVFilterPad blackdetect_outputs[] = { { .name = "default", .type = AVMEDIA_TYPE_VIDEO, - .request_frame = request_frame, }, { NULL } }; @@ -205,5 +201,6 @@ AVFilter ff_vf_blackdetect = { .query_formats = query_formats, .inputs = blackdetect_inputs, .outputs = blackdetect_outputs, + .uninit = uninit, .priv_class = &blackdetect_class, };

1 0

avfilter/vf_blackdetect: use the name 's' for the pointer to the private context
by Paul B Mahol 29 Jan '21

29 Jan '21

ffmpeg | branch: master | Paul B Mahol <onemda(a)gmail.com> | Fri Jan 29 14:14:14 2021 +0100| [0bcba12a5589a8f24bc5df85a9b8043d3a37b8a0] | committer: Paul B Mahol avfilter/vf_blackdetect: use the name 's' for the pointer to the private context This is consistent across filters and also is less typing. > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=0bcba12a5589a8f24… --- libavfilter/vf_blackdetect.c | 65 ++++++++++++++++++++++---------------------- 1 file changed, 32 insertions(+), 33 deletions(-) diff --git a/libavfilter/vf_blackdetect.c b/libavfilter/vf_blackdetect.c index 4b5d8ff561..dac17a67c5 100644 --- a/libavfilter/vf_blackdetect.c +++ b/libavfilter/vf_blackdetect.c @@ -89,48 +89,47 @@ static int query_formats(AVFilterContext *ctx) static int config_input(AVFilterLink *inlink) { AVFilterContext *ctx = inlink->dst; - BlackDetectContext *blackdetect = ctx->priv; + BlackDetectContext *s = ctx->priv; - blackdetect->black_min_duration = - blackdetect->black_min_duration_time / av_q2d(inlink->time_base); + s->black_min_duration = s->black_min_duration_time / av_q2d(inlink->time_base); - blackdetect->pixel_black_th_i = ff_fmt_is_in(inlink->format, yuvj_formats) ? + s->pixel_black_th_i = ff_fmt_is_in(inlink->format, yuvj_formats) ? // luminance_minimum_value + pixel_black_th * luminance_range_size - blackdetect->pixel_black_th * 255 : - 16 + blackdetect->pixel_black_th * (235 - 16); + s->pixel_black_th * 255 : + 16 + s->pixel_black_th * (235 - 16); - av_log(blackdetect, AV_LOG_VERBOSE, + av_log(s, AV_LOG_VERBOSE, "black_min_duration:%s pixel_black_th:%f pixel_black_th_i:%d picture_black_ratio_th:%f\n", - av_ts2timestr(blackdetect->black_min_duration, &inlink->time_base), - blackdetect->pixel_black_th, blackdetect->pixel_black_th_i, - blackdetect->picture_black_ratio_th); + av_ts2timestr(s->black_min_duration, &inlink->time_base), + s->pixel_black_th, s->pixel_black_th_i, + s->picture_black_ratio_th); return 0; } static void check_black_end(AVFilterContext *ctx) { - BlackDetectContext *blackdetect = ctx->priv; + BlackDetectContext *s = ctx->priv; AVFilterLink *inlink = ctx->inputs[0]; - if ((blackdetect->black_end - blackdetect->black_start) >= blackdetect->black_min_duration) { - av_log(blackdetect, AV_LOG_INFO, + if ((s->black_end - s->black_start) >= s->black_min_duration) { + av_log(s, AV_LOG_INFO, "black_start:%s black_end:%s black_duration:%s\n", - av_ts2timestr(blackdetect->black_start, &inlink->time_base), - av_ts2timestr(blackdetect->black_end, &inlink->time_base), - av_ts2timestr(blackdetect->black_end - blackdetect->black_start, &inlink->time_base)); + av_ts2timestr(s->black_start, &inlink->time_base), + av_ts2timestr(s->black_end, &inlink->time_base), + av_ts2timestr(s->black_end - s->black_start, &inlink->time_base)); } } static int request_frame(AVFilterLink *outlink) { AVFilterContext *ctx = outlink->src; - BlackDetectContext *blackdetect = ctx->priv; + BlackDetectContext *s = ctx->priv; AVFilterLink *inlink = ctx->inputs[0]; int ret = ff_request_frame(inlink); - if (ret == AVERROR_EOF && blackdetect->black_started) { + if (ret == AVERROR_EOF && s->black_started) { // FIXME: black_end should be set to last_picref_pts + last_picref_duration - blackdetect->black_end = blackdetect->last_picref_pts; + s->black_end = s->last_picref_pts; check_black_end(ctx); } return ret; @@ -139,18 +138,18 @@ static int request_frame(AVFilterLink *outlink) static int filter_frame(AVFilterLink *inlink, AVFrame *picref) { AVFilterContext *ctx = inlink->dst; - BlackDetectContext *blackdetect = ctx->priv; + BlackDetectContext *s = ctx->priv; double picture_black_ratio = 0; const uint8_t *p = picref->data[0]; int x, i; for (i = 0; i < inlink->h; i++) { for (x = 0; x < inlink->w; x++) - blackdetect->nb_black_pixels += p[x] <= blackdetect->pixel_black_th_i; + s->nb_black_pixels += p[x] <= s->pixel_black_th_i; p += picref->linesize[0]; } - picture_black_ratio = (double)blackdetect->nb_black_pixels / (inlink->w * inlink->h); + picture_black_ratio = (double)s->nb_black_pixels / (inlink->w * inlink->h); av_log(ctx, AV_LOG_DEBUG, "frame:%"PRId64" picture_black_ratio:%f pts:%s t:%s type:%c\n", @@ -158,25 +157,25 @@ static int filter_frame(AVFilterLink *inlink, AVFrame *picref) av_ts2str(picref->pts), av_ts2timestr(picref->pts, &inlink->time_base), av_get_picture_type_char(picref->pict_type)); - if (picture_black_ratio >= blackdetect->picture_black_ratio_th) { - if (!blackdetect->black_started) { + if (picture_black_ratio >= s->picture_black_ratio_th) { + if (!s->black_started) { /* black starts here */ - blackdetect->black_started = 1; - blackdetect->black_start = picref->pts; + s->black_started = 1; + s->black_start = picref->pts; av_dict_set(&picref->metadata, "lavfi.black_start", - av_ts2timestr(blackdetect->black_start, &inlink->time_base), 0); + av_ts2timestr(s->black_start, &inlink->time_base), 0); } - } else if (blackdetect->black_started) { + } else if (s->black_started) { /* black ends here */ - blackdetect->black_started = 0; - blackdetect->black_end = picref->pts; + s->black_started = 0; + s->black_end = picref->pts; check_black_end(ctx); av_dict_set(&picref->metadata, "lavfi.black_end", - av_ts2timestr(blackdetect->black_end, &inlink->time_base), 0); + av_ts2timestr(s->black_end, &inlink->time_base), 0); } - blackdetect->last_picref_pts = picref->pts; - blackdetect->nb_black_pixels = 0; + s->last_picref_pts = picref->pts; + s->nb_black_pixels = 0; return ff_filter_frame(inlink->dst->outputs[0], picref); }

1 0

avcodec/msmpeg4: Inline number of motion vectors
by Andreas Rheinhardt 29 Jan '21

29 Jan '21

ffmpeg | branch: master | Andreas Rheinhardt <andreas.rheinhardt(a)gmail.com> | Tue Jan 26 22:19:19 2021 +0100| [d8b2fae3c73d92608abeaa04402fd05266e29bb2] | committer: Andreas Rheinhardt avcodec/msmpeg4: Inline number of motion vectors Both motion vector tables have the same number of elements, hence one can inline said number and remove the field containing the number of elements from the structure. Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt(a)gmail.com> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=d8b2fae3c73d92608… --- libavcodec/msmpeg4data.c | 6 ++---- libavcodec/msmpeg4data.h | 2 +- libavcodec/msmpeg4dec.c | 6 +++--- libavcodec/msmpeg4enc.c | 6 +++--- 4 files changed, 9 insertions(+), 11 deletions(-) diff --git a/libavcodec/msmpeg4data.c b/libavcodec/msmpeg4data.c index b9c1d8ec0b..fb0c6185bf 100644 --- a/libavcodec/msmpeg4data.c +++ b/libavcodec/msmpeg4data.c @@ -1771,13 +1771,11 @@ static const uint8_t table1_mvy[1099] = { }; MVTable ff_mv_tables[2] = { - { 1099, - table0_mv_code, + { table0_mv_code, table0_mv_bits, table0_mvx, table0_mvy, }, - { 1099, - table1_mv_code, + { table1_mv_code, table1_mv_bits, table1_mvx, table1_mvy, } diff --git a/libavcodec/msmpeg4data.h b/libavcodec/msmpeg4data.h index 02199d0123..68a1d14f55 100644 --- a/libavcodec/msmpeg4data.h +++ b/libavcodec/msmpeg4data.h @@ -37,7 +37,6 @@ /* motion vector table */ typedef struct MVTable { - int n; const uint16_t *table_mv_code; const uint8_t *table_mv_bits; const uint8_t *table_mvx; @@ -69,6 +68,7 @@ extern const uint8_t ff_wmv1_y_dc_scale_table[32]; extern const uint8_t ff_wmv1_c_dc_scale_table[32]; extern const uint8_t ff_old_ff_y_dc_scale_table[32]; +#define MSMPEG4_MV_TABLES_NB_ELEMS 1099 extern MVTable ff_mv_tables[2]; extern const uint8_t ff_v2_mb_type[8][2]; diff --git a/libavcodec/msmpeg4dec.c b/libavcodec/msmpeg4dec.c index 9501b101ca..405fda4b83 100644 --- a/libavcodec/msmpeg4dec.c +++ b/libavcodec/msmpeg4dec.c @@ -321,11 +321,11 @@ av_cold int ff_msmpeg4_decode_init(AVCodecContext *avctx) memcpy(ff_rl_table[5].rl_vlc, ff_h263_rl_inter.rl_vlc, sizeof(ff_rl_table[5].rl_vlc)); mv = &ff_mv_tables[0]; - INIT_VLC_STATIC(&mv->vlc, MV_VLC_BITS, mv->n + 1, + INIT_VLC_STATIC(&mv->vlc, MV_VLC_BITS, MSMPEG4_MV_TABLES_NB_ELEMS + 1, mv->table_mv_bits, 1, 1, mv->table_mv_code, 2, 2, 3714); mv = &ff_mv_tables[1]; - INIT_VLC_STATIC(&mv->vlc, MV_VLC_BITS, mv->n + 1, + INIT_VLC_STATIC(&mv->vlc, MV_VLC_BITS, MSMPEG4_MV_TABLES_NB_ELEMS + 1, mv->table_mv_bits, 1, 1, mv->table_mv_code, 2, 2, 2694); @@ -836,7 +836,7 @@ void ff_msmpeg4_decode_motion(MpegEncContext *s, int *mx_ptr, int *my_ptr) mv = &ff_mv_tables[s->mv_table_index]; code = get_vlc2(&s->gb, mv->vlc.table, MV_VLC_BITS, 2); - if (code == mv->n) { + if (code == MSMPEG4_MV_TABLES_NB_ELEMS) { mx = get_bits(&s->gb, 6); my = get_bits(&s->gb, 6); } else { diff --git a/libavcodec/msmpeg4enc.c b/libavcodec/msmpeg4enc.c index 2c61735d9d..5f809c2aeb 100644 --- a/libavcodec/msmpeg4enc.c +++ b/libavcodec/msmpeg4enc.c @@ -56,9 +56,9 @@ static av_cold int init_mv_table(MVTable *tab) /* mark all entries as not used */ for(i=0;i<4096;i++) - tab->table_mv_index[i] = tab->n; + tab->table_mv_index[i] = MSMPEG4_MV_TABLES_NB_ELEMS; - for(i=0;i<tab->n;i++) { + for (i = 0; i < MSMPEG4_MV_TABLES_NB_ELEMS; i++) { x = tab->table_mvx[i]; y = tab->table_mvy[i]; tab->table_mv_index[(x << 6) | y] = i; @@ -320,7 +320,7 @@ void ff_msmpeg4_encode_motion(MpegEncContext * s, put_bits(&s->pb, mv->table_mv_bits[code], mv->table_mv_code[code]); - if (code == mv->n) { + if (code == MSMPEG4_MV_TABLES_NB_ELEMS) { /* escape : code literally */ put_bits(&s->pb, 6, mx); put_bits(&s->pb, 6, my);

1 0

avcodec/msmpeg4dec: Don't check for errors for complete VLCs
by Andreas Rheinhardt 29 Jan '21

29 Jan '21

ffmpeg | branch: master | Andreas Rheinhardt <andreas.rheinhardt(a)gmail.com> | Tue Jan 26 01:14:45 2021 +0100| [fbb81ea2c615b1189d21ea00127be205db36b342] | committer: Andreas Rheinhardt avcodec/msmpeg4dec: Don't check for errors for complete VLCs This also affected other users of VLCs from msmpeg4dec, namely vc1_block and wmv2dec. Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt(a)gmail.com> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=fbb81ea2c615b1189… --- libavcodec/msmpeg4.h | 2 +- libavcodec/msmpeg4dec.c | 20 ++------------------ libavcodec/vc1_block.c | 12 ------------ libavcodec/wmv2dec.c | 20 +++----------------- 4 files changed, 6 insertions(+), 48 deletions(-) diff --git a/libavcodec/msmpeg4.h b/libavcodec/msmpeg4.h index bcdb967401..f9c63b5022 100644 --- a/libavcodec/msmpeg4.h +++ b/libavcodec/msmpeg4.h @@ -59,7 +59,7 @@ void ff_msmpeg4_encode_mb(MpegEncContext *s, int16_t block[6][64], int ff_msmpeg4_decode_init(AVCodecContext *avctx); int ff_msmpeg4_decode_picture_header(MpegEncContext *s); int ff_msmpeg4_decode_ext_header(MpegEncContext *s, int buf_size); -int ff_msmpeg4_decode_motion(MpegEncContext * s, int *mx_ptr, int *my_ptr); +void ff_msmpeg4_decode_motion(MpegEncContext * s, int *mx_ptr, int *my_ptr); int ff_msmpeg4_decode_block(MpegEncContext * s, int16_t * block, int n, int coded, const uint8_t *scan_table); int ff_msmpeg4_pred_dc(MpegEncContext *s, int n, diff --git a/libavcodec/msmpeg4dec.c b/libavcodec/msmpeg4dec.c index d059e8eecc..9501b101ca 100644 --- a/libavcodec/msmpeg4dec.c +++ b/libavcodec/msmpeg4dec.c @@ -228,8 +228,6 @@ static int msmpeg4v34_decode_mb(MpegEncContext *s, int16_t block[6][64]) } code = get_vlc2(&s->gb, ff_mb_non_intra_vlc[DEFAULT_INTER_INDEX].table, MB_NON_INTRA_VLC_BITS, 3); - if (code < 0) - return -1; //s->mb_intra = (code & 0x40) ? 0 : 1; s->mb_intra = (~code & 0x40) >> 6; @@ -237,8 +235,6 @@ static int msmpeg4v34_decode_mb(MpegEncContext *s, int16_t block[6][64]) } else { s->mb_intra = 1; code = get_vlc2(&s->gb, ff_msmp4_mb_i_vlc.table, MB_INTRA_VLC_BITS, 2); - if (code < 0) - return -1; /* predict coded block pattern */ cbp = 0; for(i=0;i<6;i++) { @@ -259,8 +255,7 @@ static int msmpeg4v34_decode_mb(MpegEncContext *s, int16_t block[6][64]) s->rl_chroma_table_index = s->rl_table_index; } ff_h263_pred_motion(s, 0, 0, &mx, &my); - if (ff_msmpeg4_decode_motion(s, &mx, &my) < 0) - return -1; + ff_msmpeg4_decode_motion(s, &mx, &my); s->mv_dir = MV_DIR_FORWARD; s->mv_type = MV_TYPE_16X16; s->mv[0][0][0] = mx; @@ -612,11 +607,6 @@ static int msmpeg4_decode_dc(MpegEncContext * s, int n, int *dir_ptr) } else { level = get_vlc2(&s->gb, ff_msmp4_dc_chroma_vlc[s->dc_table_index].table, DC_VLC_BITS, 3); } - if (level < 0){ - av_log(s->avctx, AV_LOG_ERROR, "illegal dc vlc\n"); - *dir_ptr = 0; - return -1; - } if (level == DC_MAX) { level = get_bits(&s->gb, 8); @@ -838,8 +828,7 @@ int ff_msmpeg4_decode_block(MpegEncContext * s, int16_t * block, return 0; } -int ff_msmpeg4_decode_motion(MpegEncContext * s, - int *mx_ptr, int *my_ptr) +void ff_msmpeg4_decode_motion(MpegEncContext *s, int *mx_ptr, int *my_ptr) { MVTable *mv; int code, mx, my; @@ -847,10 +836,6 @@ int ff_msmpeg4_decode_motion(MpegEncContext * s, mv = &ff_mv_tables[s->mv_table_index]; code = get_vlc2(&s->gb, mv->vlc.table, MV_VLC_BITS, 2); - if (code < 0){ - av_log(s->avctx, AV_LOG_ERROR, "illegal MV code at %d %d\n", s->mb_x, s->mb_y); - return -1; - } if (code == mv->n) { mx = get_bits(&s->gb, 6); my = get_bits(&s->gb, 6); @@ -873,7 +858,6 @@ int ff_msmpeg4_decode_motion(MpegEncContext * s, my -= 64; *mx_ptr = mx; *my_ptr = my; - return 0; } AVCodec ff_msmpeg4v1_decoder = { diff --git a/libavcodec/vc1_block.c b/libavcodec/vc1_block.c index 5c33170933..b6ace37658 100644 --- a/libavcodec/vc1_block.c +++ b/libavcodec/vc1_block.c @@ -592,10 +592,6 @@ static int vc1_decode_i_block(VC1Context *v, int16_t block[64], int n, } else { dcdiff = get_vlc2(&s->gb, ff_msmp4_dc_chroma_vlc[s->dc_table_index].table, DC_VLC_BITS, 3); } - if (dcdiff < 0) { - av_log(s->avctx, AV_LOG_ERROR, "Illegal DC VLC\n"); - return -1; - } if (dcdiff) { const int m = (v->pq == 1 || v->pq == 2) ? 3 - v->pq : 0; if (dcdiff == 119 /* ESC index value */) { @@ -740,10 +736,6 @@ static int vc1_decode_i_block_adv(VC1Context *v, int16_t block[64], int n, } else { dcdiff = get_vlc2(&s->gb, ff_msmp4_dc_chroma_vlc[s->dc_table_index].table, DC_VLC_BITS, 3); } - if (dcdiff < 0) { - av_log(s->avctx, AV_LOG_ERROR, "Illegal DC VLC\n"); - return -1; - } if (dcdiff) { const int m = (quant == 1 || quant == 2) ? 3 - quant : 0; if (dcdiff == 119 /* ESC index value */) { @@ -944,10 +936,6 @@ static int vc1_decode_intra_block(VC1Context *v, int16_t block[64], int n, } else { dcdiff = get_vlc2(&s->gb, ff_msmp4_dc_chroma_vlc[s->dc_table_index].table, DC_VLC_BITS, 3); } - if (dcdiff < 0) { - av_log(s->avctx, AV_LOG_ERROR, "Illegal DC VLC\n"); - return -1; - } if (dcdiff) { const int m = (quant == 1 || quant == 2) ? 3 - quant : 0; if (dcdiff == 119 /* ESC index value */) { diff --git a/libavcodec/wmv2dec.c b/libavcodec/wmv2dec.c index a16c4465f0..7aae11568c 100644 --- a/libavcodec/wmv2dec.c +++ b/libavcodec/wmv2dec.c @@ -278,22 +278,16 @@ int ff_wmv2_decode_secondary_picture_header(MpegEncContext *s) return 0; } -static inline int wmv2_decode_motion(Wmv2Context *w, int *mx_ptr, int *my_ptr) +static inline void wmv2_decode_motion(Wmv2Context *w, int *mx_ptr, int *my_ptr) { MpegEncContext *const s = &w->s; - int ret; - - ret = ff_msmpeg4_decode_motion(s, mx_ptr, my_ptr); - if (ret < 0) - return ret; + ff_msmpeg4_decode_motion(s, mx_ptr, my_ptr); if ((((*mx_ptr) | (*my_ptr)) & 1) && s->mspel) w->hshift = get_bits1(&s->gb); else w->hshift = 0; - - return 0; } static int16_t *wmv2_pred_motion(Wmv2Context *w, int *px, int *py) @@ -409,8 +403,6 @@ int ff_wmv2_decode_mb(MpegEncContext *s, int16_t block[6][64]) code = get_vlc2(&s->gb, ff_mb_non_intra_vlc[w->cbp_table_index].table, MB_NON_INTRA_VLC_BITS, 3); - if (code < 0) - return AVERROR_INVALIDDATA; s->mb_intra = (~code & 0x40) >> 6; cbp = code & 0x3f; @@ -419,11 +411,6 @@ int ff_wmv2_decode_mb(MpegEncContext *s, int16_t block[6][64]) if (get_bits_left(&s->gb) <= 0) return AVERROR_INVALIDDATA; code = get_vlc2(&s->gb, ff_msmp4_mb_i_vlc.table, MB_INTRA_VLC_BITS, 2); - if (code < 0) { - av_log(s->avctx, AV_LOG_ERROR, - "II-cbp illegal at %d %d\n", s->mb_x, s->mb_y); - return AVERROR_INVALIDDATA; - } /* predict coded block pattern */ cbp = 0; for (i = 0; i < 6; i++) { @@ -456,8 +443,7 @@ int ff_wmv2_decode_mb(MpegEncContext *s, int16_t block[6][64]) w->per_block_abt = 0; } - if ((ret = wmv2_decode_motion(w, &mx, &my)) < 0) - return ret; + wmv2_decode_motion(w, &mx, &my); s->mv_dir = MV_DIR_FORWARD; s->mv_type = MV_TYPE_16X16;

1 0

avformat: Change avpriv_new_chapter() from O(n) to (1) in the common case
by Michael Niedermayer 28 Jan '21

28 Jan '21

ffmpeg | branch: master | Michael Niedermayer <michael(a)niedermayer.cc> | Wed Jan 6 23:24:49 2021 +0100| [a899d6ca101d0ed735e13dc4c57b0b8fc0465d37] | committer: Michael Niedermayer avformat: Change avpriv_new_chapter() from O(n) to (1) in the common case Fixes: timeout (slow -> 300ms) Fixes: 28876/clusterfuzz-testcase-minimized-ffmpeg_dem_MOV_fuzzer-5664824587583488 Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg Signed-off-by: Michael Niedermayer <michael(a)niedermayer.cc> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=a899d6ca101d0ed73… --- libavformat/internal.h | 5 +++++ libavformat/utils.c | 11 ++++++++--- 2 files changed, 13 insertions(+), 3 deletions(-) diff --git a/libavformat/internal.h b/libavformat/internal.h index 49e82bfbca..f45b1cd6b4 100644 --- a/libavformat/internal.h +++ b/libavformat/internal.h @@ -142,6 +142,11 @@ struct AVFormatInternal { * Prefer the codec framerate for avg_frame_rate computation. */ int prefer_codec_framerate; + + /** + * Set if chapter ids are strictly monotonic. + */ + int chapter_ids_monotonic; }; struct AVStreamInternal { diff --git a/libavformat/utils.c b/libavformat/utils.c index 1ec71691e5..9dab4fc96f 100644 --- a/libavformat/utils.c +++ b/libavformat/utils.c @@ -4614,9 +4614,14 @@ AVChapter *avpriv_new_chapter(AVFormatContext *s, int id, AVRational time_base, return NULL; } - for (i = 0; i < s->nb_chapters; i++) - if (s->chapters[i]->id == id) - chapter = s->chapters[i]; + if (!s->nb_chapters) { + s->internal->chapter_ids_monotonic = 1; + } else if (!s->internal->chapter_ids_monotonic || s->chapters[s->nb_chapters-1]->id >= id) { + s->internal->chapter_ids_monotonic = 0; + for (i = 0; i < s->nb_chapters; i++) + if (s->chapters[i]->id == id) + chapter = s->chapters[i]; + } if (!chapter) { chapter = av_mallocz(sizeof(AVChapter));

1 0

avformat/nuv: Check channels
by Michael Niedermayer 28 Jan '21

28 Jan '21

ffmpeg | branch: master | Michael Niedermayer <michael(a)niedermayer.cc> | Wed Jan 6 23:42:39 2021 +0100| [fc45d924d7ff6be80e90870540ba35efc290e428] | committer: Michael Niedermayer avformat/nuv: Check channels Fixes: signed integer overflow: -3468545475927866368 * 4 cannot be represented in type 'long' Fixes: 28879/clusterfuzz-testcase-minimized-ffmpeg_dem_NUV_fuzzer-6303367307591680 Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg Signed-off-by: Michael Niedermayer <michael(a)niedermayer.cc> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=fc45d924d7ff6be80… --- libavformat/nuv.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/libavformat/nuv.c b/libavformat/nuv.c index d99770d41d..df90df4938 100644 --- a/libavformat/nuv.c +++ b/libavformat/nuv.c @@ -117,6 +117,10 @@ static int get_codec_data(AVFormatContext *s, AVIOContext *pb, AVStream *vst, ast->codecpar->bits_per_coded_sample = avio_rl32(pb); ast->codecpar->channels = avio_rl32(pb); ast->codecpar->channel_layout = 0; + if (ast->codecpar->channels <= 0) { + av_log(s, AV_LOG_ERROR, "Invalid channels %d\n", ast->codecpar->channels); + return AVERROR_INVALIDDATA; + } id = ff_wav_codec_get_id(ast->codecpar->codec_tag, ast->codecpar->bits_per_coded_sample);

1 0

avcodec/siren: Increase noise category 5 and 6
by Michael Niedermayer 28 Jan '21

28 Jan '21

ffmpeg | branch: master | Michael Niedermayer <michael(a)niedermayer.cc> | Thu Dec 24 22:16:48 2020 +0100| [f3e4ebb00790312634e42bdd3f80ffbe34ce32e5] | committer: Michael Niedermayer avcodec/siren: Increase noise category 5 and 6 The entry read is not used in subsequent computation, thus its value is not important. Fixes: out of array read Fixes: 28578/clusterfuzz-testcase-minimized-ffmpeg_AV_CODEC_ID_SIREN_fuzzer-6332019122503680 Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg Signed-off-by: Michael Niedermayer <michael(a)niedermayer.cc> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=f3e4ebb0079031263… --- libavcodec/siren.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/libavcodec/siren.c b/libavcodec/siren.c index 6c7a8e8b34..22b6997176 100644 --- a/libavcodec/siren.c +++ b/libavcodec/siren.c @@ -342,12 +342,12 @@ static const float mlt_quant[7][14] = { { 0.0f, 1.964f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f } }; -static const float noise_category5[20] = { +static const float noise_category5[21] = { 0.70711f, 0.6179f, 0.5005f, 0.3220f, 0.17678f, 0.17678f, 0.17678f, 0.17678f, 0.17678f, 0.17678f, 0.17678f, 0.17678f, 0.17678f, 0.17678f, 0.17678f, 0.17678f, 0.17678f, 0.17678f, 0.17678f, 0.17678f }; -static const float noise_category6[20] = { +static const float noise_category6[21] = { 0.70711f, 0.5686f, 0.3563f, 0.25f, 0.25f, 0.25f, 0.25f, 0.25f, 0.25f, 0.25f, 0.25f, 0.25f, 0.25f, 0.25f, 0.25f, 0.25f, 0.25f, 0.25f, 0.25f, 0.25f };

1 0

avcodec/siren: Factorize category 5 and 6 noise computation
by Michael Niedermayer 28 Jan '21

28 Jan '21

ffmpeg | branch: master | Michael Niedermayer <michael(a)niedermayer.cc> | Thu Dec 24 22:13:56 2020 +0100| [e847cabb60a29c354512664022ad6833a907bf1b] | committer: Michael Niedermayer avcodec/siren: Factorize category 5 and 6 noise computation Signed-off-by: Michael Niedermayer <michael(a)niedermayer.cc> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=e847cabb60a29c354… --- libavcodec/siren.c | 15 +++++---------- 1 file changed, 5 insertions(+), 10 deletions(-) diff --git a/libavcodec/siren.c b/libavcodec/siren.c index 2d72fb9572..6c7a8e8b34 100644 --- a/libavcodec/siren.c +++ b/libavcodec/siren.c @@ -625,7 +625,7 @@ static int decode_vector(SirenContext *s, int number_of_regions, coefs_ptr = coefs + (region * REGION_SIZE); - if (category == 5) { + if (category == 5 || category == 6) { i = 0; for (j = 0; j < REGION_SIZE; j++) { if (*coefs_ptr != 0) @@ -633,15 +633,10 @@ static int decode_vector(SirenContext *s, int number_of_regions, coefs_ptr++; } - noise = decoder_standard_deviation[region] * noise_category5[i]; - } else if (category == 6) { - i = 0; - for (j = 0; j < REGION_SIZE; j++) { - if (*coefs_ptr++ != 0) - i++; - } - - noise = decoder_standard_deviation[region] * noise_category6[i]; + if (category == 5) { + noise = decoder_standard_deviation[region] * noise_category5[i]; + } else + noise = decoder_standard_deviation[region] * noise_category6[i]; } else if (category == 7) { noise = decoder_standard_deviation[region] * 0.70711f; } else {

1 0