[FFmpeg-cvslog] avfilter/vf_waveform: use intensity for other components too

Paul B Mahol git at videolan.org
Wed Mar 9 11:53:37 CET 2016


ffmpeg | branch: master | Paul B Mahol <onemda at gmail.com> | Wed Mar  9 11:51:20 2016 +0100| [953b8c5a43ef3f48cc0464857efffe8fdc769b3d] | committer: Paul B Mahol

avfilter/vf_waveform: use intensity for other components too

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

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

 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 9a5f5e3..0b89ed4 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);
                 }
             }
 



More information about the ffmpeg-cvslog mailing list