Commit 62442c20 authored by Laurent Aimar's avatar Laurent Aimar

* all: ported the faad decoder to the new API (btw, aac HE untested).

 I have not kept the compatibility with older faad version (but check is
 still be  done in configure.ac). (I  didn't like it as  old version are
 really buggy).
parent 2afa5cea
dnl Autoconf settings for vlc dnl Autoconf settings for vlc
dnl $Id: configure.ac,v 1.101 2003/11/01 21:50:00 fenrir Exp $ dnl $Id: configure.ac,v 1.102 2003/11/03 22:30:14 fenrir Exp $
AC_INIT(vlc,0.6.3-cvs) AC_INIT(vlc,0.6.3-cvs)
...@@ -3419,7 +3419,6 @@ AC_OUTPUT([ ...@@ -3419,7 +3419,6 @@ AC_OUTPUT([
modules/audio_mixer/Makefile modules/audio_mixer/Makefile
modules/audio_output/Makefile modules/audio_output/Makefile
modules/codec/Makefile modules/codec/Makefile
modules/codec/faad/Makefile
modules/codec/ffmpeg/Makefile modules/codec/ffmpeg/Makefile
modules/codec/ffmpeg/postprocessing/Makefile modules/codec/ffmpeg/postprocessing/Makefile
modules/codec/spudec/Makefile modules/codec/spudec/Makefile
......
...@@ -17,3 +17,4 @@ SOURCES_libmpeg2 = libmpeg2.c ...@@ -17,3 +17,4 @@ SOURCES_libmpeg2 = libmpeg2.c
SOURCES_rawvideo = rawvideo.c SOURCES_rawvideo = rawvideo.c
SOURCES_quicktime = quicktime.c SOURCES_quicktime = quicktime.c
SOURCES_subsdec = subsdec.c SOURCES_subsdec = subsdec.c
SOURCES_faad = faad.c
This diff is collapsed.
.deps
.dirstamp
*.lo
*.la
*.dll
*.dylib
*.sl
*.so
Makefile.am
Makefile.in
Makefile
SOURCES_faad = \
decoder.c \
decoder.h \
$(NULL)
This diff is collapsed.
/*****************************************************************************
* decoder.h: faad decoder modules
*
*****************************************************************************
* Copyright (C) 2001 VideoLAN
* $Id: decoder.h,v 1.6 2003/01/25 18:09:30 fenrir Exp $
*
* Authors: Laurent Aimar <fenrir@via.ecp.fr>
*
* This program 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.
*
* This program 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 this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111, USA.
*****************************************************************************/
#define AAC_MAXCHANNELS 64
typedef struct adec_thread_s
{
/*
* faad decoder session
*/
/* faad stuff */
faacDecHandle *p_handle;
/* The bit stream structure handles the PES stream at the bit level */
bit_stream_t bit_stream;
/*
* Input properties
*/
decoder_fifo_t *p_fifo;
uint8_t *p_buffer;
int i_buffer;
/*
* Output properties
*/
aout_instance_t * p_aout; /* opaque */
aout_input_t * p_aout_input; /* opaque */
audio_sample_format_t output_format;
audio_date_t date;
mtime_t pts;
} adec_thread_t;
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment