[FFmpeg-devel] [PATCH 3/4] avfilter/vf_histogram: add support for subsampled planar yuv modes in waveform mode

[Marton Balint]

Signed-off-by: Marton Balint <cus at passwd.hu>
---
 libavfilter/vf_histogram.c  | 24 +++++++++++++++++++-----
 tests/fate/filter-video.mak |  2 +-
 2 files changed, 20 insertions(+), 6 deletions(-)

diff --git a/libavfilter/vf_histogram.c b/libavfilter/vf_histogram.c
index f513a25..5fd997b 100644
--- a/libavfilter/vf_histogram.c
+++ b/libavfilter/vf_histogram.c
@@ -86,6 +86,15 @@ static const enum AVPixelFormat levels_pix_fmts[] = {
     AV_PIX_FMT_GRAY8, AV_PIX_FMT_GBRP, AV_PIX_FMT_GBRAP, AV_PIX_FMT_NONE
 };
 
+static const enum AVPixelFormat waveform_pix_fmts[] = {
+     AV_PIX_FMT_GBRP,       AV_PIX_FMT_GBRAP,
+     AV_PIX_FMT_YUV420P,    AV_PIX_FMT_YUV422P,    AV_PIX_FMT_YUV444P,    AV_PIX_FMT_YUV410P,
+     AV_PIX_FMT_YUV411P,    AV_PIX_FMT_YUVJ411P,   AV_PIX_FMT_GRAY8,      AV_PIX_FMT_YUVJ420P,
+     AV_PIX_FMT_YUVJ422P,   AV_PIX_FMT_YUVJ444P,   AV_PIX_FMT_YUV440P,    AV_PIX_FMT_YUVJ440P,
+     AV_PIX_FMT_YUVA420P,   AV_PIX_FMT_YUVA422P,   AV_PIX_FMT_YUVA444P,   AV_PIX_FMT_GRAY8A,
+     AV_PIX_FMT_NONE
+};
+
 static int query_formats(AVFilterContext *ctx)
 {
     HistogramContext *h = ctx->priv;
@@ -93,6 +102,8 @@ static int query_formats(AVFilterContext *ctx)
 
     switch (h->mode) {
     case MODE_WAVEFORM:
+        pix_fmts = waveform_pix_fmts;
+        break;
     case MODE_LEVELS:
         pix_fmts = levels_pix_fmts;
         break;
@@ -169,12 +180,15 @@ static void gen_waveform(int component, int intensity, int offset, int col_mode,
     int y;
     uint8_t *p;
     const AVPixFmtDescriptor *desc = av_pix_fmt_desc_get(inpicref->format);
-    const int src_h = inpicref->height;
-    const int src_w = inpicref->width;
+    const int is_chroma = (component == 1 || component == 2);
+    const int shift_w = (is_chroma ? desc->log2_chroma_w : 0);
+    const int shift_h = (is_chroma ? desc->log2_chroma_h : 0);
+    const int src_h = FF_CEIL_RSHIFT(inpicref->height, shift_h);
+    const int src_w = FF_CEIL_RSHIFT(inpicref->width, shift_w);
     uint8_t *src_data = inpicref->data[desc->comp[component].plane];
     const int src_linesize = inpicref->linesize[desc->comp[component].plane];
     const int dst_linesize = outpicref->linesize[desc->comp[component].plane];
-    uint8_t *dst_data = outpicref->data[desc->comp[component].plane] + (col_mode ? offset * dst_linesize : offset);
+    uint8_t *dst_data = outpicref->data[desc->comp[component].plane] + (col_mode ? ((offset >> shift_h) * dst_linesize) : (offset >> shift_w));
     uint8_t * const dst_line = dst_data;
     const uint8_t max = 255 - intensity;
     uint8_t *dst;
@@ -185,9 +199,9 @@ static void gen_waveform(int component, int intensity, int offset, int col_mode,
         for (p = src_data; p < src_data_end; p++) {
             uint8_t *target;
             if (col_mode)
-                target = dst++ + dst_linesize * *p;
+                target = dst++ + dst_linesize * (*p >> shift_h);
             else
-                target = dst_data + *p;
+                target = dst_data + (*p >> shift_w);
             if (*target <= max)
                 *target += intensity;
             else
diff --git a/tests/fate/filter-video.mak b/tests/fate/filter-video.mak
index 1ba3beb..6d99ef2 100644
--- a/tests/fate/filter-video.mak
+++ b/tests/fate/filter-video.mak
@@ -57,7 +57,7 @@ FATE_FILTER_VSYNTH-$(CONFIG_HISTOGRAM_FILTER) += fate-filter-histogram-levels
 fate-filter-histogram-levels: CMD = framecrc -c:v pgmyuv -i $(SRC) -vf histogram -flags +bitexact -sws_flags +accurate_rnd+bitexact
 
 FATE_FILTER_VSYNTH-$(CONFIG_HISTOGRAM_FILTER) += fate-filter-histogram-waveform
-fate-filter-histogram-waveform: CMD = framecrc -c:v pgmyuv -i $(SRC) -vf histogram=mode=waveform -flags +bitexact -sws_flags +accurate_rnd+bitexact
+fate-filter-histogram-waveform: CMD = framecrc -c:v pgmyuv -i $(SRC) -vf format=yuv444p,histogram=mode=waveform -flags +bitexact -sws_flags +accurate_rnd+bitexact
 
 FATE_FILTER_VSYNTH-$(CONFIG_OVERLAY_FILTER) += fate-filter-overlay
 fate-filter-overlay: tests/data/filtergraphs/overlay
-- 
1.8.1.4