Thank you to anyone who has already donated - your generous donations helped make three months of treatment possible.
My brother Nate continues to fight stage IV Hodgkin's lymphoma. He's just 31, with a wife and baby girl. They have no active income (since he's been unable to return to work), no insurance, and cannot afford the treatment he needs. Nate and his family need your help. Please consider a donation, every dollar helps. Thanks.
1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 70 71 72 73 74 75 76 77 78 79 80 81 82 83 84 85 86 87 88 89 90 91 92 93 94 95 96 97 98 99 100 101 102 103 104 105 106 107 108 109 110 111 112 113 114 115 116 117 118 119 120 121 122 123 124 125 126 127 128 129 130 131 132 133 134 135 136 137 138 139 140 141 142 143 144 145 146 147 148 149 150 151 152 153 154 155 156 157 158 159 160 161 162 163 164 165 166 167 168 169 170 171 172 173 174 175 176 177 178 179 180 |
Index: apps/codecs/libatrac/atrac3.h =================================================================== --- apps/codecs/libatrac/atrac3.h (revision 24645) +++ apps/codecs/libatrac/atrac3.h (working copy) @@ -69,7 +69,7 @@ /** data buffers */ int32_t outSamples[2048]; uint8_t decoded_bytes_buffer[1024]; - int32_t tempBuf[1070]; +//AB int32_t tempBuf[1070]; //@} //@{ /** extradata */ Index: apps/codecs/libatrac/atrac3data.h =================================================================== --- apps/codecs/libatrac/atrac3data.h (revision 24645) +++ apps/codecs/libatrac/atrac3data.h (working copy) @@ -77,7 +77,7 @@ 0x36,0x37,0x38,0x39,0x3A,0x3B,0x78,0x79,0x7A,0x7B,0x7C,0x7D,0x7E,0x7F,0x8,0x9, }; -static const uint8_t huffbits6[31] = { +static const uint8_t huffbits6[31] = { 3,4,4,4,4,4,4,5,5,5,5,5,5,6,6,6,6,6,6,6,6,7,7,7,7,7,7,7,7,4,4 }; @@ -117,18 +117,18 @@ /* tables for the scalefactor decoding */ - +/* not needed anymore static const float iMaxQuant[8] = { 0.0, 1.0/1.5, 1.0/2.5, 1.0/3.5, 1.0/4.5, 1.0/7.5, 1.0/15.5, 1.0/31.5 }; - +*/ static const uint16_t subbandTab[33] = { 0, 8, 16, 24, 32, 40, 48, 56, 64, 80, 96, 112, 128, 144, 160, 176, 192, 224, 256, 288, 320, 352, 384, 416, 448, 480, 512, 576, 640, 704, 768, 896, 1024 }; /* transform data */ - +/* not needed anymore static const float qmf_48tap_half[24] = { -0.00001461907, -0.00009205479, -0.000056157569, 0.00030117269, 0.0002422519,-0.00085293897, -0.0005205574, 0.0020340169, @@ -137,8 +137,9 @@ -0.007801671, -0.034090221, 0.01880949, 0.054326009, -0.043596379, -0.099384367, 0.13207909, 0.46424159 }; - +*/ /* joint stereo related tables */ +/* not needed anymore static const float matrixCoeffs[8] = {0.0, 2.0, 2.0, 2.0, 0.0, 0.0, 1.0, 1.0}; - +*/ #endif /* AVCODEC_ATRAC3DATA_H */ Index: apps/codecs/libatrac/atrac3.c =================================================================== --- apps/codecs/libatrac/atrac3.c (revision 24645) +++ apps/codecs/libatrac/atrac3.c (working copy) @@ -56,6 +56,7 @@ #define FFSWAP(type,a,b) do{type SWAP_tmp= b; b= a; a= SWAP_tmp;}while(0) static int32_t qmf_window[48] IBSS_ATTR; +static int32_t iqmf_temp_buf[1070] IBSS_ATTR; static VLC spectral_coeff_tab[7]; static channel_unit channel_units[2] IBSS_ATTR_LARGE_IRAM; @@ -98,6 +99,20 @@ * @param in input buffer * @param win windowing coefficients * @param nIn size of spectrum buffer + * Reference implementation: + * + * for (j = nIn; j != 0; j--) { + * s1 = fixmul32(in[0], win[0]); + * s2 = fixmul32(in[1], win[1]); + * for (i = 2; i < 48; i += 2) { + * s1 += fixmul31(in[i ], win[i ]); + * s2 += fixmul31(in[i+1], win[i+1]); + * } + * out[0] = s2; + * out[1] = s1; + * in += 2; + * out += 2; + * } */ #if defined(CPU_ARM) @@ -116,16 +131,62 @@ int32_t i, j, s1, s2; for (j = nIn; j != 0; j--) { - /* i=0 */ - s1 = fixmul31(win[0], in[0]); - s2 = fixmul31(win[1], in[1]); - - /* i=2..46 */ - for (i = 2; i < 48; i += 2) { - s1 += fixmul31(win[i ], in[i ]); - s2 += fixmul31(win[i+1], in[i+1]); - } - + i = 0; + /* 0.. 7 */ + s1 = fixmul31(win[i], in[i]); i++; + s2 = fixmul31(win[i], in[i]); i++; + s1 += fixmul31(win[i], in[i]); i++; + s2 += fixmul31(win[i], in[i]); i++; + s1 += fixmul31(win[i], in[i]); i++; + s2 += fixmul31(win[i], in[i]); i++; + s1 += fixmul31(win[i], in[i]); i++; + s2 += fixmul31(win[i], in[i]); i++; + /* 8..15 */ + s1 += fixmul31(win[i], in[i]); i++; + s2 += fixmul31(win[i], in[i]); i++; + s1 += fixmul31(win[i], in[i]); i++; + s2 += fixmul31(win[i], in[i]); i++; + s1 += fixmul31(win[i], in[i]); i++; + s2 += fixmul31(win[i], in[i]); i++; + s1 += fixmul31(win[i], in[i]); i++; + s2 += fixmul31(win[i], in[i]); i++; + /* 16..23 */ + s1 += fixmul31(win[i], in[i]); i++; + s2 += fixmul31(win[i], in[i]); i++; + s1 += fixmul31(win[i], in[i]); i++; + s2 += fixmul31(win[i], in[i]); i++; + s1 += fixmul31(win[i], in[i]); i++; + s2 += fixmul31(win[i], in[i]); i++; + s1 += fixmul31(win[i], in[i]); i++; + s2 += fixmul31(win[i], in[i]); i++; + /* 24..31 */ + s1 += fixmul31(win[i], in[i]); i++; + s2 += fixmul31(win[i], in[i]); i++; + s1 += fixmul31(win[i], in[i]); i++; + s2 += fixmul31(win[i], in[i]); i++; + s1 += fixmul31(win[i], in[i]); i++; + s2 += fixmul31(win[i], in[i]); i++; + s1 += fixmul31(win[i], in[i]); i++; + s2 += fixmul31(win[i], in[i]); i++; + /* 32..39 */ + s1 += fixmul31(win[i], in[i]); i++; + s2 += fixmul31(win[i], in[i]); i++; + s1 += fixmul31(win[i], in[i]); i++; + s2 += fixmul31(win[i], in[i]); i++; + s1 += fixmul31(win[i], in[i]); i++; + s2 += fixmul31(win[i], in[i]); i++; + s1 += fixmul31(win[i], in[i]); i++; + s2 += fixmul31(win[i], in[i]); i++; + /* 40..47 */ + s1 += fixmul31(win[i], in[i]); i++; + s2 += fixmul31(win[i], in[i]); i++; + s1 += fixmul31(win[i], in[i]); i++; + s2 += fixmul31(win[i], in[i]); i++; + s1 += fixmul31(win[i], in[i]); i++; + s2 += fixmul31(win[i], in[i]); i++; + s1 += fixmul31(win[i], in[i]); i++; + s2 += fixmul31(win[i], in[i]); + out[0] = s2; out[1] = s1; @@ -837,9 +898,14 @@ p2= p1+256; p3= p2+256; p4= p3+256; + /* iqmf (p1, p2, 256, p1, q->pUnits[i].delayBuf1, q->tempBuf); iqmf (p4, p3, 256, p3, q->pUnits[i].delayBuf2, q->tempBuf); iqmf (p1, p3, 512, p1, q->pUnits[i].delayBuf3, q->tempBuf); + */ + iqmf (p1, p2, 256, p1, q->pUnits[i].delayBuf1, iqmf_temp_buf); + iqmf (p4, p3, 256, p3, q->pUnits[i].delayBuf2, iqmf_temp_buf); + iqmf (p1, p3, 512, p1, q->pUnits[i].delayBuf3, iqmf_temp_buf); p1 +=1024; } |
