From 953b8c5a43ef3f48cc0464857efffe8fdc769b3d Mon Sep 17 00:00:00 2001
From: Paul B Mahol <onemda@gmail.com>
Date: Wed, 9 Mar 2016 11:51:20 +0100
Subject: [PATCH] avfilter/vf_waveform: use intensity for other components too
Signed-off-by: Paul B Mahol <onemda@gmail.com>
---
libavfilter/vf_waveform.c | 24 ++++++++++++------------
1 file changed, 12 insertions(+), 12 deletions(-)
diff --git a/libavfilter/vf_waveform.c b/libavfilter/vf_waveform.c
index 9a5f5e3f0ea..0b89ed4055f 100644
--- a/libavfilter/vf_waveform.c
+++ b/libavfilter/vf_waveform.c
@@ -688,9 +688,9 @@ static void flat(WaveformContext *s, AVFrame *in, AVFrame *out,
target = d0 + x + d0_signed_linesize * c0;
update(target, max, intensity);
target = d1 + x + d1_signed_linesize * (c0 - c1);
- update(target, max, 1);
+ update(target, max, intensity);
target = d1 + x + d1_signed_linesize * (c0 + c1);
- update(target, max, 1);
+ update(target, max, intensity);
c0_data += c0_linesize;
c1_data += c1_linesize;
@@ -721,16 +721,16 @@ static void flat(WaveformContext *s, AVFrame *in, AVFrame *out,
target = d0_data - c0;
update(target, max, intensity);
target = d1_data - (c0 - c1);
- update(target, max, 1);
+ update(target, max, intensity);
target = d1_data - (c0 + c1);
- update(target, max, 1);
+ update(target, max, intensity);
} else {
target = d0_data + c0;
update(target, max, intensity);
target = d1_data + (c0 - c1);
- update(target, max, 1);
+ update(target, max, intensity);
target = d1_data + (c0 + c1);
- update(target, max, 1);
+ update(target, max, intensity);
}
}
@@ -791,10 +791,10 @@ static void aflat(WaveformContext *s, AVFrame *in, AVFrame *out,
update(target, max, intensity);
target = d1 + x + d1_signed_linesize * (c0 + c1);
- update(target, max, 1);
+ update(target, max, intensity);
target = d2 + x + d2_signed_linesize * (c0 + c2);
- update(target, max, 1);
+ update(target, max, intensity);
c0_data += c0_linesize;
c1_data += c1_linesize;
@@ -829,16 +829,16 @@ static void aflat(WaveformContext *s, AVFrame *in, AVFrame *out,
target = d0_data - c0;
update(target, max, intensity);
target = d1_data - (c0 + c1);
- update(target, max, 1);
+ update(target, max, intensity);
target = d2_data - (c0 + c2);
- update(target, max, 1);
+ update(target, max, intensity);
} else {
target = d0_data + c0;
update(target, max, intensity);
target = d1_data + (c0 + c1);
- update(target, max, 1);
+ update(target, max, intensity);
target = d2_data + (c0 + c2);
- update(target, max, 1);
+ update(target, max, intensity);
}
}
--
GitLab