~ft/faad2

5a241403dd9338b0b46ef16ae88f7abde9b5dfdc — menno 18 years ago 29f3898
Updates for release
M AUTHORS => AUTHORS +4 -0
@@ 2,3 2,7 @@
menno (menno@audiocoding.com)
 - complete library

Alexander Kurpiers (a.kurpiers@nt.tu-darmstadt.de)
 - HCR code
 - DRM stuff
 - lot's of bug fixes
\ No newline at end of file

M NEWS => NEWS +9 -0
@@ 1,3 1,12 @@

8 August 2002
 - Version 1.1 of the FAAD2 library
   - Almost 50% speedup, due to new Huffman decoding
   - Better error handling
   - LD (Low Delay) AAC supported
   - ER (Error Resilient) AAC profiles supported
   - Complete new MDCT code
   - Bug fixes

14 Januari 2002
 - Initial revision of completely rewritten FAAD 2 library
\ No newline at end of file

M README => README +25 -4
@@ 1,5 1,5 @@

Freeware Advanced Audio Decoder version 2
Freeware Advanced Audio Decoder 2
http://www.audiocoding.com/

FAAD 2 is a LC, MAIN and LTP profile, MPEG2 and MPEG-4 AAC decoder, completely


@@ 45,6 45,21 @@ FAAD2 is written by:
 - menno (menno@audiocoding.com).


_______________
VERSION HISTORY

Version 1.1: 8 aug 2002
 - Almost 50% speedup, due to new Huffman decoding
 - Better error handling
 - LD (Low Delay) AAC supported
 - ER (Error Resilient) AAC profiles supported
 - Complete new MDCT code
 - Bug fixes

Version 1.0: 14 jan 2002
 - Initial revision of completely rewritten FAAD 2 library


__________________________________
REDISTRIBUTED OPEN SOURCE PACKAGES



@@ 52,7 67,7 @@ This is the list of redistributed open source packages that are included
in FAAD2:

Name:       libsndfile
Version:    0.0.27
Version:    1.0.0rc2
Origin:     http://www.zip.com.au/~erikd/libsndfile
Author:     Erik de Castro Lopo
Directory:  common/libsndfile


@@ 66,8 81,8 @@ Directory:  common/id3lib
License:    GNU Library General Public License, version 2, June 1991

Name:       mp4v2
Version:    0.9.2
Origin:     http://mpeg4ip.sourceforge.net
Version:    0.9.5
Origin:     http://www.mpeg4ip.net
Author:     David Mackie
Directory:  common/mp4v2
License:    MPL, Mozilla Public License, version 1.1


@@ 78,6 93,8 @@ DIRECTORY STRUCTURE

faad2 - top level directory.

   aacDECdrop - windows decoder/player with drag'n'drop functionality

   common - generally used libraries and code.

      faad - general common functions like filereading and streaming


@@ 95,6 112,8 @@ faad2 - top level directory.
   include - inlude file for teh FAAD2 library.

   libfaad - the FAAD2 AAC decoder library.
   
      codebook - Huffman codebooks

   plugins - plugins for all kinds of pograms.



@@ 103,4 122,6 @@ faad2 - top level directory.
      winamp - winamp2 AAC input plugin.

      winamp3 - winamp3 AAC input plugin.
      
      xmms - xmms AAC plugin


M aacDECdrop/aacDECdrop/aacDECdrop.dsp => aacDECdrop/aacDECdrop/aacDECdrop.dsp +3 -2
@@ 71,9 71,10 @@ PostBuild_Cmds=upx --best .\release\aacDECdrop.exe
# PROP Use_Debug_Libraries 1
# PROP Output_Dir "Debug"
# PROP Intermediate_Dir "Debug"
# PROP Ignore_Export_Lib 0
# PROP Target_Dir ""
# ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /YX /FD /GZ /c
# ADD CPP /nologo /W3 /Gm /GX /ZI /Od /I "..\common\libsndfile\src" /I "..\include" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /YX /FD /GZ /c
# ADD CPP /nologo /W3 /Gm /GX /ZI /Od /I "..\..\include" /I "..\..\common\libsndfile\src" /I "..\..\common\mp4v2" /I "..\..\common\libsndfile\win32" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /YX /FD /GZ /c
# ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /win32
# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /win32
# ADD BASE RSC /l 0x809 /d "_DEBUG"


@@ 83,7 84,7 @@ BSC32=bscmake.exe
# ADD BSC32 /nologo
LINK32=xilink6.exe
# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:windows /debug /machine:I386 /pdbtype:sept
# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:windows /debug /machine:I386 /pdbtype:sept
# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib  winmm.lib ws2_32.lib svml_disp.lib /nologo /subsystem:windows /debug /machine:I386 /pdbtype:sept

!ENDIF 


