claunia/flac
1
0
Fork 0
mirror of https://github.com/claunia/flac.git synced 2025-12-16 18:54:26 +00:00
Code Issues Packages Projects Releases Wiki Activity

64-bit fixes (SF#1790872: https://sourceforge.net/tracker/index.php?func=detail&aid=1790872&group_id=13478&atid=113478)

Browse Source
This commit is contained in:
Josh Coalson
2007-09-08 22:28:09 +00:00
parent 98bd994223
commit ab4bef6a8a
2 changed files with 29 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
doc/html/changelog.html
View File

@@ -109,6 +109,7 @@
<li>Some MinGW fixes (<a href="https://sourceforge.net/tracker/index.php?func=detail&amp;aid=1684879&amp;group_id=13478&amp;atid=113478">SF #1684879</a>).</li> <li>Some MinGW fixes (<a href="https://sourceforge.net/tracker/index.php?func=detail&amp;aid=1684879&amp;group_id=13478&amp;atid=113478">SF #1684879</a>).</li>
<li>Solaris 10 fixes (<a href="https://sourceforge.net/tracker/index.php?func=detail&amp;aid=1783225&amp;group_id=13478&amp;atid=113478">SF #1783225</a>).</li> <li>Solaris 10 fixes (<a href="https://sourceforge.net/tracker/index.php?func=detail&amp;aid=1783225&amp;group_id=13478&amp;atid=113478">SF #1783225</a>).</li>
<li>OS/2 fixes (<a href="https://sourceforge.net/tracker/index.php?func=detail&amp;aid=1771378&amp;group_id=13478&amp;atid=113478">SF #1771378</a> <a href="https://sourceforge.net/tracker/index.php?func=detail&amp;aid=1229495&amp;group_id=13478&amp;atid=113478">SF #1229495</a>).</li> <li>OS/2 fixes (<a href="https://sourceforge.net/tracker/index.php?func=detail&amp;aid=1771378&amp;group_id=13478&amp;atid=113478">SF #1771378</a> <a href="https://sourceforge.net/tracker/index.php?func=detail&amp;aid=1229495&amp;group_id=13478&amp;atid=113478">SF #1229495</a>).</li>
<li>64-bit fixes (<a href="https://sourceforge.net/tracker/index.php?func=detail&amp;aid=1790872&amp;group_id=13478&amp;atid=113478">SF #1790872</a>).</li>
</ul> </ul>
</li> </li>
<li> <li>

56
src/libFLAC/lpc.c
View File

@@ -569,7 +569,7 @@ void FLAC__lpc_compute_residual_from_qlp_coefficients_wide(const FLAC__int32 *da
} }
#else /* fully unrolled version for normal use */ #else /* fully unrolled version for normal use */
{ {
unsigned i; int i;
FLAC__int64 sum; FLAC__int64 sum;
FLAC__ASSERT(order > 0); FLAC__ASSERT(order > 0);
@@ -584,7 +584,7 @@ void FLAC__lpc_compute_residual_from_qlp_coefficients_wide(const FLAC__int32 *da
if(order > 8) { if(order > 8) {
if(order > 10) { if(order > 10) {
if(order == 12) { if(order == 12) {
for(i = 0; i < data_len; i++) { for(i = 0; i < (int)data_len; i++) {
sum = 0; sum = 0;
sum += qlp_coeff[11] * (FLAC__int64)data[i-12]; sum += qlp_coeff[11] * (FLAC__int64)data[i-12];
sum += qlp_coeff[10] * (FLAC__int64)data[i-11]; sum += qlp_coeff[10] * (FLAC__int64)data[i-11];
@@ -602,7 +602,7 @@ void FLAC__lpc_compute_residual_from_qlp_coefficients_wide(const FLAC__int32 *da
} }
} }
else { /* order == 11 */ else { /* order == 11 */
for(i = 0; i < data_len; i++) { for(i = 0; i < (int)data_len; i++) {
sum = 0; sum = 0;
sum += qlp_coeff[10] * (FLAC__int64)data[i-11]; sum += qlp_coeff[10] * (FLAC__int64)data[i-11];
sum += qlp_coeff[9] * (FLAC__int64)data[i-10]; sum += qlp_coeff[9] * (FLAC__int64)data[i-10];
@@ -621,7 +621,7 @@ void FLAC__lpc_compute_residual_from_qlp_coefficients_wide(const FLAC__int32 *da
} }
else { else {
if(order == 10) { if(order == 10) {
for(i = 0; i < data_len; i++) { for(i = 0; i < (int)data_len; i++) {
sum = 0; sum = 0;
sum += qlp_coeff[9] * (FLAC__int64)data[i-10]; sum += qlp_coeff[9] * (FLAC__int64)data[i-10];
sum += qlp_coeff[8] * (FLAC__int64)data[i-9]; sum += qlp_coeff[8] * (FLAC__int64)data[i-9];
@@ -637,7 +637,7 @@ void FLAC__lpc_compute_residual_from_qlp_coefficients_wide(const FLAC__int32 *da
} }
} }
else { /* order == 9 */ else { /* order == 9 */
for(i = 0; i < data_len; i++) { for(i = 0; i < (int)data_len; i++) {
sum = 0; sum = 0;
sum += qlp_coeff[8] * (FLAC__int64)data[i-9]; sum += qlp_coeff[8] * (FLAC__int64)data[i-9];
sum += qlp_coeff[7] * (FLAC__int64)data[i-8]; sum += qlp_coeff[7] * (FLAC__int64)data[i-8];
@@ -656,7 +656,7 @@ void FLAC__lpc_compute_residual_from_qlp_coefficients_wide(const FLAC__int32 *da
else if(order > 4) { else if(order > 4) {
if(order > 6) { if(order > 6) {
if(order == 8) { if(order == 8) {
for(i = 0; i < data_len; i++) { for(i = 0; i < (int)data_len; i++) {
sum = 0; sum = 0;
sum += qlp_coeff[7] * (FLAC__int64)data[i-8]; sum += qlp_coeff[7] * (FLAC__int64)data[i-8];
sum += qlp_coeff[6] * (FLAC__int64)data[i-7]; sum += qlp_coeff[6] * (FLAC__int64)data[i-7];
@@ -670,7 +670,7 @@ void FLAC__lpc_compute_residual_from_qlp_coefficients_wide(const FLAC__int32 *da
} }
} }
else { /* order == 7 */ else { /* order == 7 */
for(i = 0; i < data_len; i++) { for(i = 0; i < (int)data_len; i++) {
sum = 0; sum = 0;
sum += qlp_coeff[6] * (FLAC__int64)data[i-7]; sum += qlp_coeff[6] * (FLAC__int64)data[i-7];
sum += qlp_coeff[5] * (FLAC__int64)data[i-6]; sum += qlp_coeff[5] * (FLAC__int64)data[i-6];
@@ -685,7 +685,7 @@ void FLAC__lpc_compute_residual_from_qlp_coefficients_wide(const FLAC__int32 *da
} }
else { else {
if(order == 6) { if(order == 6) {
for(i = 0; i < data_len; i++) { for(i = 0; i < (int)data_len; i++) {
sum = 0; sum = 0;
sum += qlp_coeff[5] * (FLAC__int64)data[i-6]; sum += qlp_coeff[5] * (FLAC__int64)data[i-6];
sum += qlp_coeff[4] * (FLAC__int64)data[i-5]; sum += qlp_coeff[4] * (FLAC__int64)data[i-5];
@@ -697,7 +697,7 @@ void FLAC__lpc_compute_residual_from_qlp_coefficients_wide(const FLAC__int32 *da
} }
} }
else { /* order == 5 */ else { /* order == 5 */
for(i = 0; i < data_len; i++) { for(i = 0; i < (int)data_len; i++) {
sum = 0; sum = 0;
sum += qlp_coeff[4] * (FLAC__int64)data[i-5]; sum += qlp_coeff[4] * (FLAC__int64)data[i-5];
sum += qlp_coeff[3] * (FLAC__int64)data[i-4]; sum += qlp_coeff[3] * (FLAC__int64)data[i-4];
@@ -712,7 +712,7 @@ void FLAC__lpc_compute_residual_from_qlp_coefficients_wide(const FLAC__int32 *da
else { else {
if(order > 2) { if(order > 2) {
if(order == 4) { if(order == 4) {
for(i = 0; i < data_len; i++) { for(i = 0; i < (int)data_len; i++) {
sum = 0; sum = 0;
sum += qlp_coeff[3] * (FLAC__int64)data[i-4]; sum += qlp_coeff[3] * (FLAC__int64)data[i-4];
sum += qlp_coeff[2] * (FLAC__int64)data[i-3]; sum += qlp_coeff[2] * (FLAC__int64)data[i-3];
@@ -722,7 +722,7 @@ void FLAC__lpc_compute_residual_from_qlp_coefficients_wide(const FLAC__int32 *da
} }
} }
else { /* order == 3 */ else { /* order == 3 */
for(i = 0; i < data_len; i++) { for(i = 0; i < (int)data_len; i++) {
sum = 0; sum = 0;
sum += qlp_coeff[2] * (FLAC__int64)data[i-3]; sum += qlp_coeff[2] * (FLAC__int64)data[i-3];
sum += qlp_coeff[1] * (FLAC__int64)data[i-2]; sum += qlp_coeff[1] * (FLAC__int64)data[i-2];
@@ -733,7 +733,7 @@ void FLAC__lpc_compute_residual_from_qlp_coefficients_wide(const FLAC__int32 *da
} }
else { else {
if(order == 2) { if(order == 2) {
for(i = 0; i < data_len; i++) { for(i = 0; i < (int)data_len; i++) {
sum = 0; sum = 0;
sum += qlp_coeff[1] * (FLAC__int64)data[i-2]; sum += qlp_coeff[1] * (FLAC__int64)data[i-2];
sum += qlp_coeff[0] * (FLAC__int64)data[i-1]; sum += qlp_coeff[0] * (FLAC__int64)data[i-1];
@@ -741,14 +741,14 @@ void FLAC__lpc_compute_residual_from_qlp_coefficients_wide(const FLAC__int32 *da
} }
} }
else { /* order == 1 */ else { /* order == 1 */
for(i = 0; i < data_len; i++) for(i = 0; i < (int)data_len; i++)
residual[i] = data[i] - (FLAC__int32)((qlp_coeff[0] * (FLAC__int64)data[i-1]) >> lp_quantization); residual[i] = data[i] - (FLAC__int32)((qlp_coeff[0] * (FLAC__int64)data[i-1]) >> lp_quantization);
} }
} }
} }
} }
else { /* order > 12 */ else { /* order > 12 */
for(i = 0; i < data_len; i++) { for(i = 0; i < (int)data_len; i++) {
sum = 0; sum = 0;
switch(order) { switch(order) {
case 32: sum += qlp_coeff[31] * (FLAC__int64)data[i-32]; case 32: sum += qlp_coeff[31] * (FLAC__int64)data[i-32];
@@ -1099,7 +1099,7 @@ void FLAC__lpc_restore_signal_wide(const FLAC__int32 residual[], unsigned data_l
} }
#else /* fully unrolled version for normal use */ #else /* fully unrolled version for normal use */
{ {
unsigned i; int i;
FLAC__int64 sum; FLAC__int64 sum;
FLAC__ASSERT(order > 0); FLAC__ASSERT(order > 0);
@@ -1114,7 +1114,7 @@ void FLAC__lpc_restore_signal_wide(const FLAC__int32 residual[], unsigned data_l
if(order > 8) { if(order > 8) {
if(order > 10) { if(order > 10) {
if(order == 12) { if(order == 12) {
for(i = 0; i < data_len; i++) { for(i = 0; i < (int)data_len; i++) {
sum = 0; sum = 0;
sum += qlp_coeff[11] * (FLAC__int64)data[i-12]; sum += qlp_coeff[11] * (FLAC__int64)data[i-12];
sum += qlp_coeff[10] * (FLAC__int64)data[i-11]; sum += qlp_coeff[10] * (FLAC__int64)data[i-11];
@@ -1132,7 +1132,7 @@ void FLAC__lpc_restore_signal_wide(const FLAC__int32 residual[], unsigned data_l
} }
} }
else { /* order == 11 */ else { /* order == 11 */
for(i = 0; i < data_len; i++) { for(i = 0; i < (int)data_len; i++) {
sum = 0; sum = 0;
sum += qlp_coeff[10] * (FLAC__int64)data[i-11]; sum += qlp_coeff[10] * (FLAC__int64)data[i-11];
sum += qlp_coeff[9] * (FLAC__int64)data[i-10]; sum += qlp_coeff[9] * (FLAC__int64)data[i-10];
@@ -1151,7 +1151,7 @@ void FLAC__lpc_restore_signal_wide(const FLAC__int32 residual[], unsigned data_l
} }
else { else {
if(order == 10) { if(order == 10) {
for(i = 0; i < data_len; i++) { for(i = 0; i < (int)data_len; i++) {
sum = 0; sum = 0;
sum += qlp_coeff[9] * (FLAC__int64)data[i-10]; sum += qlp_coeff[9] * (FLAC__int64)data[i-10];
sum += qlp_coeff[8] * (FLAC__int64)data[i-9]; sum += qlp_coeff[8] * (FLAC__int64)data[i-9];
@@ -1167,7 +1167,7 @@ void FLAC__lpc_restore_signal_wide(const FLAC__int32 residual[], unsigned data_l
} }
} }
else { /* order == 9 */ else { /* order == 9 */
for(i = 0; i < data_len; i++) { for(i = 0; i < (int)data_len; i++) {
sum = 0; sum = 0;
sum += qlp_coeff[8] * (FLAC__int64)data[i-9]; sum += qlp_coeff[8] * (FLAC__int64)data[i-9];
sum += qlp_coeff[7] * (FLAC__int64)data[i-8]; sum += qlp_coeff[7] * (FLAC__int64)data[i-8];
@@ -1186,7 +1186,7 @@ void FLAC__lpc_restore_signal_wide(const FLAC__int32 residual[], unsigned data_l
else if(order > 4) { else if(order > 4) {
if(order > 6) { if(order > 6) {
if(order == 8) { if(order == 8) {
for(i = 0; i < data_len; i++) { for(i = 0; i < (int)data_len; i++) {
sum = 0; sum = 0;
sum += qlp_coeff[7] * (FLAC__int64)data[i-8]; sum += qlp_coeff[7] * (FLAC__int64)data[i-8];
sum += qlp_coeff[6] * (FLAC__int64)data[i-7]; sum += qlp_coeff[6] * (FLAC__int64)data[i-7];
@@ -1200,7 +1200,7 @@ void FLAC__lpc_restore_signal_wide(const FLAC__int32 residual[], unsigned data_l
} }
} }
else { /* order == 7 */ else { /* order == 7 */
for(i = 0; i < data_len; i++) { for(i = 0; i < (int)data_len; i++) {
sum = 0; sum = 0;
sum += qlp_coeff[6] * (FLAC__int64)data[i-7]; sum += qlp_coeff[6] * (FLAC__int64)data[i-7];
sum += qlp_coeff[5] * (FLAC__int64)data[i-6]; sum += qlp_coeff[5] * (FLAC__int64)data[i-6];
@@ -1215,7 +1215,7 @@ void FLAC__lpc_restore_signal_wide(const FLAC__int32 residual[], unsigned data_l
} }
else { else {
if(order == 6) { if(order == 6) {
for(i = 0; i < data_len; i++) { for(i = 0; i < (int)data_len; i++) {
sum = 0; sum = 0;
sum += qlp_coeff[5] * (FLAC__int64)data[i-6]; sum += qlp_coeff[5] * (FLAC__int64)data[i-6];
sum += qlp_coeff[4] * (FLAC__int64)data[i-5]; sum += qlp_coeff[4] * (FLAC__int64)data[i-5];
@@ -1227,7 +1227,7 @@ void FLAC__lpc_restore_signal_wide(const FLAC__int32 residual[], unsigned data_l
} }
} }
else { /* order == 5 */ else { /* order == 5 */
for(i = 0; i < data_len; i++) { for(i = 0; i < (int)data_len; i++) {
sum = 0; sum = 0;
sum += qlp_coeff[4] * (FLAC__int64)data[i-5]; sum += qlp_coeff[4] * (FLAC__int64)data[i-5];
sum += qlp_coeff[3] * (FLAC__int64)data[i-4]; sum += qlp_coeff[3] * (FLAC__int64)data[i-4];
@@ -1242,7 +1242,7 @@ void FLAC__lpc_restore_signal_wide(const FLAC__int32 residual[], unsigned data_l
else { else {
if(order > 2) { if(order > 2) {
if(order == 4) { if(order == 4) {
for(i = 0; i < data_len; i++) { for(i = 0; i < (int)data_len; i++) {
sum = 0; sum = 0;
sum += qlp_coeff[3] * (FLAC__int64)data[i-4]; sum += qlp_coeff[3] * (FLAC__int64)data[i-4];
sum += qlp_coeff[2] * (FLAC__int64)data[i-3]; sum += qlp_coeff[2] * (FLAC__int64)data[i-3];
@@ -1252,7 +1252,7 @@ void FLAC__lpc_restore_signal_wide(const FLAC__int32 residual[], unsigned data_l
} }
} }
else { /* order == 3 */ else { /* order == 3 */
for(i = 0; i < data_len; i++) { for(i = 0; i < (int)data_len; i++) {
sum = 0; sum = 0;
sum += qlp_coeff[2] * (FLAC__int64)data[i-3]; sum += qlp_coeff[2] * (FLAC__int64)data[i-3];
sum += qlp_coeff[1] * (FLAC__int64)data[i-2]; sum += qlp_coeff[1] * (FLAC__int64)data[i-2];
@@ -1263,7 +1263,7 @@ void FLAC__lpc_restore_signal_wide(const FLAC__int32 residual[], unsigned data_l
} }
else { else {
if(order == 2) { if(order == 2) {
for(i = 0; i < data_len; i++) { for(i = 0; i < (int)data_len; i++) {
sum = 0; sum = 0;
sum += qlp_coeff[1] * (FLAC__int64)data[i-2]; sum += qlp_coeff[1] * (FLAC__int64)data[i-2];
sum += qlp_coeff[0] * (FLAC__int64)data[i-1]; sum += qlp_coeff[0] * (FLAC__int64)data[i-1];
@@ -1271,14 +1271,14 @@ void FLAC__lpc_restore_signal_wide(const FLAC__int32 residual[], unsigned data_l
} }
} }
else { /* order == 1 */ else { /* order == 1 */
for(i = 0; i < data_len; i++) for(i = 0; i < (int)data_len; i++)
data[i] = residual[i] + (FLAC__int32)((qlp_coeff[0] * (FLAC__int64)data[i-1]) >> lp_quantization); data[i] = residual[i] + (FLAC__int32)((qlp_coeff[0] * (FLAC__int64)data[i-1]) >> lp_quantization);
} }
} }
} }
} }
else { /* order > 12 */ else { /* order > 12 */
for(i = 0; i < data_len; i++) { for(i = 0; i < (int)data_len; i++) {
sum = 0; sum = 0;
switch(order) { switch(order) {
case 32: sum += qlp_coeff[31] * (FLAC__int64)data[i-32]; case 32: sum += qlp_coeff[31] * (FLAC__int64)data[i-32];