summaryrefslogtreecommitdiff
path: root/apps
diff options
context:
space:
mode:
Diffstat (limited to 'apps')
-rw-r--r--apps/codecs/libmusepack/mpc_decoder.c36
1 files changed, 18 insertions, 18 deletions
diff --git a/apps/codecs/libmusepack/mpc_decoder.c b/apps/codecs/libmusepack/mpc_decoder.c
index d58611c23a..0c8b8b76a7 100644
--- a/apps/codecs/libmusepack/mpc_decoder.c
+++ b/apps/codecs/libmusepack/mpc_decoder.c
@@ -865,10 +865,10 @@ mpc_decoder_read_bitstream_sv7(mpc_decoder *d)
865 for (n=1; n <= d->Max_Band; ++n, ++ResL, ++ResR) 865 for (n=1; n <= d->Max_Band; ++n, ++ResL, ++ResR)
866 { 866 {
867 idx = mpc_decoder_huffman_decode_fast(d, d->HuffHdr); 867 idx = mpc_decoder_huffman_decode_fast(d, d->HuffHdr);
868 *ResL = (idx!=4) ? *(ResL-1) + idx : mpc_decoder_bitstream_read(d, 4); 868 *ResL = (idx!=4) ? *(ResL-1) + idx : (int)mpc_decoder_bitstream_read(d, 4);
869 869
870 idx = mpc_decoder_huffman_decode_fast(d, d->HuffHdr); 870 idx = mpc_decoder_huffman_decode_fast(d, d->HuffHdr);
871 *ResR = (idx!=4) ? *(ResR-1) + idx : mpc_decoder_bitstream_read(d, 4); 871 *ResR = (idx!=4) ? *(ResR-1) + idx : (int)mpc_decoder_bitstream_read(d, 4);
872 872
873 if (d->MS_used && !(*ResL==0 && *ResR==0)) { 873 if (d->MS_used && !(*ResL==0 && *ResR==0)) {
874 d->MS_Flag[n] = mpc_decoder_bitstream_read(d, 1); 874 d->MS_Flag[n] = mpc_decoder_bitstream_read(d, 1);
@@ -902,31 +902,31 @@ mpc_decoder_read_bitstream_sv7(mpc_decoder *d)
902 { 902 {
903 case 1: 903 case 1:
904 idx = mpc_decoder_huffman_decode_fast(d, d->HuffDSCF); 904 idx = mpc_decoder_huffman_decode_fast(d, d->HuffDSCF);
905 L[0] = (idx!=8) ? L[2] + idx : mpc_decoder_bitstream_read(d, 6); 905 L[0] = (idx!=8) ? L[2] + idx : (int)mpc_decoder_bitstream_read(d, 6);
906 idx = mpc_decoder_huffman_decode_fast(d, d->HuffDSCF); 906 idx = mpc_decoder_huffman_decode_fast(d, d->HuffDSCF);
907 L[1] = (idx!=8) ? L[0] + idx : mpc_decoder_bitstream_read(d, 6); 907 L[1] = (idx!=8) ? L[0] + idx : (int)mpc_decoder_bitstream_read(d, 6);
908 L[2] = L[1]; 908 L[2] = L[1];
909 break; 909 break;
910 case 3: 910 case 3:
911 idx = mpc_decoder_huffman_decode_fast(d, d->HuffDSCF); 911 idx = mpc_decoder_huffman_decode_fast(d, d->HuffDSCF);
912 L[0] = (idx!=8) ? L[2] + idx : mpc_decoder_bitstream_read(d, 6); 912 L[0] = (idx!=8) ? L[2] + idx : (int)mpc_decoder_bitstream_read(d, 6);
913 L[1] = L[0]; 913 L[1] = L[0];
914 L[2] = L[1]; 914 L[2] = L[1];
915 break; 915 break;
916 case 2: 916 case 2:
917 idx = mpc_decoder_huffman_decode_fast(d, d->HuffDSCF); 917 idx = mpc_decoder_huffman_decode_fast(d, d->HuffDSCF);
918 L[0] = (idx!=8) ? L[2] + idx : mpc_decoder_bitstream_read(d, 6); 918 L[0] = (idx!=8) ? L[2] + idx : (int)mpc_decoder_bitstream_read(d, 6);
919 L[1] = L[0]; 919 L[1] = L[0];
920 idx = mpc_decoder_huffman_decode_fast(d, d->HuffDSCF); 920 idx = mpc_decoder_huffman_decode_fast(d, d->HuffDSCF);
921 L[2] = (idx!=8) ? L[1] + idx : mpc_decoder_bitstream_read(d, 6); 921 L[2] = (idx!=8) ? L[1] + idx : (int)mpc_decoder_bitstream_read(d, 6);
922 break; 922 break;
923 case 0: 923 case 0:
924 idx = mpc_decoder_huffman_decode_fast(d, d->HuffDSCF); 924 idx = mpc_decoder_huffman_decode_fast(d, d->HuffDSCF);
925 L[0] = (idx!=8) ? L[2] + idx : mpc_decoder_bitstream_read(d, 6); 925 L[0] = (idx!=8) ? L[2] + idx : (int)mpc_decoder_bitstream_read(d, 6);
926 idx = mpc_decoder_huffman_decode_fast(d, d->HuffDSCF); 926 idx = mpc_decoder_huffman_decode_fast(d, d->HuffDSCF);
927 L[1] = (idx!=8) ? L[0] + idx : mpc_decoder_bitstream_read(d, 6); 927 L[1] = (idx!=8) ? L[0] + idx : (int)mpc_decoder_bitstream_read(d, 6);
928 idx = mpc_decoder_huffman_decode_fast(d, d->HuffDSCF); 928 idx = mpc_decoder_huffman_decode_fast(d, d->HuffDSCF);
929 L[2] = (idx!=8) ? L[1] + idx : mpc_decoder_bitstream_read(d, 6); 929 L[2] = (idx!=8) ? L[1] + idx : (int)mpc_decoder_bitstream_read(d, 6);
930 break; 930 break;
931 default: 931 default:
932 return; 932 return;
@@ -942,31 +942,31 @@ mpc_decoder_read_bitstream_sv7(mpc_decoder *d)
942 { 942 {
943 case 1: 943 case 1:
944 idx = mpc_decoder_huffman_decode_fast(d, d->HuffDSCF); 944 idx = mpc_decoder_huffman_decode_fast(d, d->HuffDSCF);
945 R[0] = (idx!=8) ? R[2] + idx : mpc_decoder_bitstream_read(d, 6); 945 R[0] = (idx!=8) ? R[2] + idx : (int)mpc_decoder_bitstream_read(d, 6);
946 idx = mpc_decoder_huffman_decode_fast(d, d->HuffDSCF); 946 idx = mpc_decoder_huffman_decode_fast(d, d->HuffDSCF);
947 R[1] = (idx!=8) ? R[0] + idx : mpc_decoder_bitstream_read(d, 6); 947 R[1] = (idx!=8) ? R[0] + idx : (int)mpc_decoder_bitstream_read(d, 6);
948 R[2] = R[1]; 948 R[2] = R[1];
949 break; 949 break;
950 case 3: 950 case 3:
951 idx = mpc_decoder_huffman_decode_fast(d, d->HuffDSCF); 951 idx = mpc_decoder_huffman_decode_fast(d, d->HuffDSCF);
952 R[0] = (idx!=8) ? R[2] + idx : mpc_decoder_bitstream_read(d, 6); 952 R[0] = (idx!=8) ? R[2] + idx : (int)mpc_decoder_bitstream_read(d, 6);
953 R[1] = R[0]; 953 R[1] = R[0];
954 R[2] = R[1]; 954 R[2] = R[1];
955 break; 955 break;
956 case 2: 956 case 2:
957 idx = mpc_decoder_huffman_decode_fast(d, d->HuffDSCF); 957 idx = mpc_decoder_huffman_decode_fast(d, d->HuffDSCF);
958 R[0] = (idx!=8) ? R[2] + idx : mpc_decoder_bitstream_read(d, 6); 958 R[0] = (idx!=8) ? R[2] + idx : (int)mpc_decoder_bitstream_read(d, 6);
959 R[1] = R[0]; 959 R[1] = R[0];
960 idx = mpc_decoder_huffman_decode_fast(d, d->HuffDSCF); 960 idx = mpc_decoder_huffman_decode_fast(d, d->HuffDSCF);
961 R[2] = (idx!=8) ? R[1] + idx : mpc_decoder_bitstream_read(d, 6); 961 R[2] = (idx!=8) ? R[1] + idx : (int)mpc_decoder_bitstream_read(d, 6);
962 break; 962 break;
963 case 0: 963 case 0:
964 idx = mpc_decoder_huffman_decode_fast(d, d->HuffDSCF); 964 idx = mpc_decoder_huffman_decode_fast(d, d->HuffDSCF);
965 R[0] = (idx!=8) ? R[2] + idx : mpc_decoder_bitstream_read(d, 6); 965 R[0] = (idx!=8) ? R[2] + idx : (int)mpc_decoder_bitstream_read(d, 6);
966 idx = mpc_decoder_huffman_decode_fast(d, d->HuffDSCF); 966 idx = mpc_decoder_huffman_decode_fast(d, d->HuffDSCF);
967 R[1] = (idx!=8) ? R[0] + idx : mpc_decoder_bitstream_read(d, 6); 967 R[1] = (idx!=8) ? R[0] + idx : (int)mpc_decoder_bitstream_read(d, 6);
968 idx = mpc_decoder_huffman_decode_fast(d, d->HuffDSCF); 968 idx = mpc_decoder_huffman_decode_fast(d, d->HuffDSCF);
969 R[2] = (idx!=8) ? R[1] + idx : mpc_decoder_bitstream_read(d, 6); 969 R[2] = (idx!=8) ? R[1] + idx : (int)mpc_decoder_bitstream_read(d, 6);
970 break; 970 break;
971 default: 971 default:
972 return; 972 return;