M aacDECdrop/decode.c => aacDECdrop/decode.c +7 -5
@@ 16,8 16,8 @@
** along with this program; if not, write to the Free Software
** Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
**
** $Id: decode.c,v 1.4 2002/07/25 12:30:57 menno Exp $
** $Id: decode.c,v 1.4 2002/07/25 12:30:57 menno Exp $
** $Id: decode.c,v 1.5 2002/08/07 08:37:15 menno Exp $
** $Id: decode.c,v 1.5 2002/08/07 08:37:15 menno Exp $
**/

#ifdef _WIN32


@@ 278,13 278,15 @@ int GetAACTrack(MP4FileHandle infile)
		{
			unsigned char *buff = NULL;
			int buff_size = 0;
			unsigned long dummy32; unsigned char dummy8;
			unsigned long dummy1_32;
            unsigned char dummy2_8, dummy3_8, dummy4_8, dummy5_8, dummy6_8,
                dummy7_8, dummy8_8;
			MP4GetTrackESConfiguration(infile, trackId, &buff, &buff_size);

			if (buff)
			{
				rc = AudioSpecificConfig(buff, &dummy32, &dummy8, &dummy8, &dummy8,
                    &dummy8, &dummy8, &dummy8, &dummy8);
				rc = AudioSpecificConfig(buff, &dummy1_32, &dummy2_8, &dummy3_8, &dummy4_8,
                    &dummy5_8, &dummy6_8, &dummy7_8, &dummy8_8);
				free(buff);

				if (rc < 0)

M frontend/main.c => frontend/main.c +3 -2
@@ 16,7 16,7 @@
** along with this program; if not, write to the Free Software
** Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
**
** $Id: main.c,v 1.17 2002/08/05 20:33:38 menno Exp $
** $Id: main.c,v 1.18 2002/08/07 08:37:15 menno Exp $
**/

#ifdef _WIN32


@@ 506,7 506,8 @@ int main(int argc, char *argv[])
    clock_t begin;
#endif

    fprintf(stderr, "FAAD (Freeware AAC Decoder) Compiled on: " __DATE__ "\n");
    fprintf(stderr, "FAAD2 (Freeware AAC Decoder) Compiled on: " __DATE__ "\n");
    fprintf(stderr, "Version:     %s\n", FAAD2_VERSION);
    fprintf(stderr, "Copyright:   M. Bakker\n");
    fprintf(stderr, "             http://www.audiocoding.com\n\n");


M include/faad.h => include/faad.h +6 -5
@@ 1,22 1,22 @@
/*
** FAAD - Freeware Advanced Audio Decoder
** Copyright (C) 2002 M. Bakker
**  
**
** 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 
** along with this program; if not, write to the Free Software
** Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
**
** $Id: faad.h,v 1.8 2002/06/15 15:10:47 menno Exp $
** $Id: faad.h,v 1.9 2002/08/07 08:37:15 menno Exp $
**/

#ifndef __AACDEC_H__


@@ 37,6 37,7 @@ extern "C" {
  #endif
#endif

#define FAAD2_VERSION "1.1"

#define MAIN 0
#define LC   1

M libfaad/Makefile.am => libfaad/Makefile.am +3 -2
@@ 6,12 6,13 @@ VPATH = @srcdir@:codebook:
libfaad_la_SOURCES = bits.c cfft.c data.c decoder.c drc.c error.c filtbank.c \
ic_predict.c is.c lt_predict.c mdct.c mp4.c ms.c output.c pns.c \
pulse.c specrec.c syntax.c tns.c reordered_spectral_data.c \
rvlc_scale_factors.c \
hcb_1.c hcb_2.c hcb_3.c hcb_4.c hcb_5.c hcb_6.c hcb_7.c hcb_8.c \
hcb_9.c hcb_10.c hcb_11.c hcb_sf.c

libfaad_la_INCLUDES = analysis.h bits.h cfft.h data.h decoder.h drc.h error.h \
filtbank.h huffman.h ic_predict.h is.h kbd_win.h lt_predict.h mdct.h mp4.h \
ms.h output.h pns.h pulse.h specrec.h syntax.h tns.h \
codebook/hcb.h
ms.h output.h pns.h pulse.h rvlc_scale_factors.h \
specrec.h syntax.h tns.h codebook/hcb.h

CFLAGS = -O2

M libfaad/libfaad2_dll.dsp => libfaad/libfaad2_dll.dsp +8 -0
@@ 212,6 212,10 @@ SOURCE=.\reordered_spectral_data.c
# End Source File
# Begin Source File

SOURCE=.\rvlc_scale_factors.c
# End Source File
# Begin Source File

SOURCE=.\specrec.c
# End Source File
# Begin Source File


@@ 312,6 316,10 @@ SOURCE=.\pulse.h
# End Source File
# Begin Source File

SOURCE=.\rvlc_scale_factors.h
# End Source File
# Begin Source File

SOURCE=.\specrec.h
# End Source File
# Begin Source File