Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[3.6] bpo-33781: audioop: enhance rounding double as int (GH-7447) #7451

Merged
merged 1 commit into from
Jun 6, 2018
Merged

[3.6] bpo-33781: audioop: enhance rounding double as int (GH-7447) #7451

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
28 changes: 17 additions & 11 deletions Modules/audioop.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,10 +20,17 @@ static const unsigned int masks[] = {0, 0xFF, 0xFFFF, 0xFFFFFF, 0xFFFFFFFF};
static int
fbound(double val, double minval, double maxval)
{
if (val > maxval)
if (val > maxval) {
val = maxval;
else if (val < minval + 1)
}
else if (val < minval + 1.0) {
val = minval;
}

/* Round towards minus infinity (-inf) */
val = floor(val);

/* Cast double to integer: round towards zero */
return (int)val;
}

Expand Down Expand Up @@ -924,9 +931,8 @@ audioop_mul_impl(PyObject *module, Py_buffer *fragment, int width,

for (i = 0; i < fragment->len; i += width) {
double val = GETRAWSAMPLE(width, fragment->buf, i);
val *= factor;
val = floor(fbound(val, minval, maxval));
SETRAWSAMPLE(width, ncp, i, (int)val);
int ival = fbound(val * factor, minval, maxval);
SETRAWSAMPLE(width, ncp, i, ival);
}
return rv;
}
Expand Down Expand Up @@ -973,9 +979,9 @@ audioop_tomono_impl(PyObject *module, Py_buffer *fragment, int width,
for (i = 0; i < len; i += width*2) {
double val1 = GETRAWSAMPLE(width, cp, i);
double val2 = GETRAWSAMPLE(width, cp, i + width);
double val = val1*lfactor + val2*rfactor;
val = floor(fbound(val, minval, maxval));
SETRAWSAMPLE(width, ncp, i/2, val);
double val = val1 * lfactor + val2 * rfactor;
int ival = fbound(val, minval, maxval);
SETRAWSAMPLE(width, ncp, i/2, ival);
}
return rv;
}
Expand Down Expand Up @@ -1021,8 +1027,8 @@ audioop_tostereo_impl(PyObject *module, Py_buffer *fragment, int width,

for (i = 0; i < fragment->len; i += width) {
double val = GETRAWSAMPLE(width, fragment->buf, i);
int val1 = (int)floor(fbound(val*lfactor, minval, maxval));
int val2 = (int)floor(fbound(val*rfactor, minval, maxval));
int val1 = fbound(val * lfactor, minval, maxval);
int val2 = fbound(val * rfactor, minval, maxval);
SETRAWSAMPLE(width, ncp, i*2, val1);
SETRAWSAMPLE(width, ncp, i*2 + width, val2);
}
Expand Down Expand Up @@ -1080,7 +1086,7 @@ audioop_add_impl(PyObject *module, Py_buffer *fragment1,
else {
double fval = (double)val1 + (double)val2;
/* truncate in case of overflow */
newval = (int)floor(fbound(fval, minval, maxval));
newval = fbound(fval, minval, maxval);
}

SETRAWSAMPLE(width, ncp, i, newval);
Expand Down