generic-library/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

avfilter/vf_histogram: make it possible to pick color components for levels mode

Browse Source 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
This commit is contained in:
Paul B Mahol 2015-08-19 10:05:33 +00:00
parent 6495c4c687
commit fa95965f5a
2 changed files with 19 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
doc/filters.texi
View File

@ -6530,6 +6530,10 @@ Default is @code{parade}.
@item levels_mode @item levels_mode
Set mode for @code{levels}. Can be either @code{linear}, or @code{logarithmic}. Set mode for @code{levels}. Can be either @code{linear}, or @code{logarithmic}.
Default is @code{linear}. Default is @code{linear}.
@item components
Set what color components to display for mode @code{levels}.
Default is @code{7}.
@end table @end table
@subsection Examples @subsection Examples

19
libavfilter/vf_histogram.c
View File

@ -50,6 +50,7 @@ typedef struct HistogramContext {
int display_mode; int display_mode;
int levels_mode; int levels_mode;
const AVPixFmtDescriptor *desc; const AVPixFmtDescriptor *desc;
int components;
} HistogramContext; } HistogramContext;
#define OFFSET(x) offsetof(HistogramContext, x) #define OFFSET(x) offsetof(HistogramContext, x)
@ -74,6 +75,7 @@ static const AVOption histogram_options[] = {
{ "levels_mode", "set levels mode", OFFSET(levels_mode), AV_OPT_TYPE_INT, {.i64=0}, 0, 1, FLAGS, "levels_mode"}, { "levels_mode", "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" }, { "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" }, { "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},
{ NULL } { NULL }
}; };
@ -158,11 +160,16 @@ static int config_output(AVFilterLink *outlink)
{ {
AVFilterContext *ctx = outlink->src; AVFilterContext *ctx = outlink->src;
HistogramContext *h = ctx->priv; HistogramContext *h = ctx->priv;
int ncomp = 0, i;
switch (h->mode) { switch (h->mode) {
case MODE_LEVELS: case MODE_LEVELS:
for (i = 0; i < h->ncomp; i++) {
if ((1 << i) & h->components)
ncomp++;
}
outlink->w = 256; outlink->w = 256;
outlink->h = (h->level_height + h->scale_height) * FFMAX(h->ncomp * h->display_mode, 1); outlink->h = (h->level_height + h->scale_height) * FFMAX(ncomp * h->display_mode, 1);
break; break;
case MODE_WAVEFORM: case MODE_WAVEFORM:
if (h->waveform_mode) if (h->waveform_mode)
@ -238,7 +245,7 @@ static int filter_frame(AVFilterLink *inlink, AVFrame *in)
AVFrame *out; AVFrame *out;
const uint8_t *src; const uint8_t *src;
uint8_t *dst; uint8_t *dst;
int i, j, k, l; int i, j, k, l, m;
out = ff_get_video_buffer(outlink, outlink->w, outlink->h); out = ff_get_video_buffer(outlink, outlink->w, outlink->h);
if (!out) { if (!out) {
@ -260,12 +267,16 @@ static int filter_frame(AVFilterLink *inlink, AVFrame *in)
switch (h->mode) { switch (h->mode) {
case MODE_LEVELS: case MODE_LEVELS:
for (k = 0; k < h->ncomp; k++) { for (m = 0, k = 0; k < h->ncomp; k++) {
const int p = h->desc->comp[k].plane; const int p = h->desc->comp[k].plane;
const int start = k * (h->level_height + h->scale_height) * h->display_mode; int start;
double max_hval_log; double max_hval_log;
unsigned max_hval = 0; unsigned max_hval = 0;
if (!((1 << k) & h->components))
continue;
start = m++ * (h->level_height + h->scale_height) * h->display_mode;
for (i = 0; i < in->height; i++) { for (i = 0; i < in->height; i++) {
src = in->data[p] + i * in->linesize[p]; src = in->data[p] + i * in->linesize[p];
for (j = 0; j < in->width; j++) for (j = 0; j < in->width; j++)