Hi,
patch attached.
From 71b621fb53b3d86a049f20f09fb2fbafd6354ccc Mon Sep 17 00:00:00 2001
From: Paul B Mahol <one...@gmail.com>
Date: Sun, 28 Feb 2016 10:39:19 +0100
Subject: [PATCH] avfilter: add rangescope filter
Signed-off-by: Paul B Mahol <one...@gmail.com>
---
libavfilter/Makefile | 1 +
libavfilter/allfilters.c | 1 +
libavfilter/vf_rangescope.c | 296 ++++++++++++++++++++++++++++++++++++++++++++
3 files changed, 298 insertions(+)
create mode 100644 libavfilter/vf_rangescope.c
diff --git a/libavfilter/Makefile b/libavfilter/Makefile
index 605ca29..a876fa4 100644
--- a/libavfilter/Makefile
+++ b/libavfilter/Makefile
@@ -219,6 +219,7 @@ OBJS-$(CONFIG_PSNR_FILTER) += vf_psnr.o dualinput.o framesync.
OBJS-$(CONFIG_PULLUP_FILTER) += vf_pullup.o
OBJS-$(CONFIG_QP_FILTER) += vf_qp.o
OBJS-$(CONFIG_RANDOM_FILTER) += vf_random.o
+OBJS-$(CONFIG_RANGESCOPE_FILTER) += vf_rangescope.o
OBJS-$(CONFIG_REALTIME_FILTER) += f_realtime.o
OBJS-$(CONFIG_REMOVEGRAIN_FILTER) += vf_removegrain.o
OBJS-$(CONFIG_REMOVELOGO_FILTER) += bbox.o lswsutils.o lavfutils.o vf_removelogo.o
diff --git a/libavfilter/allfilters.c b/libavfilter/allfilters.c
index e44a9d5..e65cdf3 100644
--- a/libavfilter/allfilters.c
+++ b/libavfilter/allfilters.c
@@ -239,6 +239,7 @@ void avfilter_register_all(void)
REGISTER_FILTER(PULLUP, pullup, vf);
REGISTER_FILTER(QP, qp, vf);
REGISTER_FILTER(RANDOM, random, vf);
+ REGISTER_FILTER(RANGESCOPE, rangescope, vf);
REGISTER_FILTER(REALTIME, realtime, vf);
REGISTER_FILTER(REMOVEGRAIN, removegrain, vf);
REGISTER_FILTER(REMOVELOGO, removelogo, vf);
diff --git a/libavfilter/vf_rangescope.c b/libavfilter/vf_rangescope.c
new file mode 100644
index 0000000..118c43b
--- /dev/null
+++ b/libavfilter/vf_rangescope.c
@@ -0,0 +1,296 @@
+/*
+ * Copyright (c) 2016 Paul B Mahol
+ *
+ * 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/avassert.h"
+#include "libavutil/intreadwrite.h"
+#include "libavutil/opt.h"
+#include "libavutil/parseutils.h"
+#include "libavutil/pixdesc.h"
+#include "libavutil/xga_font_data.h"
+#include "avfilter.h"
+#include "drawutils.h"
+#include "formats.h"
+#include "internal.h"
+#include "video.h"
+
+typedef struct Range {
+ int min;
+ int max;
+ int imin;
+ int imax;
+} Range;
+
+typedef struct RangescopeContext {
+ const AVClass *class;
+ int ow, oh;
+ int axis;
+
+ int planewidth[4];
+ int planeheight[4];
+ int nb_planes;
+ int depth;
+ FFDrawContext draw;
+ FFDrawColor color[4];
+ FFDrawColor black;
+ FFDrawColor green;
+ FFDrawColor hcolor;
+ uint8_t map[4];
+ uint8_t highlight[4];
+
+ Range range[4];
+ int max;
+ void (*get_ranges)(AVFilterContext *ctx, AVFrame *in);
+} RangescopeContext;
+
+#define OFFSET(x) offsetof(RangescopeContext, x)
+#define FLAGS AV_OPT_FLAG_FILTERING_PARAM|AV_OPT_FLAG_VIDEO_PARAM
+
+static const AVOption rangescope_options[] = {
+ { "size", "set output size", OFFSET(ow), AV_OPT_TYPE_IMAGE_SIZE, {.str="vga"}, 0, 0, FLAGS },
+ { "s", "set output size", OFFSET(ow), AV_OPT_TYPE_IMAGE_SIZE, {.str="vga"}, 0, 0, FLAGS },
+ { "axis", "draw axis", OFFSET(axis), AV_OPT_TYPE_BOOL, {.i64=0}, 0, 1, FLAGS },
+ { "a", "draw axis", OFFSET(axis), AV_OPT_TYPE_BOOL, {.i64=0}, 0, 1, FLAGS },
+ { "c", "set highlight color", OFFSET(highlight), AV_OPT_TYPE_COLOR, {.str="yellow"}, 0, 0, FLAGS },
+ { NULL }
+};
+
+AVFILTER_DEFINE_CLASS(rangescope);
+
+static const enum AVPixelFormat pix_fmts[] = {
+ AV_PIX_FMT_GBRP, AV_PIX_FMT_GBRAP,
+ AV_PIX_FMT_GBRAP12, AV_PIX_FMT_GBRAP16,
+ AV_PIX_FMT_GBRP9, AV_PIX_FMT_GBRP10, AV_PIX_FMT_GBRP12, AV_PIX_FMT_GBRP14,
+ AV_PIX_FMT_GBRP16,
+ AV_PIX_FMT_YUV422P, AV_PIX_FMT_YUV420P,
+ AV_PIX_FMT_YUV444P, AV_PIX_FMT_YUV440P,
+ AV_PIX_FMT_YUV411P, AV_PIX_FMT_YUV410P,
+ AV_PIX_FMT_YUVJ440P, AV_PIX_FMT_YUVJ411P, AV_PIX_FMT_YUVJ420P,
+ AV_PIX_FMT_YUVJ422P, AV_PIX_FMT_YUVJ444P,
+ AV_PIX_FMT_YUVA444P, AV_PIX_FMT_YUVA422P, AV_PIX_FMT_YUVA420P,
+ AV_PIX_FMT_GRAY8,
+ AV_PIX_FMT_YUV444P9, AV_PIX_FMT_YUV422P9, AV_PIX_FMT_YUV420P9,
+ AV_PIX_FMT_YUVA444P9, AV_PIX_FMT_YUVA422P9, AV_PIX_FMT_YUVA420P9,
+ AV_PIX_FMT_YUV444P10, AV_PIX_FMT_YUV422P10, AV_PIX_FMT_YUV420P10,
+ AV_PIX_FMT_YUVA444P10, AV_PIX_FMT_YUVA422P10, AV_PIX_FMT_YUVA420P10,
+ 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_NONE
+};
+
+static int query_formats(AVFilterContext *ctx)
+{
+ int ret;
+
+ if ((ret = ff_formats_ref(ff_make_format_list(pix_fmts), &ctx->inputs[0]->out_formats)) < 0)
+ return ret;
+ return ff_formats_ref(ff_draw_supported_pixel_formats(0), &ctx->outputs[0]->in_formats);
+}
+
+static void get_ranges8(AVFilterContext *ctx, AVFrame *in)
+{
+ RangescopeContext *s = ctx->priv;
+ int p, x, y;
+
+ for (p = 0; p < s->nb_planes; p++) {
+ uint8_t *value = in->data[p];
+ Range *range = &s->range[p];
+
+ range->max = range->min = value[0];
+ for (y = 0; y < s->planeheight[p]; y++) {
+ value = in->data[p] + y * in->linesize[p];
+ for (x = 0; x < s->planewidth[p]; x++) {
+ range->max = FFMAX(value[x], range->max);
+ range->min = FFMIN(value[x], range->min);
+ }
+ }
+ }
+}
+
+static void get_ranges16(AVFilterContext *ctx, AVFrame *in)
+{
+ RangescopeContext *s = ctx->priv;
+ int p, x, y;
+
+ for (p = 0; p < s->nb_planes; p++) {
+ uint16_t *value = (uint16_t *)in->data[p];
+ Range *range = &s->range[p];
+
+ range->max = range->min = value[0];
+ for (y = 0; y < s->planeheight[p]; y++) {
+ value = (uint16_t *)(in->data[p] + y * in->linesize[p]);
+ for (x = 0; x < s->planewidth[p]; x++) {
+ range->max = FFMAX(value[x], range->max);
+ range->min = FFMIN(value[x], range->min);
+ }
+ }
+ }
+}
+
+static int filter_frame(AVFilterLink *inlink, AVFrame *in)
+{
+ AVFilterContext *ctx = inlink->dst;
+ RangescopeContext *s = ctx->priv;
+ AVFilterLink *outlink = ctx->outputs[0];
+ int width = outlink->w / (s->nb_planes * 2);
+ int height, start, end, c;
+ int H = outlink->h - 1;
+ AVFrame *out;
+
+ out = ff_get_video_buffer(outlink, outlink->w, outlink->h);
+ if (!out) {
+ av_frame_free(&in);
+ return AVERROR(ENOMEM);
+ }
+ out->pts = in->pts;
+
+ ff_fill_rectangle(&s->draw, &s->black, out->data, out->linesize,
+ 0, 0, outlink->w, outlink->h);
+
+ if (av_frame_get_color_range(in) == AVCOL_RANGE_MPEG) {
+ s->range[0].imin = 16 * (1 << (s->depth - 8));
+ s->range[0].imax = 235 * (1 << (s->depth - 8));
+ s->range[1].imin = 16 * (1 << (s->depth - 8));
+ s->range[1].imax = 240 * (1 << (s->depth - 8));
+ s->range[2].imin = 16 * (1 << (s->depth - 8));
+ s->range[2].imax = 240 * (1 << (s->depth - 8));
+ s->range[3].imin = 0;
+ s->range[3].imax = 255 * (1 << (s->depth - 8));
+ } else {
+ for (c = 0; c < 4; c++) {
+ s->range[c].imin = 0;
+ s->range[c].imax = 255 * (1 << (s->depth - 8));
+ }
+ }
+
+ s->get_ranges(ctx, in);
+ av_frame_free(&in);
+
+ for (c = 0; c < s->nb_planes; c++) {
+ int cc = s->map[c];
+ FFDrawColor *color = s->range[cc].max <= s->range[cc].imax ||
+ s->range[cc].min >= s->range[cc].imin ? &s->color[c] : &s->hcolor;
+
+ start = H - (s->range[cc].max / (float)s->max) * H;
+ end = outlink->h - (s->range[cc].min / (float)s->max) * outlink->h;
+ av_clip(start, 0, H);
+ av_clip(end, 0, H);
+ height = FFMAX(end - start, 1);
+
+ ff_fill_rectangle(&s->draw, color, out->data, out->linesize,
+ width / 2 + c * outlink->w / s->nb_planes,
+ start, width, height);
+ }
+
+ for (c = outlink->h / 16; c < outlink->h && s->axis; c += outlink->h / 16)
+ ff_blend_rectangle(&s->draw, &s->green,
+ out->data, out->linesize,
+ outlink->w, outlink->h,
+ 0, c, outlink->w, 1);
+
+ return ff_filter_frame(outlink, out);
+}
+
+static int config_input(AVFilterLink *inlink)
+{
+ const AVPixFmtDescriptor *desc = av_pix_fmt_desc_get(inlink->format);
+ RangescopeContext *s = inlink->dst->priv;
+
+ s->planeheight[1] = s->planeheight[2] = AV_CEIL_RSHIFT(inlink->h, desc->log2_chroma_h);
+ s->planeheight[0] = s->planeheight[3] = inlink->h;
+ s->planewidth[1] = s->planewidth[2] = AV_CEIL_RSHIFT(inlink->w, desc->log2_chroma_w);
+ s->planewidth[0] = s->planewidth[3] = inlink->w;
+
+ s->nb_planes = av_pix_fmt_count_planes(inlink->format);
+ ff_draw_init(&s->draw, inlink->format, 0);
+ if (desc->flags & AV_PIX_FMT_FLAG_RGB) {
+ ff_fill_rgba_map(s->map, inlink->format);
+ } else {
+ s->map[1] = 1; s->map[2] = 2; s->map[3] = 3;
+ }
+
+ s->depth = desc->comp[0].depth;
+ s->max = (1 << s->depth) - 1;
+ if (s->depth == 8)
+ s->get_ranges = get_ranges8;
+ else
+ s->get_ranges = get_ranges16;
+
+ return 0;
+}
+
+static int config_output(AVFilterLink *outlink)
+{
+ AVFilterContext *ctx = outlink->src;
+ const AVPixFmtDescriptor *desc = av_pix_fmt_desc_get(ctx->inputs[0]->format);
+ RangescopeContext *s = ctx->priv;
+
+ outlink->h = s->oh;
+ outlink->w = s->ow;
+ outlink->sample_aspect_ratio = (AVRational){1,1};
+
+ ff_draw_init(&s->draw, outlink->format, 0);
+ if (desc->flags & AV_PIX_FMT_FLAG_RGB) {
+ ff_draw_color(&s->draw, &s->color[0], (uint8_t[]){ 255, 0, 0, 255 } );
+ ff_draw_color(&s->draw, &s->color[1], (uint8_t[]){ 0, 255, 0, 255 } );
+ ff_draw_color(&s->draw, &s->color[2], (uint8_t[]){ 0, 0, 255, 255 } );
+ ff_draw_color(&s->draw, &s->color[3], (uint8_t[]){ 128, 128, 128, 255 } );
+ } else {
+ ff_draw_color(&s->draw, &s->color[0], (uint8_t[]){ 255, 255, 255, 255 } );
+ ff_draw_color(&s->draw, &s->color[1], (uint8_t[]){ 0, 32, 255, 255 } );
+ ff_draw_color(&s->draw, &s->color[2], (uint8_t[]){ 255, 32, 0, 255 } );
+ ff_draw_color(&s->draw, &s->color[3], (uint8_t[]){ 128, 128, 128, 255 } );
+ }
+ ff_draw_color(&s->draw, &s->black, (uint8_t[]){ 0, 0, 0, 0} );
+ ff_draw_color(&s->draw, &s->green, (uint8_t[]){ 0, 255, 0, 125} );
+ ff_draw_color(&s->draw, &s->hcolor, s->highlight);
+
+ return 0;
+}
+
+static const AVFilterPad inputs[] = {
+ {
+ .name = "default",
+ .type = AVMEDIA_TYPE_VIDEO,
+ .filter_frame = filter_frame,
+ .config_props = config_input,
+ },
+ { NULL }
+};
+
+static const AVFilterPad outputs[] = {
+ {
+ .name = "default",
+ .type = AVMEDIA_TYPE_VIDEO,
+ .config_props = config_output,
+ },
+ { NULL }
+};
+
+AVFilter ff_vf_rangescope = {
+ .name = "rangescope",
+ .description = NULL_IF_CONFIG_SMALL("Video pixel component range analysis."),
+ .priv_size = sizeof(RangescopeContext),
+ .priv_class = &rangescope_class,
+ .query_formats = query_formats,
+ .inputs = inputs,
+ .outputs = outputs,
+};
--
1.9.1
_______________________________________________
ffmpeg-devel mailing list
ffmpeg-devel@ffmpeg.org
http://ffmpeg.org/mailman/listinfo/ffmpeg-devel
