Changeset 63 for trunk

Timestamp:

02/28/08 13:49:33 (10 months ago)

Author:

gbooker

Message:

Updated the liba52 lib (they switched to svn in some other location and didn't update any of the pointers on the sf site).

Fixes #51

Files:

• trunk/A52/ACShepA52Decoder.cpp (modified) (2 diffs)
• trunk/A52Codec.xcodeproj/project.pbxproj (modified) (5 diffs)
• trunk/liba52/AUTHORS (modified) (1 diff)
• trunk/liba52/HISTORY (modified) (1 diff)
• trunk/liba52/README (modified) (3 diffs)
• trunk/liba52/TODO (modified) (1 diff)
• trunk/liba52/acinclude.m4 (modified) (6 diffs)
• trunk/liba52/bootstrap (modified) (1 diff)
• trunk/liba52/include/Makefile.am (modified) (1 diff)
• trunk/liba52/include/a52.h (modified) (4 diffs)
• trunk/liba52/include/attributes.h (modified) (2 diffs)
• trunk/liba52/include/audio_out.h (modified) (3 diffs)
• trunk/liba52/include/mm_accel.h (deleted)
• trunk/liba52/include/mmx.h (added)
• trunk/liba52/include/tendra.h (modified) (1 diff)
• trunk/liba52/liba52/Makefile.am (modified) (1 diff)
• trunk/liba52/liba52/a52_internal.h (modified) (4 diffs)
• trunk/liba52/liba52/bit_allocate.c (modified) (2 diffs)
• trunk/liba52/liba52/bitstream.c (modified) (2 diffs)
• trunk/liba52/liba52/bitstream.h (modified) (1 diff)
• trunk/liba52/liba52/configure.incl (modified) (1 diff)
• trunk/liba52/liba52/cpu_accel.c (added)
• trunk/liba52/liba52/cpu_state.c (added)
• trunk/liba52/liba52/crc.c (added)
• trunk/liba52/liba52/downmix.c (modified) (23 diffs)
• trunk/liba52/liba52/imdct.c (modified) (20 diffs)
• trunk/liba52/liba52/liba52.pc.in (added)
• trunk/liba52/liba52/parse.c (modified) (34 diffs)
• trunk/liba52/liba52/tables.h (modified) (9 diffs)

trunk/A52/ACShepA52Decoder.cpp

@@ -221 +221 @@
-        
-        // Library setup
-
+
+
-        if (decoder_state == NULL) {
-                fprintf(stderr, "ACShepA52Decoder::Initialize: Umm... liba52 could not be loaded!\n");
@@ -250 +251 @@
-                a52_free(decoder_state);
-        }
-
+
+
-        
-        firstInput = true;

trunk/A52Codec.xcodeproj/project.pbxproj

@@ -68 +68 @@
-                F5525E090A3BF7D700F36B86 /* versions.h in Headers */ = {isa = PBXBuildFile; fileRef = F5525E030A3BF7D700F36B86 /* versions.h */; };
-                F5536FB20A3BF8E800969CA8 /* QuickTime.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = F5536FB10A3BF8E800969CA8 /* QuickTime.framework */; };
+                F56BC7E40D773F63009A9DAE /* crc.c in Sources */ = {isa = PBXBuildFile; fileRef = F56BC7E30D773F63009A9DAE /* crc.c */; };
+                F56BC7E50D773F63009A9DAE /* crc.c in Sources */ = {isa = PBXBuildFile; fileRef = F56BC7E30D773F63009A9DAE /* crc.c */; };
+                F56BC7E80D773F77009A9DAE /* cpu_accel.c in Sources */ = {isa = PBXBuildFile; fileRef = F56BC7E70D773F77009A9DAE /* cpu_accel.c */; };
+                F56BC7E90D773F77009A9DAE /* cpu_accel.c in Sources */ = {isa = PBXBuildFile; fileRef = F56BC7E70D773F77009A9DAE /* cpu_accel.c */; };
+                F56BC7EC0D773F7F009A9DAE /* cpu_state.c in Sources */ = {isa = PBXBuildFile; fileRef = F56BC7EB0D773F7F009A9DAE /* cpu_state.c */; };
+                F56BC7ED0D773F7F009A9DAE /* cpu_state.c in Sources */ = {isa = PBXBuildFile; fileRef = F56BC7EB0D773F7F009A9DAE /* cpu_state.c */; };
-                F583B2070A759C1D005F8A5A /* AC3MovieImport.component in CopyFiles */ = {isa = PBXBuildFile; fileRef = F5525DF70A3BF78A00F36B86 /* AC3MovieImport.component */; };
-                F583B2150A759C4C005F8A5A /* A52Codec.component in CopyFiles */ = {isa = PBXBuildFile; fileRef = F5BDACAD0A20A00000FF4884 /* A52Codec.component */; };
@@ -210 +216 @@
-                F5536FA50A3BF89E00969CA8 /* AC3MovieImport.exp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.exports; path = AC3MovieImport.exp; sourceTree = "<group>"; };
-                F5536FB10A3BF8E800969CA8 /* QuickTime.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = QuickTime.framework; path = /System/Library/Frameworks/QuickTime.framework; sourceTree = "<absolute>"; };
+                F56BC7E30D773F63009A9DAE /* crc.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = crc.c; sourceTree = "<group>"; };
+                F56BC7E70D773F77009A9DAE /* cpu_accel.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = cpu_accel.c; sourceTree = "<group>"; };
+                F56BC7EB0D773F7F009A9DAE /* cpu_state.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = cpu_state.c; sourceTree = "<group>"; };
-                F5A548EC0287A16D01000102 /* CoreServices.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CoreServices.framework; path = /System/Library/Frameworks/CoreServices.framework; sourceTree = "<absolute>"; };
-                F5BDACAC0A20A00000FF4884 /* Info-A52Codec__Upgraded_.plist */ = {isa = PBXFileReference; lastKnownFileType = text.xml; path = "Info-A52Codec__Upgraded_.plist"; sourceTree = "<group>"; };
@@ -428 +437 @@
-                                F5BDACC80A20A03200FF4884 /* bitstream.c */,
-                                F5BDACC90A20A03200FF4884 /* bitstream.h */,
+                                F56BC7E70D773F77009A9DAE /* cpu_accel.c */,
+                                F56BC7EB0D773F7F009A9DAE /* cpu_state.c */,
+                                F56BC7E30D773F63009A9DAE /* crc.c */,
-                                F5BDACCB0A20A03200FF4884 /* downmix.c */,
-                                F5BDACCC0A20A03200FF4884 /* imdct.c */,
@@ -628 +640 @@
-                                F5525DE80A3BF78A00F36B86 /* parse.c in Sources */,
-                                F5525E040A3BF7D700F36B86 /* AC3MovieImport.c in Sources */,
+                                F56BC7E50D773F63009A9DAE /* crc.c in Sources */,
+                                F56BC7E90D773F77009A9DAE /* cpu_accel.c in Sources */,
+                                F56BC7ED0D773F7F009A9DAE /* cpu_state.c in Sources */,
-                        );
-                        runOnlyForDeploymentPostprocessing = 0;
@@ -648 +663 @@
-                                F5BDACFB0A20A11D00FF4884 /* ACShepA52Decoder.cpp in Sources */,
-                                F508127A0A21251C0092BF70 /* ACSimpleCodec.cpp in Sources */,
+                                F56BC7E40D773F63009A9DAE /* crc.c in Sources */,
+                                F56BC7E80D773F77009A9DAE /* cpu_accel.c in Sources */,
+                                F56BC7EC0D773F7F009A9DAE /* cpu_state.c in Sources */,
-                        );
-                        runOnlyForDeploymentPostprocessing = 0;

