devs/foxbox
1
0
Fork 0
forked from len0rd/rockbox
Code Pull requests Activity

See my message on the mailinglist. This should kill all warnings left in the iriver builds. And the changes will be added to the next musepack minor release.

Browse source 
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@6710 a1c6a512-1295-4272-9138-f99709370657
This commit is contained in:
Tomas Salfischberger 2005-06-14 18:48:35 +00:00
parent 9b9d6e7767
commit fe8663c548
1 changed files with 18 additions and 18 deletions
Download patch file Download diff file Expand all files Collapse all files

36
apps/codecs/libmusepack/mpc_decoder.c
View file

@ -865,10 +865,10 @@ mpc_decoder_read_bitstream_sv7(mpc_decoder *d)
for (n=1; n <= d->Max_Band; ++n, ++ResL, ++ResR) for (n=1; n <= d->Max_Band; ++n, ++ResL, ++ResR)
{ {
idx = mpc_decoder_huffman_decode_fast(d, d->HuffHdr); idx = mpc_decoder_huffman_decode_fast(d, d->HuffHdr);
*ResL = (idx!=4) ? *(ResL-1) + idx : mpc_decoder_bitstream_read(d, 4); *ResL = (idx!=4) ? *(ResL-1) + idx : (int)mpc_decoder_bitstream_read(d, 4);
idx = mpc_decoder_huffman_decode_fast(d, d->HuffHdr); idx = mpc_decoder_huffman_decode_fast(d, d->HuffHdr);
*ResR = (idx!=4) ? *(ResR-1) + idx : mpc_decoder_bitstream_read(d, 4); *ResR = (idx!=4) ? *(ResR-1) + idx : (int)mpc_decoder_bitstream_read(d, 4);
if (d->MS_used && !(*ResL==0 && *ResR==0)) { if (d->MS_used && !(*ResL==0 && *ResR==0)) {
d->MS_Flag[n] = mpc_decoder_bitstream_read(d, 1); d->MS_Flag[n] = mpc_decoder_bitstream_read(d, 1);
@ -902,31 +902,31 @@ mpc_decoder_read_bitstream_sv7(mpc_decoder *d)
{ {
case 1: case 1:
idx = mpc_decoder_huffman_decode_fast(d, d->HuffDSCF); idx = mpc_decoder_huffman_decode_fast(d, d->HuffDSCF);
L[0] = (idx!=8) ? L[2] + idx : mpc_decoder_bitstream_read(d, 6); L[0] = (idx!=8) ? L[2] + idx : (int)mpc_decoder_bitstream_read(d, 6);
idx = mpc_decoder_huffman_decode_fast(d, d->HuffDSCF); idx = mpc_decoder_huffman_decode_fast(d, d->HuffDSCF);
L[1] = (idx!=8) ? L[0] + idx : mpc_decoder_bitstream_read(d, 6); L[1] = (idx!=8) ? L[0] + idx : (int)mpc_decoder_bitstream_read(d, 6);
L[2] = L[1]; L[2] = L[1];
break; break;
case 3: case 3:
idx = mpc_decoder_huffman_decode_fast(d, d->HuffDSCF); idx = mpc_decoder_huffman_decode_fast(d, d->HuffDSCF);
L[0] = (idx!=8) ? L[2] + idx : mpc_decoder_bitstream_read(d, 6); L[0] = (idx!=8) ? L[2] + idx : (int)mpc_decoder_bitstream_read(d, 6);
L[1] = L[0]; L[1] = L[0];
L[2] = L[1]; L[2] = L[1];
break; break;
case 2: case 2:
idx = mpc_decoder_huffman_decode_fast(d, d->HuffDSCF); idx = mpc_decoder_huffman_decode_fast(d, d->HuffDSCF);
L[0] = (idx!=8) ? L[2] + idx : mpc_decoder_bitstream_read(d, 6); L[0] = (idx!=8) ? L[2] + idx : (int)mpc_decoder_bitstream_read(d, 6);
L[1] = L[0]; L[1] = L[0];
idx = mpc_decoder_huffman_decode_fast(d, d->HuffDSCF); idx = mpc_decoder_huffman_decode_fast(d, d->HuffDSCF);
L[2] = (idx!=8) ? L[1] + idx : mpc_decoder_bitstream_read(d, 6); L[2] = (idx!=8) ? L[1] + idx : (int)mpc_decoder_bitstream_read(d, 6);
break; break;
case 0: case 0:
idx = mpc_decoder_huffman_decode_fast(d, d->HuffDSCF); idx = mpc_decoder_huffman_decode_fast(d, d->HuffDSCF);
L[0] = (idx!=8) ? L[2] + idx : mpc_decoder_bitstream_read(d, 6); L[0] = (idx!=8) ? L[2] + idx : (int)mpc_decoder_bitstream_read(d, 6);
idx = mpc_decoder_huffman_decode_fast(d, d->HuffDSCF); idx = mpc_decoder_huffman_decode_fast(d, d->HuffDSCF);
L[1] = (idx!=8) ? L[0] + idx : mpc_decoder_bitstream_read(d, 6); L[1] = (idx!=8) ? L[0] + idx : (int)mpc_decoder_bitstream_read(d, 6);
idx = mpc_decoder_huffman_decode_fast(d, d->HuffDSCF); idx = mpc_decoder_huffman_decode_fast(d, d->HuffDSCF);
L[2] = (idx!=8) ? L[1] + idx : mpc_decoder_bitstream_read(d, 6); L[2] = (idx!=8) ? L[1] + idx : (int)mpc_decoder_bitstream_read(d, 6);
break; break;
default: default:
return; return;
@ -942,31 +942,31 @@ mpc_decoder_read_bitstream_sv7(mpc_decoder *d)
{ {
case 1: case 1:
idx = mpc_decoder_huffman_decode_fast(d, d->HuffDSCF); idx = mpc_decoder_huffman_decode_fast(d, d->HuffDSCF);
R[0] = (idx!=8) ? R[2] + idx : mpc_decoder_bitstream_read(d, 6); R[0] = (idx!=8) ? R[2] + idx : (int)mpc_decoder_bitstream_read(d, 6);
idx = mpc_decoder_huffman_decode_fast(d, d->HuffDSCF); idx = mpc_decoder_huffman_decode_fast(d, d->HuffDSCF);
R[1] = (idx!=8) ? R[0] + idx : mpc_decoder_bitstream_read(d, 6); R[1] = (idx!=8) ? R[0] + idx : (int)mpc_decoder_bitstream_read(d, 6);
R[2] = R[1]; R[2] = R[1];
break; break;
case 3: case 3:
idx = mpc_decoder_huffman_decode_fast(d, d->HuffDSCF); idx = mpc_decoder_huffman_decode_fast(d, d->HuffDSCF);
R[0] = (idx!=8) ? R[2] + idx : mpc_decoder_bitstream_read(d, 6); R[0] = (idx!=8) ? R[2] + idx : (int)mpc_decoder_bitstream_read(d, 6);
R[1] = R[0]; R[1] = R[0];
R[2] = R[1]; R[2] = R[1];
break; break;
case 2: case 2:
idx = mpc_decoder_huffman_decode_fast(d, d->HuffDSCF); idx = mpc_decoder_huffman_decode_fast(d, d->HuffDSCF);
R[0] = (idx!=8) ? R[2] + idx : mpc_decoder_bitstream_read(d, 6); R[0] = (idx!=8) ? R[2] + idx : (int)mpc_decoder_bitstream_read(d, 6);
R[1] = R[0]; R[1] = R[0];
idx = mpc_decoder_huffman_decode_fast(d, d->HuffDSCF); idx = mpc_decoder_huffman_decode_fast(d, d->HuffDSCF);
R[2] = (idx!=8) ? R[1] + idx : mpc_decoder_bitstream_read(d, 6); R[2] = (idx!=8) ? R[1] + idx : (int)mpc_decoder_bitstream_read(d, 6);
break; break;
case 0: case 0:
idx = mpc_decoder_huffman_decode_fast(d, d->HuffDSCF); idx = mpc_decoder_huffman_decode_fast(d, d->HuffDSCF);
R[0] = (idx!=8) ? R[2] + idx : mpc_decoder_bitstream_read(d, 6); R[0] = (idx!=8) ? R[2] + idx : (int)mpc_decoder_bitstream_read(d, 6);
idx = mpc_decoder_huffman_decode_fast(d, d->HuffDSCF); idx = mpc_decoder_huffman_decode_fast(d, d->HuffDSCF);
R[1] = (idx!=8) ? R[0] + idx : mpc_decoder_bitstream_read(d, 6); R[1] = (idx!=8) ? R[0] + idx : (int)mpc_decoder_bitstream_read(d, 6);
idx = mpc_decoder_huffman_decode_fast(d, d->HuffDSCF); idx = mpc_decoder_huffman_decode_fast(d, d->HuffDSCF);
R[2] = (idx!=8) ? R[1] + idx : mpc_decoder_bitstream_read(d, 6); R[2] = (idx!=8) ? R[1] + idx : (int)mpc_decoder_bitstream_read(d, 6);
break; break;
default: default:
return; return;