RepoMirrors
/
mpv
mirror of https://github.com/mpv-player/mpv
1
0
Fork 0
Code Issues Releases Wiki Activity

Minor optimization 

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@1041 b3059339-0415-0410-9bf9-f77b7e298cf2
This commit is contained in:
nickols_k 2001-06-06 09:33:36 +00:00
parent 4bcb371f64
commit d5925fe568
2 changed files with 9 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
mp3lib/bswap.h Normal file
View File

@ -0,0 +1,2 @@
/* Let it be for now*/
#include "../libac3/bswap.h"

21
mp3lib/sr1.c
View File

@ -24,7 +24,7 @@
#include "mpg123.h" #include "mpg123.h"
#include "huffman.h" #include "huffman.h"
#include "mp3.h" #include "mp3.h"
#include "bswap.h"
#include "d_cpu.h" #include "d_cpu.h"
//static FILE* mp3_file=NULL; //static FILE* mp3_file=NULL;
@ -122,9 +122,7 @@ LOCAL unsigned int getbits_fast(short number_of_bits)
// if(MP3_frames>=7741) printf("getbits_fast: bits=%d bitsleft=%d wordptr=%x\n",number_of_bits,bitsleft,wordpointer); // 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((bitsleft-=number_of_bits)<0) return 0;
if(!number_of_bits) return 0; if(!number_of_bits) return 0;
rval = wordpointer[0]; rval = bswap_16(*((unsigned short *)wordpointer));
rval <<= 8;
rval |= wordpointer[1];
rval <<= bitindex; rval <<= bitindex;
rval &= 0xffff; rval &= 0xffff;
bitindex += number_of_bits; bitindex += number_of_bits;
@ -159,19 +157,15 @@ LOCAL void set_pointer(long backstep)
LOCAL int stream_head_read(unsigned char *hbuf,unsigned long *newhead){ LOCAL int stream_head_read(unsigned char *hbuf,unsigned long *newhead){
if(mp3_read(hbuf,4) != 4) return FALSE; if(mp3_read(hbuf,4) != 4) return FALSE;
*newhead = ((unsigned long) hbuf[0] << 24) | *newhead = bswap_32(*((unsigned long *)hbuf));
((unsigned long) hbuf[1] << 16) | return TRUE;
((unsigned long) hbuf[2] << 8) |
(unsigned long) hbuf[3];
return TRUE;
} }
LOCAL int stream_head_shift(unsigned char *hbuf,unsigned long *head){ LOCAL int stream_head_shift(unsigned char *hbuf,unsigned long *head){
memmove (&hbuf[0], &hbuf[1], 3); *((unsigned long *)hbuf) >>= 8;
if(mp3_read(hbuf+3,1) != 1) return 0; if(mp3_read(hbuf+3,1) != 1) return 0;
*head <<= 8; *head <<= 8;
*head |= hbuf[3]; *head |= hbuf[3];
*head &= 0xffffffff;
return 1; return 1;
} }
@ -182,9 +176,8 @@ LOCAL int stream_head_shift(unsigned char *hbuf,unsigned long *head){
LOCAL int decode_header(struct frame *fr,unsigned long newhead){ LOCAL int decode_header(struct frame *fr,unsigned long newhead){
// head_check: // head_check:
if( (newhead & 0xffe00000) != 0xffe00000) return FALSE; if( (newhead & 0xffe00000) != 0xffe00000 ||
if( ((newhead>>12)&0xf) == 0xf) return FALSE; (newhead & 0x0000f300) == 0x0000f300) return FALSE;
if( ((newhead>>10)&0x3) == 0x3 ) return FALSE;
fr->lay = 4-((newhead>>17)&3); fr->lay = 4-((newhead>>17)&3);
// if(fr->lay!=3) return FALSE; // if(fr->lay!=3) return FALSE;