RepoMirrors/mpv
1
0
Fork 0
mirror of https://github.com/mpv-player/mpv synced 2024-12-19 21:31:52 +00:00
Code Issues Releases Wiki Activity

Split the aac header parsing out of aac demuxer to allow using libmpmux

Browse Source 
without libmpdemux.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26359 b3059339-0415-0410-9bf9-f77b7e298cf2
This commit is contained in:
albeu 2008-04-09 00:43:19 +00:00
parent f481e7870b
commit 0359e6ddfb
3 changed files with 51 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
libmpdemux/Makefile
View File

@ -3,7 +3,8 @@ include ../config.mak
LIBNAME_COMMON = libmpdemux.a
LIBNAME_MENCODER = libmpmux.a
SRCS_COMMON = asfheader.c \
SRCS_COMMON = aac_hdr.c \
asfheader.c \
aviheader.c \
aviprint.c \
demuxer.c \

48
libmpdemux/aac_hdr.c Normal file
View File

@ -0,0 +1,48 @@
/*
* Copyright (C) 2005 Nico Sabbi
*
* This file is part of MPlayer.
*
* MPlayer is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation; either version 2 of the License, or
* (at your option) any later version.
*
* MPlayer is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License along
* with MPlayer; if not, write to the Free Software Foundation, Inc.,
* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
*/
#include <stdlib.h>
#include <inttypes.h>
#include "config.h"
/// \param srate (out) sample rate
/// \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;
}

20
libmpdemux/demux_aac.c
View File

@ -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)
{