diff options
author | arpi <arpi@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2003-07-24 22:12:59 +0000 |
---|---|---|
committer | arpi <arpi@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2003-07-24 22:12:59 +0000 |
commit | bb0e90b4f73cf42e5dbda52b1ae3dc4ffd995b9c (patch) | |
tree | a0ca613ae219e7a0a15ec176027cc418b6d5daad /mp3lib/sr1.c | |
parent | 3f0415488a2e39bb827faf38ae61c4352b287f6e (diff) | |
download | mpv-bb0e90b4f73cf42e5dbda52b1ae3dc4ffd995b9c.tar.bz2 mpv-bb0e90b4f73cf42e5dbda52b1ae3dc4ffd995b9c.tar.xz |
layer-1 support
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@10469 b3059339-0415-0410-9bf9-f77b7e298cf2
Diffstat (limited to 'mp3lib/sr1.c')
-rw-r--r-- | mp3lib/sr1.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/mp3lib/sr1.c b/mp3lib/sr1.c index cdd07bcdd0..760b95ce68 100644 --- a/mp3lib/sr1.c +++ b/mp3lib/sr1.c @@ -271,8 +271,9 @@ switch(fr->lay){ MP3_samplerate=freqs[fr->sampling_frequency]; fr->framesize = (long) MP3_bitrate * 12000; fr->framesize /= MP3_samplerate; - MP3_framesize = fr->framesize; - fr->framesize = ((fr->framesize+fr->padding)<<2)-4; + MP3_framesize = ((fr->framesize+fr->padding)<<2); + fr->framesize = MP3_framesize-4; + printf("framesize=%d\n",fr->framesize); break; default: MP3_framesize=fr->framesize=0; @@ -375,6 +376,7 @@ int _has_mmx = 0; // used by layer2.c, layer3.c to pre-scale coeffs #include "layer2.c" #include "layer3.c" +#include "layer1.c" /******************************************************************************/ /* PUBLIC FUNCTIONS */ @@ -516,9 +518,7 @@ int MP3_DecodeFrame(unsigned char *hova,short single){ switch(fr.lay){ case 2: do_layer2(&fr,single);break; case 3: do_layer3(&fr,single);break; - case 1: - printf("mp3lib: layer-1 audio not yet supported!\n"); - return 4608; + case 1: do_layer1(&fr,single);break; default: return 0; // unsupported } |