X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=libavfilter%2Fvf_histogram.c;h=ed6892bc8ba6a2cd945d3abb8ca32876df6d563c;hb=ef6a9e5e311f09fa8032974fa4d0c1e166a959bb;hp=5185992de60a6bec8360b16353d95c8adfffd5d5;hpb=9a88a47be4da9cd25a582feec7cc36790500b481;p=ffmpeg diff --git a/libavfilter/vf_histogram.c b/libavfilter/vf_histogram.c index 5185992de60..ed6892bc8ba 100644 --- a/libavfilter/vf_histogram.c +++ b/libavfilter/vf_histogram.c @@ -1,5 +1,5 @@ /* - * Copyright (c) 2012-2013 Paul B Mahol + * Copyright (c) 2012-2019 Paul B Mahol * * This file is part of FFmpeg. * @@ -19,6 +19,7 @@ */ #include "libavutil/avassert.h" +#include "libavutil/colorspace.h" #include "libavutil/opt.h" #include "libavutil/parseutils.h" #include "libavutil/pixdesc.h" @@ -31,13 +32,20 @@ typedef struct HistogramContext { const AVClass *class; ///< AVClass context for log and options purpose + int thistogram; + int envelope; + int slide; unsigned histogram[256*256]; int histogram_size; + int width; + int x_pos; int mult; int ncomp; int dncomp; uint8_t bg_color[4]; uint8_t fg_color[4]; + uint8_t envelope_rgba[4]; + uint8_t envelope_color[4]; int level_height; int scale_height; int display_mode; @@ -48,25 +56,30 @@ typedef struct HistogramContext { float bgopacity; int planewidth[4]; int planeheight[4]; + int start[4]; + AVFrame *out; } HistogramContext; #define OFFSET(x) offsetof(HistogramContext, x) #define FLAGS AV_OPT_FLAG_FILTERING_PARAM|AV_OPT_FLAG_VIDEO_PARAM +#define COMMON_OPTIONS \ + { "display_mode", "set display mode", OFFSET(display_mode), AV_OPT_TYPE_INT, {.i64=2}, 0, 2, FLAGS, "display_mode"}, \ + { "d", "set display mode", OFFSET(display_mode), AV_OPT_TYPE_INT, {.i64=2}, 0, 2, FLAGS, "display_mode"}, \ + { "overlay", NULL, 0, AV_OPT_TYPE_CONST, {.i64=0}, 0, 0, FLAGS, "display_mode" }, \ + { "parade", NULL, 0, AV_OPT_TYPE_CONST, {.i64=1}, 0, 0, FLAGS, "display_mode" }, \ + { "stack", NULL, 0, AV_OPT_TYPE_CONST, {.i64=2}, 0, 0, FLAGS, "display_mode" }, \ + { "levels_mode", "set levels mode", OFFSET(levels_mode), AV_OPT_TYPE_INT, {.i64=0}, 0, 1, FLAGS, "levels_mode"}, \ + { "m", "set levels mode", OFFSET(levels_mode), AV_OPT_TYPE_INT, {.i64=0}, 0, 1, FLAGS, "levels_mode"}, \ + { "linear", NULL, 0, AV_OPT_TYPE_CONST, {.i64=0}, 0, 0, FLAGS, "levels_mode" }, \ + { "logarithmic", NULL, 0, AV_OPT_TYPE_CONST, {.i64=1}, 0, 0, FLAGS, "levels_mode" }, \ + { "components", "set color components to display", OFFSET(components), AV_OPT_TYPE_INT, {.i64=7}, 1, 15, FLAGS}, \ + { "c", "set color components to display", OFFSET(components), AV_OPT_TYPE_INT, {.i64=7}, 1, 15, FLAGS}, + static const AVOption histogram_options[] = { { "level_height", "set level height", OFFSET(level_height), AV_OPT_TYPE_INT, {.i64=200}, 50, 2048, FLAGS}, { "scale_height", "set scale height", OFFSET(scale_height), AV_OPT_TYPE_INT, {.i64=12}, 0, 40, FLAGS}, - { "display_mode", "set display mode", OFFSET(display_mode), AV_OPT_TYPE_INT, {.i64=2}, 0, 2, FLAGS, "display_mode"}, - { "d", "set display mode", OFFSET(display_mode), AV_OPT_TYPE_INT, {.i64=2}, 0, 2, FLAGS, "display_mode"}, - { "overlay", NULL, 0, AV_OPT_TYPE_CONST, {.i64=0}, 0, 0, FLAGS, "display_mode" }, - { "parade", NULL, 0, AV_OPT_TYPE_CONST, {.i64=1}, 0, 0, FLAGS, "display_mode" }, - { "stack", NULL, 0, AV_OPT_TYPE_CONST, {.i64=2}, 0, 0, FLAGS, "display_mode" }, - { "levels_mode", "set levels mode", OFFSET(levels_mode), AV_OPT_TYPE_INT, {.i64=0}, 0, 1, FLAGS, "levels_mode"}, - { "m", "set levels mode", OFFSET(levels_mode), AV_OPT_TYPE_INT, {.i64=0}, 0, 1, FLAGS, "levels_mode"}, - { "linear", NULL, 0, AV_OPT_TYPE_CONST, {.i64=0}, 0, 0, FLAGS, "levels_mode" }, - { "logarithmic", NULL, 0, AV_OPT_TYPE_CONST, {.i64=1}, 0, 0, FLAGS, "levels_mode" }, - { "components", "set color components to display", OFFSET(components), AV_OPT_TYPE_INT, {.i64=7}, 1, 15, FLAGS}, - { "c", "set color components to display", OFFSET(components), AV_OPT_TYPE_INT, {.i64=7}, 1, 15, FLAGS}, + COMMON_OPTIONS { "fgopacity", "set foreground opacity", OFFSET(fgopacity), AV_OPT_TYPE_FLOAT, {.dbl=0.7}, 0, 1, FLAGS}, { "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}, @@ -87,6 +100,7 @@ static const enum AVPixelFormat levels_in_pix_fmts[] = { AV_PIX_FMT_YUV420P10, AV_PIX_FMT_YUV422P10, AV_PIX_FMT_YUV444P10, AV_PIX_FMT_YUVA420P10, AV_PIX_FMT_YUVA422P10, AV_PIX_FMT_YUVA444P10, AV_PIX_FMT_YUV420P12, AV_PIX_FMT_YUV422P12, AV_PIX_FMT_YUV444P12, AV_PIX_FMT_YUV440P12, + AV_PIX_FMT_YUVA422P12, AV_PIX_FMT_YUVA444P12, AV_PIX_FMT_GBRAP, AV_PIX_FMT_GBRP, AV_PIX_FMT_GBRP9, AV_PIX_FMT_GBRP10, AV_PIX_FMT_GBRAP10, AV_PIX_FMT_GBRP12, AV_PIX_FMT_GBRAP12, @@ -110,7 +124,7 @@ static const enum AVPixelFormat levels_out_yuv10_pix_fmts[] = { }; static const enum AVPixelFormat levels_out_yuv12_pix_fmts[] = { - AV_PIX_FMT_YUV444P12, + AV_PIX_FMT_YUVA444P12, AV_PIX_FMT_YUV444P12, AV_PIX_FMT_NONE }; @@ -142,15 +156,15 @@ static int query_formats(AVFilterContext *ctx) int rgb, i, bits; int ret; - if (!ctx->inputs[0]->in_formats || - !ctx->inputs[0]->in_formats->nb_formats) { + if (!ctx->inputs[0]->incfg.formats || + !ctx->inputs[0]->incfg.formats->nb_formats) { return AVERROR(EAGAIN); } - if (!ctx->inputs[0]->out_formats) - if ((ret = ff_formats_ref(ff_make_format_list(levels_in_pix_fmts), &ctx->inputs[0]->out_formats)) < 0) + if (!ctx->inputs[0]->outcfg.formats) + if ((ret = ff_formats_ref(ff_make_format_list(levels_in_pix_fmts), &ctx->inputs[0]->outcfg.formats)) < 0) return ret; - avff = ctx->inputs[0]->in_formats; + avff = ctx->inputs[0]->incfg.formats; desc = av_pix_fmt_desc_get(avff->formats[0]); rgb = desc->flags & AV_PIX_FMT_FLAG_RGB; bits = desc->comp[0].depth; @@ -179,7 +193,7 @@ static int query_formats(AVFilterContext *ctx) out_pix_fmts = levels_out_yuv12_pix_fmts; else return AVERROR(EAGAIN); - if ((ret = ff_formats_ref(ff_make_format_list(out_pix_fmts), &ctx->outputs[0]->in_formats)) < 0) + if ((ret = ff_formats_ref(ff_make_format_list(out_pix_fmts), &ctx->outputs[0]->incfg.formats)) < 0) return ret; return 0; @@ -192,12 +206,12 @@ static const uint8_t white_gbrp_color[4] = { 255, 255, 255, 255 }; static int config_input(AVFilterLink *inlink) { - HistogramContext *h = inlink->dst->priv; + HistogramContext *s = inlink->dst->priv; - h->desc = av_pix_fmt_desc_get(inlink->format); - h->ncomp = h->desc->nb_components; - h->histogram_size = 1 << h->desc->comp[0].depth; - h->mult = h->histogram_size / 256; + s->desc = av_pix_fmt_desc_get(inlink->format); + s->ncomp = s->desc->nb_components; + s->histogram_size = 1 << s->desc->comp[0].depth; + s->mult = s->histogram_size / 256; switch (inlink->format) { case AV_PIX_FMT_GBRAP12: @@ -207,21 +221,29 @@ static int config_input(AVFilterLink *inlink) case AV_PIX_FMT_GBRP9: case AV_PIX_FMT_GBRAP: case AV_PIX_FMT_GBRP: - memcpy(h->bg_color, black_gbrp_color, 4); - memcpy(h->fg_color, white_gbrp_color, 4); + memcpy(s->bg_color, black_gbrp_color, 4); + memcpy(s->fg_color, white_gbrp_color, 4); + s->start[0] = s->start[1] = s->start[2] = s->start[3] = 0; + memcpy(s->envelope_color, s->envelope_rgba, 4); break; default: - memcpy(h->bg_color, black_yuva_color, 4); - memcpy(h->fg_color, white_yuva_color, 4); + memcpy(s->bg_color, black_yuva_color, 4); + memcpy(s->fg_color, white_yuva_color, 4); + s->start[0] = s->start[3] = 0; + s->start[1] = s->start[2] = s->histogram_size / 2; + s->envelope_color[0] = RGB_TO_Y_BT709(s->envelope_rgba[0], s->envelope_rgba[1], s->envelope_rgba[2]); + s->envelope_color[1] = RGB_TO_U_BT709(s->envelope_rgba[0], s->envelope_rgba[1], s->envelope_rgba[2], 0); + s->envelope_color[2] = RGB_TO_V_BT709(s->envelope_rgba[0], s->envelope_rgba[1], s->envelope_rgba[2], 0); + s->envelope_color[3] = s->envelope_rgba[3]; } - h->fg_color[3] = h->fgopacity * 255; - h->bg_color[3] = h->bgopacity * 255; + s->fg_color[3] = s->fgopacity * 255; + s->bg_color[3] = s->bgopacity * 255; - h->planeheight[1] = h->planeheight[2] = AV_CEIL_RSHIFT(inlink->h, h->desc->log2_chroma_h); - h->planeheight[0] = h->planeheight[3] = inlink->h; - h->planewidth[1] = h->planewidth[2] = AV_CEIL_RSHIFT(inlink->w, h->desc->log2_chroma_w); - h->planewidth[0] = h->planewidth[3] = inlink->w; + s->planeheight[1] = s->planeheight[2] = AV_CEIL_RSHIFT(inlink->h, s->desc->log2_chroma_h); + s->planeheight[0] = s->planeheight[3] = inlink->h; + s->planewidth[1] = s->planewidth[2] = AV_CEIL_RSHIFT(inlink->w, s->desc->log2_chroma_w); + s->planewidth[0] = s->planewidth[3] = inlink->w; return 0; } @@ -229,18 +251,29 @@ static int config_input(AVFilterLink *inlink) static int config_output(AVFilterLink *outlink) { AVFilterContext *ctx = outlink->src; - HistogramContext *h = ctx->priv; + HistogramContext *s = ctx->priv; int ncomp = 0, i; - for (i = 0; i < h->ncomp; i++) { - if ((1 << i) & h->components) + if (!strcmp(ctx->filter->name, "thistogram")) + s->thistogram = 1; + + for (i = 0; i < s->ncomp; i++) { + if ((1 << i) & s->components) ncomp++; } - outlink->w = h->histogram_size * FFMAX(ncomp * (h->display_mode == 1), 1); - outlink->h = (h->level_height + h->scale_height) * FFMAX(ncomp * (h->display_mode == 2), 1); - h->odesc = av_pix_fmt_desc_get(outlink->format); - h->dncomp = h->odesc->nb_components; + if (s->thistogram) { + if (!s->width) + s->width = ctx->inputs[0]->w; + outlink->w = s->width * FFMAX(ncomp * (s->display_mode == 1), 1); + outlink->h = s->histogram_size * FFMAX(ncomp * (s->display_mode == 2), 1); + } else { + outlink->w = s->histogram_size * FFMAX(ncomp * (s->display_mode == 1), 1); + outlink->h = (s->level_height + s->scale_height) * FFMAX(ncomp * (s->display_mode == 2), 1); + } + + s->odesc = av_pix_fmt_desc_get(outlink->format); + s->dncomp = s->odesc->nb_components; outlink->sample_aspect_ratio = (AVRational){1,1}; return 0; @@ -248,111 +281,204 @@ static int config_output(AVFilterLink *outlink) static int filter_frame(AVFilterLink *inlink, AVFrame *in) { - HistogramContext *h = inlink->dst->priv; + HistogramContext *s = inlink->dst->priv; AVFilterContext *ctx = inlink->dst; AVFilterLink *outlink = ctx->outputs[0]; - AVFrame *out; + AVFrame *out = s->out; int i, j, k, l, m; - out = ff_get_video_buffer(outlink, outlink->w, outlink->h); - if (!out) { - av_frame_free(&in); - return AVERROR(ENOMEM); - } - - out->pts = in->pts; - - for (k = 0; k < 4 && out->data[k]; k++) { - const int is_chroma = (k == 1 || k == 2); - const int dst_h = AV_CEIL_RSHIFT(outlink->h, (is_chroma ? h->odesc->log2_chroma_h : 0)); - const int dst_w = AV_CEIL_RSHIFT(outlink->w, (is_chroma ? h->odesc->log2_chroma_w : 0)); - - if (h->histogram_size <= 256) { - for (i = 0; i < dst_h ; i++) - memset(out->data[h->odesc->comp[k].plane] + - i * out->linesize[h->odesc->comp[k].plane], - h->bg_color[k], dst_w); - } else { - const int mult = h->mult; + if (!s->thistogram || !out) { + out = ff_get_video_buffer(outlink, outlink->w, outlink->h); + if (!out) { + av_frame_free(&in); + return AVERROR(ENOMEM); + } + s->out = out; + + for (k = 0; k < 4 && out->data[k]; k++) { + const int is_chroma = (k == 1 || k == 2); + const int dst_h = AV_CEIL_RSHIFT(outlink->h, (is_chroma ? s->odesc->log2_chroma_h : 0)); + const int dst_w = AV_CEIL_RSHIFT(outlink->w, (is_chroma ? s->odesc->log2_chroma_w : 0)); + + if (s->histogram_size <= 256) { + for (i = 0; i < dst_h ; i++) + memset(out->data[s->odesc->comp[k].plane] + + i * out->linesize[s->odesc->comp[k].plane], + s->bg_color[k], dst_w); + } else { + const int mult = s->mult; - for (i = 0; i < dst_h ; i++) - for (j = 0; j < dst_w; j++) - AV_WN16(out->data[h->odesc->comp[k].plane] + - i * out->linesize[h->odesc->comp[k].plane] + j * 2, - h->bg_color[k] * mult); + for (i = 0; i < dst_h ; i++) + for (j = 0; j < dst_w; j++) + AV_WN16(out->data[s->odesc->comp[k].plane] + + i * out->linesize[s->odesc->comp[k].plane] + j * 2, + s->bg_color[k] * mult); + } } } - for (m = 0, k = 0; k < h->ncomp; k++) { - const int p = h->desc->comp[k].plane; - const int height = h->planeheight[p]; - const int width = h->planewidth[p]; + for (m = 0, k = 0; k < s->ncomp; k++) { + const int p = s->desc->comp[k].plane; + const int max_value = s->histogram_size - 1 - s->start[p]; + const int height = s->planeheight[p]; + const int width = s->planewidth[p]; double max_hval_log; unsigned max_hval = 0; - int start, startx; + int starty, startx; - if (!((1 << k) & h->components)) + if (!((1 << k) & s->components)) continue; - startx = m * h->histogram_size * (h->display_mode == 1); - start = m++ * (h->level_height + h->scale_height) * (h->display_mode == 2); + if (s->thistogram) { + starty = m * s->histogram_size * (s->display_mode == 2); + startx = m++ * s->width * (s->display_mode == 1); + } else { + startx = m * s->histogram_size * (s->display_mode == 1); + starty = m++ * (s->level_height + s->scale_height) * (s->display_mode == 2); + } - if (h->histogram_size <= 256) { + if (s->histogram_size <= 256) { for (i = 0; i < height; i++) { const uint8_t *src = in->data[p] + i * in->linesize[p]; for (j = 0; j < width; j++) - h->histogram[src[j]]++; + s->histogram[src[j]]++; } } else { for (i = 0; i < height; i++) { const uint16_t *src = (const uint16_t *)(in->data[p] + i * in->linesize[p]); for (j = 0; j < width; j++) - h->histogram[src[j]]++; + s->histogram[src[j]]++; } } - for (i = 0; i < h->histogram_size; i++) - max_hval = FFMAX(max_hval, h->histogram[i]); + for (i = 0; i < s->histogram_size; i++) + max_hval = FFMAX(max_hval, s->histogram[i]); max_hval_log = log2(max_hval + 1); - for (i = 0; i < h->histogram_size; i++) { - int col_height; - - if (h->levels_mode) - col_height = lrint(h->level_height * (1. - (log2(h->histogram[i] + 1) / max_hval_log))); - else - col_height = h->level_height - (h->histogram[i] * (int64_t)h->level_height + max_hval - 1) / max_hval; - - if (h->histogram_size <= 256) { - for (j = h->level_height - 1; j >= col_height; j--) { - if (h->display_mode) { - for (l = 0; l < h->dncomp; l++) - out->data[l][(j + start) * out->linesize[l] + startx + i] = h->fg_color[l]; - } else { - out->data[p][(j + start) * out->linesize[p] + startx + i] = 255; + if (s->thistogram) { + const int bpp = 1 + (s->histogram_size > 256); + int minh = s->histogram_size - 1, maxh = 0; + + if (s->slide == 2) { + s->x_pos = out->width - 1; + for (j = 0; j < outlink->h; j++) { + memmove(out->data[p] + j * out->linesize[p] , + out->data[p] + j * out->linesize[p] + bpp, + (outlink->w - 1) * bpp); + } + } else if (s->slide == 3) { + s->x_pos = 0; + for (j = 0; j < outlink->h; j++) { + memmove(out->data[p] + j * out->linesize[p] + bpp, + out->data[p] + j * out->linesize[p], + (outlink->w - 1) * bpp); + } + } + + for (int i = 0; i < s->histogram_size; i++) { + int idx = s->histogram_size - i - 1; + int value = s->start[p]; + + if (s->envelope && s->histogram[idx]) { + minh = FFMIN(minh, i); + maxh = FFMAX(maxh, i); + } + + if (s->levels_mode) + value += lrint(max_value * (log2(s->histogram[idx] + 1) / max_hval_log)); + else + value += lrint(max_value * s->histogram[idx] / (float)max_hval); + + if (s->histogram_size <= 256) { + s->out->data[p][(i + starty) * s->out->linesize[p] + startx + s->x_pos] = value; + } else { + AV_WN16(s->out->data[p] + (i + starty) * s->out->linesize[p] + startx * 2 + s->x_pos * 2, value); + } + } + + if (s->envelope) { + if (s->histogram_size <= 256) { + s->out->data[0][(minh + starty) * s->out->linesize[p] + startx + s->x_pos] = s->envelope_color[0]; + s->out->data[0][(maxh + starty) * s->out->linesize[p] + startx + s->x_pos] = s->envelope_color[0]; + if (s->dncomp >= 3) { + s->out->data[1][(minh + starty) * s->out->linesize[p] + startx + s->x_pos] = s->envelope_color[1]; + s->out->data[2][(minh + starty) * s->out->linesize[p] + startx + s->x_pos] = s->envelope_color[2]; + s->out->data[1][(maxh + starty) * s->out->linesize[p] + startx + s->x_pos] = s->envelope_color[1]; + s->out->data[2][(maxh + starty) * s->out->linesize[p] + startx + s->x_pos] = s->envelope_color[2]; + } + } else { + const int mult = s->mult; + + AV_WN16(s->out->data[0] + (minh + starty) * s->out->linesize[p] + startx * 2 + s->x_pos * 2, s->envelope_color[0] * mult); + AV_WN16(s->out->data[0] + (maxh + starty) * s->out->linesize[p] + startx * 2 + s->x_pos * 2, s->envelope_color[0] * mult); + if (s->dncomp >= 3) { + AV_WN16(s->out->data[1] + (minh + starty) * s->out->linesize[p] + startx * 2 + s->x_pos * 2, s->envelope_color[1] * mult); + AV_WN16(s->out->data[2] + (minh + starty) * s->out->linesize[p] + startx * 2 + s->x_pos * 2, s->envelope_color[2] * mult); + AV_WN16(s->out->data[1] + (maxh + starty) * s->out->linesize[p] + startx * 2 + s->x_pos * 2, s->envelope_color[1] * mult); + AV_WN16(s->out->data[2] + (maxh + starty) * s->out->linesize[p] + startx * 2 + s->x_pos * 2, s->envelope_color[2] * mult); } } - for (j = h->level_height + h->scale_height - 1; j >= h->level_height; j--) - out->data[p][(j + start) * out->linesize[p] + startx + i] = i; - } else { - const int mult = h->mult; - - for (j = h->level_height - 1; j >= col_height; j--) { - if (h->display_mode) { - for (l = 0; l < h->dncomp; l++) - AV_WN16(out->data[l] + (j + start) * out->linesize[l] + startx * 2 + i * 2, h->fg_color[l] * mult); - } else { - AV_WN16(out->data[p] + (j + start) * out->linesize[p] + startx * 2 + i * 2, 255 * mult); + } + } else { + for (i = 0; i < s->histogram_size; i++) { + int col_height; + + if (s->levels_mode) + col_height = lrint(s->level_height * (1. - (log2(s->histogram[i] + 1) / max_hval_log))); + else + col_height = s->level_height - (s->histogram[i] * (int64_t)s->level_height + max_hval - 1) / max_hval; + + if (s->histogram_size <= 256) { + for (j = s->level_height - 1; j >= col_height; j--) { + if (s->display_mode) { + for (l = 0; l < s->dncomp; l++) + out->data[l][(j + starty) * out->linesize[l] + startx + i] = s->fg_color[l]; + } else { + out->data[p][(j + starty) * out->linesize[p] + startx + i] = 255; + } } + for (j = s->level_height + s->scale_height - 1; j >= s->level_height; j--) + out->data[p][(j + starty) * out->linesize[p] + startx + i] = i; + } else { + const int mult = s->mult; + + for (j = s->level_height - 1; j >= col_height; j--) { + if (s->display_mode) { + for (l = 0; l < s->dncomp; l++) + AV_WN16(out->data[l] + (j + starty) * out->linesize[l] + startx * 2 + i * 2, s->fg_color[l] * mult); + } else { + AV_WN16(out->data[p] + (j + starty) * out->linesize[p] + startx * 2 + i * 2, 255 * mult); + } + } + for (j = s->level_height + s->scale_height - 1; j >= s->level_height; j--) + AV_WN16(out->data[p] + (j + starty) * out->linesize[p] + startx * 2 + i * 2, i); } - for (j = h->level_height + h->scale_height - 1; j >= h->level_height; j--) - AV_WN16(out->data[p] + (j + start) * out->linesize[p] + startx * 2 + i * 2, i); } } - memset(h->histogram, 0, h->histogram_size * sizeof(unsigned)); + memset(s->histogram, 0, s->histogram_size * sizeof(unsigned)); } + out->pts = in->pts; av_frame_free(&in); + s->x_pos++; + if (s->x_pos >= s->width) { + s->x_pos = 0; + if (s->thistogram && (s->slide == 4 || s->slide == 0)) { + s->out = NULL; + goto end; + } + } else if (s->thistogram && s->slide == 4) { + return 0; + } + + if (s->thistogram) { + AVFrame *clone = av_frame_clone(out); + + if (!clone) + return AVERROR(ENOMEM); + return ff_filter_frame(outlink, clone); + } +end: return ff_filter_frame(outlink, out); } @@ -375,6 +501,8 @@ static const AVFilterPad outputs[] = { { NULL } }; +#if CONFIG_HISTOGRAM_FILTER + AVFilter ff_vf_histogram = { .name = "histogram", .description = NULL_IF_CONFIG_SMALL("Compute and draw a histogram."), @@ -384,3 +512,48 @@ AVFilter ff_vf_histogram = { .outputs = outputs, .priv_class = &histogram_class, }; + +#endif /* CONFIG_HISTOGRAM_FILTER */ + +#if CONFIG_THISTOGRAM_FILTER + +static av_cold void uninit(AVFilterContext *ctx) +{ + HistogramContext *s = ctx->priv; + + av_frame_free(&s->out); +} + +static const AVOption thistogram_options[] = { + { "width", "set width", OFFSET(width), AV_OPT_TYPE_INT, {.i64=0}, 0, 8192, FLAGS}, + { "w", "set width", OFFSET(width), AV_OPT_TYPE_INT, {.i64=0}, 0, 8192, FLAGS}, + COMMON_OPTIONS + { "bgopacity", "set background opacity", OFFSET(bgopacity), AV_OPT_TYPE_FLOAT, {.dbl=0.9}, 0, 1, FLAGS}, + { "b", "set background opacity", OFFSET(bgopacity), AV_OPT_TYPE_FLOAT, {.dbl=0.9}, 0, 1, FLAGS}, + { "envelope", "display envelope", OFFSET(envelope), AV_OPT_TYPE_BOOL, {.i64=0}, 0, 1, FLAGS }, + { "e", "display envelope", OFFSET(envelope), AV_OPT_TYPE_BOOL, {.i64=0}, 0, 1, FLAGS }, + { "ecolor", "set envelope color", OFFSET(envelope_rgba), AV_OPT_TYPE_COLOR, {.str="gold"}, 0, 0, FLAGS }, + { "ec", "set envelope color", OFFSET(envelope_rgba), AV_OPT_TYPE_COLOR, {.str="gold"}, 0, 0, FLAGS }, + { "slide", "set slide mode", OFFSET(slide), AV_OPT_TYPE_INT, {.i64=1}, 0, 4, FLAGS, "slide" }, + {"frame", "draw new frames", OFFSET(slide), AV_OPT_TYPE_CONST, {.i64=0}, 0, 0, FLAGS, "slide"}, + {"replace", "replace old columns with new", OFFSET(slide), AV_OPT_TYPE_CONST, {.i64=1}, 0, 0, FLAGS, "slide"}, + {"scroll", "scroll from right to left", OFFSET(slide), AV_OPT_TYPE_CONST, {.i64=2}, 0, 0, FLAGS, "slide"}, + {"rscroll", "scroll from left to right", OFFSET(slide), AV_OPT_TYPE_CONST, {.i64=3}, 0, 0, FLAGS, "slide"}, + {"picture", "display graph in single frame", OFFSET(slide), AV_OPT_TYPE_CONST, {.i64=4}, 0, 0, FLAGS, "slide"}, + { NULL } +}; + +AVFILTER_DEFINE_CLASS(thistogram); + +AVFilter ff_vf_thistogram = { + .name = "thistogram", + .description = NULL_IF_CONFIG_SMALL("Compute and draw a temporal histogram."), + .priv_size = sizeof(HistogramContext), + .query_formats = query_formats, + .inputs = inputs, + .outputs = outputs, + .uninit = uninit, + .priv_class = &thistogram_class, +}; + +#endif /* CONFIG_THISTOGRAM_FILTER */