etc/furnace
0
0
Fork 0
mirror of https://github.com/tildearrow/furnace.git synced 2024-11-16 01:35:07 +00:00
Code Issues Projects Releases Packages Wiki Activity

update brrUtils

Browse source
This commit is contained in:
tildearrow 2022-09-28 04:49:02 -05:00
parent 8cc15b398d
commit c6173311f7
1 changed files with 14 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

25
src/engine/brrUtils.c
View file

@ -95,7 +95,7 @@ long brrEncode(short* buf, unsigned char* out, long len, long loopStart) {
short o1f1=0; short o1f1=0;
short o1f2=0; short o1f2=0;
short o1f3=0; short o1f3=0;
short o2f1=0; //short o2f1=0;
short o2f2=0; short o2f2=0;
short o2f3=0; short o2f3=0;
@ -138,7 +138,7 @@ long brrEncode(short* buf, unsigned char* out, long len, long loopStart) {
range1=0; range1=0;
range2=0; range2=0;
range3=0; range3=0;
o2f1=o2; //o2f1=o2;
o2f2=o2; o2f2=o2;
o2f3=o2; o2f3=o2;
o1f1=o1; o1f1=o1;
@ -180,6 +180,7 @@ long brrEncode(short* buf, unsigned char* out, long len, long loopStart) {
// second pass // second pass
int prevLast1=last1; int prevLast1=last1;
int prevLast2=last2; int prevLast2=last2;
filter=1;
for (int j=0; j<16; j++) { for (int j=0; j<16; j++) {
int s=NEXT_SAMPLE; int s=NEXT_SAMPLE;
@ -200,11 +201,12 @@ long brrEncode(short* buf, unsigned char* out, long len, long loopStart) {
nextDec=o; nextDec=o;
DO_ONE_DEC(range1); DO_ONE_DEC(range1);
o2f1=last2<<1; //o2f1=last2<<1;
o1f1=last1<<1; o1f1=last1<<1;
} }
last1=prevLast1; last1=prevLast1;
last2=prevLast2; last2=prevLast2;
filter=2;
for (int j=0; j<16; j++) { for (int j=0; j<16; j++) {
int s=NEXT_SAMPLE; int s=NEXT_SAMPLE;
pred2[j]=s+(((int)o2f2*15)>>4)-(((int)o1f2*61)>>5); pred2[j]=s+(((int)o2f2*15)>>4)-(((int)o1f2*61)>>5);
@ -229,6 +231,7 @@ long brrEncode(short* buf, unsigned char* out, long len, long loopStart) {
} }
last1=prevLast1; last1=prevLast1;
last2=prevLast2; last2=prevLast2;
filter=3;
for (int j=0; j<16; j++) { for (int j=0; j<16; j++) {
int s=NEXT_SAMPLE; int s=NEXT_SAMPLE;
pred3[j]=s+(((int)o2f3*13)>>4)-(((int)o1f3*115)>>6); pred3[j]=s+(((int)o2f3*13)>>4)-(((int)o1f3*115)>>6);
@ -253,12 +256,8 @@ long brrEncode(short* buf, unsigned char* out, long len, long loopStart) {
} }
last1=prevLast1; last1=prevLast1;
last2=prevLast2; last2=prevLast2;
}
if (i && i!=loopStart) {
// find best filter // find best filter
int prevLast1=last1;
int prevLast2=last2;
int error=0; int error=0;
maxError[0]=0; maxError[0]=0;
@ -347,7 +346,6 @@ long brrEncode(short* buf, unsigned char* out, long len, long loopStart) {
// pick best filter // pick best filter
int candError=0x7fffffff; int candError=0x7fffffff;
//avgError[0]+=1000;
for (int j=0; j<4; j++) { for (int j=0; j<4; j++) {
if (avgError[j]<candError) { if (avgError[j]<candError) {
candError=avgError[j]; candError=avgError[j];
@ -362,13 +360,14 @@ long brrEncode(short* buf, unsigned char* out, long len, long loopStart) {
switch (filter) { switch (filter) {
case 0: case 0:
nextDec=next0[7]>>4; for (int j=0; j<8; j++) {
nextDec=next0[j]>>4;
DO_ONE_DEC(range0); DO_ONE_DEC(range0);
o2=nextDec<<1; nextDec=next0[j]&15;
nextDec=next0[7]&15;
DO_ONE_DEC(range0); DO_ONE_DEC(range0);
o1=nextDec<<1; }
o2=last2<<1;
o1=last1<<1;
out[0]=(range0<<4)|(filter<<2)|((i+16>=len)?((loopStart>=0)?3:1):0); out[0]=(range0<<4)|(filter<<2)|((i+16>=len)?((loopStart>=0)?3:1):0);
out[1]=next0[0]; out[1]=next0[0];