trunk/liba52/AUTHORS

@@ -8 +8 @@
-        Gildas Bazin <gbazin@netcourrier.com> - mingw32 port
-        Billy Biggs <vektor@div8.net> - most of liba52.txt
+        Jeroen Dobbelaere <jeroen.dobbelaere@acunia.com> - fixed point version
-        Eduard Hasenleithner <eduardh@aon.at> - gcc 3.0 fixes
-        Håkan Hjort <d95hjort@dtek.chalmers.se> - Solaris output, mlib code

trunk/liba52/HISTORY

@@ -23 +23 @@
-
-2002/02/24 08:54:49 - window function computed at runtime, with more precision
+
+2003/01/28 06.57:37 - switched to integer q_* coefficients
+
+2003/01/28 07:39:35 - use level of 0.75 for dithering instead of 0.707

trunk/liba52/README

@@ -66 +66 @@
-        full-featured DVD and video media player.
-
+      * VideoLAN (http://www.videolan.org/) - video streaming over an
+        ethernet network, can also be used as a standalone player.
+
-      * MPlayer (http://www.MPlayerHQ.hu) - another good player, it is
-        also very robust against damaged streams.
@@ -78 +81 @@
-        player with menu support
-
- 
+        
-        a graphical interface for a52dec in macintosh osX.
-
-
+
+
+
-        interface for macintosh osX.
+
+      * drip (http://drip.sourceforge.net/) - a DVD to DIVX transcoder.
-
-      * OMS (http://www.linuxvideo.org/oms/)
@@ -95 +102 @@
-
-If you use liba52 in another project, let us know !
-
-VideoLAN (http://www.videolan.org/) does not use liba52, but this is
-still a cool project :)
-
-

trunk/liba52/TODO

@@ -1 @@
-
-
-
+
-
-* get rid of globals in bitstream parsing
-* get rid of statics in imdct.c
-* avoid overflows, including reading the a52 stream !!!
-* make dither code faster (generate dither table in advance ?)
-* redo all bit allocation if previous frame had zero_snr_offsets
-* make dynrng work in dual-channel streams
-
-
+
+
+
+
+
+
+
+
+
+
+
+

trunk/liba52/acinclude.m4

@@ -18 +18 @@
-    esac])
-
+dnl AC_C_BUILTIN_EXPECT
+dnl Check whether compiler understands __builtin_expect.
+AC_DEFUN([AC_C_BUILTIN_EXPECT],
+    [AC_CACHE_CHECK([for __builtin_expect],[ac_cv_builtin_expect],
+        [cat > conftest.c <<EOF
+#line __oline__ "configure"
+int foo (int a)
+{
+    a = __builtin_expect (a, 10);
+    return a == 10 ? 0 : 1;
+}
+EOF
+        if AC_TRY_COMMAND([${CC-cc} $CFLAGS -nostdlib -nostartfiles
+            -o conftest conftest.c -lgcc >&AC_FD_CC]); then
+            ac_cv_builtin_expect=yes
+        else
+            ac_cv_builtin_expect=no
+        fi
+        rm -f conftest*])
+    if test x"$ac_cv_builtin_expect" = x"yes"; then
+        AC_DEFINE(HAVE_BUILTIN_EXPECT,,
+            [Define if you have the `__builtin_expect' function.])
+    fi])
+
-dnl AC_C_ALWAYS_INLINE
-dnl Define inline to something appropriate, including the new always_inline
@@ -27 +51 @@
-        SAVE_CFLAGS="$CFLAGS"
-        CFLAGS="$CFLAGS -Wall -Werror"
-
+
+
+
+
+
-            [ac_cv_always_inline=yes],[ac_cv_always_inline=no])
-        CFLAGS="$SAVE_CFLAGS"
@@ -39 +67 @@
-dnl define ATTRIBUTE_ALIGNED_MAX to the maximum alignment if this is supported
-AC_DEFUN([AC_C_ATTRIBUTE_ALIGNED],
-
+
+
+
-        [ac_cv_c_attribute_aligned],
-        [ac_cv_c_attribute_aligned=0
@@ -50 +80 @@
-        AC_DEFINE_UNQUOTED([ATTRIBUTE_ALIGNED_MAX],
-            [$ac_cv_c_attribute_aligned],[maximum supported data alignment])
-
+
+
-
-dnl AC_TRY_CFLAGS (CFLAGS, [ACTION-IF-WORKS], [ACTION-IF-FAILS])
@@ -67 +98 @@
-    fi])
-
+dnl AC_LIBTOOL_NON_PIC ([ACTION-IF-WORKS], [ACTION-IF-FAILS])
+dnl check for nonbuggy libtool -prefer-non-pic
+AC_DEFUN([AC_LIBTOOL_NON_PIC],
+    [AC_MSG_CHECKING([if libtool supports -prefer-non-pic flag])
+    mkdir ac_test_libtool; cd ac_test_libtool; ac_cv_libtool_non_pic=no
+    echo "int g (int i); int f (int i) {return g (i);}" >f.c
+    echo "int (* hook) (int) = 0; int g (int i) {if (hook) i = hook (i); return i + 1;}" >g.c
+    ../libtool --mode=compile $CC $CFLAGS -prefer-non-pic \
+                -c f.c >/dev/null 2>&1 && \
+        ../libtool --mode=compile $CC $CFLAGS -prefer-non-pic \
+                -c g.c >/dev/null 2>&1 && \
+        ../libtool --mode=link $CC $CFLAGS -prefer-non-pic -o libfoo.la \
+                -rpath / f.lo g.lo >/dev/null 2>&1 &&
+        ac_cv_libtool_non_pic=yes
+    cd ..; rm -fr ac_test_libtool; AC_MSG_RESULT([$ac_cv_libtool_non_pic])
+    if test x"$ac_cv_libtool_non_pic" = x"yes"; then
+        ifelse([$1],[],[:],[$1])
+    else
+        ifelse([$2],[],[:],[$2])
+    fi])
-
-dnl AC_CHECK_GENERATE_INTTYPES_H (INCLUDE-DIRECTORY)
@@ -72 +123 @@
-AC_DEFUN([AC_CHECK_GENERATE_INTTYPES],
-    [rm -f $1/inttypes.h
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-#define __int8_t_defined
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-typedef unsigned long long uint64_t;
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+

trunk/liba52/bootstrap

@@ -1 +1 @@
-#! /bin/sh
+# $Id: bootstrap 602 2008-01-20 23:32:22Z xtophe $
+
+# bootstrap: generic bootstrap/autogen.sh script for autotools projects
+#
+# Copyright (c) 2002-2007 Sam Hocevar <sam@zoy.org>
+#
+#    This program is free software. It comes without any warranty, to
+#    the extent permitted by applicable law. You can redistribute it
+#    and/or modify it under the terms of the Do What The Fuck You Want
+#    To Public License, Version 2, as published by Sam Hocevar. See
+#    http://sam.zoy.org/wtfpl/COPYING for more details.
+#
+# The latest version of this script can be found at the following place:
+#   http://sam.zoy.org/autotools/
+
+# Die if an error occurs
+set -e
+
+# Guess whether we are using configure.ac or configure.in
+if test -f configure.ac; then
+  conffile="configure.ac"
+elif test -f configure.in; then
+  conffile="configure.in"
+else
+  echo "$0: could not find configure.ac or configure.in"
+  exit 1
+fi
+
+# Check for needed features
+auxdir="`sed -ne 's/^[ \t]*A._CONFIG_AUX_DIR *([[ ]*\([^] )]*\).*/\1/p' $conffile`"
+libtool="`grep -q '^[ \t]*A._PROG_LIBTOOL' $conffile && echo yes || echo no`"
+header="`grep -q '^[ \t]*A._CONFIG_HEADER' $conffile && echo yes || echo no`"
+aclocalflags="`sed -ne 's/^[ \t]*ACLOCAL_AMFLAGS[ \t]*=//p' Makefile.am`"
+
+# Check for automake
+amvers="no"
+for v in 10 9 8 7 6 5; do
+  if automake-1.${v} --version >/dev/null 2>&1; then
+    amvers="-1.${v}"
+    break
+  elif automake1.${v} --version >/dev/null 2>&1; then
+    amvers="1.${v}"
+    break
+  fi
+done
+
+if test "${amvers}" = "no" && automake --version > /dev/null 2>&1; then
+  amvers="`automake --version | sed -e '1s/[^0-9]*//' -e q`"
+  if expr "$amvers" "<" "1.5" > /dev/null 2>&1; then
+    amvers="no"
+  else
+    amvers=""
+  fi
+fi
+
+if test "$amvers" = "no"; then
+  echo "$0: you need automake version 1.5 or later"
+  exit 1
+fi
+
+# Check for autoconf
+acvers="no"
+for v in "" "259" "253"; do
+  if autoconf${v} --version >/dev/null 2>&1; then
+    acvers="${v}"
+    break
+  fi
+done
+
+if test "$acvers" = "no"; then
+  echo "$0: you need autoconf"
+  exit 1
+fi
+
+# Check for libtool
+if test "$libtool" = "yes"; then
+  libtoolize="no"
+  if glibtoolize --version >/dev/null 2>&1; then
+    libtoolize="glibtoolize"
+  else
+    for v in "16" "15" "" "14"; do
+      if libtoolize${v} --version >/dev/null 2>&1; then
+        libtoolize="libtoolize${v}"
+        break
+      fi
+    done
+  fi
+
+  if test "$libtoolize" = "no"; then
+    echo "$0: you need libtool"
+    exit 1
+  fi
+fi
+
+# Remove old cruft
+for x in aclocal.m4 configure config.guess config.log config.sub config.cache config.h.in config.h compile libtool.m4 ltoptions.m4 ltsugar.m4 ltversion.m4 ltmain.sh libtool ltconfig missing mkinstalldirs depcomp install-sh; do rm -f $x autotools/$x; if test -n "$auxdir"; then rm -f "$auxdir/$x"; fi; done
+rm -Rf autom4te.cache
+if test -n "$auxdir"; then
+  if test ! -d "$auxdir"; then
+    mkdir "$auxdir"
+  fi
+  aclocalflags="${aclocalflags} -I $auxdir -I ."
+fi
+
+# Explain what we are doing from now
-set -x
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+

trunk/liba52/include/Makefile.am

@@ -1 @@
- mm_accel.h
+
-
-
+mmx.h 

trunk/liba52/include/a52.h

@@ -1 +1 @@
-/*
- * a52.h
-2
+3
- * Copyright (C) 1999-2000 Aaron Holtzman <aholtzma@ess.engr.uvic.ca>
- *
@@ -25 +25 @@
-extern "C"{
-#endif
-
+
-#ifndef A52_H
-#define A52_H
-
-
+
+
+
+
+
+
+
-typedef float sample_t;
-
-
+
-#endif
-
@@ -55 +60 @@
-// this next constant can be ORed with A52_DOLBY to tell liba52 to use 5.0 DPLII matrix encoding,
-// rather than just 4.0 Dolby Surround matrix encoding
-
+
+
+
-
-