From 32f217edadf0b79151aa2a2d16b38d07354749de Mon Sep 17 00:00:00 2001 From: Paul B Mahol Date: Fri, 28 Aug 2015 18:45:53 +0000 Subject: [PATCH] avfilter/vf_waveform: implement various filters Signed-off-by: Paul B Mahol --- doc/filters.texi | 21 + libavfilter/vf_waveform.c | 992 ++++++++++++++++++++++++++++++-------- 2 files changed, 814 insertions(+), 199 deletions(-) diff --git a/doc/filters.texi b/doc/filters.texi index b78cf90435..892347b21d 100644 --- a/doc/filters.texi +++ b/doc/filters.texi @@ -11102,6 +11102,27 @@ can still spot out of range values without constantly looking at waveforms. @item peak+instant Peak and instant envelope combined together. @end table + +@item filter, f +@table @samp +@item lowpass +No filtering, this is default. + +@item flat +Luma and chroma combined together. + +@item aflat +Similar as above, but shows difference between blue and red chroma. + +@item chroma +Displays only chroma. + +@item achroma +Similar as above, but shows difference between blue and red chroma. + +@item color +Displays actual color value on waveform. +@end table @end table @section xbr diff --git a/libavfilter/vf_waveform.c b/libavfilter/vf_waveform.c index 7dfd89019d..eb49ef39e2 100644 --- a/libavfilter/vf_waveform.c +++ b/libavfilter/vf_waveform.c @@ -28,6 +28,16 @@ #include "internal.h" #include "video.h" +enum FilterType { + LOWPASS, + FLAT, + AFLAT, + CHROMA, + ACHROMA, + COLOR, + NB_FILTERS +}; + typedef struct WaveformContext { const AVClass *class; int mode; @@ -42,6 +52,10 @@ typedef struct WaveformContext { int eend[4]; int *emax[4]; int *emin[4]; + int filter; + int size; + void (*waveform)(struct WaveformContext *s, AVFrame *in, AVFrame *out, + int component, int intensity, int offset, int column); const AVPixFmtDescriptor *desc; } WaveformContext; @@ -69,26 +83,54 @@ static const AVOption waveform_options[] = { { "instant", NULL, 0, AV_OPT_TYPE_CONST, {.i64=1}, 0, 0, FLAGS, "envelope" }, { "peak", NULL, 0, AV_OPT_TYPE_CONST, {.i64=2}, 0, 0, FLAGS, "envelope" }, { "peak+instant", NULL, 0, AV_OPT_TYPE_CONST, {.i64=3}, 0, 0, FLAGS, "envelope" }, + { "filter", "set filter", OFFSET(filter), AV_OPT_TYPE_INT, {.i64=0}, 0, NB_FILTERS-1, FLAGS, "filter" }, + { "f", "set filter", OFFSET(filter), AV_OPT_TYPE_INT, {.i64=0}, 0, NB_FILTERS-1, FLAGS, "filter" }, + { "lowpass", NULL, 0, AV_OPT_TYPE_CONST, {.i64=LOWPASS}, 0, 0, FLAGS, "filter" }, + { "flat" , NULL, 0, AV_OPT_TYPE_CONST, {.i64=FLAT}, 0, 0, FLAGS, "filter" }, + { "aflat" , NULL, 0, AV_OPT_TYPE_CONST, {.i64=AFLAT}, 0, 0, FLAGS, "filter" }, + { "chroma", NULL, 0, AV_OPT_TYPE_CONST, {.i64=CHROMA}, 0, 0, FLAGS, "filter" }, + { "achroma", NULL, 0, AV_OPT_TYPE_CONST, {.i64=ACHROMA}, 0, 0, FLAGS, "filter" }, + { "color", NULL, 0, AV_OPT_TYPE_CONST, {.i64=COLOR}, 0, 0, FLAGS, "filter" }, { NULL } }; AVFILTER_DEFINE_CLASS(waveform); -static const enum AVPixelFormat pix_fmts[] = { - AV_PIX_FMT_GBRP, AV_PIX_FMT_GBRAP, - 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_NONE +static const enum AVPixelFormat lowpass_pix_fmts[] = { + AV_PIX_FMT_GBRP, AV_PIX_FMT_GBRAP, + 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_NONE +}; + +static const enum AVPixelFormat flat_pix_fmts[] = { + AV_PIX_FMT_YUV444P, AV_PIX_FMT_YUVJ444P, AV_PIX_FMT_NONE +}; + +static const enum AVPixelFormat color_pix_fmts[] = { + AV_PIX_FMT_GBRP, AV_PIX_FMT_GBRAP, + AV_PIX_FMT_YUV444P, AV_PIX_FMT_YUVJ444P, AV_PIX_FMT_NONE }; static int query_formats(AVFilterContext *ctx) { + WaveformContext *s = ctx->priv; AVFilterFormats *fmts_list; + const enum AVPixelFormat *pix_fmts; + + switch (s->filter) { + case LOWPASS: pix_fmts = lowpass_pix_fmts; break; + case FLAT: + case AFLAT: + case CHROMA: + case ACHROMA: pix_fmts = flat_pix_fmts; break; + case COLOR: pix_fmts = color_pix_fmts; break; + } fmts_list = ff_make_format_list(pix_fmts); if (!fmts_list) @@ -96,6 +138,720 @@ static int query_formats(AVFilterContext *ctx) return ff_set_common_formats(ctx, fmts_list); } +static void envelope_instant(WaveformContext *s, AVFrame *out, int plane) +{ + const int dst_linesize = out->linesize[plane]; + const uint8_t bg = s->bg_color[plane]; + const int is_chroma = (plane == 1 || plane == 2); + const int shift_w = (is_chroma ? s->desc->log2_chroma_w : 0); + const int shift_h = (is_chroma ? s->desc->log2_chroma_h : 0); + const int dst_h = FF_CEIL_RSHIFT(out->height, shift_h); + const int dst_w = FF_CEIL_RSHIFT(out->width, shift_w); + const int start = s->estart[plane]; + const int end = s->eend[plane]; + uint8_t *dst; + int x, y; + + if (s->mode) { + for (x = 0; x < dst_w; x++) { + for (y = start; y < end; y++) { + dst = out->data[plane] + y * dst_linesize + x; + if (dst[0] != bg) { + dst[0] = 255; + break; + } + } + for (y = end - 1; y >= start; y--) { + dst = out->data[plane] + y * dst_linesize + x; + if (dst[0] != bg) { + dst[0] = 255; + break; + } + } + } + } else { + for (y = 0; y < dst_h; y++) { + dst = out->data[plane] + y * dst_linesize; + for (x = start; x < end; x++) { + if (dst[x] != bg) { + dst[x] = 255; + break; + } + } + for (x = end - 1; x >= start; x--) { + if (dst[x] != bg) { + dst[x] = 255; + break; + } + } + } + } +} + +static void envelope_peak(WaveformContext *s, AVFrame *out, int plane) +{ + const int dst_linesize = out->linesize[plane]; + const uint8_t bg = s->bg_color[plane]; + const int is_chroma = (plane == 1 || plane == 2); + const int shift_w = (is_chroma ? s->desc->log2_chroma_w : 0); + const int shift_h = (is_chroma ? s->desc->log2_chroma_h : 0); + const int dst_h = FF_CEIL_RSHIFT(out->height, shift_h); + const int dst_w = FF_CEIL_RSHIFT(out->width, shift_w); + const int start = s->estart[plane]; + const int end = s->eend[plane]; + int *emax = s->emax[plane]; + int *emin = s->emin[plane]; + uint8_t *dst; + int x, y; + + if (s->mode) { + for (x = 0; x < dst_w; x++) { + for (y = start; y < end && y < emin[x]; y++) { + dst = out->data[plane] + y * dst_linesize + x; + if (dst[0] != bg) { + emin[x] = y; + break; + } + } + for (y = end - 1; y >= start && y >= emax[x]; y--) { + dst = out->data[plane] + y * dst_linesize + x; + if (dst[0] != bg) { + emax[x] = y; + break; + } + } + } + + if (s->envelope == 3) + envelope_instant(s, out, plane); + + for (x = 0; x < dst_w; x++) { + dst = out->data[plane] + emin[x] * dst_linesize + x; + dst[0] = 255; + dst = out->data[plane] + emax[x] * dst_linesize + x; + dst[0] = 255; + } + } else { + for (y = 0; y < dst_h; y++) { + dst = out->data[plane] + y * dst_linesize; + for (x = start; x < end && x < emin[y]; x++) { + if (dst[x] != bg) { + emin[y] = x; + break; + } + } + for (x = end - 1; x >= start && x >= emax[y]; x--) { + if (dst[x] != bg) { + emax[y] = x; + break; + } + } + } + + if (s->envelope == 3) + envelope_instant(s, out, plane); + + for (y = 0; y < dst_h; y++) { + dst = out->data[plane] + y * dst_linesize + emin[y]; + dst[0] = 255; + dst = out->data[plane] + y * dst_linesize + emax[y]; + dst[0] = 255; + } + } +} + +static void envelope(WaveformContext *s, AVFrame *out, int plane) +{ + if (s->envelope == 0) { + return; + } else if (s->envelope == 1) { + envelope_instant(s, out, plane); + } else { + envelope_peak(s, out, plane); + } +} + +static void update(uint8_t *target, int max, int intensity) +{ + if (*target <= max) + *target += intensity; + else + *target = 255; +} + +static void lowpass(WaveformContext *s, AVFrame *in, AVFrame *out, + int component, int intensity, int offset, int column) +{ + const int plane = s->desc->comp[component].plane; + const int mirror = s->mirror; + const int is_chroma = (component == 1 || component == 2); + const int shift_w = (is_chroma ? s->desc->log2_chroma_w : 0); + const int shift_h = (is_chroma ? s->desc->log2_chroma_h : 0); + const int src_linesize = in->linesize[plane]; + const int dst_linesize = out->linesize[plane]; + const int dst_signed_linesize = dst_linesize * (mirror == 1 ? -1 : 1); + const int max = 255 - intensity; + const int src_h = FF_CEIL_RSHIFT(in->height, shift_h); + const int src_w = FF_CEIL_RSHIFT(in->width, shift_w); + const uint8_t *src_data = in->data[plane]; + uint8_t *dst_data = out->data[plane] + (column ? (offset >> shift_h) * dst_linesize : offset >> shift_w); + uint8_t * const dst_bottom_line = dst_data + dst_linesize * ((s->size >> shift_h) - 1); + uint8_t * const dst_line = (mirror ? dst_bottom_line : dst_data); + const uint8_t *p; + int y; + + if (!column && mirror) + dst_data += s->size >> shift_w; + + for (y = 0; y < src_h; y++) { + const uint8_t *src_data_end = src_data + src_w; + uint8_t *dst = dst_line; + + for (p = src_data; p < src_data_end; p++) { + uint8_t *target; + if (column) { + target = dst++ + dst_signed_linesize * (*p >> shift_h); + } else { + if (mirror) + target = dst_data - (*p >> shift_w) - 1; + else + target = dst_data + (*p >> shift_w); + } + update(target, max, intensity); + } + src_data += src_linesize; + dst_data += dst_linesize; + } + + envelope(s, out, plane); +} + +static void flat(WaveformContext *s, AVFrame *in, AVFrame *out, + int component, int intensity, int offset, int column) +{ + const int plane = s->desc->comp[component].plane; + const int mirror = s->mirror; + const int c0_linesize = in->linesize[ plane + 0 ]; + const int c1_linesize = in->linesize[(plane + 1) % s->ncomp]; + const int c2_linesize = in->linesize[(plane + 2) % s->ncomp]; + const int d0_linesize = out->linesize[ plane + 0 ]; + const int d1_linesize = out->linesize[(plane + 1) % s->ncomp]; + const int max = 255 - intensity; + const int src_h = in->height; + const int src_w = in->width; + int x, y; + + if (column) { + const int d0_signed_linesize = d0_linesize * (mirror == 1 ? -1 : 1); + const int d1_signed_linesize = d1_linesize * (mirror == 1 ? -1 : 1); + + for (x = 0; x < src_w; x++) { + const uint8_t *c0_data = in->data[plane + 0]; + const uint8_t *c1_data = in->data[(plane + 1) % s->ncomp]; + const uint8_t *c2_data = in->data[(plane + 2) % s->ncomp]; + uint8_t *d0_data = out->data[plane] + offset * d0_linesize; + uint8_t *d1_data = out->data[(plane + 1) % s->ncomp] + offset * d1_linesize; + uint8_t * const d0_bottom_line = d0_data + d0_linesize * (s->size - 1); + uint8_t * const d0 = (mirror ? d0_bottom_line : d0_data); + uint8_t * const d1_bottom_line = d1_data + d1_linesize * (s->size - 1); + uint8_t * const d1 = (mirror ? d1_bottom_line : d1_data); + + for (y = 0; y < src_h; y++) { + const int c0 = c0_data[x] + 256; + const int c1 = FFABS(c1_data[x] - 128) + FFABS(c2_data[x] - 128); + uint8_t *target; + int p; + + target = d0 + x + d0_signed_linesize * c0; + update(target, max, intensity); + + for (p = c0 - c1; p < c0 + c1; p++) { + target = d1 + x + d1_signed_linesize * p; + update(target, max, 1); + } + c0_data += c0_linesize; + c1_data += c1_linesize; + c2_data += c2_linesize; + d0_data += d0_linesize; + d1_data += d1_linesize; + } + } + } else { + const uint8_t *c0_data = in->data[plane]; + const uint8_t *c1_data = in->data[(plane + 1) % s->ncomp]; + const uint8_t *c2_data = in->data[(plane + 2) % s->ncomp]; + uint8_t *d0_data = out->data[plane] + offset; + uint8_t *d1_data = out->data[(plane + 1) % s->ncomp] + offset; + + if (mirror) { + d0_data += s->size - 1; + d1_data += s->size; + } + + for (y = 0; y < src_h; y++) { + for (x = 0; x < src_w; x++) { + int c0 = c0_data[x] + 256; + const int c1 = FFABS(c1_data[x] - 128) + FFABS(c2_data[x] - 128); + uint8_t *target; + int p; + + if (mirror) + target = d0_data - c0; + else + target = d0_data + c0; + + update(target, max, intensity); + + for (p = c0 - c1; p < c0 + c1; p++) { + if (mirror) + target = d1_data - p - 1; + else + target = d1_data + p; + + update(target, max, 1); + } + } + + c0_data += c0_linesize; + c1_data += c1_linesize; + c2_data += c2_linesize; + d0_data += d0_linesize; + d1_data += d1_linesize; + } + } +} + +static void aflat(WaveformContext *s, AVFrame *in, AVFrame *out, + int component, int intensity, int offset, int column) +{ + const int plane = s->desc->comp[component].plane; + const int mirror = s->mirror; + const int c0_linesize = in->linesize[ plane + 0 ]; + const int c1_linesize = in->linesize[(plane + 1) % s->ncomp]; + const int c2_linesize = in->linesize[(plane + 2) % s->ncomp]; + const int d0_linesize = out->linesize[ plane + 0 ]; + const int d1_linesize = out->linesize[(plane + 1) % s->ncomp]; + const int d2_linesize = out->linesize[(plane + 2) % s->ncomp]; + const int max = 255 - intensity; + const int src_h = in->height; + const int src_w = in->width; + int x, y; + + if (column) { + const int d0_signed_linesize = d0_linesize * (mirror == 1 ? -1 : 1); + const int d1_signed_linesize = d1_linesize * (mirror == 1 ? -1 : 1); + const int d2_signed_linesize = d2_linesize * (mirror == 1 ? -1 : 1); + + for (x = 0; x < src_w; x++) { + const uint8_t *c0_data = in->data[plane + 0]; + const uint8_t *c1_data = in->data[(plane + 1) % s->ncomp]; + const uint8_t *c2_data = in->data[(plane + 2) % s->ncomp]; + uint8_t *d0_data = out->data[plane] + offset * d0_linesize; + uint8_t *d1_data = out->data[(plane + 1) % s->ncomp] + offset * d1_linesize; + uint8_t *d2_data = out->data[(plane + 2) % s->ncomp] + offset * d2_linesize; + uint8_t * const d0_bottom_line = d0_data + d0_linesize * (s->size - 1); + uint8_t * const d0 = (mirror ? d0_bottom_line : d0_data); + uint8_t * const d1_bottom_line = d1_data + d1_linesize * (s->size - 1); + uint8_t * const d1 = (mirror ? d1_bottom_line : d1_data); + uint8_t * const d2_bottom_line = d2_data + d2_linesize * (s->size - 1); + uint8_t * const d2 = (mirror ? d2_bottom_line : d2_data); + + for (y = 0; y < src_h; y++) { + const int c0 = c0_data[x] + 128; + const int c1 = c1_data[x] - 128; + const int c2 = c2_data[x] - 128; + uint8_t *target; + int p; + + target = d0 + x + d0_signed_linesize * c0; + update(target, max, intensity); + + for (p = c0 + c1; p < c0; p++) { + target = d1 + x + d1_signed_linesize * p; + update(target, max, 1); + } + + for (p = c0 + c1 - 1; p > c0; p--) { + target = d1 + x + d1_signed_linesize * p; + update(target, max, 1); + } + + for (p = c0 + c2; p < c0; p++) { + target = d2 + x + d2_signed_linesize * p; + update(target, max, 1); + } + + for (p = c0 + c2 - 1; p > c0; p--) { + target = d2 + x + d2_signed_linesize * p; + update(target, max, 1); + } + + c0_data += c0_linesize; + c1_data += c1_linesize; + c2_data += c2_linesize; + d0_data += d0_linesize; + d1_data += d1_linesize; + d2_data += d2_linesize; + } + } + } else { + const uint8_t *c0_data = in->data[plane]; + const uint8_t *c1_data = in->data[(plane + 1) % s->ncomp]; + const uint8_t *c2_data = in->data[(plane + 2) % s->ncomp]; + uint8_t *d0_data = out->data[plane] + offset; + uint8_t *d1_data = out->data[(plane + 1) % s->ncomp] + offset; + uint8_t *d2_data = out->data[(plane + 2) % s->ncomp] + offset; + + if (mirror) { + d0_data += s->size - 1; + d1_data += s->size - 1; + d2_data += s->size - 1; + } + + for (y = 0; y < src_h; y++) { + for (x = 0; x < src_w; x++) { + const int c0 = c0_data[x] + 128; + const int c1 = c1_data[x] - 128; + const int c2 = c2_data[x] - 128; + uint8_t *target; + int p; + + if (mirror) + target = d0_data - c0; + else + target = d0_data + c0; + + update(target, max, intensity); + + for (p = c0 + c1; p < c0; p++) { + if (mirror) + target = d1_data - p; + else + target = d1_data + p; + + update(target, max, 1); + } + + for (p = c0 + 1; p < c0 + c1; p++) { + if (mirror) + target = d1_data - p; + else + target = d1_data + p; + + update(target, max, 1); + } + + for (p = c0 + c2; p < c0; p++) { + if (mirror) + target = d2_data - p; + else + target = d2_data + p; + + update(target, max, 1); + } + + for (p = c0 + 1; p < c0 + c2; p++) { + if (mirror) + target = d2_data - p; + else + target = d2_data + p; + + update(target, max, 1); + } + } + + c0_data += c0_linesize; + c1_data += c1_linesize; + c2_data += c2_linesize; + d0_data += d0_linesize; + d1_data += d1_linesize; + d2_data += d2_linesize; + } + } +} + +static void chroma(WaveformContext *s, AVFrame *in, AVFrame *out, + int component, int intensity, int offset, int column) +{ + const int plane = s->desc->comp[component].plane; + const int mirror = s->mirror; + const int c0_linesize = in->linesize[(plane + 1) % s->ncomp]; + const int c1_linesize = in->linesize[(plane + 2) % s->ncomp]; + const int dst_linesize = out->linesize[plane]; + const int max = 255 - intensity; + const int src_h = in->height; + const int src_w = in->width; + int x, y; + + if (column) { + const int dst_signed_linesize = dst_linesize * (mirror == 1 ? -1 : 1); + + for (x = 0; x < src_w; x++) { + const uint8_t *c0_data = in->data[(plane + 1) % s->ncomp]; + const uint8_t *c1_data = in->data[(plane + 2) % s->ncomp]; + uint8_t *dst_data = out->data[plane] + offset * dst_linesize; + uint8_t * const dst_bottom_line = dst_data + dst_linesize * (s->size - 1); + uint8_t * const dst_line = (mirror ? dst_bottom_line : dst_data); + uint8_t *dst = dst_line; + + for (y = 0; y < src_h; y++) { + const int sum = FFABS(c0_data[x] - 128) + FFABS(c1_data[x] - 128); + uint8_t *target; + int p; + + for (p = 256 - sum; p < 256 + sum; p++) { + target = dst + x + dst_signed_linesize * p; + update(target, max, 1); + } + + c0_data += c0_linesize; + c1_data += c1_linesize; + dst_data += dst_linesize; + } + } + } else { + const uint8_t *c0_data = in->data[(plane + 1) % s->ncomp]; + const uint8_t *c1_data = in->data[(plane + 2) % s->ncomp]; + uint8_t *dst_data = out->data[plane] + offset; + + if (mirror) + dst_data += s->size - 1; + for (y = 0; y < src_h; y++) { + for (x = 0; x < src_w; x++) { + const int sum = FFABS(c0_data[x] - 128) + FFABS(c1_data[x] - 128); + uint8_t *target; + int p; + + for (p = 256 - sum; p < 256 + sum; p++) { + if (mirror) + target = dst_data - p; + else + target = dst_data + p; + + update(target, max, 1); + } + } + + c0_data += c0_linesize; + c1_data += c1_linesize; + dst_data += dst_linesize; + } + } +} + +static void achroma(WaveformContext *s, AVFrame *in, AVFrame *out, + int component, int intensity, int offset, int column) +{ + const int plane = s->desc->comp[component].plane; + const int mirror = s->mirror; + const int c1_linesize = in->linesize[(plane + 1) % s->ncomp]; + const int c2_linesize = in->linesize[(plane + 2) % s->ncomp]; + const int d1_linesize = out->linesize[(plane + 1) % s->ncomp]; + const int d2_linesize = out->linesize[(plane + 2) % s->ncomp]; + const int max = 255 - intensity; + const int src_h = in->height; + const int src_w = in->width; + int x, y; + + if (column) { + const int d1_signed_linesize = d1_linesize * (mirror == 1 ? -1 : 1); + const int d2_signed_linesize = d2_linesize * (mirror == 1 ? -1 : 1); + + for (x = 0; x < src_w; x++) { + const uint8_t *c1_data = in->data[(plane + 1) % s->ncomp]; + const uint8_t *c2_data = in->data[(plane + 2) % s->ncomp]; + uint8_t *d1_data = out->data[(plane + 1) % s->ncomp] + offset * d1_linesize; + uint8_t *d2_data = out->data[(plane + 2) % s->ncomp] + offset * d2_linesize; + uint8_t * const d1_bottom_line = d1_data + d1_linesize * (s->size - 1); + uint8_t * const d1 = (mirror ? d1_bottom_line : d1_data); + uint8_t * const d2_bottom_line = d2_data + d2_linesize * (s->size - 1); + uint8_t * const d2 = (mirror ? d2_bottom_line : d2_data); + + for (y = 0; y < src_h; y++) { + const int c1 = c1_data[x] - 128; + const int c2 = c2_data[x] - 128; + uint8_t *target; + int p; + + for (p = 128 + c1; p < 128; p++) { + target = d1 + x + d1_signed_linesize * p; + update(target, max, 1); + } + + for (p = 128 + c1 - 1; p > 128; p--) { + target = d1 + x + d1_signed_linesize * p; + update(target, max, 1); + } + + for (p = 128 + c2; p < 128; p++) { + target = d2 + x + d2_signed_linesize * p; + update(target, max, 1); + } + + for (p = 128 + c2 - 1; p > 128; p--) { + target = d2 + x + d2_signed_linesize * p; + update(target, max, 1); + } + + c1_data += c1_linesize; + c2_data += c2_linesize; + d1_data += d1_linesize; + d2_data += d2_linesize; + } + } + } else { + const uint8_t *c1_data = in->data[(plane + 1) % s->ncomp]; + const uint8_t *c2_data = in->data[(plane + 2) % s->ncomp]; + uint8_t *d0_data = out->data[plane] + offset; + uint8_t *d1_data = out->data[(plane + 1) % s->ncomp] + offset; + uint8_t *d2_data = out->data[(plane + 2) % s->ncomp] + offset; + + if (mirror) { + d0_data += s->size - 1; + d1_data += s->size - 1; + d2_data += s->size - 1; + } + + for (y = 0; y < src_h; y++) { + for (x = 0; x < src_w; x++) { + const int c1 = c1_data[x] - 128; + const int c2 = c2_data[x] - 128; + uint8_t *target; + int p; + + for (p = 128 + c1; p < 128; p++) { + if (mirror) + target = d1_data - p; + else + target = d1_data + p; + + update(target, max, 1); + } + + for (p = 128 + 1; p < 128 + c1; p++) { + if (mirror) + target = d1_data - p; + else + target = d1_data + p; + + update(target, max, 1); + } + + for (p = 128 + c2; p < 128; p++) { + if (mirror) + target = d2_data - p; + else + target = d2_data + p; + + update(target, max, 1); + } + + for (p = 128 + 1; p < 128 + c2; p++) { + if (mirror) + target = d2_data - p; + else + target = d2_data + p; + + update(target, max, 1); + } + } + + c1_data += c1_linesize; + c2_data += c2_linesize; + d1_data += d1_linesize; + d2_data += d2_linesize; + } + } +} + +static void color(WaveformContext *s, AVFrame *in, AVFrame *out, + int component, int intensity, int offset, int column) +{ + const int plane = s->desc->comp[component].plane; + const int mirror = s->mirror; + const uint8_t *c0_data = in->data[plane + 0]; + const uint8_t *c1_data = in->data[(plane + 1) % s->ncomp]; + const uint8_t *c2_data = in->data[(plane + 2) % s->ncomp]; + const int c0_linesize = in->linesize[ plane + 0 ]; + const int c1_linesize = in->linesize[(plane + 1) % s->ncomp]; + const int c2_linesize = in->linesize[(plane + 2) % s->ncomp]; + const int d0_linesize = out->linesize[ plane + 0 ]; + const int d1_linesize = out->linesize[(plane + 1) % s->ncomp]; + const int d2_linesize = out->linesize[(plane + 2) % s->ncomp]; + const int src_h = in->height; + const int src_w = in->width; + int x, y; + + if (s->mode) { + const int d0_signed_linesize = d0_linesize * (mirror == 1 ? -1 : 1); + const int d1_signed_linesize = d1_linesize * (mirror == 1 ? -1 : 1); + const int d2_signed_linesize = d2_linesize * (mirror == 1 ? -1 : 1); + uint8_t *d0_data = out->data[plane] + offset * d0_linesize; + uint8_t *d1_data = out->data[(plane + 1) % s->ncomp] + offset * d1_linesize; + uint8_t *d2_data = out->data[(plane + 2) % s->ncomp] + offset * d2_linesize; + uint8_t * const d0_bottom_line = d0_data + d0_linesize * (s->size - 1); + uint8_t * const d0 = (mirror ? d0_bottom_line : d0_data); + uint8_t * const d1_bottom_line = d1_data + d1_linesize * (s->size - 1); + uint8_t * const d1 = (mirror ? d1_bottom_line : d1_data); + uint8_t * const d2_bottom_line = d2_data + d2_linesize * (s->size - 1); + uint8_t * const d2 = (mirror ? d2_bottom_line : d2_data); + + for (y = 0; y < src_h; y++) { + for (x = 0; x < src_w; x++) { + const int c0 = c0_data[x]; + const int c1 = c1_data[x]; + const int c2 = c2_data[x]; + + *(d0 + d0_signed_linesize * c0 + x) = c0; + *(d1 + d1_signed_linesize * c0 + x) = c1; + *(d2 + d2_signed_linesize * c0 + x) = c2; + } + + c0_data += c0_linesize; + c1_data += c1_linesize; + c2_data += c2_linesize; + d0_data += d0_linesize; + d1_data += d1_linesize; + d2_data += d2_linesize; + } + } else { + uint8_t *d0_data = out->data[plane] + offset; + uint8_t *d1_data = out->data[(plane + 1) % s->ncomp] + offset; + uint8_t *d2_data = out->data[(plane + 2) % s->ncomp] + offset; + + if (mirror) { + d0_data += s->size - 1; + d1_data += s->size - 1; + d2_data += s->size - 1; + } + + for (y = 0; y < src_h; y++) { + for (x = 0; x < src_w; x++) { + const int c0 = c0_data[x]; + const int c1 = c1_data[x]; + const int c2 = c2_data[x]; + + if (mirror) { + *(d0_data - c0) = c0; + *(d1_data - c0) = c1; + *(d2_data - c0) = c2; + } else { + *(d0_data + c0) = c0; + *(d1_data + c0) = c1; + *(d2_data + c0) = c2; + } + } + + c0_data += c0_linesize; + c1_data += c1_linesize; + c2_data += c2_linesize; + d0_data += d0_linesize; + d1_data += d1_linesize; + d2_data += d2_linesize; + } + } +} + static const uint8_t black_yuva_color[4] = { 0, 127, 127, 255 }; static const uint8_t black_gbrp_color[4] = { 0, 0, 0, 255 }; @@ -107,6 +863,27 @@ static int config_input(AVFilterLink *inlink) s->desc = av_pix_fmt_desc_get(inlink->format); s->ncomp = s->desc->nb_components; + switch (s->filter) { + case LOWPASS: + s->size = 256; + s->waveform = lowpass; break; + case FLAT: + s->size = 256 * 3; + s->waveform = flat; break; + case AFLAT: + s->size = 256 * 2; + s->waveform = aflat; break; + case CHROMA: + s->size = 256 * 2; + s->waveform = chroma; break; + case ACHROMA: + s->size = 256; + s->waveform = achroma; break; + case COLOR: + s->size = 256; + s->waveform = color; break; + } + switch (inlink->format) { case AV_PIX_FMT_GBRAP: case AV_PIX_FMT_GBRP: @@ -137,10 +914,10 @@ static int config_output(AVFilterLink *outlink) } if (s->mode) { - outlink->h = 256 * FFMAX(comp * s->display, 1); + outlink->h = s->size * FFMAX(comp * s->display, 1); size = inlink->w * sizeof(int); } else { - outlink->w = 256 * FFMAX(comp * s->display, 1); + outlink->w = s->size * FFMAX(comp * s->display, 1); size = inlink->h * sizeof(int); } @@ -162,9 +939,9 @@ static int config_output(AVFilterLink *outlink) if (!s->emin[plane] || !s->emax[plane]) return AVERROR(ENOMEM); - offset = j++ * 256 * s->display; + offset = j++ * s->size * s->display; s->estart[plane] = offset >> shift; - s->eend[plane] = (offset + 255) >> shift; + s->eend[plane] = (offset + s->size - 1) >> shift; for (i = 0; i < size / sizeof(int); i++) { s->emax[plane][i] = s->estart[plane]; s->emin[plane][i] = s->eend[plane]; @@ -176,188 +953,6 @@ static int config_output(AVFilterLink *outlink) return 0; } -static void gen_waveform(WaveformContext *s, AVFrame *in, AVFrame *out, - int component, int intensity, int offset, int col_mode) -{ - const int plane = s->desc->comp[component].plane; - const int mirror = s->mirror; - const int is_chroma = (component == 1 || component == 2); - const int shift_w = (is_chroma ? s->desc->log2_chroma_w : 0); - const int shift_h = (is_chroma ? s->desc->log2_chroma_h : 0); - const int src_linesize = in->linesize[plane]; - const int dst_linesize = out->linesize[plane]; - const int dst_signed_linesize = dst_linesize * (mirror == 1 ? -1 : 1); - const int max = 255 - intensity; - const int src_h = FF_CEIL_RSHIFT(in->height, shift_h); - const int src_w = FF_CEIL_RSHIFT(in->width, shift_w); - const uint8_t *src_data = in->data[plane]; - uint8_t *dst_data = out->data[plane] + (col_mode ? (offset >> shift_h) * dst_linesize : offset >> shift_w); - uint8_t * const dst_bottom_line = dst_data + dst_linesize * ((256 >> shift_h) - 1); - uint8_t * const dst_line = (mirror ? dst_bottom_line : dst_data); - const uint8_t *p; - uint8_t *dst; - int y; - - if (!col_mode && mirror) - dst_data += 256 >> shift_w; - for (y = 0; y < src_h; y++) { - const uint8_t *src_data_end = src_data + src_w; - dst = dst_line; - for (p = src_data; p < src_data_end; p++) { - uint8_t *target; - if (col_mode) { - target = dst++ + dst_signed_linesize * (*p >> shift_h); - } else { - if (mirror) - target = dst_data - (*p >> shift_w) - 1; - else - target = dst_data + (*p >> shift_w); - } - if (*target <= max) - *target += intensity; - else - *target = 255; - } - src_data += src_linesize; - dst_data += dst_linesize; - } -} - -static void gen_envelope_instant(WaveformContext *s, AVFrame *out, int component) -{ - const int plane = s->desc->comp[component].plane; - const int dst_linesize = out->linesize[plane]; - const uint8_t bg = s->bg_color[plane]; - const int is_chroma = (component == 1 || component == 2); - const int shift_w = (is_chroma ? s->desc->log2_chroma_w : 0); - const int shift_h = (is_chroma ? s->desc->log2_chroma_h : 0); - const int dst_h = FF_CEIL_RSHIFT(out->height, shift_h); - const int dst_w = FF_CEIL_RSHIFT(out->width, shift_w); - const int start = s->estart[plane]; - const int end = s->eend[plane]; - uint8_t *dst; - int x, y; - - if (!s->mode) { - for (y = 0; y < dst_h; y++) { - dst = out->data[plane] + y * dst_linesize; - for (x = start; x < end; x++) { - if (dst[x] != bg) { - dst[x] = 255; - break; - } - } - for (x = end - 1; x >= start; x--) { - if (dst[x] != bg) { - dst[x] = 255; - break; - } - } - } - } else { - for (x = 0; x < dst_w; x++) { - for (y = start; y < end; y++) { - dst = out->data[plane] + y * dst_linesize + x; - if (dst[0] != bg) { - dst[0] = 255; - break; - } - } - for (y = end - 1; y >= start; y--) { - dst = out->data[plane] + y * dst_linesize + x; - if (dst[0] != bg) { - dst[0] = 255; - break; - } - } - } - } -} - -static void gen_envelope_peak(WaveformContext *s, AVFrame *out, int component) -{ - const int plane = s->desc->comp[component].plane; - const int dst_linesize = out->linesize[plane]; - const uint8_t bg = s->bg_color[plane]; - const int is_chroma = (component == 1 || component == 2); - const int shift_w = (is_chroma ? s->desc->log2_chroma_w : 0); - const int shift_h = (is_chroma ? s->desc->log2_chroma_h : 0); - const int dst_h = FF_CEIL_RSHIFT(out->height, shift_h); - const int dst_w = FF_CEIL_RSHIFT(out->width, shift_w); - const int start = s->estart[plane]; - const int end = s->eend[plane]; - int *emax = s->emax[plane]; - int *emin = s->emin[plane]; - uint8_t *dst; - int x, y; - - if (!s->mode) { - for (y = 0; y < dst_h; y++) { - dst = out->data[plane] + y * dst_linesize; - for (x = start; x < end && x < emin[y]; x++) { - if (dst[x] != bg) { - emin[y] = x; - break; - } - } - for (x = end - 1; x >= start && x >= emax[y]; x--) { - if (dst[x] != bg) { - emax[y] = x; - break; - } - } - } - - if (s->envelope == 3) - gen_envelope_instant(s, out, component); - - for (y = 0; y < dst_h; y++) { - dst = out->data[plane] + y * dst_linesize + emin[y]; - dst[0] = 255; - dst = out->data[plane] + y * dst_linesize + emax[y]; - dst[0] = 255; - } - } else { - for (x = 0; x < dst_w; x++) { - for (y = start; y < end && y < emin[x]; y++) { - dst = out->data[plane] + y * dst_linesize + x; - if (dst[0] != bg) { - emin[x] = y; - break; - } - } - for (y = end - 1; y >= start && y >= emax[x]; y--) { - dst = out->data[plane] + y * dst_linesize + x; - if (dst[0] != bg) { - emax[x] = y; - break; - } - } - } - - if (s->envelope == 3) - gen_envelope_instant(s, out, component); - - for (x = 0; x < dst_w; x++) { - dst = out->data[plane] + emin[x] * dst_linesize + x; - dst[0] = 255; - dst = out->data[plane] + emax[x] * dst_linesize + x; - dst[0] = 255; - } - } -} - -static void gen_envelope(WaveformContext *s, AVFrame *out, int component) -{ - if (s->envelope == 0) { - return; - } else if (s->envelope == 1) { - gen_envelope_instant(s, out, component); - } else { - gen_envelope_peak(s, out, component); - } -} - static int filter_frame(AVFilterLink *inlink, AVFrame *in) { AVFilterContext *ctx = inlink->dst; @@ -385,9 +980,8 @@ static int filter_frame(AVFilterLink *inlink, AVFrame *in) for (k = 0, i = 0; k < s->ncomp; k++) { if ((1 << k) & s->pcomp) { - const int offset = i++ * 256 * s->display; - gen_waveform(s, in, out, k, s->intensity, offset, s->mode); - gen_envelope(s, out, k); + const int offset = i++ * s->size * s->display; + s->waveform(s, in, out, k, s->intensity, offset, s->mode); } }