[FFmpeg-devel] [PATCH 1/4] avfilter/vf_histogram: improve waveform speed
Marton Balint
cus at passwd.hu
Tue Oct 1 21:53:57 CEST 2013
Signed-off-by: Marton Balint <cus at passwd.hu>
---
libavfilter/vf_histogram.c | 66 ++++++++++++++++++++++++++--------------------
1 file changed, 38 insertions(+), 28 deletions(-)
diff --git a/libavfilter/vf_histogram.c b/libavfilter/vf_histogram.c
index db52199..c5d5b31 100644
--- a/libavfilter/vf_histogram.c
+++ b/libavfilter/vf_histogram.c
@@ -164,6 +164,41 @@ static int config_output(AVFilterLink *outlink)
return 0;
}
+static void gen_waveform(int component, int intensity, int offset, int col_mode, AVFrame *inpicref, AVFrame *outpicref)
+{
+ 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;
+ 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 * const dst_line = dst_data;
+ const uint8_t max = 255 - intensity;
+ uint8_t *dst;
+
+ for (y = 0; y < src_h; y++) {
+ uint8_t * const 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;
+ else
+ target = dst_data + *p;
+ if (*target <= max)
+ *target += intensity;
+ else
+ *target = 255;
+ }
+ src_data += src_linesize;
+ dst_data += dst_linesize;
+ }
+}
+
+
static int filter_frame(AVFilterLink *inlink, AVFrame *in)
{
HistogramContext *h = inlink->dst->priv;
@@ -227,34 +262,9 @@ static int filter_frame(AVFilterLink *inlink, AVFrame *in)
}
break;
case MODE_WAVEFORM:
- if (h->waveform_mode) {
- for (k = 0; k < h->ncomp; k++) {
- int offset = k * 256 * h->display_mode;
- for (i = 0; i < inlink->w; i++) {
- for (j = 0; j < inlink->h; j++) {
- int pos = (offset +
- in->data[k][j * in->linesize[k] + i]) *
- out->linesize[k] + i;
- unsigned value = out->data[k][pos];
- value = FFMIN(value + h->step, 255);
- out->data[k][pos] = value;
- }
- }
- }
- } else {
- for (k = 0; k < h->ncomp; k++) {
- int offset = k * 256 * h->display_mode;
- for (i = 0; i < inlink->h; i++) {
- src = in ->data[k] + i * in ->linesize[k];
- dst = out->data[k] + i * out->linesize[k];
- for (j = 0; j < inlink->w; j++) {
- int pos = src[j] + offset;
- unsigned value = dst[pos];
- value = FFMIN(value + h->step, 255);
- dst[pos] = value;
- }
- }
- }
+ for (k = 0; k < h->ncomp; k++) {
+ int offset = k * 256 * h->display_mode;
+ gen_waveform(k, h->step, offset, h->waveform_mode, in, out);
}
break;
case MODE_COLOR:
--
1.8.1.4
More information about the ffmpeg-devel
mailing list