diff options
| author | albeu <albeu@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2008-04-09 00:43:19 +0000 |
|---|---|---|
| committer | albeu <albeu@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2008-04-09 00:43:19 +0000 |
| commit | 0359e6ddfb15fe24a413fe6113eefd0cdb7bb7a3 (patch) | |
| tree | 0eada30118675215ce2bf68101c6882ca07c960f /libmpdemux/demux_aac.c | |
| parent | f481e7870b0fcb7fec1614efab4fc7baf380bf1c (diff) | |
| download | mpv-0359e6ddfb15fe24a413fe6113eefd0cdb7bb7a3.tar.bz2 mpv-0359e6ddfb15fe24a413fe6113eefd0cdb7bb7a3.tar.xz | |
Split the aac header parsing out of aac demuxer to allow using libmpmux
without libmpdemux.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26359 b3059339-0415-0410-9bf9-f77b7e298cf2
Diffstat (limited to 'libmpdemux/demux_aac.c')
| -rw-r--r-- | libmpdemux/demux_aac.c | 20 |
1 files changed, 1 insertions, 19 deletions
diff --git a/libmpdemux/demux_aac.c b/libmpdemux/demux_aac.c index 0226abdb79..88d9204615 100644 --- a/libmpdemux/demux_aac.c +++ b/libmpdemux/demux_aac.c @@ -25,25 +25,7 @@ typedef struct { /// \param num (out) number of audio frames in this ADTS frame /// \return size of the ADTS frame in bytes /// aac_parse_frames needs a buffer at least 8 bytes long -int aac_parse_frame(uint8_t *buf, int *srate, int *num) -{ - int i = 0, sr, fl = 0, id; - static int srates[] = {96000, 88200, 64000, 48000, 44100, 32000, 24000, 22050, 16000, 12000, 11025, 8000, 0, 0, 0}; - - if((buf[i] != 0xFF) || ((buf[i+1] & 0xF6) != 0xF0)) - return 0; - - id = (buf[i+1] >> 3) & 0x01; //id=1 mpeg2, 0: mpeg4 - sr = (buf[i+2] >> 2) & 0x0F; - if(sr > 11) - return 0; - *srate = srates[sr]; - - fl = ((buf[i+3] & 0x03) << 11) | (buf[i+4] << 3) | ((buf[i+5] >> 5) & 0x07); - *num = (buf[i+6] & 0x02) + 1; - - return fl; -} +int aac_parse_frame(uint8_t *buf, int *srate, int *num); static int demux_aac_init(demuxer_t *demuxer) { |