mirror/mpv
0
0
Fork 0
mirror of https://github.com/mpv-player/mpv.git synced 2024-09-20 12:02:23 +02:00
Code

libfaad2 v1.0, v1.1, v1.2 detection, and API change workaround in ad_faad.c

Browse Source 
based on patch by Andre Schulz <andre@0wnage.de>


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@9322 b3059339-0415-0410-9bf9-f77b7e298cf2
This commit is contained in:
arpi 2003-02-07 21:04:35 +00:00
parent d08be7cba9
commit af229ffaea
2 changed files with 44 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
configure vendored
View File

@ -3751,7 +3751,7 @@ fi
echores "$_vorbis"
echocheck "FAAD (AAC) support"
echocheck "faad2 (AAC) support"
if test "$_faad" = auto ; then
_faad=no
cat > $TMPC << EOF
@ -3766,7 +3766,34 @@ if test "$_faad" = yes ; then
else
_def_faad='#undef HAVE_FAAD'
fi
echores "$_faad"
if test "$_faad" = yes; then
cat > $TMPC <<EOF
#include <faad.h>
#ifndef FAAD_MIN_STREAMSIZE
#error Too old version
#endif
int main(void) {
#ifdef FAAD2_VERSION
printf("%s",FAAD2_VERSION);
#else
printf("1.0");
#endif
return 0;
}
EOF
if cc_check $_ld_faad -lm && "$TMPO" >> "$TMPLOG" ; then
_faad_version=`"$TMPO"`
_faad_tempversion=`"$TMPO" | sed -e 's/^\([0-9]\+\)\.\([0-9]\+\).*/\1\2/'`
_def_faad_version="#define FAADVERSION $_faad_tempversion"
echores "yes ($_faad_version)"
else
_faad=no
echores "no (failed to get version)"
fi
else
echores "$_faad"
fi
if test "$_win32" = auto ; then
if x86 ; then
@ -5251,6 +5278,7 @@ $_def_tremor
/* enable FAAD (AAC) support */
$_def_faad
$_def_faad_version
/* enable streaming */
$_def_streaming

14
libmpcodecs/ad_faad.c
View File

@ -85,8 +85,13 @@ static int init(sh_audio_t *sh)
sh->a_in_buffer_len = demux_read_data(sh->ds, sh->a_in_buffer, sh->a_in_buffer_size);
/* init the codec */
#if (FAADVERSION <= 11)
faac_init = faacDecInit(faac_hdec, sh->a_in_buffer,
&faac_samplerate, &faac_channels);
#else
faac_init = faacDecInit(faac_hdec, sh->a_in_buffer,
sh->a_in_buffer_len, &faac_samplerate, &faac_channels);
#endif
sh->a_in_buffer_len -= (faac_init > 0)?faac_init:0; // how many bytes init consumed
// XXX FIXME: shouldn't we memcpy() here in a_in_buffer ?? --A'rpi
@ -164,7 +169,12 @@ static int decode_audio(sh_audio_t *sh,unsigned char *buf,int minlen,int maxlen)
if(!sh->codecdata_len){
// raw aac stream:
do {
#if (FAADVERSION <= 11)
faac_sample_buffer = faacDecDecode(faac_hdec, &faac_finfo, sh->a_in_buffer+j);
#else
faac_sample_buffer = faacDecDecode(faac_hdec, &faac_finfo, sh->a_in_buffer+j, sh->a_in_buffer_len);
#endif
/* update buffer index after faacDecDecode */
if(faac_finfo.bytesconsumed >= sh->a_in_buffer_len) {
sh->a_in_buffer_len=0;
@ -184,7 +194,11 @@ static int decode_audio(sh_audio_t *sh,unsigned char *buf,int minlen,int maxlen)
unsigned char* bufptr=NULL;
int buflen=ds_get_packet(sh->ds, &bufptr);
if(buflen<=0) break;
#if (FAADVERSION <= 11)
faac_sample_buffer = faacDecDecode(faac_hdec, &faac_finfo, bufptr);
#else
faac_sample_buffer = faacDecDecode(faac_hdec, &faac_finfo, bufptr, buflen);
#endif
// printf("FAAC decoded %d of %d (err: %d) \n",faac_finfo.bytesconsumed,buflen,faac_finfo.error);
}