[MPlayer-cvslog] r31603 - in trunk: Changelog configure libmpcodecs/ad_faad.c

[attila]

Author: attila
Date: Thu Jul  1 21:59:42 2010
New Revision: 31603

Log:
* fix compilation using external libfaad
* revert r31565

Modified:
   trunk/Changelog
   trunk/configure
   trunk/libmpcodecs/ad_faad.c

Modified: trunk/Changelog
==============================================================================
--- trunk/Changelog	Thu Jul  1 21:52:18 2010	(r31602)
+++ trunk/Changelog	Thu Jul  1 21:59:42 2010	(r31603)
@@ -26,8 +26,6 @@ MPlayer (1.0)
     * VP8 en-/decoding through libvpx wrapper and native decoder in FFmpeg
     * support for external libmpeg2 added
     * hardware MPEG decoder priority lowered
-    * support for external FAAD removed, since FFmpeg decoder is complete
-      and only internal FAAD supports LATM it is pointless.
     * external libmpg123 support
 
     Demuxers:

Modified: trunk/configure
==============================================================================
--- trunk/configure	Thu Jul  1 21:52:18 2010	(r31602)
+++ trunk/configure	Thu Jul  1 21:59:42 2010	(r31603)
@@ -339,6 +339,7 @@ Codecs:
   --disable-libvorbis       disable libvorbis support [autodetect]
   --disable-speex           disable Speex support [autodetect]
   --enable-theora           enable OggTheora libraries [autodetect]
+  --enable-faad             enable external FAAD2 (AAC) [autodetect]
   --disable-faad-internal   disable internal FAAD2 (AAC) [autodetect]
   --enable-faad-fixed       enable fixed-point mode in internal FAAD2 [disabled]
   --disable-faac            disable support for FAAC (AAC encoder) [autodetect]
@@ -655,7 +656,7 @@ _liba52=auto
 _libdca=auto
 _libmpeg2=auto
 _libmpeg2_internal=auto
-_faad=no
+_faad=auto
 _faad_internal=auto
 _faad_fixed=no
 _faac=auto
@@ -1058,6 +1059,8 @@ for ac_option do
   --disable-libmpeg2-internal)   _libmpeg2_internal=no    ;;
   --enable-musepack)    _musepack=yes   ;;
   --disable-musepack)   _musepack=no    ;;
+  --enable-faad)        _faad=yes       ;;
+  --disable-faad)       _faad=no        ;;
   --enable-faad-internal)       _faad_internal=yes      ;;
   --disable-faad-internal)      _faad_internal=no       ;;
   --enable-faad-fixed)  _faad_fixed=yes ;;

Modified: trunk/libmpcodecs/ad_faad.c
==============================================================================
--- trunk/libmpcodecs/ad_faad.c	Thu Jul  1 21:52:18 2010	(r31602)
+++ trunk/libmpcodecs/ad_faad.c	Thu Jul  1 21:59:42 2010	(r31603)
@@ -126,6 +126,7 @@ static int init(sh_audio_t *sh)
     faacDecSetConfiguration(faac_hdec, faac_conf);
 
     sh->a_in_buffer_len = demux_read_data(sh->ds, sh->a_in_buffer, sh->a_in_buffer_size);
+#if CONFIG_FAAD_INTERNAL
     /* init the codec, look for LATM */
     faac_init = faacDecInit(faac_hdec, sh->a_in_buffer,
                             sh->a_in_buffer_len, &faac_samplerate, &faac_channels,1);
@@ -144,6 +145,11 @@ static int init(sh_audio_t *sh)
             if (faac_init >= 0) break;
         }
     }
+#else
+    /* external faad does not have latm lookup support */
+    faac_init = faacDecInit(faac_hdec, sh->a_in_buffer,
+                            sh->a_in_buffer_len, &faac_samplerate, &faac_channels);
+#endif
 
     if (faac_init < 0) {
     pos = aac_probe(sh->a_in_buffer, sh->a_in_buffer_len);
@@ -157,8 +163,13 @@ static int init(sh_audio_t *sh)
     }
 
     /* init the codec */
+#if CONFIG_FAAD_INTERNAL
     faac_init = faacDecInit(faac_hdec, sh->a_in_buffer,
           sh->a_in_buffer_len, &faac_samplerate, &faac_channels,0);
+#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