mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2024-11-27 20:21:24 +00:00
Code Issues 1 Projects Releases Wiki Activity

audiovisualizer: remove check for below zero for unsigned value

Browse source 
CLAMP checks both if value is '< 0' and '> max'. Value will never be a negative
number since it is an unsigned integer. Removing that check and only checking if
it is bigger than max and setting it appropriately.

Also converting the previous instance of this into MIN() for consistency.

CID 1139793
This commit is contained in:
Luis de Bethencourt 2015-01-09 17:56:09 +00:00
parent 542c77ab38
commit c01af3aa8f
1 changed files with 9 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

21
gst/audiovisualizers/gstwavescope.c
View file

@ -325,18 +325,15 @@ render_color_dots (GstAudioVisualizer * base, guint32 * vdata,
filter ((gfloat) adata[s]); filter ((gfloat) adata[s]);
y = (guint) (oy + flt[0] * dy); y = (guint) (oy + flt[0] * dy);
if (y > h1) y = MIN (y, h1);
y = h1;
draw_dot_c (vdata, x, y, w, 0x00FF0000); draw_dot_c (vdata, x, y, w, 0x00FF0000);
y = (guint) (oy + flt[3] * dy); y = (guint) (oy + flt[3] * dy);
if (y > h1) y = MIN (y, h1);
y = h1;
draw_dot_c (vdata, x, y, w, 0x0000FF00); draw_dot_c (vdata, x, y, w, 0x0000FF00);
y = (guint) (oy + (flt[4] + flt[5]) * dy); y = (guint) (oy + (flt[4] + flt[5]) * dy);
if (y > h1) y = MIN (y, h1);
y = h1;
draw_dot_c (vdata, x, y, w, 0x000000FF); draw_dot_c (vdata, x, y, w, 0x000000FF);
s += channels; s += channels;
@ -370,30 +367,30 @@ render_color_lines (GstAudioVisualizer * base, guint32 * vdata,
filter ((gfloat) adata[s]); filter ((gfloat) adata[s]);
y = (guint) (oy + flt[0] * dy); y = (guint) (oy + flt[0] * dy);
y2 = CLAMP (y, 0, h1); y2 = MIN (y, h1);
y = (guint) (oy + flt[3] * dy); y = (guint) (oy + flt[3] * dy);
y3 = CLAMP (y, 0, h1); y3 = MIN (y, h1);
y = (guint) (oy + (flt[4] + flt[5]) * dy); y = (guint) (oy + (flt[4] + flt[5]) * dy);
y4 = CLAMP (y, 0, h1); y4 = MIN (y, h1);
for (i = 1; i < num_samples; i++) { for (i = 1; i < num_samples; i++) {
x = (guint) ((gfloat) i * dx); x = (guint) ((gfloat) i * dx);
filter ((gfloat) adata[s]); filter ((gfloat) adata[s]);
y = (guint) (oy + flt[0] * dy); y = (guint) (oy + flt[0] * dy);
y = CLAMP (y, 0, h1); y = MIN (y, h1);
draw_line_aa (vdata, x2, x, y2, y, w, 0x00FF0000); draw_line_aa (vdata, x2, x, y2, y, w, 0x00FF0000);
y2 = y; y2 = y;
y = (guint) (oy + flt[3] * dy); y = (guint) (oy + flt[3] * dy);
y = CLAMP (y, 0, h1); y = MIN (y, h1);
draw_line_aa (vdata, x2, x, y3, y, w, 0x0000FF00); draw_line_aa (vdata, x2, x, y3, y, w, 0x0000FF00);
y3 = y; y3 = y;
y = (guint) (oy + (flt[4] + flt[5]) * dy); y = (guint) (oy + (flt[4] + flt[5]) * dy);
y = CLAMP (y, 0, h1); y = MIN (y, h1);
draw_line_aa (vdata, x2, x, y4, y, w, 0x000000FF); draw_line_aa (vdata, x2, x, y4, y, w, 0x000000FF);
y4 = y; y4 = y;