summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--mp3lib/decode_MMX.c2
-rw-r--r--mp3lib/decode_i586.c6
-rw-r--r--mp3lib/layer3.c6
-rw-r--r--mp3lib/mpg123.h4
-rw-r--r--mp3lib/sr1.c32
-rw-r--r--mp3lib/tabinit.c2
6 files changed, 26 insertions, 26 deletions
diff --git a/mp3lib/decode_MMX.c b/mp3lib/decode_MMX.c
index 2651577abe..613a11cf35 100644
--- a/mp3lib/decode_MMX.c
+++ b/mp3lib/decode_MMX.c
@@ -14,7 +14,7 @@
extern void (*dct64_MMX_func)(short*, short*, real*);
static unsigned long long attribute_used __attribute__((aligned(8))) null_one = 0x0000ffff0000ffffULL;
static unsigned long long attribute_used __attribute__((aligned(8))) one_null = 0xffff0000ffff0000ULL;
-unsigned long __attribute__((aligned(16))) costab_mmx[] =
+unsigned int __attribute__((aligned(16))) costab_mmx[] =
{
1056974725,
1057056395,
diff --git a/mp3lib/decode_i586.c b/mp3lib/decode_i586.c
index 0a4ca1ebf1..0d1370f342 100644
--- a/mp3lib/decode_i586.c
+++ b/mp3lib/decode_i586.c
@@ -33,9 +33,9 @@
#include "mangle.h"
#define real float /* ugly - but only way */
-static long attribute_used buffs[1088]={0};
-static long attribute_used bo=1;
-static long attribute_used saved_ebp=0;
+static int attribute_used buffs[1088]={0};
+static int attribute_used bo=1;
+static int attribute_used saved_ebp=0;
int synth_1to1_pent(real *bandPtr, int channel, short *samples)
{
diff --git a/mp3lib/layer3.c b/mp3lib/layer3.c
index b465bb174c..6c1b233ca2 100644
--- a/mp3lib/layer3.c
+++ b/mp3lib/layer3.c
@@ -324,7 +324,7 @@ static void init_layer3(int down_sample_sblimit)
* read additional side information (for MPEG 1 and MPEG 2)
*/
static int III_get_side_info(struct III_sideinfo *si,int stereo,
- int ms_stereo,long sfreq,int single,int lsf)
+ int ms_stereo,int sfreq,int single,int lsf)
{
int ch, gr;
int powdiff = (single == 3) ? 4 : 0;
@@ -1264,7 +1264,7 @@ static int do_layer3(struct frame *fr,int single){
static real hybridOut[2][SSLIMIT][SBLIMIT];
{ struct gr_info_s *gr_info = &(sideinfo.ch[0].gr[gr]);
- long part2bits;
+ int part2bits;
if(fr->lsf)
part2bits = III_get_scale_factors_2(scalefacs[0],gr_info,0);
else
@@ -1276,7 +1276,7 @@ static int do_layer3(struct frame *fr,int single){
if(stereo == 2) {
struct gr_info_s *gr_info = &(sideinfo.ch[1].gr[gr]);
- long part2bits;
+ int part2bits;
if(fr->lsf)
part2bits = III_get_scale_factors_2(scalefacs[1],gr_info,i_stereo);
else
diff --git a/mp3lib/mpg123.h b/mp3lib/mpg123.h
index e223bd67c8..478f94dd01 100644
--- a/mp3lib/mpg123.h
+++ b/mp3lib/mpg123.h
@@ -71,7 +71,7 @@ struct frame {
int lay;
int error_protection;
int bitrate_index;
- long sampling_frequency;
+ int sampling_frequency;
int padding;
int extension;
int mode;
@@ -79,7 +79,7 @@ struct frame {
int copyright;
int original;
int emphasis;
- long framesize; /* computed framesize */
+ int framesize; /* computed framesize */
};
diff --git a/mp3lib/sr1.c b/mp3lib/sr1.c
index 8e35003ead..70058955ed 100644
--- a/mp3lib/sr1.c
+++ b/mp3lib/sr1.c
@@ -108,11 +108,11 @@ static int tabsel_123[2][3][16] = {
{0,8,16,24,32,40,48,56,64,80,96,112,128,144,160,} }
};
-static long freqs[9] = { 44100, 48000, 32000, 22050, 24000, 16000 , 11025 , 12000 , 8000 };
+static int freqs[9] = { 44100, 48000, 32000, 22050, 24000, 16000 , 11025 , 12000 , 8000 };
LOCAL unsigned int getbits(short number_of_bits)
{
- unsigned long rval;
+ unsigned rval;
// if(MP3_frames>=7741) printf("getbits: bits=%d bitsleft=%d wordptr=%x\n",number_of_bits,bitsleft,wordpointer);
if((bitsleft-=number_of_bits)<0) return 0;
if(!number_of_bits) return 0;
@@ -133,12 +133,12 @@ LOCAL unsigned int getbits(short number_of_bits)
LOCAL unsigned int getbits_fast(short number_of_bits)
{
- unsigned long rval;
+ unsigned rval;
// if(MP3_frames>=7741) printf("getbits_fast: bits=%d bitsleft=%d wordptr=%x\n",number_of_bits,bitsleft,wordpointer);
if((bitsleft-=number_of_bits)<0) return 0;
if(!number_of_bits) return 0;
#if defined(CAN_COMPILE_X86_ASM)
- rval = bswap_16(*((unsigned short *)wordpointer));
+ rval = bswap_16(*((uint16_t *)wordpointer));
#else
/*
* we may not be able to address unaligned 16-bit data on non-x86 cpus.
@@ -167,7 +167,7 @@ LOCAL unsigned int get1bit(void)
return ((rval>>7)&1);
}
-LOCAL void set_pointer(long backstep)
+LOCAL void set_pointer(int backstep)
{
// if(backstep!=512 && backstep>fsizeold)
// printf("\rWarning! backstep (%d>%d) \n",backstep,fsizeold);
@@ -178,10 +178,10 @@ LOCAL void set_pointer(long backstep)
// printf("Backstep %d (bitsleft=%d)\n",backstep,bitsleft);
}
-LOCAL int stream_head_read(unsigned char *hbuf,unsigned long *newhead){
+LOCAL int stream_head_read(unsigned char *hbuf,uint32_t *newhead){
if(mp3_read(hbuf,4) != 4) return FALSE;
#if defined(CAN_COMPILE_X86_ASM)
- *newhead = bswap_32(*((unsigned long *)hbuf));
+ *newhead = bswap_32(*((uint32_t*)hbuf));
#else
/*
* we may not be able to address unaligned 32-bit data on non-x86 cpus.
@@ -196,8 +196,8 @@ LOCAL int stream_head_read(unsigned char *hbuf,unsigned long *newhead){
return TRUE;
}
-LOCAL int stream_head_shift(unsigned char *hbuf,unsigned long *head){
- *((unsigned long *)hbuf) >>= 8;
+LOCAL int stream_head_shift(unsigned char *hbuf,uint32_t *head){
+ *((uint32_t*)hbuf) >>= 8;
if(mp3_read(hbuf+3,1) != 1) return 0;
*head <<= 8;
*head |= hbuf[3];
@@ -208,7 +208,7 @@ LOCAL int stream_head_shift(unsigned char *hbuf,unsigned long *head){
* decode a header and write the information
* into the frame structure
*/
-LOCAL int decode_header(struct frame *fr,unsigned long newhead){
+LOCAL int decode_header(struct frame *fr,uint32_t newhead){
// head_check:
if( (newhead & 0xffe00000) != 0xffe00000 ||
@@ -217,8 +217,8 @@ LOCAL int decode_header(struct frame *fr,unsigned long newhead){
fr->lay = 4-((newhead>>17)&3);
// if(fr->lay!=3) return FALSE;
- if( newhead & ((long)1<<20) ) {
- fr->lsf = (newhead & ((long)1<<19)) ? 0x0 : 0x1;
+ if( newhead & (1<<20) ) {
+ fr->lsf = (newhead & (1<<19)) ? 0x0 : 0x1;
fr->mpeg25 = 0;
} else {
fr->lsf = 1;
@@ -253,7 +253,7 @@ switch(fr->lay){
case 2:
MP3_bitrate=tabsel_123[fr->lsf][1][fr->bitrate_index];
MP3_samplerate=freqs[fr->sampling_frequency];
- fr->framesize = (long) MP3_bitrate * 144000;
+ fr->framesize = MP3_bitrate * 144000;
fr->framesize /= MP3_samplerate;
MP3_framesize=fr->framesize;
fr->framesize += fr->padding - 4;
@@ -267,7 +267,7 @@ switch(fr->lay){
MP3_bitrate=tabsel_123[fr->lsf][2][fr->bitrate_index];
MP3_samplerate=freqs[fr->sampling_frequency];
- fr->framesize = (long) MP3_bitrate * 144000;
+ fr->framesize = MP3_bitrate * 144000;
fr->framesize /= MP3_samplerate<<(fr->lsf);
MP3_framesize=fr->framesize;
fr->framesize += fr->padding - 4;
@@ -276,7 +276,7 @@ switch(fr->lay){
// fr->jsbound = (fr->mode == MPG_MD_JOINT_STEREO) ? (fr->mode_ext<<2)+4 : 32;
MP3_bitrate=tabsel_123[fr->lsf][0][fr->bitrate_index];
MP3_samplerate=freqs[fr->sampling_frequency];
- fr->framesize = (long) MP3_bitrate * 12000;
+ fr->framesize = MP3_bitrate * 12000;
fr->framesize /= MP3_samplerate;
MP3_framesize = ((fr->framesize+fr->padding)<<2);
fr->framesize = MP3_framesize-4;
@@ -314,7 +314,7 @@ LOCAL int stream_read_frame_body(int size){
* read next frame return number of frames read.
*/
LOCAL int read_frame(struct frame *fr){
- unsigned long newhead;
+ uint32_t newhead;
union {
unsigned char buf[8];
unsigned long dummy; // for alignment
diff --git a/mp3lib/tabinit.c b/mp3lib/tabinit.c
index acd4aa5536..7c6facd2f6 100644
--- a/mp3lib/tabinit.c
+++ b/mp3lib/tabinit.c
@@ -8,7 +8,7 @@ real mp3lib_decwin[(512+32)];
static real cos64[32], cos32[16], cos16[8], cos8[4], cos4[2];
real *mp3lib_pnts[]={ cos64,cos32,cos16,cos8,cos4 };
-static long intwinbase[] = {
+static int intwinbase[] = {
0, -1, -1, -1, -1, -1, -1, -2, -2, -2,
-2, -3, -3, -4, -4, -5, -5, -6, -7, -7,
-8, -9, -10, -11, -13, -14, -16, -17, -19, -21,
generated by cgit v1.2.3 (git 2.25.1) at 2024-04-20 06:16:21 +0000