[FFmpeg-cvslog] avfilter/vf_histogram: change order of histograms for planar rgb

Paul B Mahol git at videolan.org
Tue Oct 1 23:27:32 CEST 2013


ffmpeg | branch: master | Paul B Mahol <onemda at gmail.com> | Tue Oct  1 21:22:22 2013 +0000| [edadda968c249bd10d412704cf305b1565fd3f7c] | committer: Paul B Mahol

avfilter/vf_histogram: change order of histograms for planar rgb

Signed-off-by: Paul B Mahol <onemda at gmail.com>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=edadda968c249bd10d412704cf305b1565fd3f7c
---

 doc/filters.texi           |    2 +-
 libavfilter/vf_histogram.c |    7 ++++---
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/doc/filters.texi b/doc/filters.texi
index 93cdad8..efadaf1 100644
--- a/doc/filters.texi
+++ b/doc/filters.texi
@@ -4698,7 +4698,7 @@ It accepts the following values:
 @item levels
 standard histogram that display color components distribution in an image.
 Displays color graph for each color component. Shows distribution
-of the Y, U, V, A or G, B, R components, depending on input format,
+of the Y, U, V, A or R, G, B components, depending on input format,
 in current frame. Bellow each graph is color component scale meter.
 
 @item color
diff --git a/libavfilter/vf_histogram.c b/libavfilter/vf_histogram.c
index 8a98bc7..273d03b 100644
--- a/libavfilter/vf_histogram.c
+++ b/libavfilter/vf_histogram.c
@@ -248,12 +248,13 @@ static int filter_frame(AVFilterLink *inlink, AVFrame *in)
     switch (h->mode) {
     case MODE_LEVELS:
         for (k = 0; k < h->ncomp; k++) {
+            const int p = h->desc->comp[k].plane;
             int start = k * (h->level_height + h->scale_height) * h->display_mode;
             double max_hval_log;
             unsigned max_hval = 0;
 
             for (i = 0; i < in->height; i++) {
-                src = in->data[k] + i * in->linesize[k];
+                src = in->data[p] + i * in->linesize[p];
                 for (j = 0; j < in->width; j++)
                     h->histogram[src[j]]++;
             }
@@ -275,11 +276,11 @@ static int filter_frame(AVFilterLink *inlink, AVFrame *in)
                         for (l = 0; l < h->ncomp; l++)
                             out->data[l][(j + start) * out->linesize[l] + i] = h->fg_color[l];
                     } else {
-                        out->data[k][(j + start) * out->linesize[k] + i] = 255;
+                        out->data[p][(j + start) * out->linesize[p] + i] = 255;
                     }
                 }
                 for (j = h->level_height + h->scale_height - 1; j >= h->level_height; j--)
-                    out->data[k][(j + start) * out->linesize[k] + i] = i;
+                    out->data[p][(j + start) * out->linesize[p] + i] = i;
             }
 
             memset(h->histogram, 0, 256 * sizeof(unsigned));



More information about the ffmpeg-cvslog mailing list