notwa/crap
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

split decimate, interpolate

Browse source
This commit is contained in:
Connor Olding 2015-04-07 11:33:11 -07:00
parent 33c0ef8f14
commit 95c3e58ff9
2 changed files with 36 additions and 32 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

28
include/os2piir_stereo.h
View file

@ -14,7 +14,6 @@ typedef struct {
v2df ao[8], bo[8]; v2df ao[8], bo[8];
v2df at[8], bt[8]; v2df at[8], bt[8];
v2df x1, x2, x3; v2df x1, x2, x3;
int i;
} halfband_t; } halfband_t;
INNER void INNER void
@ -60,39 +59,46 @@ halfband(halfband_t *h, v2df x0)
} }
INNER v2df INNER v2df
decimate(halfband_t *h, v2df x0) decimate_a(halfband_t *h, v2df x0)
{ {
v2df c[8]; v2df c[8];
if ((h->i = !h->i)) {
halfband_b(c, h->bo, x0, h->x2); halfband_b(c, h->bo, x0, h->x2);
copy(h->bo, c); copy(h->bo, c);
h->x2 = h->x1; h->x2 = h->x1;
h->x1 = x0; h->x1 = x0;
return V(0); return V(0);
} else { }
INNER v2df
decimate_b(halfband_t *h, v2df x0)
{
v2df c[8];
halfband_a(c, h->ao, x0, h->x2); halfband_a(c, h->ao, x0, h->x2);
copy(h->ao, c); copy(h->ao, c);
h->x2 = h->x1; h->x2 = h->x1;
h->x1 = x0; h->x1 = x0;
return (c[7] + h->bo[7])*V(0.5); return (c[7] + h->bo[7])*V(0.5);
} }
// note: do not zero-stuff! send the input each time.
INNER v2df
interpolate_a(halfband_t *h, v2df x0)
{
v2df c[8];
halfband_a(c, h->ao, x0, h->x1);
copy(h->ao, c);
return c[7];
} }
// note: do not zero-stuff! send the input each time. // note: do not zero-stuff! send the input each time.
INNER v2df INNER v2df
interpolate(halfband_t *h, v2df x0) interpolate_b(halfband_t *h, v2df x0)
{ {
v2df c[8]; v2df c[8];
if ((h->i = !h->i)) {
halfband_a(c, h->ao, x0, h->x1);
copy(h->ao, c);
return c[7];
} else {
halfband_b(c, h->bo, x0, h->x1); halfband_b(c, h->bo, x0, h->x1);
copy(h->bo, c); copy(h->bo, c);
h->x1 = x0; h->x1 = x0;
return c[7]; return c[7];
} }
}
#undef copy #undef copy

10
include/process_nonlinear.h
View file

@ -30,9 +30,8 @@
} }
for (ulong i = 0; i < rem; i++) { for (ulong i = 0; i < rem; i++) {
hb_up->i = 0; // so compiler can optimize over[i*2+0] = interpolate_a(hb_up, buf[i]);
over[i*2+0] = interpolate(hb_up, buf[i]); over[i*2+1] = interpolate_b(hb_up, buf[i]);
over[i*2+1] = interpolate(hb_up, buf[i]);
} }
for (ulong i = 0; i < rem2; i++) { for (ulong i = 0; i < rem2; i++) {
@ -40,9 +39,8 @@
} }
for (ulong i = 0; i < rem; i++) { for (ulong i = 0; i < rem; i++) {
hb_down->i = 0; // so compiler can optimize decimate_a(hb_down, over[i*2+0]);
decimate(hb_down, over[i*2+0]); buf[i] = decimate_b(hb_down, over[i*2+1]);
buf[i] = decimate(hb_down, over[i*2+1]);
} }
for (ulong i = 0; i < rem; i++) { for (ulong i = 0; i < rem; i++) {