diff options
| author | Marton Balint <cus@passwd.hu> | 2013-10-02 22:23:55 +0200 |
|---|---|---|
| committer | Paul B Mahol <onemda@gmail.com> | 2013-10-02 21:02:59 +0000 |
| commit | 0362cf1a1928b5236e079b8b2aac1c776f91145e (patch) | |
| tree | b5848a01a84f2d6ec865549e65837872a3b41e21 /libavfilter/vf_histogram.c | |
| parent | 5b5bb0d81c5353f64e142a52ade18db4a6c2f512 (diff) | |
avfilter/vf_histogram: add mirrored waveform mode
Added parameter to mirror the waveform (high values are shown on top in column mode)
Signed-off-by: Marton Balint <cus@passwd.hu>
Diffstat (limited to 'libavfilter/vf_histogram.c')
| -rw-r--r-- | libavfilter/vf_histogram.c | 21 |
1 files changed, 16 insertions, 5 deletions
diff --git a/libavfilter/vf_histogram.c b/libavfilter/vf_histogram.c index 4bd309f2b2..e30ebe189d 100644 --- a/libavfilter/vf_histogram.c +++ b/libavfilter/vf_histogram.c @@ -46,6 +46,7 @@ typedef struct HistogramContext { int scale_height; int step; int waveform_mode; + int waveform_mirror; int display_mode; int levels_mode; const AVPixFmtDescriptor *desc; @@ -66,6 +67,7 @@ static const AVOption histogram_options[] = { { "waveform_mode", "set waveform mode", OFFSET(waveform_mode), AV_OPT_TYPE_INT, {.i64=0}, 0, 1, FLAGS, "waveform_mode"}, { "row", NULL, 0, AV_OPT_TYPE_CONST, {.i64=0}, 0, 0, FLAGS, "waveform_mode" }, { "column", NULL, 0, AV_OPT_TYPE_CONST, {.i64=1}, 0, 0, FLAGS, "waveform_mode" }, + { "waveform_mirror", "set waveform mirroring", OFFSET(waveform_mirror), AV_OPT_TYPE_INT, {.i64=0}, 0, 1, FLAGS, "waveform_mirror"}, { "display_mode", "set display mode", OFFSET(display_mode), AV_OPT_TYPE_INT, {.i64=1}, 0, 1, FLAGS, "display_mode"}, { "parade", NULL, 0, AV_OPT_TYPE_CONST, {.i64=1}, 0, 0, FLAGS, "display_mode" }, { "overlay", NULL, 0, AV_OPT_TYPE_CONST, {.i64=0}, 0, 0, FLAGS, "display_mode" }, @@ -183,29 +185,38 @@ static void gen_waveform(HistogramContext *h, AVFrame *inpicref, AVFrame *outpic int component, int intensity, int offset, int col_mode) { const int plane = h->desc->comp[component].plane; + const int mirror = h->waveform_mirror; const int is_chroma = (component == 1 || component == 2); const int shift_w = (is_chroma ? h->desc->log2_chroma_w : 0); const int shift_h = (is_chroma ? h->desc->log2_chroma_h : 0); const int src_linesize = inpicref->linesize[plane]; const int dst_linesize = outpicref->linesize[plane]; + const int dst_signed_linesize = dst_linesize * (mirror == 1 ? -1 : 1); uint8_t *src_data = inpicref->data[plane]; uint8_t *dst_data = outpicref->data[plane] + (col_mode ? (offset >> shift_h) * dst_linesize : offset >> shift_w); - uint8_t * const dst_line = dst_data; + 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 max = 255 - intensity; const int src_h = FF_CEIL_RSHIFT(inpicref->height, shift_h); const int src_w = FF_CEIL_RSHIFT(inpicref->width, shift_w); uint8_t *dst, *p; 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_linesize * (*p >> shift_h); - else - target = dst_data + (*p >> shift_w); + if (col_mode) { + target = dst++ + dst_signed_linesize * (*p >> shift_h); + } else { + if (mirror) + target = dst_data - (*p >> shift_w); + else + target = dst_data + (*p >> shift_w); + } if (*target <= max) *target += intensity; else |