Request 4050 (accepted)

Overview

Request 4050 (accepted)

Versionbump

Created by zaitor over 6 years ago
In state accepted
Package maintainers: detrei and mantre

Submit faac

Submit package home:zaitor:branches:Essentials / faac to package Essentials / faac

faac.changes Changed

@@ -1,4 +1,34 @@
 -------------------------------------------------------------------
+Sun Nov 26 23:27:40 UTC 2017 - zaitor@opensuse.org
+
+- Update to version 1.29.9.2:
+  * initial version of PNS coding
+  * Intensity Stereo coding
+  * more speed improvements
+  * finer bandwidth/cutoff setting (doesn't work with PNS)
+  * fixed more bugs
+  * rewritten mid/side coding
+  * fixed bug in blockswitch
+- Changes from version 1.29.8:
+  * changed default mode to ABR 64kbps/channel
+  * implemented short windows grouping
+  * new huffman coder
+  * SSE quantizer
+  * modified functioning of ABR mode (-b option)
+  * improved autotools support
+  * allowed even higher bitrates, including ADTS
+  * framebuffer size bug fixed
+  * removed broken object types: Main and LTP
+  * some mp4 atoms fixed for better compalibility
+  * stdin seek bug fixed
+- Drop faac-1.28-strict-aliasing-punning.patch: No longer needed.
+- Drop faac-1.29.7.8-disable-sse2.patch: Fix upstream in a
+  different way, arm now builds.
+- Following the above, drop autoconf, automake and libtool
+  BuildRequires and no longer pass autoreconf, we do not carry any
+  patches touching the build system anymore.
+
+-------------------------------------------------------------------
 Mon Oct  9 08:59:43 UTC 2017 - hillwood@opensuse.org
 
 - Add faac-1.29.7.8-disable-sse2.patch

faac.spec Changed

@@ -21,7 +21,7 @@
 %define libname   %{lib}%{major}
 
 Name:           faac
-Version:        1.29.7.8
+Version:        1.29.9.2
 Release:        0
 Summary:        Frontend for encoding MPEG2/4 AAC
 # Original Code was free to use but restricted. Modifications are LGPL-2.1+
@@ -30,13 +30,6 @@
 Url:            http://www.audiocoding.com/
 Source0:        https://sourceforge.net/projects/faac/files/faac-src/faac-1.29/%{name}-%{version}.tar.gz
 Source99:       baselibs.conf
-# PATCH-FIX-UPSTREAM marguerite@opensuse.org - fix strict-aliasing-punning warning.
-Patch0:         faac-1.28-strict-aliasing-punning.patch
-# PATCH-FIX-UPSTREAM faac-1.29.7.8-disable-sse2.patch hillwood@opensuse.org - fix build for ARM
-Patch1:         faac-1.29.7.8-disable-sse2.patch
-BuildRequires:  autoconf
-BuildRequires:  automake
-BuildRequires:  libtool
 BuildRequires:  gcc-c++
 Requires:       %{libname} = %{version}
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
@@ -72,11 +65,8 @@
 
 %prep
 %setup -q
-%patch0 -p1
-%patch1 -p1
 
 %build
-autoreconf -fi
 %configure \
            --enable-shared \
            --disable-static

faac-1.28-strict-aliasing-punning.patch Deleted

@@ -1,68 +0,0 @@
-Index: faac-1.28/frontend/input.c
-===================================================================
---- faac-1.28.orig/frontend/input.c
-+++ faac-1.28/frontend/input.c
-@@ -270,13 +270,17 @@ static void chan_remap(int32_t *buf, int
- size_t wav_read_float32(pcmfile_t *sndf, float *buf, size_t num, int *map)
- {
-   size_t i = 0;
--  unsigned char bufi[8];
-+  union {
-+	unsigned char c[8];
-+	int i;
-+	double d;
-+  } bufi;
- 
-   if ((sndf->samplebytes > 8) || (sndf->samplebytes < 1))
-     return 0;
- 
-   while (i<num) {
--    if (fread(bufi, sndf->samplebytes, 1, sndf->f) != 1)
-+    if (fread(&bufi, sndf->samplebytes, 1, sndf->f) != 1)
-       break;
- 
-     if (sndf->isfloat)
-@@ -301,7 +305,7 @@ size_t wav_read_float32(pcmfile_t *sndf,
-       switch (sndf->samplebytes) {
-       case 1:
-         /* this is endian clean */
--        buf[i] = ((float)bufi[0] - 128) * (float)256;
-+        buf[i] = ((float)bufi.c[0] - 128) * (float)256;
-         break;
- 
-       case 2:
-@@ -312,14 +316,14 @@ size_t wav_read_float32(pcmfile_t *sndf,
- #endif
-         {
-           // swap bytes
--          int16_t s = ((int16_t *)bufi)[0];
-+          int16_t s = ((int16_t *)&bufi)[0];
-           s = SWAP16(s);
-           buf[i] = (float)s;
-         }
-         else
-         {
-           // no swap
--          int s = ((int16_t *)bufi)[0];
-+          int s = ((int16_t *)&bufi)[0];
-           buf[i] = (float)s;
-         }
-         break;
-@@ -327,7 +331,7 @@ size_t wav_read_float32(pcmfile_t *sndf,
-       case 3:
-         if (!sndf->bigendian)
-         {
--          int s = bufi[0] | (bufi[1] << 8) | (bufi[2] << 16);
-+          int s = bufi.c[0] | (bufi.c[1] << 8) | (bufi.c[2] << 16);
- 
-           // fix sign
-           if (s & 0x800000)
-@@ -337,7 +341,7 @@ size_t wav_read_float32(pcmfile_t *sndf,
-         }
-         else // big endian input
-         {
--          int s = (bufi[0] << 16) | (bufi[1] << 8) | bufi[2];
-+          int s = (bufi.c[0] << 16) | (bufi.c[1] << 8) | bufi.c[2];
- 
-           // fix sign
-           if (s & 0x800000)

faac-1.29.7.8-disable-sse2.patch Deleted

@@ -1,62 +0,0 @@
-diff -Nur faac-1.29.7.8/libfaac/Makefile.am faac-1.29.7.8-new/libfaac/Makefile.am
---- faac-1.29.7.8/libfaac/Makefile.am	2017-10-05 14:55:48.000000000 +0800
-+++ faac-1.29.7.8-new/libfaac/Makefile.am	2017-10-09 22:35:34.243608500 +0800
-@@ -1,7 +1,7 @@
- common_SOURCES = aacquant.c bitstream.c fft.c frame.c midside.c blockswitch.c util.c channels.c filtbank.c huffman.c tns.c quantize.c
- common_INCLUDES = aacquant.h channels.h filtbank.h hufftab.h blockswitch.h coder.h frame.h midside.h tns.h bitstream.h fft.h huffman.h util.h quantize.h version.h
- common_LIBADD = -lm
--common_CFLAGS = -fvisibility=hidden -msse2
-+common_CFLAGS = -fvisibility=hidden
- 
- if USE_DRM
- lib_LTLIBRARIES = libfaac_drm.la
-diff -Nur faac-1.29.7.8/libfaac/Makefile.in faac-1.29.7.8-new/libfaac/Makefile.in
---- faac-1.29.7.8/libfaac/Makefile.in	2017-10-05 20:31:51.000000000 +0800
-+++ faac-1.29.7.8-new/libfaac/Makefile.in	2017-10-09 22:35:21.713357700 +0800
-@@ -366,7 +366,7 @@
- common_SOURCES = aacquant.c bitstream.c fft.c frame.c midside.c blockswitch.c util.c channels.c filtbank.c huffman.c tns.c quantize.c
- common_INCLUDES = aacquant.h channels.h filtbank.h hufftab.h blockswitch.h coder.h frame.h midside.h tns.h bitstream.h fft.h huffman.h util.h quantize.h version.h
- common_LIBADD = -lm
--common_CFLAGS = -fvisibility=hidden -msse2
-+common_CFLAGS = -fvisibility=hidden
- @USE_DRM_FALSE@lib_LTLIBRARIES = libfaac.la
- @USE_DRM_TRUE@lib_LTLIBRARIES = libfaac_drm.la
- @USE_DRM_TRUE@libfaac_drm_la_SOURCES = ${common_SOURCES} ${common_INCLUDES} kiss_fft/kiss_fftr.c kiss_fft/kiss_fft.c kiss_fft/kiss_fft.h
-diff -Nur faac-1.29.7.8/libfaac/quantize.c faac-1.29.7.8-new/libfaac/quantize.c
---- faac-1.29.7.8/libfaac/quantize.c	2017-10-05 14:55:48.000000000 +0800
-+++ faac-1.29.7.8-new/libfaac/quantize.c	2017-10-09 22:26:53.347399200 +0800
-@@ -126,34 +126,7 @@
- #ifdef __GNUC__
- typedef float v4sf __attribute__ ((vector_size (16)));
- typedef int v4si __attribute__ ((vector_size (16)));
--      if (__builtin_cpu_supports("sse2"))
--      {
--          static const v4sf zero = {0, 0, 0, 0};
--          static const v4sf magic = {MAGIC_NUMBER, MAGIC_NUMBER, MAGIC_NUMBER, MAGIC_NUMBER};
- 
--          for (cnt = start; cnt < end; cnt += 4)
--          {
--              float fin[4];
--              fin[0] = xr[cnt];
--              fin[1] = xr[cnt+1];
--              fin[2] = xr[cnt+2];
--              fin[3] = xr[cnt+3];
--
--              v4sf x = __builtin_ia32_loadups(fin);
--              x = __builtin_ia32_maxps(x, __builtin_ia32_subps(zero, x));
--
--              v4sf fix = {sfacfix, sfacfix, sfacfix, sfacfix};
--              x = __builtin_ia32_mulps(x, fix);
--              x = __builtin_ia32_mulps(x , __builtin_ia32_sqrtps(x));
--              x = __builtin_ia32_sqrtps(x);
--
--              x = __builtin_ia32_addps(x, magic);
--              v4si vi = __builtin_ia32_cvttps2dq(x);
--              memcpy(xi+cnt,&vi,16);
--          }
--
--          continue;
--      }
- #endif
- 
-       for (cnt = start; cnt < end; cnt++)

faac-1.29.7.8.tar.gz/libfaac/aacquant.c Deleted

@@ -1,219 +0,0 @@
-/*
- * FAAC - Freeware Advanced Audio Coder
- * Copyright (C) 2001 Menno Bakker
- * Copyright (C) 2002, 2003 Krzysztof Nikiel
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
- *
- * This library 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
- * Lesser General Public License for more details.
-
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- *
- */
-
-#include <math.h>
-#include <stdlib.h>
-
-#include <faac.h>
-#include "aacquant.h"
-#include "coder.h"
-#include "huffman.h"
-#include "util.h"
-#include "quantize.h"
-
-
-void AACQuantizeInit(CoderInfo *coderInfo, unsigned int numChannels,
-                     AACQuantCfg *aacquantCfg)
-{
-    unsigned int i;
-
-    aacquantCfg->pow43 = (double*)AllocMemory(PRECALC_SIZE*sizeof(double));
-    aacquantCfg->pow43[0] = 0.0;
-    for(i=1;i<PRECALC_SIZE;i++)
-        aacquantCfg->pow43[i] = pow((double)i, 4.0/3.0);
-}
-
-void AACQuantizeEnd(CoderInfo *coderInfo, unsigned int numChannels,
-                    AACQuantCfg *aacquantCfg)
-{
-    if (aacquantCfg->pow43)
-    {
-        FreeMemory(aacquantCfg->pow43);
-        aacquantCfg->pow43 = NULL;
-    }
-}
-
-int AACQuantize(CoderInfo *coderInfo,
-                int *cb_width,
-                int num_cb,
-                double *xr,
-                AACQuantCfg *aacquantCfg)
-{
-    int sb, i;
-    int bits = 0, sign;
-    int xi[FRAME_LEN];
-
-    /* Use local copy's */
-    int *scale_factor = coderInfo->scale_factor;
-
-    /* Set all scalefactors to 0 */
-    coderInfo->global_gain = 0;
-    for (sb = 0; sb < coderInfo->sfbn; sb++)
-        scale_factor[sb] = 0;
-
-    if (BlocQuant(coderInfo, xr, xi, aacquantCfg))
-    {
-        for ( i = 0; i < FRAME_LEN; i++ )  {
-            sign = (xr[i] < 0) ? -1 : 1;
-            xi[i] *= sign;
-        }
-    }
-
-    BitSearch(coderInfo, xi);
-
-    /* offset the difference of common_scalefac and scalefactors by SF_OFFSET  */
-    for (i = 0; i < coderInfo->sfbn; i++) {
-        if ((coderInfo->book_vector[i]!=INTENSITY_HCB)&&(coderInfo->book_vector[i]!=INTENSITY_HCB2)) {
-            scale_factor[i] = coderInfo->global_gain - scale_factor[i] + SF_OFFSET;
-        }
-    }
-    coderInfo->global_gain = scale_factor[0];
-    // clamp to valid diff range
-    {
-      int previous_scale_factor = coderInfo->global_gain;
-      int previous_is_factor = 0;
-      for (i = 0; i < coderInfo->sfbn; i++) {
-        if ((coderInfo->book_vector[i]==INTENSITY_HCB) ||
-            (coderInfo->book_vector[i]==INTENSITY_HCB2)) {
-            const int diff = scale_factor[i] - previous_is_factor;
-            if (diff < -60) scale_factor[i] = previous_is_factor - 60;
-            else if (diff > 60) scale_factor[i] = previous_is_factor + 60;
-            previous_is_factor = scale_factor[i];
-//            printf("sf %d: %d diff=%d **\n", i, coderInfo->scale_factor[i], diff);
-        } else if (coderInfo->book_vector[i]) {
-            const int diff = scale_factor[i] - previous_scale_factor;
-            if (diff < -60) scale_factor[i] = previous_scale_factor - 60;
-            else if (diff > 60) scale_factor[i] = previous_scale_factor + 60;
-            previous_scale_factor = scale_factor[i];
-//            printf("sf %d: %d diff=%d\n", i, coderInfo->scale_factor[i], diff);
-        }
-      }
-    }
-
-    /* place the codewords and their respective lengths in arrays data[] and len[] respectively */
-    /* there are 'counter' elements in each array, and these are variable length arrays depending on the input */
-#ifdef DRM
-    coderInfo->iLenReordSpData = 0; /* init length of reordered spectral data */
-    coderInfo->iLenLongestCW = 0; /* init length of longest codeword */
-    coderInfo->cur_cw = 0; /* init codeword counter */
-#endif
-    coderInfo->spectral_count = 0;
-    sb = 0;
-    for(i = 0; i < coderInfo->sfbn; i++) {
-        OutputBits(
-            coderInfo,
-#ifdef DRM
-            &coderInfo->book_vector[i], /* needed for VCB11 */
-#else
-            coderInfo->book_vector[i],
-#endif
-            xi,
-            coderInfo->sfb_offset[i],
-            coderInfo->sfb_offset[i+1]-coderInfo->sfb_offset[i]);
-
-        if (coderInfo->book_vector[i])
-              sb = i;
-    }
-
-    coderInfo->sfbn = sb + 1;
-
-    return bits;
-}
-
-int SortForGrouping(CoderInfo* coderInfo,
-                    int *sfb_width_table,
-                    double *xr)
-{
-    int i,j,ii;
-    int index = 0;
-    double xr_tmp[FRAME_LEN];
-    int group_offset=0;
-    int k=0;
-    int windowOffset = 0;
-
-
-    /* set up local variables for used quantInfo elements */
-    int* sfb_offset = coderInfo->sfb_offset;
-    int sfbn = coderInfo->sfbn;
-    int* groups = coderInfo->groups.len;
-    int num_window_groups = coderInfo->groups.n;
-
-    /* calc org sfb_offset just for shortblock */
-    sfb_offset[k]=0;
-    for (k=1 ; k < sfbn; k++) {
-        sfb_offset[k] = sfb_offset[k-1] + sfb_width_table[k-1];
-    }
-
-    /* sort the input spectral coefficients */
-    index = 0;
-    group_offset=0;
-    for (i=0; i< num_window_groups; i++) {
-        for (k=0; k < sfbn; k++) {
-            for (j=0; j < groups[i]; j++) {
-                for (ii=0;ii< sfb_width_table[k];ii++)
-                    xr_tmp[index++] = xr[ii+ sfb_offset[k] + BLOCK_LEN_SHORT*j +group_offset];
-            }
-        }
-        group_offset +=  BLOCK_LEN_SHORT*groups[i];
-    }
-
-    for (k=0; k<FRAME_LEN; k++){
-        xr[k] = xr_tmp[k];
-    }
-
-
-    /* now calc the new sfb_offset table for the whole p_spectrum vector*/
-    index = 0;
-    sfb_offset[index++] = 0;
-    windowOffset = 0;
-    for (i=0; i < num_window_groups; i++) {
-        for (k=0; k < sfbn; k++) {
-            sfb_offset[index] = sfb_offset[index-1] + sfb_width_table[k]*groups[i] ;
-            index++;
-        }
-        windowOffset += groups[i];
-    }
-
-    coderInfo->sfbn = sfbn * num_window_groups;
-
-    return 0;
-}
-
-void CalcAvgEnrg(CoderInfo *coderInfo,
-                 const double *xr)
-{
-  int end, l;
-  int last = 0;
-  double totenrg = 0.0;
-
-  end = coderInfo->sfb_offset[coderInfo->sfbn];
-  for (l = 0; l < end; l++)
-  {
-    if (xr[l])
-    {
-      last = l;
-      totenrg += xr[l] * xr[l];
-    }
-    }
-  last++;
-
-  coderInfo->avgenrg = totenrg / last;
-}

faac-1.29.7.8.tar.gz/libfaac/aacquant.h Deleted

@@ -1,72 +0,0 @@
-/*
- * FAAC - Freeware Advanced Audio Coder
- * Copyright (C) 2001 Menno Bakker
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
- *
- * This library 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
- * Lesser General Public License for more details.
-
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- *
- * $Id: aacquant.h,v 1.9 2003/10/12 16:43:39 knik Exp $
- */
-
-#ifndef AACQUANT_H
-#define AACQUANT_H
-
-#ifdef __cplusplus
-extern "C" {
-#endif /* __cplusplus */
-
-#include "coder.h"
-
-#define IXMAX_VAL 8191
-#define PRECALC_SIZE (IXMAX_VAL+2)
-#define LARGE_BITS 100000
-#define SF_OFFSET 100
-
-#define POW20(x)  pow(2.0,((double)x)*.25)
-#define IPOW20(x)  pow(2.0,-((double)x)*.1875)
-
-typedef struct
-  {
-    double *pow43;
-    double quality;
-    int max_cbl;
-    int max_cbs;
-  } AACQuantCfg;
-
-#include "quantize.h"
-
-enum {DEFQUAL = 100, MAXQUAL = 5000, MAXQUALADTS = MAXQUAL, MINQUAL = 10};
-
-void AACQuantizeInit(CoderInfo *coderInfo, unsigned int numChannels,
-		     AACQuantCfg *aacquantCfg);
-void AACQuantizeEnd(CoderInfo *coderInfo, unsigned int numChannels,
-		    AACQuantCfg *aacquantCfg);
-
-int AACQuantize(CoderInfo *coderInfo,
-                int *cb_width,
-                int num_cb,
-                double *xr,
-		AACQuantCfg *aacquantcfg);
-
-int SortForGrouping(CoderInfo* coderInfo,
-		    int *sfb_width_table,
-		    double *xr);
-void CalcAvgEnrg(CoderInfo *coderInfo,
-		 const double *xr);
-
-#ifdef __cplusplus
-}
-#endif /* __cplusplus */
-
-#endif /* AACQUANT_H */

faac-1.29.7.8.tar.gz/libfaac/huffman.c Deleted

@@ -1,1244 +0,0 @@
-/***********
-
-This software module was originally developed by Dolby
-Laboratories and edited by Sony Corporation
-in the course of development of the MPEG-2 NBC/MPEG-4
-Audio standard ISO/IEC13818-7, 14496-1, 2 and 3. This software module is an
-implementation of a part of one or more MPEG-2 NBC/MPEG-4 Audio tools as
-specified by the MPEG-2 NBC/MPEG-4 Audio standard. ISO/IEC  gives users of the
-MPEG-2NBC/MPEG-4 Audio standards free license to this software module
-or modifications thereof for use in hardware or software products
-claiming conformance to the MPEG-2 NBC/MPEG-4 Audio  standards. Those
-intending to use this software module in hardware or software products
-are advised that this use may infringe existing patents. The original
-developer of this software module, the subsequent
-editors and their companies, and ISO/IEC have no liability for use of
-this software module or modifications thereof in an
-implementation. Copyright is not released for non MPEG-2 NBC/MPEG-4
-Audio conforming products. The original developer retains full right to
-use the code for the developer's own purpose, assign or donate the code to a
-third party and to inhibit third party from using the code for non
-MPEG-2 NBC/MPEG-4 Audio conforming products. This copyright notice
-must be included in all copies or derivative works. Copyright 1996.
-
-***********/
-/*
- * $Id: huffman.c,v 1.12 2009/06/05 16:16:06 menno Exp $
- */
-
-#include <math.h>
-#include <stdlib.h>
-
-#include "huffman.h"
-#include "coder.h"
-#include "bitstream.h"
-#include "util.h"
-
-#include "hufftab.h"
-
-void HuffmanInit(CoderInfo *coderInfo, unsigned int numChannels)
-{
-    unsigned int channel;
-
-    for (channel = 0; channel < numChannels; channel++) {
-        coderInfo[channel].data = (int*)AllocMemory(5*FRAME_LEN*sizeof(int));
-        coderInfo[channel].len = (int*)AllocMemory(5*FRAME_LEN*sizeof(int));
-
-#ifdef DRM
-        coderInfo[channel].num_data_cw = (int*)AllocMemory(FRAME_LEN*sizeof(int));
-#endif
-    }
-}
-
-void HuffmanEnd(CoderInfo *coderInfo, unsigned int numChannels)
-{
-    unsigned int channel;
-
-    for (channel = 0; channel < numChannels; channel++) {
-        if (coderInfo[channel].data) FreeMemory(coderInfo[channel].data);
-        if (coderInfo[channel].len) FreeMemory(coderInfo[channel].len);
-
-#ifdef DRM
-        if (coderInfo[channel].num_data_cw) FreeMemory(coderInfo[channel].num_data_cw);
-#endif
-    }
-}
-
-int BitSearch(CoderInfo *coderInfo,
-              int *quant)  /* Quantized spectral values */
-  /*
-  This function inputs a vector of quantized spectral data, quant[][], and returns a vector,
-  'book_vector[]' that describes how to group together the scalefactor bands into a smaller
-  number of sections.  There are MAX_SCFAC_BANDS elements in book_vector (equal to 49 in the
-  case of long blocks and 112 for short blocks), and each element has a huffman codebook
-  number assigned to it.
-
-  For a quick and simple algorithm, this function performs a binary
-  search across the sfb's (scale factor bands).  On the first approach, it calculates the
-  needed amount of bits if every sfb were its own section and transmitted its own huffman
-  codebook value side information (equal to 9 bits for a long block, 7 for a short).  The
-  next iteration combines adjacent sfb's, and calculates the bit rate for length two sfb
-  sections.  If any wider two-sfb section requires fewer bits than the sum of the two
-  single-sfb sections (below it in the binary tree), then the wider section will be chosen.
-  This process occurs until the sections are split into three uniform parts, each with an
-  equal amount of sfb's contained.
-
-  The binary tree is stored as a two-dimensional array.  Since this tree is not full, (there
-  are only 49 nodes, not 2^6 = 64), the numbering is a little complicated.  If the tree were
-  full, the top node would be 1.  It's children would be 2 and 3.  But, since this tree
-  is not full, the top row of three nodes are numbered {4,5,6}.  The row below it is
-  {8,9,10,11,12,13}, and so on.
-
-  The binary tree is called bit_stats[112][3].  There are 112 total nodes (some are not
-  used since it's not full).  bit_stats[x][0] holds the bit totals needed for the sfb sectioning
-  strategy represented by the node x in the tree.  bit_stats[x][1] holds the optimal huffman
-  codebook table that minimizes the bit rate, given the sectioning boundaries dictated by node x.
-*/
-
-{
-    int i,j,k;
-    int hop;
-    int min_book_choice[112][3];
-    int bit_stats[240][3];
-    int total_bit_count;
-    int levels;
-    int pow2levels;
-    int fracpow2lev;
-
-    /* Set local pointer to coderInfo book_vector */
-    int* book_vector = coderInfo -> book_vector;
-
-    levels = (int) ((log((double)coderInfo->sfbn)/log((double)2.0))+1);
-
-/* #define SLOW */
-
-#ifdef SLOW
-    for(i = 0; i < 5; i++) {
-#else
-        i = 0;
-#endif
-        hop = 1 << i;
-
-        NoiselessBitCount(coderInfo, quant, hop, min_book_choice);
-
-        /* load up the (not-full) binary search tree with the min_book_choice values */
-        k=0;
-        total_bit_count = 0;
-
-        pow2levels = 1 << (levels - i);
-        fracpow2lev = pow2levels + (coderInfo->sfbn >> i);
-
-        for (j=pow2levels; j < fracpow2lev; j++)
-        {
-            bit_stats[j][0] = min_book_choice[k][0]; /* the minimum bit cost for this section */
-            bit_stats[j][1] = min_book_choice[k][1]; /* used with this huffman book number */
-
-#ifdef SLOW
-            if (i>0){  /* not on the lowest level, grouping more than one signle scalefactor band per section*/
-                if  (bit_stats[j][0] < bit_stats[2*j][0] + bit_stats[2*j+1][0]){
-
-                    /* it is cheaper to combine surrounding sfb secionts into one larger huffman book section */
-                    for(n=k;n<k+hop;n++) { /* write the optimal huffman book value for the new larger section */
-                        if ( (book_vector[n]!=INTENSITY_HCB)&&(book_vector[n]!=INTENSITY_HCB2) ) { /* Don't merge with IS bands */
-                            book_vector[n] = bit_stats[j][1];
-                        }
-                    }
-                } else {  /* it was cheaper to transmit the smaller huffman table sections */
-                    bit_stats[j][0] = bit_stats[2*j][0] + bit_stats[2*j+1][0];
-                }
-	    } else
-#endif
-	    {  /* during the first stage of the iteration, all sfb's are individual sections */
-                if ( (book_vector[k]!=INTENSITY_HCB)&&(book_vector[k]!=INTENSITY_HCB2) ) {
-                    book_vector[k] = bit_stats[j][1];  /* initially, set all sfb's to their own optimal section table values */
-                }
-            }
-            total_bit_count = total_bit_count +  bit_stats[j][0];
-            k=k+hop;
-        }
-#ifdef SLOW
-    }
-#endif
-    /*   book_vector[k] = book_vector[k-1]; */
-    return(total_bit_count);
-}
-
-
-int NoiselessBitCount(CoderInfo *coderInfo,
-                      int *quant,
-                      int hop,
-                      int min_book_choice[112][3])
-{
-  int i,j,k;
-
-  /*
-     This function inputs:
-     - the quantized spectral data, 'quant[]';
-     - all of the huffman codebooks, 'huff[][]';
-     - the size of the sections, in scalefactor bands (SFB's), 'hop';
-     - an empty matrix, min_book_choice[][] passed to it;
-
-     This function outputs:
-     - the matrix, min_book_choice.  It is a two dimensional matrix, with its
-     rows corresponding to spectral sections.  The 0th column corresponds to
-     the bits needed to code a section with 'hop' scalefactors bands wide, all using
-     the same huffman codebook.  The 1st column contains the huffman codebook number
-     that allows the minimum number of bits to be used.
-
-     Other notes:
-     - Initally, the dynamic range is calculated for each spectral section.  The section
-     can only be entropy coded with books that have an equal or greater dynamic range
-     than the section's spectral data.  The exception to this is for the 11th ESC codebook.
-     If the dynamic range is larger than 16, then an escape code is appended after the
-     table 11 codeword which encodes the larger value explicity in a pseudo-non-uniform
-     quantization method.
-
-     */
-
-    int max_sb_coeff;
-    int book_choice[12][2];
-    int total_bits_cost = 0;
-    int offset, length, end;
-    int q;
-
-    /* set local pointer to sfb_offset */
-    int *sfb_offset = coderInfo->sfb_offset;
-    int sfbn = coderInfo->sfbn;
-
-    /* each section is 'hop' scalefactor bands wide */
-    for (i = 0; i < sfbn; i = i + hop){
-#ifdef SLOW
-        if ((i+hop) > nr_of_sfb)
-            q = nr_of_sfb;
-        else
-#endif
-            q = i+hop;
-
-        {
-
-            /* find the maximum absolute value in the current spectral section, to see what tables are available to use */
-            max_sb_coeff = 0;
-            for (j=sfb_offset[i]; j<sfb_offset[q]; j++){  /* snl */
-                if (ABS(quant[j]) > max_sb_coeff)
-                    max_sb_coeff = ABS(quant[j]);
-            }
-
-            j = 0;
-            offset = sfb_offset[i];
-#ifdef SLOW
-            if ((i+hop) > nr_of_sfb){
-                end = sfb_offset[nr_of_sfb];
-            } else
-#endif
-                end = sfb_offset[q];
-            length = end - offset;
-
-            /* all spectral coefficients in this section are zero */
-            if (max_sb_coeff == 0) {
-                book_choice[j][0] = CalcBits(coderInfo,0,quant,offset,length);
-                book_choice[j++][1] = 0;
-
-            }
-            else {  /* if the section does have non-zero coefficients */
-                if(max_sb_coeff < 2){
-                    book_choice[j][0] = CalcBits(coderInfo,1,quant,offset,length);
-                    book_choice[j++][1] = 1;
-                    book_choice[j][0] = CalcBits(coderInfo,2,quant,offset,length);
-                    book_choice[j++][1] = 2;
-                    book_choice[j][0] = CalcBits(coderInfo,3,quant,offset,length);
-                    book_choice[j++][1] = 3;
-                }
-                else if (max_sb_coeff < 3){
-                    book_choice[j][0] = CalcBits(coderInfo,3,quant,offset,length);
-                    book_choice[j++][1] = 3;
-                    book_choice[j][0] = CalcBits(coderInfo,4,quant,offset,length);
-                    book_choice[j++][1] = 4;
-                    book_choice[j][0] = CalcBits(coderInfo,5,quant,offset,length);
-                    book_choice[j++][1] = 5;
-                }
-                else if (max_sb_coeff < 5){
-                    book_choice[j][0] = CalcBits(coderInfo,5,quant,offset,length);
-                    book_choice[j++][1] = 5;
-                    book_choice[j][0] = CalcBits(coderInfo,6,quant,offset,length);
-                    book_choice[j++][1] = 6;
-                    book_choice[j][0] = CalcBits(coderInfo,7,quant,offset,length);
-                    book_choice[j++][1] = 7;
-                }
-                else if (max_sb_coeff < 8){
-                    book_choice[j][0] = CalcBits(coderInfo,7,quant,offset,length);
-                    book_choice[j++][1] = 7;
-                    book_choice[j][0] = CalcBits(coderInfo,8,quant,offset,length);
-                    book_choice[j++][1] = 8;
-                    book_choice[j][0] = CalcBits(coderInfo,9,quant,offset,length);
-                    book_choice[j++][1] = 9;
-                }
-                else if (max_sb_coeff < 13){
-                    book_choice[j][0] = CalcBits(coderInfo,9,quant,offset,length);
-                    book_choice[j++][1] = 9;
-                    book_choice[j][0] = CalcBits(coderInfo,10,quant,offset,length);
-                    book_choice[j++][1] = 10;
-                }
-                /* (max_sb_coeff >= 13), choose table 11 */
-                else {
-                    book_choice[j][0] = CalcBits(coderInfo,11,quant,offset,length);
-                    book_choice[j++][1] = 11;
-                }
-            }
-
-            /* find the minimum bit cost and table number for huffman coding this scalefactor section */
-            min_book_choice[i][1] = book_choice[0][1];
-            min_book_choice[i][0] = book_choice[0][0];
-
-            for(k=1;k<j;k++){
-                if (book_choice[k][0] < min_book_choice[i][0]){
-                    min_book_choice[i][1] = book_choice[k][1];
-                    min_book_choice[i][0] = book_choice[k][0];
-                }
-            }
-            total_bits_cost += min_book_choice[i][0];
-        }
-    }
-    return(total_bits_cost);
-}
-
-
-
-static int CalculateEscSequence(int input, int *len_esc_sequence)
-/*
-   This function takes an element that is larger than 16 and generates the base10 value of the
-   equivalent escape sequence.  It returns the escape sequence in the variable, 'output'.  It
-   also passed the length of the escape sequence through the parameter, 'len_esc_sequence'.
-*/
-
-{
-    float x,y;
-    int output;
-    int N;
-
-    N = -1;
-    y = (float)ABS(input);
-    x = y / 16;
-
-    while (x >= 1) {
-        N++;
-        x = x/2;
-    }
-
-    *len_esc_sequence = 2*N + 5;  /* the length of the escape sequence in bits */
-
-    output = (int)((pow(2,N) - 1)*pow(2,N+5) + y - pow(2,N+4));
-    return(output);
-}
-
-int OutputBits(CoderInfo *coderInfo,
-#ifdef DRM
-               int *book, /* we need to change book for VCB11 */
-#else
-               int book,
-#endif
-               int *quant,
-               int offset,
-               int length)
-{
-  /*
-     This function inputs
-     - a specific codebook number, 'book'
-     - the quantized spectral data, 'quant[][]'
-     - the offset into the spectral data to begin scanning, 'offset'
-     - the 'length' of the segment to huffman code
-     -> therefore, the segment quant[offset] to quant[offset+length-1]
-     is huffman coded.
-
-     This function outputs
-     - the number of bits required, 'bits'  using the prescribed codebook, book applied to
-     the given segment of spectral data.
-
-     There are three parameters that are passed back and forth into this function.  data[]
-     and len[] are one-dimensional arrays that store the codebook values and their respective
-     bit lengths.  These are used when packing the data for the bitstream in OutputBits().  The
-     index into these arrays is 'coderInfo->spectral_count''.  It gets incremented internally in this
-     function as counter, then passed to the outside through outside_counter.  The next time
-     OutputBits() is called, counter starts at the value it left off from the previous call.
-
-   */
-    int esc_sequence;
-    int len_esc;
-    int index;
-    int bits=0;
-    int tmp;
-    int codebook,i,j;
-    int counter;
-
-    /* Set up local pointers to coderInfo elements data and len */
-    int* data=      coderInfo->data;
-    int* len=       coderInfo->len;
-#ifdef DRM
-    int* num_data = coderInfo->num_data_cw;
-    int cur_cw_len;
-    int max_esc_sequ = 0;
-#endif
-
-    counter = coderInfo->spectral_count;
-
-#ifdef DRM
-    switch (*book) {
-#else
-    switch (book) {
-#endif
-    case 0:
-    case INTENSITY_HCB2:
-    case INTENSITY_HCB:
-#ifdef DRM
-        for(i=offset;i<offset+length;i=i+4){
-#endif
-        /* This case also applies to intensity stereo encoding */
-        coderInfo->data[counter] = 0;
-        coderInfo->len[counter++] = 0;
-        coderInfo->spectral_count = counter;  /* send the current count back to the outside world */
-
-#ifdef DRM
-        num_data[coderInfo->cur_cw++] = 1;
-        }
-#endif
-        return(bits);
-    case 1:
-        for(i=offset;i<offset+length;i=i+4){
-            index = 27*quant[i] + 9*quant[i+1] + 3*quant[i+2] + quant[i+3] + 40;
-            codebook = huff1[index][LASTINTAB];
-            tmp = huff1[index][FIRSTINTAB];
-            bits += tmp;
-            data[counter] = codebook;
-            len[counter++] = tmp;
-#ifdef DRM
-            num_data[coderInfo->cur_cw++] = 1;
-            coderInfo->iLenReordSpData += tmp;
-            if (tmp > coderInfo->iLenLongestCW)
-                coderInfo->iLenLongestCW = tmp;
-#endif
-        }
-        coderInfo->spectral_count = counter;  /* send the current count back to the outside world */
-        return(bits);
-    case 2:
-        for(i=offset;i<offset+length;i=i+4){
-            index = 27*quant[i] + 9*quant[i+1] + 3*quant[i+2] + quant[i+3] + 40;
-            codebook = huff2[index][LASTINTAB];
-            tmp = huff2[index][FIRSTINTAB];
-            bits += tmp;
-            data[counter] = codebook;
-            len[counter++] = tmp;
-#ifdef DRM
-            num_data[coderInfo->cur_cw++] = 1;
-            coderInfo->iLenReordSpData += tmp;
-            if (tmp > coderInfo->iLenLongestCW)
-                coderInfo->iLenLongestCW = tmp;
-#endif
-        }
-        coderInfo->spectral_count = counter;  /* send the current count back to the outside world */
-        return(bits);
-    case 3:
-        for(i=offset;i<offset+length;i=i+4){
-            index = 27*ABS(quant[i]) + 9*ABS(quant[i+1]) + 3*ABS(quant[i+2]) + ABS(quant[i+3]);
-            codebook = huff3[index][LASTINTAB];
-            tmp = huff3[index][FIRSTINTAB];
-            bits = bits + tmp;
-            data[counter] = codebook;
-            len[counter++] = tmp;
-#ifdef DRM
-            num_data[coderInfo->cur_cw] = 1;
-            cur_cw_len = tmp;
-#endif
-            for(j=0;j<4;j++){
-                if(quant[i+j] > 0) {  /* send out '0' if a positive value */
-                    data[counter] = 0;
-                    len[counter++] = 1;
-                    bits += 1;
-#ifdef DRM
-                    num_data[coderInfo->cur_cw]++;
-                    cur_cw_len += 1;
-#endif
-                } else
-                if(quant[i+j] < 0) {  /* send out '1' if a negative value */
-                    data[counter] = 1;
-                    len[counter++] = 1;
-                    bits += 1;
-#ifdef DRM
-                    num_data[coderInfo->cur_cw]++;
-                    cur_cw_len += 1;
-#endif
-                }
-            }
-#ifdef DRM
-            coderInfo->iLenReordSpData += cur_cw_len;
-            if (cur_cw_len > coderInfo->iLenLongestCW)
-                coderInfo->iLenLongestCW = cur_cw_len;
-
-            coderInfo->cur_cw++;
-#endif
-        }
-        coderInfo->spectral_count = counter;  /* send the current count back to the outside world */
-        return(bits);
-    case 4:
-        for(i=offset;i<offset+length;i=i+4){
-            index = 27*ABS(quant[i]) + 9*ABS(quant[i+1]) + 3*ABS(quant[i+2]) + ABS(quant[i+3]);
-            codebook = huff4[index][LASTINTAB];
-            tmp = huff4[index][FIRSTINTAB];
-            bits = bits + tmp;
-            data[counter] = codebook;
-            len[counter++] = tmp;
-#ifdef DRM
-            num_data[coderInfo->cur_cw] = 1;
-            cur_cw_len = tmp;
-#endif
-            for(j=0;j<4;j++){
-                if(quant[i+j] > 0) {  /* send out '0' if a positive value */
-                    data[counter] = 0;
-                    len[counter++] = 1;
-                    bits += 1;
-#ifdef DRM
-                    num_data[coderInfo->cur_cw]++;
-                    cur_cw_len += 1;
-#endif
-                } else
-                if(quant[i+j] < 0) {  /* send out '1' if a negative value */
-                    data[counter] = 1;
-                    len[counter++] = 1;
-                    bits += 1;
-#ifdef DRM
-                    num_data[coderInfo->cur_cw]++;
-                    cur_cw_len += 1;
-#endif
-                }
-            }
-#ifdef DRM
-            coderInfo->iLenReordSpData += cur_cw_len;
-            if (cur_cw_len > coderInfo->iLenLongestCW)
-                coderInfo->iLenLongestCW = cur_cw_len;
-
-            coderInfo->cur_cw++;
-#endif
-        }
-        coderInfo->spectral_count = counter;  /* send the current count back to the outside world */
-        return(bits);
-    case 5:
-        for(i=offset;i<offset+length;i=i+2){
-            index = 9*(quant[i]) + (quant[i+1]) + 40;
-            codebook = huff5[index][LASTINTAB];
-            tmp = huff5[index][FIRSTINTAB];
-            bits = bits + tmp;
-            data[counter] = codebook;
-            len[counter++] = tmp;
-#ifdef DRM
-            num_data[coderInfo->cur_cw++] = 1;
-            coderInfo->iLenReordSpData += tmp;
-            if (tmp > coderInfo->iLenLongestCW)
-                coderInfo->iLenLongestCW = tmp;
-#endif
-        }
-        coderInfo->spectral_count = counter;  /* send the current count back to the outside world */
-        return(bits);
-    case 6:
-        for(i=offset;i<offset+length;i=i+2){
-            index = 9*(quant[i]) + (quant[i+1]) + 40;
-            codebook = huff6[index][LASTINTAB];
-            tmp = huff6[index][FIRSTINTAB];
-            bits = bits + tmp;
-            data[counter] = codebook;
-            len[counter++] = tmp;
-#ifdef DRM
-            num_data[coderInfo->cur_cw++] = 1;
-            coderInfo->iLenReordSpData += tmp;
-            if (tmp > coderInfo->iLenLongestCW)
-                coderInfo->iLenLongestCW = tmp;
-#endif
-        }
-        coderInfo->spectral_count = counter;  /* send the current count back to the outside world */
-        return(bits);
-    case 7:
-        for(i=offset;i<offset+length;i=i+2){
-            index = 8*ABS(quant[i]) + ABS(quant[i+1]);
-            codebook = huff7[index][LASTINTAB];
-            tmp = huff7[index][FIRSTINTAB];
-            bits = bits + tmp;
-            data[counter] = codebook;
-            len[counter++] = tmp;
-#ifdef DRM
-            num_data[coderInfo->cur_cw] = 1;
-            cur_cw_len = tmp;
-#endif
-            for(j=0;j<2;j++){
-                if(quant[i+j] > 0) {  /* send out '0' if a positive value */
-                    data[counter] = 0;
-                    len[counter++] = 1;
-                    bits += 1;
-#ifdef DRM
-                    num_data[coderInfo->cur_cw]++;
-                    cur_cw_len += 1;
-#endif
-                } else
-                if(quant[i+j] < 0) {  /* send out '1' if a negative value */
-                    data[counter] = 1;
-                    len[counter++] = 1;
-                    bits += 1;
-#ifdef DRM
-                    num_data[coderInfo->cur_cw]++;
-                    cur_cw_len += 1;
-#endif
-                }
-            }
-#ifdef DRM
-            coderInfo->iLenReordSpData += cur_cw_len;
-            if (cur_cw_len > coderInfo->iLenLongestCW)
-                coderInfo->iLenLongestCW = cur_cw_len;
-
-            coderInfo->cur_cw++;
-#endif
-        }
-        coderInfo->spectral_count = counter;  /* send the current count back to the outside world */
-        return(bits);
-    case 8:
-        for(i=offset;i<offset+length;i=i+2){
-            index = 8*ABS(quant[i]) + ABS(quant[i+1]);
-            codebook = huff8[index][LASTINTAB];
-            tmp = huff8[index][FIRSTINTAB];
-            bits = bits + tmp;
-            data[counter] = codebook;
-            len[counter++] = tmp;
-#ifdef DRM
-            num_data[coderInfo->cur_cw] = 1;
-            cur_cw_len = tmp;
-#endif
-            for(j=0;j<2;j++){
-                if(quant[i+j] > 0) {  /* send out '0' if a positive value */
-                    data[counter] = 0;
-                    len[counter++] = 1;
-                    bits += 1;
-#ifdef DRM
-                    num_data[coderInfo->cur_cw]++;
-                    cur_cw_len += 1;
-#endif
-                } else
-                if(quant[i+j] < 0) {  /* send out '1' if a negative value */
-                    data[counter] = 1;
-                    len[counter++] = 1;
-                    bits += 1;
-#ifdef DRM
-                    num_data[coderInfo->cur_cw]++;
-                    cur_cw_len += 1;
-#endif
-                }
-            }
-#ifdef DRM
-            coderInfo->iLenReordSpData += cur_cw_len;
-            if (cur_cw_len > coderInfo->iLenLongestCW)
-                coderInfo->iLenLongestCW = cur_cw_len;
-
-            coderInfo->cur_cw++;
-#endif
-        }
-        coderInfo->spectral_count = counter;  /* send the current count back to the outside world */
-        return(bits);
-    case 9:
-        for(i=offset;i<offset+length;i=i+2){
-            index = 13*ABS(quant[i]) + ABS(quant[i+1]);
-            codebook = huff9[index][LASTINTAB];
-            tmp = huff9[index][FIRSTINTAB];
-            bits = bits + tmp;
-            data[counter] = codebook;
-            len[counter++] = tmp;
-#ifdef DRM
-            num_data[coderInfo->cur_cw] = 1;
-            cur_cw_len = tmp;
-#endif
-            for(j=0;j<2;j++){
-                if(quant[i+j] > 0) {  /* send out '0' if a positive value */
-                    data[counter] = 0;
-                    len[counter++] = 1;
-                    bits += 1;
-#ifdef DRM
-                    num_data[coderInfo->cur_cw]++;
-                    cur_cw_len += 1;
-#endif
-                } else
-                if(quant[i+j] < 0) {  /* send out '1' if a negative value */
-                    data[counter] = 1;
-                    len[counter++] = 1;
-                    bits += 1;
-#ifdef DRM
-                    num_data[coderInfo->cur_cw]++;
-                    cur_cw_len += 1;
-#endif
-                }
-            }
-#ifdef DRM
-            coderInfo->iLenReordSpData += cur_cw_len;
-            if (cur_cw_len > coderInfo->iLenLongestCW)
-                coderInfo->iLenLongestCW = cur_cw_len;
-
-            coderInfo->cur_cw++;
-#endif
-        }
-        coderInfo->spectral_count = counter;  /* send the current count back to the outside world */
-        return(bits);
-    case 10:
-        for(i=offset;i<offset+length;i=i+2){
-            index = 13*ABS(quant[i]) + ABS(quant[i+1]);
-            codebook = huff10[index][LASTINTAB];
-            tmp = huff10[index][FIRSTINTAB];
-            bits = bits + tmp;
-            data[counter] = codebook;
-            len[counter++] = tmp;
-#ifdef DRM
-            num_data[coderInfo->cur_cw] = 1;
-            cur_cw_len = tmp;
-#endif
-            for(j=0;j<2;j++){
-                if(quant[i+j] > 0) {  /* send out '0' if a positive value */
-                    data[counter] = 0;
-                    len[counter++] = 1;
-                    bits += 1;
-#ifdef DRM
-                    num_data[coderInfo->cur_cw]++;
-                    cur_cw_len += 1;
-#endif
-                } else
-                if(quant[i+j] < 0) {  /* send out '1' if a negative value */
-                    data[counter] = 1;
-                    len[counter++] = 1;
-                    bits += 1;
-#ifdef DRM
-                    num_data[coderInfo->cur_cw]++;
-                    cur_cw_len += 1;
-#endif
-                }
-            }
-#ifdef DRM
-            coderInfo->iLenReordSpData += cur_cw_len;
-            if (cur_cw_len > coderInfo->iLenLongestCW)
-                coderInfo->iLenLongestCW = cur_cw_len;
-
-            coderInfo->cur_cw++;
-#endif
-        }
-        coderInfo->spectral_count = counter;  /* send the current count back to the outside world */
-        return(bits);
-    case 11:
-        /* First, calculate the indecies into the huffman tables */
-        for(i=offset;i<offset+length;i=i+2){
-            if ((ABS(quant[i]) >= 16) && (ABS(quant[i+1]) >= 16)) {  /* both codewords were above 16 */
-                /* first, code the orignal pair, with the larger value saturated to +/- 16 */
-                index = 17*16 + 16;
-            }
-            else if (ABS(quant[i]) >= 16) {  /* the first codeword was above 16, not the second one */
-                /* first, code the orignal pair, with the larger value saturated to +/- 16 */
-                index = 17*16 + ABS(quant[i+1]);
-            }
-            else if (ABS(quant[i+1]) >= 16) { /* the second codeword was above 16, not the first one */
-                index = 17*ABS(quant[i]) + 16;
-            }
-            else {  /* there were no values above 16, so no escape sequences */
-                index = 17*ABS(quant[i]) + ABS(quant[i+1]);
-            }
-
-            /* write out the codewords */
-            tmp = huff11[index][FIRSTINTAB];
-            codebook = huff11[index][LASTINTAB];
-            bits += tmp;
-            data[counter] = codebook;
-            len[counter++] = tmp;
-#ifdef DRM
-            num_data[coderInfo->cur_cw] = 1;
-            cur_cw_len = tmp;
-#endif
-
-            /* Take care of the sign bits */
-            for(j=0;j<2;j++){
-                if(quant[i+j] > 0) {  /* send out '0' if a positive value */
-                    data[counter] = 0;
-                    len[counter++] = 1;
-                    bits += 1;
-#ifdef DRM
-                    num_data[coderInfo->cur_cw]++;
-                    cur_cw_len += 1;
-#endif
-                } else
-                if(quant[i+j] < 0) {  /* send out '1' if a negative value */
-                    data[counter] = 1;
-                    len[counter++] = 1;
-                    bits += 1;
-#ifdef DRM
-                    num_data[coderInfo->cur_cw]++;
-                    cur_cw_len += 1;
-#endif
-                }
-            }
-
-            /* write out the escape sequences */
-            if ((ABS(quant[i]) >= 16) && (ABS(quant[i+1]) >= 16)) {  /* both codewords were above 16 */
-                /* code and transmit the first escape_sequence */
-                esc_sequence = CalculateEscSequence(quant[i],&len_esc);
-                bits += len_esc;
-                data[counter] = esc_sequence;
-                len[counter++] = len_esc;
-#ifdef DRM
-                num_data[coderInfo->cur_cw]++;
-                cur_cw_len += len_esc;
-
-                if (esc_sequence > max_esc_sequ)
-                    max_esc_sequ = esc_sequence;
-#endif
-
-                /* then code and transmit the second escape_sequence */
-                esc_sequence = CalculateEscSequence(quant[i+1],&len_esc);
-                bits += len_esc;
-                data[counter] = esc_sequence;
-                len[counter++] = len_esc;
-#ifdef DRM
-                num_data[coderInfo->cur_cw]++;
-                cur_cw_len += len_esc;
-
-                if (esc_sequence > max_esc_sequ)
-                    max_esc_sequ = esc_sequence;
-#endif
-            }
-            else if (ABS(quant[i]) >= 16) {  /* the first codeword was above 16, not the second one */
-                /* code and transmit the escape_sequence */
-                esc_sequence = CalculateEscSequence(quant[i],&len_esc);
-                bits += len_esc;
-                data[counter] = esc_sequence;
-                len[counter++] = len_esc;
-#ifdef DRM
-                num_data[coderInfo->cur_cw]++;
-                cur_cw_len += len_esc;
-
-                if (esc_sequence > max_esc_sequ)
-                    max_esc_sequ = esc_sequence;
-#endif
-            }
-            else if (ABS(quant[i+1]) >= 16) { /* the second codeword was above 16, not the first one */
-                /* code and transmit the escape_sequence */
-                esc_sequence = CalculateEscSequence(quant[i+1],&len_esc);
-                bits += len_esc;
-                data[counter] = esc_sequence;
-                len[counter++] = len_esc;
-#ifdef DRM
-                num_data[coderInfo->cur_cw]++;
-                cur_cw_len += len_esc;
-
-                if (esc_sequence > max_esc_sequ)
-                    max_esc_sequ = esc_sequence;
-#endif
-            }
-#ifdef DRM
-            coderInfo->iLenReordSpData += cur_cw_len;
-            if (cur_cw_len > coderInfo->iLenLongestCW)
-                coderInfo->iLenLongestCW = cur_cw_len;
-
-            coderInfo->cur_cw++;
-#endif
-        }
-        coderInfo->spectral_count = counter;  /* send the current count back to the outside world */
-
-#ifdef DRM
-        /* VCB11: check which codebook should be used using max escape sequence */
-        /* 8.5.3.1.3, table 157 */
-        if (max_esc_sequ <= 15)
-            *book = 16;
-        else if (max_esc_sequ <= 31)
-            *book = 17;
-        else if (max_esc_sequ <= 47)
-            *book = 18;
-        else if (max_esc_sequ <= 63)
-            *book = 19;
-        else if (max_esc_sequ <= 95)
-            *book = 20;
-        else if (max_esc_sequ <= 127)
-            *book = 21;
-        else if (max_esc_sequ <= 159)
-            *book = 22;
-        else if (max_esc_sequ <= 191)
-            *book = 23;
-        else if (max_esc_sequ <= 223)
-            *book = 24;
-        else if (max_esc_sequ <= 255)
-            *book = 25;
-        else if (max_esc_sequ <= 319)
-            *book = 26;
-        else if (max_esc_sequ <= 383)
-            *book = 27;
-        else if (max_esc_sequ <= 511)
-            *book = 28;
-        else if (max_esc_sequ <= 767)
-            *book = 29;
-        else if (max_esc_sequ <= 1023)
-            *book = 30;
-        else if (max_esc_sequ <= 2047)
-            *book = 31;
-        /* else: codebook 11 -> it is already 11 */
-#endif
-
-        return(bits);
-    }
-    return 0;
-}
-
-int CalcBits(CoderInfo *coderInfo,
-             int book,
-             int *quant,
-             int offset,
-             int length)
-{
-  /*
-     This function inputs
-     - a specific codebook number, 'book'
-     - the quantized spectral data, 'quant[]'
-     - the offset into the spectral data to begin scanning, 'offset'
-     - the 'length' of the segment to huffman code
-     -> therefore, the segment quant[offset] to quant[offset+length-1]
-     is huffman coded.
-
-     This function outputs
-     - the number of bits required, 'bits'  using the prescribed codebook, book applied to
-     the given segment of spectral data.
-
-   */
-
-    int len_esc;
-    int index;
-    int bits = 0;
-    int i, j;
-
-    switch (book) {
-    case 1:
-        for(i=offset;i<offset+length;i=i+4){
-            index = 27*quant[i] + 9*quant[i+1] + 3*quant[i+2] + quant[i+3] + 40;
-            bits += huff1[index][FIRSTINTAB];
-        }
-        return (bits);
-    case 2:
-        for(i=offset;i<offset+length;i=i+4){
-            index = 27*quant[i] + 9*quant[i+1] + 3*quant[i+2] + quant[i+3] + 40;
-            bits += huff2[index][FIRSTINTAB];
-        }
-        return (bits);
-    case 3:
-        for(i=offset;i<offset+length;i=i+4){
-            index = 27*ABS(quant[i]) + 9*ABS(quant[i+1]) + 3*ABS(quant[i+2]) + ABS(quant[i+3]);
-            bits += huff3[index][FIRSTINTAB];
-            for(j=0;j<4;j++){
-                if(quant[i+j] != 0) bits += 1; /* only for non-zero spectral coefficients */
-            }
-        }
-        return (bits);
-    case 4:
-        for(i=offset;i<offset+length;i=i+4){
-            index = 27*ABS(quant[i]) + 9*ABS(quant[i+1]) + 3*ABS(quant[i+2]) + ABS(quant[i+3]);
-            bits += huff4[index][FIRSTINTAB];
-            for(j=0;j<4;j++){
-                if(quant[i+j] != 0) bits += 1; /* only for non-zero spectral coefficients */
-            }
-        }
-        return (bits);
-    case 5:
-        for(i=offset;i<offset+length;i=i+2){
-            index = 9*(quant[i]) + (quant[i+1]) + 40;
-            bits += huff5[index][FIRSTINTAB];
-        }
-        return (bits);
-    case 6:
-        for(i=offset;i<offset+length;i=i+2){
-            index = 9*(quant[i]) + (quant[i+1]) + 40;
-            bits += huff6[index][FIRSTINTAB];
-        }
-        return (bits);
-    case 7:
-        for(i=offset;i<offset+length;i=i+2){
-            index = 8*ABS(quant[i]) + ABS(quant[i+1]);
-            bits += huff7[index][FIRSTINTAB];
-            for(j=0;j<2;j++){
-                if(quant[i+j] != 0) bits += 1; /* only for non-zero spectral coefficients */
-            }
-        }
-        return (bits);
-    case 8:
-        for(i=offset;i<offset+length;i=i+2){
-            index = 8*ABS(quant[i]) + ABS(quant[i+1]);
-            bits += huff8[index][FIRSTINTAB];
-            for(j=0;j<2;j++){
-                if(quant[i+j] != 0) bits += 1; /* only for non-zero spectral coefficients */
-            }
-        }
-        return (bits);
-    case 9:
-        for(i=offset;i<offset+length;i=i+2){
-            index = 13*ABS(quant[i]) + ABS(quant[i+1]);
-            bits += huff9[index][FIRSTINTAB];
-            for(j=0;j<2;j++){
-                if(quant[i+j] != 0) bits += 1; /* only for non-zero spectral coefficients */
-            }
-        }
-        return (bits);
-    case 10:
-        for(i=offset;i<offset+length;i=i+2){
-            index = 13*ABS(quant[i]) + ABS(quant[i+1]);
-            bits += huff10[index][FIRSTINTAB];
-            for(j=0;j<2;j++){
-                if(quant[i+j] != 0) bits += 1; /* only for non-zero spectral coefficients */
-            }
-        }
-        return (bits);
-    case 11:
-        /* First, calculate the indecies into the huffman tables */
-        for(i=offset;i<offset+length;i=i+2){
-            if ((ABS(quant[i]) >= 16) && (ABS(quant[i+1]) >= 16)) {  /* both codewords were above 16 */
-                /* first, code the orignal pair, with the larger value saturated to +/- 16 */
-                index = 17*16 + 16;
-            } else if (ABS(quant[i]) >= 16) {  /* the first codeword was above 16, not the second one */
-                /* first, code the orignal pair, with the larger value saturated to +/- 16 */
-                index = 17*16 + ABS(quant[i+1]);
-            } else if (ABS(quant[i+1]) >= 16) { /* the second codeword was above 16, not the first one */
-                index = 17*ABS(quant[i]) + 16;
-            } else {  /* there were no values above 16, so no escape sequences */
-                index = 17*ABS(quant[i]) + ABS(quant[i+1]);
-            }
-
-            /* write out the codewords */
-            bits += huff11[index][FIRSTINTAB];
-
-            /* Take care of the sign bits */
-            for(j=0;j<2;j++){
-                if(quant[i+j] != 0) bits += 1; /* only for non-zero spectral coefficients */
-            }
-
-            /* write out the escape sequences */
-            if ((ABS(quant[i]) >= 16) && (ABS(quant[i+1]) >= 16)) {  /* both codewords were above 16 */
-                /* code and transmit the first escape_sequence */
-                CalculateEscSequence(quant[i],&len_esc);
-                bits += len_esc;
-
-                /* then code and transmit the second escape_sequence */
-                CalculateEscSequence(quant[i+1],&len_esc);
-                bits += len_esc;
-            } else if (ABS(quant[i]) >= 16) {  /* the first codeword was above 16, not the second one */
-                /* code and transmit the escape_sequence */
-                CalculateEscSequence(quant[i],&len_esc);
-                bits += len_esc;
-            } else if (ABS(quant[i+1]) >= 16) { /* the second codeword was above 16, not the first one */
-                /* code and transmit the escape_sequence */
-                CalculateEscSequence(quant[i+1],&len_esc);
-                bits += len_esc;
-            }
-        }
-        return (bits);
-    }
-    return 0;
-}
-
-int SortBookNumbers(CoderInfo *coderInfo,
-                    BitStream *bitStream,
-                    int writeFlag)
-{
-  /*
-    This function inputs the vector, 'book_vector[]', which is of length MAX_SCFAC_BANDS,
-    and contains the optimal huffman tables of each sfb.  It returns the vector, 'output_book_vector[]', which
-    has it's elements formatted for the encoded bit stream.  It's syntax is:
-
-    {sect_cb[0], length_segment[0], ... ,sect_cb[num_of_sections], length_segment[num_of_sections]}
-
-    The above syntax is true, unless there is an escape sequence.  An
-    escape sequence occurs when a section is longer than 2 ^ (bit_len)
-    long in units of scalefactor bands.  Also, the integer returned from
-    this function is the number of bits written in the bitstream,
-    'bit_count'.
-
-    This function supports both long and short blocks.
-    */
-
-    int i;
-    int repeat_counter;
-    int bit_count = 0;
-    int previous;
-    int max, bit_len/*,sfbs*/;
-    int g,band;
-    int sect_cb_bits = 4;
-
-    /* Set local pointers to coderInfo elements */
-    int* book_vector = coderInfo->book_vector;
-
-#ifdef DRM
-    sect_cb_bits = 5; /* 5 bits in case of VCB11 */
-#endif
-
-    if (coderInfo->block_type == ONLY_SHORT_WINDOW){
-        max = 7;
-        bit_len = 3;
-    } else {  /* the block_type is a long,start, or stop window */
-        max = 31;
-        bit_len = 5;
-    }
-
-    for (g = 0; g < coderInfo->groups.n; g++) {
-        band = g * coderInfo->sfbn;
-
-        repeat_counter=1;
-
-        previous = book_vector[band];
-        if (writeFlag) {
-            PutBit(bitStream,book_vector[band],sect_cb_bits);
-        }
-        bit_count += sect_cb_bits;
-
-        for (i = band + 1; i < (band + coderInfo->sfbn); i++) {
-#ifdef DRM
-            /* sect_len is not transmitted in case the codebook for a */
-            /* section is 11 or in the range of 16 and 31 */
-            if ((previous == 11) ||
-                ((previous >= 16) && (previous <= 32)))
-            {
-                if (writeFlag)
-                    PutBit(bitStream,book_vector[i],sect_cb_bits);
-                bit_count += sect_cb_bits;
-                previous = book_vector[i];
-                repeat_counter=1;
-
-            } else
-#endif
-            if( (book_vector[i] != previous)) {
-                if (writeFlag) {
-                    PutBit(bitStream,repeat_counter,bit_len);
-                }
-                bit_count += bit_len;
-
-                if (repeat_counter == max){  /* in case you need to terminate an escape sequence */
-                    if (writeFlag)
-                        PutBit(bitStream,0,bit_len);
-                    bit_count += bit_len;
-                }
-
-                if (writeFlag)
-                    PutBit(bitStream,book_vector[i],sect_cb_bits);
-                bit_count += sect_cb_bits;
-                previous = book_vector[i];
-                repeat_counter=1;
-            }
-            /* if the length of the section is longer than the amount of bits available in */
-            /* the bitsream, "max", then start up an escape sequence */
-            else if ((book_vector[i] == previous) && (repeat_counter == max)) {
-                if (writeFlag) {
-                    PutBit(bitStream,repeat_counter,bit_len);
-                }
-                bit_count += bit_len;
-                repeat_counter = 1;
-            }
-            else {
-                repeat_counter++;
-            }
-        }
-
-#ifdef DRM
-        if (!((previous == 11) || ((previous >= 16) && (previous <= 32))))
-#endif
-        {
-            if (writeFlag)
-                PutBit(bitStream,repeat_counter,bit_len);
-            bit_count += bit_len;
-
-            if (repeat_counter == max) {  /* special case if the last section length is an */
-                /* escape sequence */
-                if (writeFlag)
-                    PutBit(bitStream,0,bit_len);
-                bit_count += bit_len;
-            }
-        }
-    }  /* Bottom of group iteration */
-
-    return bit_count;
-}
-
-int WriteScalefactors(CoderInfo *coderInfo,
-                      BitStream *bitStream,
-                      int writeFlag)
-
-{
-    /* this function takes care of counting the number of bits necessary */
-    /* to encode the scalefactors.  In addition, if the writeFlag == 1, */
-    /* then the scalefactors are written out the bitStream output bit */
-    /* stream.  it returns k, the number of bits written to the bitstream*/
-
-    int i,j,bit_count=0;
-    int diff,length,codeword;
-    int previous_scale_factor;
-    int previous_is_factor;       /* Intensity stereo */
-    int index = 0;
-    int nr_of_sfb_per_group;
-
-    /* set local pointer to coderInfo elements */
-    int* scale_factors = coderInfo->scale_factor;
-
-    if (coderInfo->block_type == ONLY_SHORT_WINDOW) { /* short windows */
-        nr_of_sfb_per_group = coderInfo->sfbn;
-    } else {
-        nr_of_sfb_per_group = coderInfo->sfbn;
-        coderInfo->groups.n = 1;
-        coderInfo->groups.len[0] = 1;
-    }
-
-    previous_scale_factor = coderInfo->global_gain;
-    previous_is_factor = 0;
-
-    for(j=0; j<coderInfo->groups.n; j++){
-        for(i=0;i<nr_of_sfb_per_group;i++) {
-            /* test to see if any codebooks in a group are zero */
-            if ( (coderInfo->book_vector[index]==INTENSITY_HCB) ||
-                (coderInfo->book_vector[index]==INTENSITY_HCB2) ) {
-                /* only send scalefactors if using non-zero codebooks */
-                diff = scale_factors[index] - previous_is_factor;
-                if ((diff <= 60)&&(diff >= -60))
-				{
-					length = huff12[diff+60][FIRSTINTAB];
-				}
-                else if ( diff > 60 ) // frank 30.Oct.2007 added this because faad2 decoder and QuickTime choke when nothing is written and the codebook says a number is expected.
-				{
-					diff = 60;
-					length = huff12[120][FIRSTINTAB]; //max
-				}
-                else 
-				{
-					diff = -60;
-					length = huff12[0][FIRSTINTAB]; // min
-				}
-                bit_count+=length;
-                previous_is_factor += diff;
-                if (writeFlag == 1 ) {
-                    codeword = huff12[diff+60][LASTINTAB];
-                    PutBit(bitStream,codeword,length);
-                }
-            } else if (coderInfo->book_vector[index]) {
-                /* only send scalefactors if using non-zero codebooks */
-                diff = scale_factors[index] - previous_scale_factor;
-                if ((diff <= 60)&&(diff >= -60))
-				{
-					length = huff12[diff+60][FIRSTINTAB];
-				}
-                else if ( diff > 60 ) // frank 30.Oct.2007 added this because faad2 decoder and QuickTime choke when nothing is written and the codebook says a number is expected.
-				{
-					diff = 60;
-					length = huff12[120][FIRSTINTAB]; //max
-				}
-                else 
-				{
-					diff = -60;
-					length = huff12[0][FIRSTINTAB]; //min
-				}
-                bit_count+=length;
-                previous_scale_factor += diff;
-                if (writeFlag == 1 ) {
-                    codeword = huff12[diff+60][LASTINTAB];
-                    PutBit(bitStream,codeword,length);
-                }
-            }
-            index++;
-        }
-    }
-    return bit_count;
-}
-

faac-1.29.7.8.tar.gz/libfaac/huffman.h Deleted

@@ -1,91 +0,0 @@
-/***********
-
-This software module was originally developed by Dolby
-Laboratories in the course of development of the MPEG-2 AAC/MPEG-4
-Audio standard ISO/IEC13818-7, 14496-1, 2 and 3. This software module is an implementation of a part
-of one or more MPEG-2 AAC/MPEG-4 Audio tools as specified by the
-MPEG-2 aac/MPEG-4 Audio standard. ISO/IEC  gives users of the
-MPEG-2aac/MPEG-4 Audio standards free license to this software module
-or modifications thereof for use in hardware or software products
-claiming conformance to the MPEG-2 aac/MPEG-4 Audio  standards. Those
-intending to use this software module in hardware or software products
-are advised that this use may infringe existing patents. The original
-developer of this software module, the subsequent
-editors and their companies, and ISO/IEC have no liability for use of
-this software module or modifications thereof in an
-implementation. Copyright is not released for non MPEG-2 aac/MPEG-4
-Audio conforming products. The original developer retains full right to
-use the code for the developer's own purpose, assign or donate the code to a
-third party and to inhibit third party from using the code for non
-MPEG-2 aac/MPEG-4 Audio conforming products. This copyright notice
-must be included in all copies or derivative works. Copyright 1996.
-
-***********/
-/*
- * $Id: huffman.h,v 1.7 2012/03/01 18:34:17 knik Exp $
- */
-
-#ifndef HUFFMAN_H
-#define HUFFMAN_H
-
-#ifdef __cplusplus
-extern "C" {
-#endif /* __cplusplus */
-
-#include "bitstream.h"
-#include "coder.h"
-
-/* Huffman tables */
-#define MAXINDEX 289
-#define NUMINTAB 2
-#define FIRSTINTAB 0
-#define LASTINTAB 1
-
-#define INTENSITY_HCB 15
-#define INTENSITY_HCB2 14
-
-
-#define ABS(A) ((A) < 0 ? (-A) : (A))
-
-#include <faac.h>
-
-void HuffmanInit(CoderInfo *coderInfo, unsigned int numChannels);
-void HuffmanEnd(CoderInfo *coderInfo, unsigned int numChannels);
-
-int BitSearch(CoderInfo *coderInfo,
-              int *quant);
-
-int NoiselessBitCount(CoderInfo *coderInfo,
-                      int *quant,
-                      int hop,
-                      int min_book_choice[112][3]);
-
-int CalcBits(CoderInfo *coderInfo,
-             int book,
-             int *quant,
-             int offset,
-             int length);
-
-int OutputBits(CoderInfo *coderInfo,
-#ifdef DRM
-               int *book, /* we need to change book for VCB11 */
-#else
-               int book,
-#endif
-               int *quant,
-               int offset,
-               int length);
-
-int SortBookNumbers(CoderInfo *coderInfo,
-                    BitStream *bitStream,
-                    int writeFlag);
-
-int WriteScalefactors(CoderInfo *coderInfo,
-                      BitStream *bitStream,
-                      int writeFlag);
-
-#ifdef __cplusplus
-}
-#endif /* __cplusplus */
-
-#endif /* HUFFMAN_H */

faac-1.29.7.8.tar.gz/libfaac/hufftab.h Deleted

@@ -1,331 +0,0 @@
-/*
- * FAAC - Freeware Advanced Audio Coder
- * Copyright (C) 2001 Menno Bakker
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
- *
- * This library 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
- * Lesser General Public License for more details.
-
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- *
- * $Id: hufftab.h,v 1.3 2001/06/08 18:01:09 menno Exp $
- */
-
-unsigned short huff1[][2] = {
-        { 11,  2040},
-        { 9,  497},{ 11,  2045},{ 10,  1013},{ 7,  104},{ 10,  1008},
-        { 11,  2039},{ 9,  492},{ 11,  2037},{ 10,  1009},{ 7,  114},
-        { 10,  1012},{ 7,  116},{ 5,  17},{ 7,  118},{ 9,  491},
-        { 7,  108},{ 10,  1014},{ 11,  2044},{ 9,  481},{ 11,  2033},
-        { 9,  496},{ 7,  97},{ 9,  502},{ 11,  2034},{ 9,  490},
-        { 11,  2043},{ 9,  498},{ 7,  105},{ 9,  493},{ 7,  119},
-        { 5,  23},{ 7,  111},{ 9,  486},{ 7,  100},{ 9,  485},
-        { 7,  103},{ 5,  21},{ 7,  98},{ 5,  18},{ 1,  0},
-        { 5,  20},{ 7,  101},{ 5,  22},{ 7,  109},{ 9,  489},
-        { 7,  99},{ 9,  484},{ 7,  107},{ 5,  19},{ 7,  113},
-        { 9,  483},{ 7,  112},{ 9,  499},{ 11,  2046},{ 9,  487},
-        { 11,  2035},{ 9,  495},{ 7,  96},{ 9,  494},{ 11,  2032},
-        { 9,  482},{ 11,  2042},{ 10,  1011},{ 7,  106},{ 9,  488},
-        { 7,  117},{ 5,  16},{ 7,  115},{ 9,  500},{ 7,  110},
-        { 10,  1015},{ 11,  2038},{ 9,  480},{ 11,  2041},{ 10,  1010},
-        { 7,  102},{ 9,  501},{ 11,  2047},{ 9,  503},{ 11,  2036}
-    };
-unsigned short huff2[][2] = {
-    { 9,  499},
-        { 7,  111},{ 9,  509},{ 8,  235},{ 6,  35},{ 8,  234},
-        { 9,  503},{ 8,  232},{ 9,  506},{ 8,  242},{ 6,  45},
-        { 7,  112},{ 6,  32},{ 5,  6},{ 6,  43},{ 7,  110},
-        { 6,  40},{ 8,  233},{ 9,  505},{ 7,  102},{ 8,  248},
-        { 8,  231},{ 6,  27},{ 8,  241},{ 9,  500},{ 7,  107},
-        { 9,  501},{ 8,  236},{ 6,  42},{ 7,  108},{ 6,  44},
-        { 5,  10},{ 6,  39},{ 7,  103},{ 6,  26},{ 8,  245},
-        { 6,  36},{ 5,  8},{ 6,  31},{ 5,  9},{ 3,  0},
-        { 5,  7},{ 6,  29},{ 5,  11},{ 6,  48},{ 8,  239},
-        { 6,  28},{ 7,  100},{ 6,  30},{ 5,  12},{ 6,  41},
-        { 8,  243},{ 6,  47},{ 8,  240},{ 9,  508},{ 7,  113},
-        { 9,  498},{ 8,  244},{ 6,  33},{ 8,  230},{ 8,  247},
-        { 7,  104},{ 9,  504},{ 8,  238},{ 6,  34},{ 7,  101},
-        { 6,  49},{ 4,  2},{ 6,  38},{ 8,  237},{ 6,  37},
-        { 7,  106},{ 9,  507},{ 7,  114},{ 9,  510},{ 7,  105},
-        { 6,  46},{ 8,  246},{ 9,  511},{ 7,  109},{ 9,  502}
-    };
-unsigned short huff3[][2] = {
-        { 1,  0},
-        { 4,  9},{ 8,  239},{ 4,  11},{ 5,  25},{ 8,  240},
-        { 9,  491},{ 9,  486},{ 10,  1010},{ 4,  10},{ 6,  53},
-        { 9,  495},{ 6,  52},{ 6,  55},{ 9,  489},{ 9,  493},
-        { 9,  487},{ 10,  1011},{ 9,  494},{ 10,  1005},{ 13,  8186},
-        { 9,  492},{ 9,  498},{ 11,  2041},{ 11,  2040},{ 10,  1016},
-        { 12,  4088},{ 4,  8},{ 6,  56},{ 10,  1014},{ 6,  54},
-        { 7,  117},{ 10,  1009},{ 10,  1003},{ 10,  1004},{ 12,  4084},
-        { 5,  24},{ 7,  118},{ 11,  2036},{ 6,  57},{ 7,  116},
-        { 10,  1007},{ 9,  499},{ 9,  500},{ 11,  2038},{ 9,  488},
-        { 10,  1002},{ 13,  8188},{ 8,  242},{ 9,  497},{ 12,  4091},
-        { 10,  1013},{ 11,  2035},{ 12,  4092},{ 8,  238},{ 10,  1015},
-        { 15,  32766},{ 9,  496},{ 11,  2037},{ 15,  32765},{ 13,  8187},
-        { 14,  16378},{ 16,  65535},{ 8,  241},{ 10,  1008},{ 14,  16380},
-        { 9,  490},{ 10,  1006},{ 14,  16379},{ 12,  4086},{ 12,  4090},
-        { 15,  32764},{ 11,  2034},{ 12,  4085},{ 16,  65534},{ 10,  1012},
-        { 11,  2039},{ 15,  32763},{ 12,  4087},{ 12,  4089},{ 15,  32762}
-    };
-unsigned short huff4[][2] = {
-        { 4,  7},
-        { 5,  22},{ 8,  246},{ 5,  24},{ 4,  8},{ 8,  239},
-        { 9,  495},{ 8,  243},{ 11,  2040},{ 5,  25},{ 5,  23},
-        { 8,  237},{ 5,  21},{ 4,  1},{ 8,  226},{ 8,  240},
-        { 7,  112},{ 10,  1008},{ 9,  494},{ 8,  241},{ 11,  2042},
-        { 8,  238},{ 8,  228},{ 10,  1010},{ 11,  2038},{ 10,  1007},
-        { 11,  2045},{ 4,  5},{ 5,  20},{ 8,  242},{ 4,  9},
-        { 4,  4},{ 8,  229},{ 8,  244},{ 8,  232},{ 10,  1012},
-        { 4,  6},{ 4,  2},{ 8,  231},{ 4,  3},{ 4,  0},
-        { 7,  107},{ 8,  227},{ 7,  105},{ 9,  499},{ 8,  235},
-        { 8,  230},{ 10,  1014},{ 7,  110},{ 7,  106},{ 9,  500},
-        { 10,  1004},{ 9,  496},{ 10,  1017},{ 8,  245},{ 8,  236},
-        { 11,  2043},{ 8,  234},{ 7,  111},{ 10,  1015},{ 11,  2041},
-        { 10,  1011},{ 12,  4095},{ 8,  233},{ 7,  109},{ 10,  1016},
-        { 7,  108},{ 7,  104},{ 9,  501},{ 10,  1006},{ 9,  498},
-        { 11,  2036},{ 11,  2039},{ 10,  1009},{ 12,  4094},{ 10,  1005},
-        { 9,  497},{ 11,  2037},{ 11,  2046},{ 10,  1013},{ 11,  2044}
-    };
-unsigned short huff5[][2] = {
-        { 13,  8191},
-        { 12,  4087},{ 11,  2036},{ 11,  2024},{ 10,  1009},{ 11,  2030},
-        { 11,  2041},{ 12,  4088},{ 13,  8189},{ 12,  4093},{ 11,  2033},
-        { 10,  1000},{ 9,  488},{ 8,  240},{ 9,  492},{ 10,  1006},
-        { 11,  2034},{ 12,  4090},{ 12,  4084},{ 10,  1007},{ 9,  498},
-        { 8,  232},{ 7,  112},{ 8,  236},{ 9,  496},{ 10,  1002},
-        { 11,  2035},{ 11,  2027},{ 9,  491},{ 8,  234},{ 5,  26},
-        { 4,  8},{ 5,  25},{ 8,  238},{ 9,  495},{ 11,  2029},
-        { 10,  1008},{ 8,  242},{ 7,  115},{ 4,  11},{ 1,  0},
-        { 4,  10},{ 7,  113},{ 8,  243},{ 11,  2025},{ 11,  2031},
-        { 9,  494},{ 8,  239},{ 5,  24},{ 4,  9},{ 5,  27},
-        { 8,  235},{ 9,  489},{ 11,  2028},{ 11,  2038},{ 10,  1003},
-        { 9,  499},{ 8,  237},{ 7,  114},{ 8,  233},{ 9,  497},
-        { 10,  1005},{ 11,  2039},{ 12,  4086},{ 11,  2032},{ 10,  1001},
-        { 9,  493},{ 8,  241},{ 9,  490},{ 10,  1004},{ 11,  2040},
-        { 12,  4089},{ 13,  8188},{ 12,  4092},{ 12,  4085},{ 11,  2026},
-        { 10,  1011},{ 10,  1010},{ 11,  2037},{ 12,  4091},{ 13,  8190}
-    };
-unsigned short huff6[][2] = {
-        { 11,  2046},
-        { 10,  1021},{ 9,  497},{ 9,  491},{ 9,  500},{ 9,  490},
-        { 9,  496},{ 10,  1020},{ 11,  2045},{ 10,  1014},{ 9,  485},
-        { 8,  234},{ 7,  108},{ 7,  113},{ 7,  104},{ 8,  240},
-        { 9,  486},{ 10,  1015},{ 9,  499},{ 8,  239},{ 6,  50},
-        { 6,  39},{ 6,  40},{ 6,  38},{ 6,  49},{ 8,  235},
-        { 9,  503},{ 9,  488},{ 7,  111},{ 6,  46},{ 4,  8},
-        { 4,  4},{ 4,  6},{ 6,  41},{ 7,  107},{ 9,  494},
-        { 9,  495},{ 7,  114},{ 6,  45},{ 4,  2},{ 4,  0},
-        { 4,  3},{ 6,  47},{ 7,  115},{ 9,  506},{ 9,  487},
-        { 7,  110},{ 6,  43},{ 4,  7},{ 4,  1},{ 4,  5},
-        { 6,  44},{ 7,  109},{ 9,  492},{ 9,  505},{ 8,  238},
-        { 6,  48},{ 6,  36},{ 6,  42},{ 6,  37},{ 6,  51},
-        { 8,  236},{ 9,  498},{ 10,  1016},{ 9,  484},{ 8,  237},
-        { 7,  106},{ 7,  112},{ 7,  105},{ 7,  116},{ 8,  241},
-        { 10,  1018},{ 11,  2047},{ 10,  1017},{ 9,  502},{ 9,  493},
-        { 9,  504},{ 9,  489},{ 9,  501},{ 10,  1019},{ 11,  2044}
-    };
-unsigned short huff7[][2] = {
-        { 1,  0},
-        { 3,  5},{ 6,  55},{ 7,  116},{ 8,  242},{ 9,  491},
-        { 10,  1005},{ 11,  2039},{ 3,  4},{ 4,  12},{ 6,  53},
-        { 7,  113},{ 8,  236},{ 8,  238},{ 9,  494},{ 9,  501},
-        { 6,  54},{ 6,  52},{ 7,  114},{ 8,  234},{ 8,  241},
-        { 9,  489},{ 9,  499},{ 10,  1013},{ 7,  115},{ 7,  112},
-        { 8,  235},{ 8,  240},{ 9,  497},{ 9,  496},{ 10,  1004},
-        { 10,  1018},{ 8,  243},{ 8,  237},{ 9,  488},{ 9,  495},
-        { 10,  1007},{ 10,  1009},{ 10,  1017},{ 11,  2043},{ 9,  493},
-        { 8,  239},{ 9,  490},{ 9,  498},{ 10,  1011},{ 10,  1016},
-        { 11,  2041},{ 11,  2044},{ 10,  1006},{ 9,  492},{ 9,  500},
-        { 10,  1012},{ 10,  1015},{ 11,  2040},{ 12,  4093},{ 12,  4094},
-        { 11,  2038},{ 10,  1008},{ 10,  1010},{ 10,  1014},{ 11,  2042},
-        { 11,  2045},{ 12,  4092},{ 12,  4095}
-    };
-unsigned short huff8[][2] = {
-        { 5,  14},
-        { 4,  5},{ 5,  16},{ 6,  48},{ 7,  111},{ 8,  241},
-        { 9,  506},{ 10,  1022},{ 4,  3},{ 3,  0},{ 4,  4},
-        { 5,  18},{ 6,  44},{ 7,  106},{ 7,  117},{ 8,  248},
-        { 5,  15},{ 4,  2},{ 4,  6},{ 5,  20},{ 6,  46},
-        { 7,  105},{ 7,  114},{ 8,  245},{ 6,  47},{ 5,  17},
-        { 5,  19},{ 6,  42},{ 6,  50},{ 7,  108},{ 8,  236},
-        { 8,  250},{ 7,  113},{ 6,  43},{ 6,  45},{ 6,  49},
-        { 7,  109},{ 7,  112},{ 8,  242},{ 9,  505},{ 8,  239},
-        { 7,  104},{ 6,  51},{ 7,  107},{ 7,  110},{ 8,  238},
-        { 8,  249},{ 10,  1020},{ 9,  504},{ 7,  116},{ 7,  115},
-        { 8,  237},{ 8,  240},{ 8,  246},{ 9,  502},{ 9,  509},
-        { 10,  1021},{ 8,  243},{ 8,  244},{ 8,  247},{ 9,  503},
-        { 9,  507},{ 9,  508},{ 10,  1023}
-    };
-unsigned short huff9[][2] = {
-        { 1,  0},
-        { 3,  5},{ 6,  55},{ 8,  231},{ 9,  478},{ 10,  974},
-        { 10,  985},{ 11,  1992},{ 11,  1997},{ 12,  4040},{ 12,  4061},
-        { 13,  8164},{ 13,  8172},{ 3,  4},{ 4,  12},{ 6,  53},
-        { 7,  114},{ 8,  234},{ 8,  237},{ 9,  482},{ 10,  977},
-        { 10,  979},{ 10,  992},{ 11,  2008},{ 12,  4047},{ 12,  4053},
-        { 6,  54},{ 6,  52},{ 7,  113},{ 8,  232},{ 8,  236},
-        { 9,  481},{ 10,  975},{ 10,  989},{ 10,  987},{ 11,  2000},
-        { 12,  4039},{ 12,  4052},{ 12,  4068},{ 8,  230},{ 7,  112},
-        { 8,  233},{ 9,  477},{ 9,  483},{ 10,  978},{ 10,  988},
-        { 11,  1996},{ 11,  1994},{ 11,  2014},{ 12,  4056},{ 12,  4074},
-        { 13,  8155},{ 9,  479},{ 8,  235},{ 9,  476},{ 9,  486},
-        { 10,  981},{ 10,  990},{ 11,  1995},{ 11,  2013},{ 11,  2012},
-        { 12,  4045},{ 12,  4066},{ 12,  4071},{ 13,  8161},{ 10,  976},
-        { 9,  480},{ 9,  484},{ 10,  982},{ 11,  1989},{ 11,  2001},
-        { 11,  2011},{ 12,  4050},{ 11,  2016},{ 12,  4057},{ 12,  4075},
-        { 13,  8163},{ 13,  8169},{ 11,  1988},{ 9,  485},{ 10,  983},
-        { 11,  1990},{ 11,  1999},{ 11,  2010},{ 12,  4043},{ 12,  4058},
-        { 12,  4067},{ 12,  4073},{ 13,  8166},{ 13,  8179},{ 13,  8183},
-        { 11,  2003},{ 10,  984},{ 10,  993},{ 11,  2004},{ 11,  2009},
-        { 12,  4051},{ 12,  4062},{ 13,  8157},{ 13,  8153},{ 13,  8162},
-        { 13,  8170},{ 13,  8177},{ 13,  8182},{ 11,  2002},{ 10,  980},
-        { 10,  986},{ 11,  1991},{ 11,  2007},{ 11,  2018},{ 12,  4046},
-        { 12,  4059},{ 13,  8152},{ 13,  8174},{ 14,  16368},{ 13,  8180},
-        { 14,  16370},{ 11,  2017},{ 10,  991},{ 11,  1993},{ 11,  2006},
-        { 12,  4042},{ 12,  4048},{ 12,  4069},{ 12,  4070},{ 13,  8171},
-        { 13,  8175},{ 14,  16371},{ 14,  16372},{ 14,  16373},{ 12,  4064},
-        { 11,  1998},{ 11,  2005},{ 12,  4038},{ 12,  4049},{ 12,  4065},
-        { 13,  8160},{ 13,  8168},{ 13,  8176},{ 14,  16369},{ 14,  16376},
-        { 14,  16374},{ 15,  32764},{ 12,  4072},{ 11,  2015},{ 12,  4041},
-        { 12,  4055},{ 12,  4060},{ 13,  8156},{ 13,  8159},{ 13,  8173},
-        { 13,  8181},{ 14,  16377},{ 14,  16379},{ 15,  32765},{ 15,  32766},
-        { 13,  8167},{ 12,  4044},{ 12,  4054},{ 12,  4063},{ 13,  8158},
-        { 13,  8154},{ 13,  8165},{ 13,  8178},{ 14,  16378},{ 14,  16375},
-        { 14,  16380},{ 14,  16381},{ 15,  32767}
-    };
-unsigned short huff10[][2] = {
-        { 6,  34},
-        { 5,  8},{ 6,  29},{ 6,  38},{ 7,  95},{ 8,  211},
-        { 9,  463},{ 10,  976},{ 10,  983},{ 10,  1005},{ 11,  2032},
-        { 11,  2038},{ 12,  4093},{ 5,  7},{ 4,  0},{ 4,  1},
-        { 5,  9},{ 6,  32},{ 7,  84},{ 7,  96},{ 8,  213},
-        { 8,  220},{ 9,  468},{ 10,  973},{ 10,  990},{ 11,  2023},
-        { 6,  28},{ 4,  2},{ 5,  6},{ 5,  12},{ 6,  30},
-        { 6,  40},{ 7,  91},{ 8,  205},{ 8,  217},{ 9,  462},
-        { 9,  476},{ 10,  985},{ 10,  1009},{ 6,  37},{ 5,  11},
-        { 5,  10},{ 5,  13},{ 6,  36},{ 7,  87},{ 7,  97},
-        { 8,  204},{ 8,  221},{ 9,  460},{ 9,  478},{ 10,  979},
-        { 10,  999},{ 7,  93},{ 6,  33},{ 6,  31},{ 6,  35},
-        { 6,  39},{ 7,  89},{ 7,  100},{ 8,  216},{ 8,  223},
-        { 9,  466},{ 9,  482},{ 10,  989},{ 10,  1006},{ 8,  209},
-        { 7,  85},{ 6,  41},{ 7,  86},{ 7,  88},{ 7,  98},
-        { 8,  206},{ 8,  224},{ 8,  226},{ 9,  474},{ 10,  980},
-        { 10,  995},{ 11,  2027},{ 9,  457},{ 7,  94},{ 7,  90},
-        { 7,  92},{ 7,  99},{ 8,  202},{ 8,  218},{ 9,  455},
-        { 9,  458},{ 9,  480},{ 10,  987},{ 10,  1000},{ 11,  2028},
-        { 9,  483},{ 8,  210},{ 8,  203},{ 8,  208},{ 8,  215},
-        { 8,  219},{ 9,  454},{ 9,  469},{ 9,  472},{ 10,  970},
-        { 10,  986},{ 11,  2026},{ 11,  2033},{ 9,  481},{ 8,  212},
-        { 8,  207},{ 8,  214},{ 8,  222},{ 8,  225},{ 9,  464},
-        { 9,  470},{ 10,  977},{ 10,  981},{ 10,  1010},{ 11,  2030},
-        { 11,  2043},{ 10,  1001},{ 9,  461},{ 9,  456},{ 9,  459},
-        { 9,  465},{ 9,  471},{ 9,  479},{ 10,  975},{ 10,  992},
-        { 10,  1007},{ 11,  2022},{ 11,  2040},{ 12,  4090},{ 10,  1003},
-        { 9,  477},{ 9,  467},{ 9,  473},{ 9,  475},{ 10,  978},
-        { 10,  972},{ 10,  988},{ 10,  1002},{ 11,  2029},{ 11,  2035},
-        { 11,  2041},{ 12,  4089},{ 11,  2034},{ 10,  974},{ 9,  484},
-        { 10,  971},{ 10,  984},{ 10,  982},{ 10,  994},{ 10,  997},
-        { 11,  2024},{ 11,  2036},{ 11,  2037},{ 11,  2039},{ 12,  4091},
-        { 11,  2042},{ 10,  1004},{ 10,  991},{ 10,  993},{ 10,  996},
-        { 10,  998},{ 10,  1008},{ 11,  2025},{ 11,  2031},{ 12,  4088},
-        { 12,  4094},{ 12,  4092},{ 12,  4095}
-    };
-unsigned short huff11[][2] = {
-        { 4,  0},
-        { 5,  6},{ 6,  25},{ 7,  61},{ 8,  156},{ 8,  198},
-        { 9,  423},{ 10,  912},{ 10,  962},{ 10,  991},{ 11,  2022},
-        { 11,  2035},{ 12,  4091},{ 11,  2028},{ 12,  4090},{ 12,  4094},
-        { 10,  910},{ 5,  5},{ 4,  1},{ 5,  8},{ 6,  20},
-        { 7,  55},{ 7,  66},{ 8,  146},{ 8,  175},{ 9,  401},
-        { 9,  421},{ 9,  437},{ 10,  926},{ 10,  960},{ 10,  930},
-        { 10,  973},{ 11,  2006},{ 8,  174},{ 6,  23},{ 5,  7},
-        { 5,  9},{ 6,  24},{ 7,  57},{ 7,  64},{ 8,  142},
-        { 8,  163},{ 8,  184},{ 9,  409},{ 9,  428},{ 9,  449},
-        { 10,  945},{ 10,  918},{ 10,  958},{ 10,  970},{ 8,  157},
-        { 7,  60},{ 6,  21},{ 6,  22},{ 6,  26},{ 7,  59},
-        { 7,  68},{ 8,  145},{ 8,  165},{ 8,  190},{ 9,  406},
-        { 9,  430},{ 9,  441},{ 10,  929},{ 10,  913},{ 10,  933},
-        { 10,  981},{ 8,  148},{ 8,  154},{ 7,  54},{ 7,  56},
-        { 7,  58},{ 7,  65},{ 8,  140},{ 8,  155},{ 8,  176},
-        { 8,  195},{ 9,  414},{ 9,  427},{ 9,  444},{ 10,  927},
-        { 10,  911},{ 10,  937},{ 10,  975},{ 8,  147},{ 8,  191},
-        { 7,  62},{ 7,  63},{ 7,  67},{ 7,  69},{ 8,  158},
-        { 8,  167},{ 8,  185},{ 9,  404},{ 9,  418},{ 9,  442},
-        { 9,  451},{ 10,  934},{ 10,  935},{ 10,  955},{ 10,  980},
-        { 8,  159},{ 9,  416},{ 8,  143},{ 8,  141},{ 8,  144},
-        { 8,  152},{ 8,  166},{ 8,  182},{ 8,  196},{ 9,  415},
-        { 9,  431},{ 9,  447},{ 10,  921},{ 10,  959},{ 10,  948},
-        { 10,  969},{ 10,  999},{ 8,  168},{ 9,  438},{ 8,  171},
-        { 8,  164},{ 8,  170},{ 8,  178},{ 8,  194},{ 8,  197},
-        { 9,  408},{ 9,  420},{ 9,  440},{ 10,  908},{ 10,  932},
-        { 10,  964},{ 10,  966},{ 10,  989},{ 10,  1000},{ 8,  173},
-        { 10,  943},{ 9,  402},{ 8,  189},{ 8,  188},{ 9,  398},
-        { 9,  407},{ 9,  410},{ 9,  419},{ 9,  433},{ 10,  909},
-        { 10,  920},{ 10,  951},{ 10,  979},{ 10,  977},{ 10,  987},
-        { 11,  2013},{ 8,  180},{ 10,  990},{ 9,  425},{ 9,  411},
-        { 9,  412},{ 9,  417},{ 9,  426},{ 9,  429},{ 9,  435},
-        { 10,  907},{ 10,  946},{ 10,  952},{ 10,  974},{ 10,  993},
-        { 10,  992},{ 11,  2002},{ 11,  2021},{ 8,  183},{ 11,  2019},
-        { 9,  443},{ 9,  424},{ 9,  422},{ 9,  432},{ 9,  434},
-        { 9,  439},{ 10,  923},{ 10,  922},{ 10,  954},{ 10,  949},
-        { 10,  982},{ 11,  2007},{ 10,  996},{ 11,  2008},{ 11,  2026},
-        { 8,  186},{ 11,  2024},{ 10,  928},{ 9,  445},{ 9,  436},
-        { 10,  906},{ 9,  452},{ 10,  914},{ 10,  938},{ 10,  944},
-        { 10,  956},{ 10,  983},{ 11,  2004},{ 11,  2012},{ 11,  2011},
-        { 11,  2005},{ 11,  2032},{ 8,  193},{ 11,  2043},{ 10,  968},
-        { 10,  931},{ 10,  917},{ 10,  925},{ 10,  940},{ 10,  942},
-        { 10,  965},{ 10,  984},{ 10,  994},{ 10,  998},{ 11,  2020},
-        { 11,  2023},{ 11,  2016},{ 11,  2025},{ 11,  2039},{ 9,  400},
-        { 11,  2034},{ 10,  915},{ 9,  446},{ 9,  448},{ 10,  916},
-        { 10,  919},{ 10,  941},{ 10,  963},{ 10,  961},{ 10,  978},
-        { 11,  2010},{ 11,  2009},{ 11,  2015},{ 11,  2027},{ 11,  2036},
-        { 11,  2042},{ 9,  405},{ 11,  2040},{ 10,  957},{ 10,  924},
-        { 10,  939},{ 10,  936},{ 10,  947},{ 10,  953},{ 10,  976},
-        { 10,  995},{ 10,  997},{ 11,  2018},{ 11,  2014},{ 11,  2029},
-        { 11,  2033},{ 11,  2041},{ 11,  2044},{ 9,  403},{ 12,  4093},
-        { 10,  988},{ 10,  950},{ 10,  967},{ 10,  972},{ 10,  971},
-        { 10,  985},{ 10,  986},{ 11,  2003},{ 11,  2017},{ 11,  2030},
-        { 11,  2031},{ 11,  2037},{ 11,  2038},{ 12,  4092},{ 12,  4095},
-        { 9,  413},{ 9,  450},{ 8,  181},{ 8,  161},{ 8,  150},
-        { 8,  151},{ 8,  149},{ 8,  153},{ 8,  160},{ 8,  162},
-        { 8,  172},{ 8,  169},{ 8,  177},{ 8,  179},{ 8,  187},
-        { 8,  192},{ 9,  399},{ 5,  4}
-    };
-unsigned int huff12[][2] = {
-        { 18,  262120},
-        { 18,  262118},{ 18,  262119},{ 18,  262117},{ 19,  524277},{ 19,  524273},
-        { 19,  524269},{ 19,  524278},{ 19,  524270},{ 19,  524271},{ 19,  524272},
-        { 19,  524284},{ 19,  524285},{ 19,  524287},{ 19,  524286},{ 19,  524279},
-        { 19,  524280},{ 19,  524283},{ 19,  524281},{ 18,  262116},{ 19,  524282},
-        { 18,  262115},{ 17,  131055},{ 17,  131056},{ 16,  65525},{ 17,  131054},
-        { 16,  65522},{ 16,  65523},{ 16,  65524},{ 16,  65521},{ 15,  32758},
-        { 15,  32759},{ 14,  16377},{ 14,  16373},{ 14,  16375},{ 14,  16371},
-        { 14,  16374},{ 14,  16370},{ 13,  8183},{ 13,  8181},{ 12,  4089},
-        { 12,  4087},{ 12,  4086},{ 11,  2041},{ 12,  4084},{ 11,  2040},
-        { 10,  1017},{ 10,  1015},{ 10,  1013},{ 9,  504},{ 9,  503},
-        { 8,  250},{ 8,  248},{ 8,  246},{ 7,  121},{ 6,  58},
-        { 6,  56},{ 5,  26},{ 4,  11},{ 3,  4},{ 1,  0},
-        { 4,  10},{ 4,  12},{ 5,  27},{ 6,  57},{ 6,  59},
-        { 7,  120},{ 7,  122},{ 8,  247},{ 8,  249},{ 9,  502},
-        { 9,  505},{ 10,  1012},{ 10,  1014},{ 10,  1016},{ 11,  2037},
-        { 11,  2036},{ 11,  2038},{ 11,  2039},{ 12,  4085},{ 12,  4088},
-        { 13,  8180},{ 13,  8182},{ 13,  8184},{ 14,  16376},{ 14,  16372},
-        { 16,  65520},{ 15,  32756},{ 16,  65526},{ 15,  32757},{ 18,  262114},
-        { 19,  524249},{ 19,  524250},{ 19,  524251},{ 19,  524252},{ 19,  524253},
-        { 19,  524254},{ 19,  524248},{ 19,  524242},{ 19,  524243},{ 19,  524244},
-        { 19,  524245},{ 19,  524246},{ 19,  524274},{ 19,  524255},{ 19,  524263},
-        { 19,  524264},{ 19,  524265},{ 19,  524266},{ 19,  524267},{ 19,  524262},
-        { 19,  524256},{ 19,  524257},{ 19,  524258},{ 19,  524259},{ 19,  524260},
-        { 19,  524261},{ 19,  524247},{ 19,  524268},{ 19,  524276},{ 19,  524275}
-    };
-
-

faac-1.29.7.8.tar.gz/libfaac/midside.c Deleted

@@ -1,123 +0,0 @@
-/*
- * FAAC - Freeware Advanced Audio Coder
- * Copyright (C) 2003 Krzysztof Nikiel
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
- *
- * This library 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
- * Lesser General Public License for more details.
-
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- *
- * $Id: midside.c,v 1.1 2003/06/26 19:39:54 knik Exp $
- */
-
-#include <math.h>
-#include "channels.h"
-#include "util.h"
-
-
-void MSEncode(CoderInfo *coderInfo,
-	      ChannelInfo *channelInfo,
-	      double *spectrum[MAX_CHANNELS],
-	      int maxchan,
-	      int allowms)
-{
-  int chn;
-
-  for (chn = 0; chn < maxchan; chn++)
-  {
-    if (channelInfo[chn].present)
-    {
-      if ((channelInfo[chn].cpe) && (channelInfo[chn].ch_is_left))
-      {
-	int rch = channelInfo[chn].paired_ch;
-
-	channelInfo[chn].msInfo.is_present = 0;
-	channelInfo[rch].msInfo.is_present = 0;
-
-	/* Perform MS if block_types are the same */
-	if ((coderInfo[chn].block_type == coderInfo[rch].block_type)
-	    && allowms)
-	{
-            int nsfb = coderInfo[chn].sfbn;
-	  MSInfo *msInfoL = &(channelInfo[chn].msInfo);
-	  MSInfo *msInfoR = &(channelInfo[rch].msInfo);
-	  int sfb;
-
-	  channelInfo[chn].common_window = 1;  /* Use common window */
-	  channelInfo[chn].msInfo.is_present = 1;
-	  channelInfo[rch].msInfo.is_present = 1;
-
-          // make the same reference energy in both channels
-	  coderInfo[chn].avgenrg = coderInfo[rch].avgenrg =
-	    0.5 * (coderInfo[chn].avgenrg + coderInfo[rch].avgenrg);
-
-	  for (sfb = 0; sfb < nsfb; sfb++)
-	  {
-            int ms = 0;
-	    int l, start, end;
-	    double sum, diff;
-            double enrgs, enrgd, enrgl, enrgr;
-	    double maxs, maxd, maxl, maxr;
-
-	    start = coderInfo[chn].sfb_offset[sfb];
-            end = coderInfo[chn].sfb_offset[sfb + 1];
-
-            enrgs = enrgd = enrgl = enrgr = 0.0;
-	    maxs = maxd = maxl = maxr = 0.0;
-	    for (l = start; l < end; l++)
-	    {
-              double lx = spectrum[chn][l];
-	      double rx = spectrum[rch][l];
-
-	      sum = 0.5 * (lx + rx);
-	      diff = 0.5 * (lx - rx);
-
-	      enrgs += sum * sum;
-	      maxs = max(maxs, fabs(sum));
-
-	      enrgd += diff * diff;
-	      maxd = max(maxd, fabs(diff));
-
-	      enrgl += lx * lx;
-	      enrgr += rx * rx;
-
-              maxl = max(maxl, fabs(lx));
-              maxr = max(maxr, fabs(rx));
-	    }
-
-#if 1
-	    if ((min(enrgs, enrgd) < min(enrgl, enrgr))
-		&& (min(maxs, maxd) < min(maxl, maxr)))
-	      ms = 1;
-#else
-	    if (min(enrgs, enrgd) < min(enrgl, enrgr))
-	      ms = 1;
-#endif
-
-	    //printf("%d:%d\n", sfb, ms);
-
-	    msInfoR->ms_used[sfb] = msInfoL->ms_used[sfb] = ms;
-
-	    if (ms)
-	      for (l = start; l < end; l++)
-	      {
-		sum = spectrum[chn][l] + spectrum[rch][l];
-		diff = spectrum[chn][l] - spectrum[rch][l];
-		spectrum[chn][l] = 0.5 * sum;
-		spectrum[rch][l] = 0.5 * diff;
-	      }
-	  }
-	}
-      }
-    }
-  }
-}

faac-1.29.7.8.tar.gz/libfaac/midside.h Deleted

@@ -1,39 +0,0 @@
-/*
- * FAAC - Freeware Advanced Audio Coder
- * Copyright (C) 2003 Krzysztof Nikiel
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
- *
- * This library 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
- * Lesser General Public License for more details.
-
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- *
- * $Id: midside.h,v 1.1 2003/06/26 19:40:23 knik Exp $
- */
-
-#ifndef _MIDSIDE_H
-#define _MIDSIDE_H
-
-#ifdef __cplusplus
-extern "C" {
-#endif /* __cplusplus */
-
-#include "coder.h"
-
-
-void MSEncode(CoderInfo *coderInfo, ChannelInfo *channelInfo, double *spectrum[MAX_CHANNELS],
-              unsigned int numberOfChannels, unsigned int msenable);
-
-#ifdef __cplusplus
-}
-#endif /* __cplusplus */
-
-#endif /* _MIDSIDE_H */

faac-1.29.7.8.tar.gz/libfaac/version.h Deleted

faac-1.29.7.8.tar.gz/ChangeLog -> faac-1.29.9.2.tar.gz/ChangeLog Changed

faac-1.29.7.8.tar.gz/Makefile.in -> faac-1.29.9.2.tar.gz/Makefile.in Changed

faac-1.29.7.8.tar.gz/NEWS -> faac-1.29.9.2.tar.gz/NEWS Changed

@@ -1,35 +1,10 @@
-D'oh! ;-)
+2017:
 
-The most important news in the last weeks probably was moving libmp4v2 from
-FAAD2 to the FAAC folder in the currently available snapshots on
-Audiocoding.com and in the CVS. So FAAC doesn't need an installed FAAD2
-anymore if it is compiled with MP4 writing and tagging support. Yes, FAAC can
-do that on its own now, thanks to Dan and Case...
+FAAC thread on hydrogenaudio:
+https://hydrogenaud.io/index.php/topic,114363.0.html
 
-Volker Fischer adapted FAAC to Digital Radio Mondiale, i.e. it works as an AAC
-LC encoder in his DReaM receiver/transmitter software now. There are still
-things to straighten out like the frame length, but these test transmissions
-can be decoded by the official DRM receiver from FhG/Merlin, too.
+FAAC mirrored on github:
+https://github.com/knik0/faac
 
-There's a new FAAC project summary on Freshmeat.net with many links to existing
-ports and packages as well as other applications using either FAAC or FAAD2:
-http://freshmeat.net/projects/faac/ And Audiocoding.com has been added to the
-Open Directory Project on dmoz.org, too, which serves as a database for many
-important search engines, e.g. Google, Yahoo, AOL and others.
-
-The Winamp and CoolEdit output plugins by Antonio Foranna have been updated
-quite often recently (MP4 tagging and importing tags from input files), and
-he'll probably be an official project member soon. By the way, the currently
-available compiles on RareWares need the external id3lib.dll in your system
-directory, otherwise they won't show up in Winamp's output plugins folder.
-CoolEdit even quits with an error message at the start.
-
-Sad news was that knik quit developing FAAC after bringing it to its current
-competitive state which was proven in the last AAC comparison from 2004 on
-http://www.rjamorim.com/test/aac128v2/results.html So if someone out there
-feels like tuning the only available open source AAC encoder, go ahead...
-
-Hans-Juergen (Oct 17, 2004)
-
-P.S.: See also the updated ChangeLog for all changes since the last
-ChangeLog from Nov 24, 2003.
+FAAC download page:
+http://faac.sourceforge.net/

faac-1.29.7.8.tar.gz/TODO -> faac-1.29.9.2.tar.gz/TODO Changed

@@ -1,39 +1,8 @@
-TODO: In any order
-
-Big list, but a lot of it can be done fairly easily with some old code.
-Note: most of these issues are quite old, and it's not clear who submitted them
-in this file and why and/or if some of them are fixed in the meantime. The
-ChangeLog might give some insight on this though.
-
-- DONE: Add frequency cutoff filter
-- DONE: Add ADTS headers
-- DONE: Write GUI
-- DONE: Add TNS
-- DONE: Add LTP
-- DONE: Add backward prediction (MPEG2-AAC)????
-- DONE: Test (and maybe fix) sample rates other than 44100 Hz
-- DONE: Test (and maybe fix) multichannel and mono support
-- DONE: Figure out how to read and write ".mp4" format
-- DONE: Write documentation for library interface
-- DONE: Improve command line tool
-- DONE: VBR quantizer
-- DONE: Speedup
-- Done: Clean up psychoacoustics code
-- Done: Add Window shape switching
-
-- Add PNS
-- Add IS
+- test DRM
+- optimize quantization bias
+- optimize codebook list (section_data)
+- optimize CPE windows grouping
 - Add bit reservoir control
-- Add pulse coding (?)
-- Rewrite noiseless coding (now taken from old version) (?)
-- Better grouping support (?)
-- Fix short block psychoacoustics (?)
-- Fix LTP (hans-juergen, Oct 17, 2004)
-- Fix Main (hans-juergen, Oct 17, 2004)
 - Add resampler and downmixer (hans-juergen, Oct 17, 2004)
 - Add HE AAC (hans-juergen, Oct 17, 2004)
-- Fix mysterious crash/freeze with some decoded WAV files on
-  Linux: endianness? TNS? M/S? decoder bug? (hans-juergen, Oct 17, 2004)
-- Fix default ABR cutoff frequencies at different bitrates
-  (hans-juergen, Oct 17, 2004)
 - Test TNS(arcen, Apr 8th, 2012)

faac-1.29.7.8.tar.gz/common/Makefile.in -> faac-1.29.9.2.tar.gz/common/Makefile.in Changed

faac-1.29.7.8.tar.gz/config.h.in -> faac-1.29.9.2.tar.gz/config.h.in Changed

faac-1.29.7.8.tar.gz/configure -> faac-1.29.9.2.tar.gz/configure Changed

@@ -1,6 +1,6 @@
 #! /bin/sh
 # Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.69 for faac 1.29.7.8.
+# Generated by GNU Autoconf 2.69 for faac 1.29.9.2.
 #
 # Report bugs to <https://sourceforge.net/p/faac/bugs/>.
 #
@@ -590,8 +590,8 @@
 # Identity of this package.
 PACKAGE_NAME='faac'
 PACKAGE_TARNAME='faac'
-PACKAGE_VERSION='1.29.7.8'
-PACKAGE_STRING='faac 1.29.7.8'
+PACKAGE_VERSION='1.29.9.2'
+PACKAGE_STRING='faac 1.29.9.2'
 PACKAGE_BUGREPORT='https://sourceforge.net/p/faac/bugs/'
 PACKAGE_URL=''
 
@@ -635,6 +635,9 @@
 am__EXEEXT_TRUE
 LTLIBOBJS
 LIBOBJS
+WINDRES
+CPUSSE_FALSE
+CPUSSE_TRUE
 MINGW_FALSE
 MINGW_TRUE
 USE_DRM_FALSE
@@ -1340,7 +1343,7 @@
   # Omit some internal or obsolete options to make the list less imposing.
   # This message is too long to be a string in the A/UX 3.1 sh.
   cat <<_ACEOF
-\`configure' configures faac 1.29.7.8 to adapt to many kinds of systems.
+\`configure' configures faac 1.29.9.2 to adapt to many kinds of systems.
 
 Usage: $0 [OPTION]... [VAR=VALUE]...
 
@@ -1411,7 +1414,7 @@
 
 if test -n "$ac_init_help"; then
   case $ac_init_help in
-     short | recursive ) echo "Configuration of faac 1.29.7.8:";;
+     short | recursive ) echo "Configuration of faac 1.29.9.2:";;
    esac
   cat <<\_ACEOF
 
@@ -1526,7 +1529,7 @@
 test -n "$ac_init_help" && exit $ac_status
 if $ac_init_version; then
   cat <<\_ACEOF
-faac configure 1.29.7.8
+faac configure 1.29.9.2
 generated by GNU Autoconf 2.69
 
 Copyright (C) 2012 Free Software Foundation, Inc.
@@ -2013,6 +2016,52 @@
 
 } # ac_fn_c_check_header_mongrel
 
+# ac_fn_c_check_decl LINENO SYMBOL VAR INCLUDES
+# ---------------------------------------------
+# Tests whether SYMBOL is declared in INCLUDES, setting cache variable VAR
+# accordingly.
+ac_fn_c_check_decl ()
+{
+  as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
+  as_decl_name=`echo $2|sed 's/ *(.*//'`
+  as_decl_use=`echo $2|sed -e 's/(/((/' -e 's/)/) 0&/' -e 's/,/) 0& (/g'`
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $as_decl_name is declared" >&5
+$as_echo_n "checking whether $as_decl_name is declared... " >&6; }
+if eval \${$3+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+$4
+int
+main ()
+{
+#ifndef $as_decl_name
+#ifdef __cplusplus
+  (void) $as_decl_use;
+#else
+  (void) $as_decl_name;
+#endif
+#endif
+
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"; then :
+  eval "$3=yes"
+else
+  eval "$3=no"
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+fi
+eval ac_res=\$$3
+	       { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
+$as_echo "$ac_res" >&6; }
+  eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
+
+} # ac_fn_c_check_decl
+
 # ac_fn_c_check_type LINENO TYPE VAR INCLUDES
 # -------------------------------------------
 # Tests whether TYPE exists after having included INCLUDES, setting cache
@@ -2067,52 +2116,6 @@
 
 } # ac_fn_c_check_type
 
-# ac_fn_c_check_decl LINENO SYMBOL VAR INCLUDES
-# ---------------------------------------------
-# Tests whether SYMBOL is declared in INCLUDES, setting cache variable VAR
-# accordingly.
-ac_fn_c_check_decl ()
-{
-  as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
-  as_decl_name=`echo $2|sed 's/ *(.*//'`
-  as_decl_use=`echo $2|sed -e 's/(/((/' -e 's/)/) 0&/' -e 's/,/) 0& (/g'`
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $as_decl_name is declared" >&5
-$as_echo_n "checking whether $as_decl_name is declared... " >&6; }
-if eval \${$3+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-$4
-int
-main ()
-{
-#ifndef $as_decl_name
-#ifdef __cplusplus
-  (void) $as_decl_use;
-#else
-  (void) $as_decl_name;
-#endif
-#endif
-
-  ;
-  return 0;
-}
-_ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
-  eval "$3=yes"
-else
-  eval "$3=no"
-fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-fi
-eval ac_res=\$$3
-	       { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
-$as_echo "$ac_res" >&6; }
-  eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
-
-} # ac_fn_c_check_decl
-
 # ac_fn_c_check_member LINENO AGGR MEMBER VAR INCLUDES
 # ----------------------------------------------------
 # Tries to find if the field MEMBER exists in type AGGR, after including
@@ -2173,7 +2176,7 @@
 This file contains any messages produced by compilers while
 running configure, to aid debugging if configure makes a mistake.
 
-It was created by faac $as_me 1.29.7.8, which was
+It was created by faac $as_me 1.29.9.2, which was
 generated by GNU Autoconf 2.69.  Invocation command line was
 
   $ $0 $@
@@ -3036,7 +3039,7 @@
 
 # Define the identity of the package.
  PACKAGE='faac'
- VERSION='1.29.7.8'
+ VERSION='1.29.9.2'
 
 
 cat >>confdefs.h <<_ACEOF
@@ -15983,12 +15986,13 @@
 
 
 
-for ac_header in getopt.h
+for ac_header in getopt.h immintrin.h
 do :
-  ac_fn_c_check_header_mongrel "$LINENO" "getopt.h" "ac_cv_header_getopt_h" "$ac_includes_default"
-if test "x$ac_cv_header_getopt_h" = xyes; then :
+  as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
+ac_fn_c_check_header_mongrel "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default"
+if eval test \"x\$"$as_ac_Header"\" = x"yes"; then :
   cat >>confdefs.h <<_ACEOF
-#define HAVE_GETOPT_H 1
+#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
 _ACEOF
 
 fi
@@ -15996,47 +16000,6 @@
 done
 
 
-ac_fn_c_check_type "$LINENO" "u_int32_t" "ac_cv_type_u_int32_t" "$ac_includes_default"
-if test "x$ac_cv_type_u_int32_t" = xyes; then :
-
-cat >>confdefs.h <<_ACEOF
-#define HAVE_U_INT32_T 1
-_ACEOF
-
-
-fi
-
-ac_fn_c_check_type "$LINENO" "u_int16_t" "ac_cv_type_u_int16_t" "$ac_includes_default"
-if test "x$ac_cv_type_u_int16_t" = xyes; then :
-
-cat >>confdefs.h <<_ACEOF
-#define HAVE_U_INT16_T 1
-_ACEOF
-
-
-fi
-
-ac_fn_c_check_type "$LINENO" "int32_t" "ac_cv_type_int32_t" "$ac_includes_default"
-if test "x$ac_cv_type_int32_t" = xyes; then :
-
-cat >>confdefs.h <<_ACEOF
-#define HAVE_INT32_T 1
-_ACEOF
-
-
-fi
-
-ac_fn_c_check_type "$LINENO" "int16_t" "ac_cv_type_int16_t" "$ac_includes_default"
-if test "x$ac_cv_type_int16_t" = xyes; then :
-
-cat >>confdefs.h <<_ACEOF
-#define HAVE_INT16_T 1
-_ACEOF
-
-
-fi
-
-
 ac_fn_c_check_decl "$LINENO" "strcasecmp" "ac_cv_have_decl_strcasecmp" "$ac_includes_default"
 if test "x$ac_cv_have_decl_strcasecmp" = xyes; then :
 
@@ -16123,6 +16086,107 @@
   MINGW_FALSE=
 fi
 
+ if test "$host_cpu" = "x86_64" || test "$host_cpu" = "i686"; then
+  CPUSSE_TRUE=
+  CPUSSE_FALSE='#'
+else
+  CPUSSE_TRUE='#'
+  CPUSSE_FALSE=
+fi
+
+
+if test -n "$ac_tool_prefix"; then
+  # Extract the first word of "${ac_tool_prefix}windres", so it can be a program name with args.
+set dummy ${ac_tool_prefix}windres; ac_word=$2
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if ${ac_cv_prog_WINDRES+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  if test -n "$WINDRES"; then
+  ac_cv_prog_WINDRES="$WINDRES" # Let the user override the test.
+else
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+    for ac_exec_ext in '' $ac_executable_extensions; do
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+    ac_cv_prog_WINDRES="${ac_tool_prefix}windres"
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+  done
+IFS=$as_save_IFS
+
+fi
+fi
+WINDRES=$ac_cv_prog_WINDRES
+if test -n "$WINDRES"; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $WINDRES" >&5
+$as_echo "$WINDRES" >&6; }
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+
+fi
+if test -z "$ac_cv_prog_WINDRES"; then
+  ac_ct_WINDRES=$WINDRES
+  # Extract the first word of "windres", so it can be a program name with args.
+set dummy windres; ac_word=$2
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if ${ac_cv_prog_ac_ct_WINDRES+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  if test -n "$ac_ct_WINDRES"; then
+  ac_cv_prog_ac_ct_WINDRES="$ac_ct_WINDRES" # Let the user override the test.
+else
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+    for ac_exec_ext in '' $ac_executable_extensions; do
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+    ac_cv_prog_ac_ct_WINDRES="windres"
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+  done
+IFS=$as_save_IFS
+
+fi
+fi
+ac_ct_WINDRES=$ac_cv_prog_ac_ct_WINDRES
+if test -n "$ac_ct_WINDRES"; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_WINDRES" >&5
+$as_echo "$ac_ct_WINDRES" >&6; }
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+  if test "x$ac_ct_WINDRES" = x; then
+    WINDRES=""
+  else
+    case $cross_compiling:$ac_tool_warned in
+yes:)
+{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
+$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
+ac_tool_warned=yes ;;
+esac
+    WINDRES=$ac_ct_WINDRES
+  fi
+else
+  WINDRES="$ac_cv_prog_WINDRES"
+fi
+
 
  { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether byte ordering is bigendian" >&5
 $as_echo_n "checking whether byte ordering is bigendian... " >&6; }
@@ -16964,6 +17028,10 @@
   as_fn_error $? "conditional \"MINGW\" was never defined.
 Usually this means the macro was only invoked conditionally." "$LINENO" 5
 fi
+if test -z "${CPUSSE_TRUE}" && test -z "${CPUSSE_FALSE}"; then
+  as_fn_error $? "conditional \"CPUSSE\" was never defined.
+Usually this means the macro was only invoked conditionally." "$LINENO" 5
+fi
 
 
 : "${CONFIG_STATUS=./config.status}"
@@ -17362,7 +17430,7 @@
 # report actual input values of CONFIG_FILES etc. instead of their
 # values after options handling.
 ac_log="
-This file was extended by faac $as_me 1.29.7.8, which was
+This file was extended by faac $as_me 1.29.9.2, which was
 generated by GNU Autoconf 2.69.  Invocation command line was
 
   CONFIG_FILES    = $CONFIG_FILES
@@ -17428,7 +17496,7 @@
 cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
 ac_cs_version="\\
-faac config.status 1.29.7.8
+faac config.status 1.29.9.2
 configured by $0, generated by GNU Autoconf 2.69,
   with options \\"\$ac_cs_config\\"

faac-1.29.7.8.tar.gz/configure.ac -> faac-1.29.9.2.tar.gz/configure.ac Changed

faac-1.29.7.8.tar.gz/frontend/Makefile.am -> faac-1.29.9.2.tar.gz/frontend/Makefile.am Changed

faac-1.29.7.8.tar.gz/frontend/Makefile.in -> faac-1.29.9.2.tar.gz/frontend/Makefile.in Changed

@@ -88,8 +88,9 @@
 POST_UNINSTALL = :
 build_triplet = @build@
 host_triplet = @host@
-@USE_DRM_FALSE@bin_PROGRAMS = faac$(EXEEXT)
-@MINGW_TRUE@@USE_DRM_FALSE@am__append_1 = -lws2_32
+@USE_DRM_FALSE@bin_PROGRAMS = faac$(EXEEXT) $(am__EXEEXT_1)
+@MINGW_TRUE@@USE_DRM_FALSE@am__append_1 = faacgui
+@MINGW_TRUE@@USE_DRM_FALSE@am__append_2 = -lws2_32 icon.o
 subdir = frontend
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/configure.ac
@@ -100,21 +101,30 @@
 CONFIG_HEADER = $(top_builddir)/config.h
 CONFIG_CLEAN_FILES =
 CONFIG_CLEAN_VPATH_FILES =
+@MINGW_TRUE@@USE_DRM_FALSE@am__EXEEXT_1 = faacgui$(EXEEXT)
 am__installdirs = "$(DESTDIR)$(bindir)" "$(DESTDIR)$(man1dir)"
 PROGRAMS = $(bin_PROGRAMS)
 am__faac_SOURCES_DIST = main.c input.c mp4write.c input.h mp4write.h
 @USE_DRM_FALSE@am_faac_OBJECTS = main.$(OBJEXT) input.$(OBJEXT) \
 @USE_DRM_FALSE@	mp4write.$(OBJEXT)
-am__EXTRA_faac_SOURCES_DIST = getopt.c
+am__EXTRA_faac_SOURCES_DIST = getopt.c faacgui.rc icon.rc faac.ico
 faac_OBJECTS = $(am_faac_OBJECTS)
-faac_LDADD = $(LDADD)
-am__DEPENDENCIES_1 =
+@MINGW_TRUE@@USE_DRM_FALSE@am__DEPENDENCIES_1 = icon.o
 @USE_DRM_FALSE@faac_DEPENDENCIES = $(top_builddir)/libfaac/libfaac.la \
 @USE_DRM_FALSE@	$(am__DEPENDENCIES_1)
 AM_V_lt = $(am__v_lt_@AM_V@)
 am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@)
 am__v_lt_0 = --silent
 am__v_lt_1 = 
+am__faacgui_SOURCES_DIST = maingui.c input.c input.h resource.h
+@MINGW_TRUE@@USE_DRM_FALSE@am_faacgui_OBJECTS = maingui.$(OBJEXT) \
+@MINGW_TRUE@@USE_DRM_FALSE@	input.$(OBJEXT)
+faacgui_OBJECTS = $(am_faacgui_OBJECTS)
+@USE_DRM_FALSE@am__DEPENDENCIES_2 =  \
+@USE_DRM_FALSE@	$(top_builddir)/libfaac/libfaac.la \
+@USE_DRM_FALSE@	$(am__DEPENDENCIES_1)
+@MINGW_TRUE@@USE_DRM_FALSE@faacgui_DEPENDENCIES =  \
+@MINGW_TRUE@@USE_DRM_FALSE@	$(am__DEPENDENCIES_2) faacguires.o
 AM_V_P = $(am__v_P_@AM_V@)
 am__v_P_ = $(am__v_P_@AM_DEFAULT_V@)
 am__v_P_0 = false
@@ -149,8 +159,9 @@
 am__v_CCLD_ = $(am__v_CCLD_@AM_DEFAULT_V@)
 am__v_CCLD_0 = @echo "  CCLD    " $@;
 am__v_CCLD_1 = 
-SOURCES = $(faac_SOURCES) $(EXTRA_faac_SOURCES)
-DIST_SOURCES = $(am__faac_SOURCES_DIST) $(am__EXTRA_faac_SOURCES_DIST)
+SOURCES = $(faac_SOURCES) $(EXTRA_faac_SOURCES) $(faacgui_SOURCES)
+DIST_SOURCES = $(am__faac_SOURCES_DIST) $(am__EXTRA_faac_SOURCES_DIST) \
+	$(am__faacgui_SOURCES_DIST)
 am__can_run_installinfo = \
   case $$AM_UPDATE_INFO_DIR in \
     n|no|NO) false;; \
@@ -275,6 +286,7 @@
 SHELL = @SHELL@
 STRIP = @STRIP@
 VERSION = @VERSION@
+WINDRES = @WINDRES@
 abs_builddir = @abs_builddir@
 abs_srcdir = @abs_srcdir@
 abs_top_builddir = @abs_top_builddir@
@@ -331,10 +343,12 @@
 top_srcdir = @top_srcdir@
 @USE_DRM_FALSE@dist_man_MANS = ../docs/faac.1
 @USE_DRM_FALSE@faac_SOURCES = main.c input.c mp4write.c input.h mp4write.h
-@USE_DRM_FALSE@EXTRA_faac_SOURCES = getopt.c
+@USE_DRM_FALSE@EXTRA_faac_SOURCES = getopt.c faacgui.rc icon.rc faac.ico
 @USE_DRM_FALSE@AM_CPPFLAGS = -I$(top_srcdir)/include
-@USE_DRM_FALSE@LDADD = $(top_builddir)/libfaac/libfaac.la -lm \
-@USE_DRM_FALSE@	$(am__append_1)
+@USE_DRM_FALSE@faac_LDADD = $(top_builddir)/libfaac/libfaac.la -lm \
+@USE_DRM_FALSE@	$(am__append_2)
+@MINGW_TRUE@@USE_DRM_FALSE@faacgui_SOURCES = maingui.c input.c input.h resource.h
+@MINGW_TRUE@@USE_DRM_FALSE@faacgui_LDADD = $(faac_LDADD) faacguires.o -lcomdlg32
 all: all-am
 
 .SUFFIXES:
@@ -422,6 +436,10 @@
 	@rm -f faac$(EXEEXT)
 	$(AM_V_CCLD)$(LINK) $(faac_OBJECTS) $(faac_LDADD) $(LIBS)
 
+faacgui$(EXEEXT): $(faacgui_OBJECTS) $(faacgui_DEPENDENCIES) $(EXTRA_faacgui_DEPENDENCIES) 
+	@rm -f faacgui$(EXEEXT)
+	$(AM_V_CCLD)$(LINK) $(faacgui_OBJECTS) $(faacgui_LDADD) $(LIBS)
+
 mostlyclean-compile:
 	-rm -f *.$(OBJEXT)
 
@@ -431,6 +449,7 @@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/getopt.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/input.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/main.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/maingui.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/mp4write.Po@am__quote@
 
 .c.o:
@@ -716,6 +735,10 @@
 
 .PRECIOUS: Makefile
 
+@MINGW_TRUE@@USE_DRM_FALSE@faacguires.o:
+@MINGW_TRUE@@USE_DRM_FALSE@	$(WINDRES) faacgui.rc faacguires.o
+@MINGW_TRUE@@USE_DRM_FALSE@icon.o:
+@MINGW_TRUE@@USE_DRM_FALSE@	$(WINDRES) icon.rc icon.o
 
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
 # Otherwise a system limit (for SysV at least) may be exceeded.

faac-1.29.9.2.tar.gz/frontend/faac.ico Added

faac-1.29.9.2.tar.gz/frontend/faacgui.rc Added

@@ -0,0 +1,148 @@
+//Microsoft Developer Studio generated resource script.
+//
+#include "resource.h"
+
+#define APSTUDIO_READONLY_SYMBOLS
+/////////////////////////////////////////////////////////////////////////////
+//
+// Generated from the TEXTINCLUDE 2 resource.
+//
+#include "afxres.h"
+
+/////////////////////////////////////////////////////////////////////////////
+#undef APSTUDIO_READONLY_SYMBOLS
+
+/////////////////////////////////////////////////////////////////////////////
+// English (U.S.) resources
+
+#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_ENU)
+#ifdef _WIN32
+LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US
+#pragma code_page(1252)
+#endif //_WIN32
+
+#ifdef APSTUDIO_INVOKED
+/////////////////////////////////////////////////////////////////////////////
+//
+// TEXTINCLUDE
+//
+
+1 TEXTINCLUDE DISCARDABLE 
+BEGIN
+    "resource.h\0"
+END
+
+2 TEXTINCLUDE DISCARDABLE 
+BEGIN
+    "#include ""afxres.h""\r\n"
+    "\0"
+END
+
+3 TEXTINCLUDE DISCARDABLE 
+BEGIN
+    "\r\n"
+    "\0"
+END
+
+#endif    // APSTUDIO_INVOKED
+
+
+/////////////////////////////////////////////////////////////////////////////
+//
+// Dialog
+//
+
+IDD_MAINDIALOG DIALOGEX 0, 0, 264, 190
+STYLE DS_MODALFRAME | DS_CENTER | WS_MINIMIZEBOX | WS_POPUP | WS_CAPTION | 
+    WS_SYSMENU
+CAPTION "FAAC GUI"
+FONT 8, "MS Sans Serif"
+BEGIN
+    PUSHBUTTON      "...",IDC_SELECT_INPUTFILE,225,12,19,14,0,
+                    WS_EX_STATICEDGE
+    PUSHBUTTON      "...",IDC_SELECT_OUTPUTFILE,225,33,19,14,WS_DISABLED,
+                    WS_EX_STATICEDGE
+    CONTROL         "Allow Mid/Side",IDC_ALLOWMIDSIDE,"Button",
+                    BS_AUTOCHECKBOX | BS_LEFTTEXT | WS_TABSTOP,14,81,71,10
+    LTEXT           "Quantizer\nquality", IDC_STATIC, 98, 73, 44, 18
+    EDITTEXT        IDC_QUALITY, 138, 76, 30, 12, ES_AUTOHSCROLL
+    CONTROL         "", IDC_STATIC, "static", SS_SUNKEN, 98, 94, 70, 30
+    CONTROL         "Set bandwidth", IDC_BWCTL, "Button", BS_AUTOCHECKBOX
+                    | WS_TABSTOP, 102, 96, 62, 12
+    EDITTEXT        IDC_BANDWIDTH,102,109,34,12,ES_AUTOHSCROLL | WS_DISABLED | WS_TABSTOP
+    LTEXT           "Hz", IDC_STATIC, 140, 111, 10, 8
+    DEFPUSHBUTTON   "Encode",IDOK,200,152,50,14,WS_DISABLED
+    PUSHBUTTON      "Quit",IDCANCEL,200,170,50,14
+    LTEXT           "",IDC_TIME,7,151,190,20
+    LTEXT           "", IDC_COMPILEDATE, 20, 176, 150, 8
+    EDITTEXT        IDC_INPUTFILENAME,61,12,158,14,ES_AUTOHSCROLL
+    EDITTEXT        IDC_OUTPUTFILENAME,61,33,158,14,ES_AUTOHSCROLL | 
+                    WS_DISABLED
+    LTEXT           "Input File:",IDC_STATIC,18,13,38,8
+    LTEXT           "Output File:",IDC_STATIC,18,34,37,8
+    CONTROL         "",IDC_STATIC,"Static",SS_BLACKFRAME | SS_SUNKEN,7,54,
+                    250,1
+    LTEXT           "-",IDC_INPUTPARAMS,32,66,55,8
+    LTEXT           "In:",IDC_STATIC,14,66,12,8
+    CONTROL         "Progress1",IDC_PROGRESS,"msctls_progress32",WS_BORDER,7,
+                    135,250,10
+    GROUPBOX        "Output Format",IDC_STATIC,93,62,164,67
+    CONTROL         "Use RAW output",IDC_USERAW,"Button",BS_AUTOCHECKBOX | 
+                    BS_LEFTTEXT | WS_TABSTOP,14,103,71,10
+    CONTROL         "Use TNS",IDC_USETNS,"Button",BS_AUTOCHECKBOX | 
+                    BS_LEFTTEXT | WS_TABSTOP,14,92,71,10
+    COMBOBOX        IDC_MPEGVERSION,183,82,67,63,CBS_DROPDOWNLIST | 
+                    WS_VSCROLL | WS_TABSTOP
+    COMBOBOX        IDC_OBJECTTYPE,183,109,67,59,CBS_DROPDOWNLIST | 
+                    WS_VSCROLL | WS_TABSTOP
+    LTEXT           "MPEG Verion",IDC_STATIC,183,73,44,8
+    LTEXT           "AAC Object Type",IDC_STATIC,183,100,56,8
+    CONTROL         "Use LFE channel",IDC_USELFE,"Button",BS_AUTOCHECKBOX | 
+                    BS_LEFTTEXT | WS_DISABLED | WS_TABSTOP,14,114,71,10
+END
+
+
+/////////////////////////////////////////////////////////////////////////////
+//
+// DESIGNINFO
+//
+
+#ifdef APSTUDIO_INVOKED
+GUIDELINES DESIGNINFO DISCARDABLE 
+BEGIN
+    IDD_MAINDIALOG, DIALOG
+    BEGIN
+        LEFTMARGIN, 7
+        RIGHTMARGIN, 257
+        TOPMARGIN, 7
+        BOTTOMMARGIN, 178
+    END
+END
+#endif    // APSTUDIO_INVOKED
+
+
+/////////////////////////////////////////////////////////////////////////////
+//
+// Dialog Info
+//
+
+IDD_MAINDIALOG DLGINIT
+BEGIN
+    IDC_MPEGVERSION, 0x403, 1, 0, "\000", 0
+END
+
+#endif    // English (U.S.) resources
+/////////////////////////////////////////////////////////////////////////////
+
+
+
+#ifndef APSTUDIO_INVOKED
+/////////////////////////////////////////////////////////////////////////////
+//
+// Generated from the TEXTINCLUDE 3 resource.
+//
+
+
+/////////////////////////////////////////////////////////////////////////////
+#endif    // not APSTUDIO_INVOKED
+

faac-1.29.9.2.tar.gz/frontend/icon.rc Added

faac-1.29.7.8.tar.gz/frontend/input.c -> faac-1.29.9.2.tar.gz/frontend/input.c Changed

@@ -278,125 +278,114 @@
 
 size_t wav_read_float32(pcmfile_t *sndf, float *buf, size_t num, int *map)
 {
-  size_t i = 0;
-  unsigned char bufi[8];
+  size_t cnt;
+  size_t isize;
+  void *bufi;
 
-  if ((sndf->samplebytes > 8) || (sndf->samplebytes < 1))
+  if ((sndf->samplebytes > 4) || (sndf->samplebytes < 1))
     return 0;
 
-  while (i<num) {
-    if (fread(bufi, sndf->samplebytes, 1, sndf->f) != 1)
-      break;
-
-    if (sndf->isfloat)
-    {
-      switch (sndf->samplebytes) {
-      case 4:
-        buf[i] = (*(float *)&bufi) * (float)32768;
-        break;
+  isize = num * sndf->samplebytes;
+  bufi = (buf + num);
+  bufi -= isize;
+  isize = fread(bufi, 1, isize, sndf->f);
+  isize /= sndf->samplebytes;
 
-      case 8:
-        buf[i] = (float)((*(double *)&bufi) * (float)32768);
-        break;
+  // perform in-place conversion
+  for (cnt = 0; cnt < num; cnt++)
+  {
+      if (cnt >= isize)
+          break;
 
-      default:
-        return 0;
+      if (sndf->isfloat)
+      {
+          switch (sndf->samplebytes) {
+          case 4:
+              buf[cnt] *= 32768.0;
+              break;
+          default:
+              return 0;
+          }
+          continue;
       }
-    }
-    else
-    {
-      // convert to 32 bit float
-      // fix endianness
-      switch (sndf->samplebytes) {
+
+      switch (sndf->samplebytes)
+      {
       case 1:
-        /* this is endian clean */
-        buf[i] = ((float)bufi[0] - 128) * (float)256;
-        break;
+          {
+              uint8_t *in = bufi;
+              uint8_t s = in[cnt];
 
+              buf[cnt] = ((float)s - 128.0) * (float)256;
+          }
+          break;
       case 2:
+          {
+              int16_t *in = bufi;
+              int16_t s = in[cnt];
 #ifdef WORDS_BIGENDIAN
-        if (!sndf->bigendian)
+              if (!sndf->bigendian)
 #else
-        if (sndf->bigendian)
+              if (sndf->bigendian)
 #endif
-        {
-          // swap bytes
-          int16_t s = ((int16_t *)bufi)[0];
-          s = SWAP16(s);
-          buf[i] = (float)s;
-        }
-        else
-        {
-          // no swap
-          int s = ((int16_t *)bufi)[0];
-          buf[i] = (float)s;
-        }
-        break;
-
+                  buf[cnt] = (float)SWAP16(s);
+              else
+                  buf[cnt] = (float)s;
+          }
+          break;
       case 3:
-        if (!sndf->bigendian)
-        {
-          int s = bufi[0] | (bufi[1] << 8) | (bufi[2] << 16);
+          {
+              int s;
+              uint8_t *in = bufi;
+              in += 3 * cnt;
 
-          // fix sign
-          if (s & 0x800000)
-            s |= 0xff000000;
+              if (!sndf->bigendian)
+                  s = in[0] | (in[1] << 8) | (in[2] << 16);
+              else
+                  s = (in[0] << 16) | (in[1] << 8) | in[2];
 
-          buf[i] = (float)s / 256;
-        }
-        else // big endian input
-        {
-          int s = (bufi[0] << 16) | (bufi[1] << 8) | bufi[2];
-
-          // fix sign
-          if (s & 0x800000)
-            s |= 0xff000000;
+              // fix sign
+              if (s & 0x800000)
+                  s |= 0xff000000;
 
-          buf[i] = (float)s / 256;
-        }
+              buf[cnt] = (float)s / 256;
+          }
         break;
-
       case 4:
+          {
+              int32_t *in = bufi;
+              int s = in[cnt];
 #ifdef WORDS_BIGENDIAN
-        if (!sndf->bigendian)
+              if (!sndf->bigendian)
 #else
-        if (sndf->bigendian)
+              if (sndf->bigendian)
 #endif
-        {
-          // swap bytes
-          int s = *(int *)&bufi;
-          buf[i] = (float)SWAP32(s) / 65536;
-        }
-        else
-        {
-          int s = *(int *)&bufi;
-          buf[i] = (float)s / 65536;
-        }
-        break;
-
+                  buf[cnt] = (float)SWAP32(s) / 65536;
+              else
+                  buf[cnt] = (float)s / 65536;
+          }
+          break;
       default:
-        return 0;
+          return 0;
       }
-    }
-    i++;
   }
 
   if (map)
-    chan_remap((int32_t *)buf, sndf->channels, i / sndf->channels, map);
+    chan_remap((int32_t *)buf, sndf->channels, cnt / sndf->channels, map);
 
-  return i;
+  return cnt;
 }
 
 size_t wav_read_int24(pcmfile_t *sndf, int32_t *buf, size_t num, int *map)
 {
   int size;
   int i;
-  unsigned char *bufi;
+  uint8_t *bufi;
 
   if ((sndf->samplebytes > 4) || (sndf->samplebytes < 1))
     return 0;
 
-  bufi = (char *)buf + sizeof(*buf) * num - sndf->samplebytes * (num - 1) - sizeof(*buf);
+  bufi = (uint8_t *)buf + sizeof(*buf) * num - sndf->samplebytes * (num - 1) - sizeof(*buf);
 
   size = fread(bufi, sndf->samplebytes, num, sndf->f);

faac-1.29.7.8.tar.gz/frontend/main.c -> faac-1.29.9.2.tar.gz/frontend/main.c Changed

@@ -94,6 +94,8 @@
     HELP_IO,
     HELP_MP4,
     HELP_ADVANCED,
+    OPT_JOINT,
+    OPT_PNS
 };
 
 typedef struct {
@@ -183,7 +185,10 @@
 static help_t help_advanced[] = {
     {"--tns  \tEnable coding of TNS, temporal noise shaping.\n"},
     {"--no-tns\tDisable coding of TNS, temporal noise shaping.\n"},
-    {"--no-midside\tDon\'t use mid/side coding.\n"},
+    {"--joint 0\tDisable joint stereo coding.\n"},
+    {"--joint 1\tUse Mid/Side coding.\n"},
+    {"--joint 2\tUse Intensity Stereo coding.\n"},
+    {"--pns <0 .. 10>\tPNS level; 0=disabled.\n"},
     {"--mpeg-vers X\tForce AAC MPEG version, X can be 2 or 4\n"},
     {"--shortctl X\tEnforce block type (0 = both (default); 1 = no short; 2 = no\n"
     "\t\tlong).\n"},
@@ -421,7 +426,8 @@
     faacEncConfigurationPtr myFormat;
     unsigned int mpegVersion = MPEG2;
     unsigned int objectType = LOW;
-    static int useMidSide = 1;
+    int jointmode = -1;
+    int pnslevel = -1;
     static int useTns = 0;
     enum container_format container = NO_CONTAINER;
     enum stream_format stream = ADTS_STREAM;
@@ -505,7 +511,8 @@
             {"help-mp4", 0, 0, HELP_MP4},
             {"help-advanced", 0, 0, HELP_ADVANCED},
             {"raw", 0, 0, 'r'},
-            {"no-midside", 0, &useMidSide, 0},
+            {"joint", required_argument, 0, OPT_JOINT},
+            {"pns", required_argument, 0, OPT_PNS},
             {"cutoff", 1, 0, 'c'},
             {"quality", 1, 0, 'q'},
             {"pcmraw", 0, 0, 'P'},
@@ -749,6 +756,12 @@
             help(c);
             return 1;
             break;
+        case OPT_JOINT:
+            jointmode = atoi(optarg);
+            break;
+        case OPT_PNS:
+            pnslevel = atoi(optarg);
+            break;
         case '?':
         default:
             help('?');
@@ -885,12 +898,18 @@
     }
     if (infile->channels >= 6)
         myFormat->useLfe = 1;
-    myFormat->allowMidside = useMidSide;
+    if (jointmode >= 0)
+        myFormat->jointmode = jointmode;
+    if (pnslevel >= 0)
+        myFormat->pnslevel = pnslevel;
+    if (quantqual > 0)
+    {
+        myFormat->quantqual = quantqual;
+        myFormat->bitRate = 0;
+    }
     if (bitRate)
         myFormat->bitRate = bitRate / infile->channels;
     myFormat->bandWidth = cutOff;
-    if (quantqual > 0)
-        myFormat->quantqual = quantqual;
     myFormat->outputFormat = stream;
     myFormat->inputFormat = FAAC_INPUT_FLOAT;
     if (!faacEncSetConfiguration(hEncoder, myFormat))
@@ -941,10 +960,16 @@
     quantqual = myFormat->quantqual;
     bitRate = myFormat->bitRate;
     if (bitRate)
-        fprintf(stderr, "Average bitrate: %d kbps\n",
-                (bitRate + 500) / 1000 * infile->channels);
-    fprintf(stderr, "Quantization quality: %ld\n", quantqual);
+    {
+        fprintf(stderr, "Initial quantization quality: %ld\n", quantqual);
+        fprintf(stderr, "Average bitrate: %d kbps/channel\n",
+                (bitRate + 500) / 1000);
+    }
+    else
+        fprintf(stderr, "Quantization quality: %ld\n", quantqual);
     fprintf(stderr, "Bandwidth: %d Hz\n", cutOff);
+    if (myFormat->pnslevel > 0)
+        fprintf(stderr, "PNS level: %d\n", myFormat->pnslevel);
     fprintf(stderr, "Object type: ");
     switch (objectType)
     {
@@ -961,8 +986,17 @@
     fprintf(stderr, "(MPEG-%d)", (mpegVersion == MPEG4) ? 4 : 2);
     if (myFormat->useTns)
         fprintf(stderr, " + TNS");
-    if (myFormat->allowMidside)
+
+    switch(myFormat->jointmode) {
+    case JOINT_MS:
         fprintf(stderr, " + M/S");
+        break;
+    case JOINT_IS:
+        fprintf(stderr, " + IS");
+        break;
+    }
+    if (myFormat->pnslevel > 0)
+        fprintf(stderr, " + PNS");
     fprintf(stderr, "\n");
 
     fprintf(stderr, "Container format: ");
@@ -1171,11 +1205,11 @@
 
         if (verbose >= 2)
         {
-        fprintf(stderr, "%u frames\n", mp4config.frame.ents);
-        fprintf(stderr, "%u output samples\n", mp4config.samples);
-        fprintf(stderr, "max bitrate: %u\n", mp4config.bitratemax);
-        fprintf(stderr, "avg bitrate: %u\n", mp4config.bitrateavg);
-        fprintf(stderr, "max frame size: %u\n", mp4config.buffersize);
+            fprintf(stderr, "%u frames\n", mp4config.frame.ents);
+            fprintf(stderr, "%u output samples\n", mp4config.samples);
+            fprintf(stderr, "max bitrate: %u\n", mp4config.bitrate.max);
+            fprintf(stderr, "avg bitrate: %u\n", mp4config.bitrate.avg);
+            fprintf(stderr, "max frame size: %u\n", mp4config.buffersize);
         }
     }
     else

faac-1.29.9.2.tar.gz/frontend/maingui.c Added

@@ -0,0 +1,428 @@
+/*
+ * FAAC - Freeware Advanced Audio Coder
+ * Copyright (C) 2001 Menno Bakker
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library 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
+ * Lesser General Public License for more details.
+
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ *
+ * $Id: maingui.c,v 1.21 2007/03/19 19:57:40 menno Exp $
+ */
+
+#include <windows.h>
+#include <commdlg.h>
+#include <commctrl.h>
+#include <stdlib.h>
+
+#include "input.h"
+
+#include <faac.h>
+#include "resource.h"
+
+
+static HINSTANCE hInstance;
+
+static char inputFilename[_MAX_PATH], outputFilename[_MAX_PATH];
+
+static BOOL Encoding = FALSE;
+
+static BOOL SelectFileName(HWND hParent, char *filename, BOOL forReading)
+{
+    OPENFILENAME ofn;
+
+    ofn.lStructSize = sizeof(OPENFILENAME);
+    ofn.hwndOwner = hParent;
+    ofn.hInstance = hInstance;
+    ofn.nFilterIndex = 0;
+    ofn.lpstrFileTitle = NULL;
+    ofn.nMaxFileTitle = 31;
+    filename [0] = 0x00;
+    ofn.lpstrFile = (LPSTR)filename;
+    ofn.nMaxFile = _MAX_PATH;
+    ofn.lpstrInitialDir = NULL;
+    ofn.lpstrCustomFilter = NULL;
+    ofn.nMaxCustFilter = 0;
+    ofn.nFileOffset = 0;
+    ofn.nFileExtension = 0;
+    ofn.lCustData = 0;
+    ofn.lpfnHook = NULL;
+    ofn.lpTemplateName = NULL;
+
+    if (forReading)
+    {
+        char filters[] = { "Wave Files (*.wav)\0*.wav\0" \
+            "AIFF Files (*.aif;*.aiff;*.aifc)\0*.aif;*.aiff;*.aifc\0" \
+            "AU Files (*.au)\0*.au\0" \
+            "All Files (*.*)\0*.*\0\0" };
+
+        ofn.lpstrFilter = filters;
+        ofn.lpstrDefExt = "wav";
+
+        ofn.Flags = OFN_EXPLORER | OFN_FILEMUSTEXIST | OFN_HIDEREADONLY;
+        ofn.lpstrTitle = "Select Source File";
+
+        return GetOpenFileName (&ofn);
+    } else {
+        char filters [] = { "AAC Files (*.aac)\0*.aac\0" \
+            "All Files (*.*)\0*.*\0\0" };
+
+        ofn.lpstrFilter = filters;
+        ofn.lpstrDefExt = "aac";
+
+        ofn.Flags = OFN_EXPLORER | OFN_PATHMUSTEXIST | OFN_OVERWRITEPROMPT | OFN_HIDEREADONLY;
+        ofn.lpstrTitle = "Select Output File";
+
+        return GetSaveFileName(&ofn);
+    }
+}
+
+static void AwakeDialogControls(HWND hWnd)
+{
+    char szTemp[64];
+    pcmfile_t *infile = NULL;
+    unsigned int sampleRate, numChannels;
+    char *pExt;
+
+    if ((infile = wav_open_read(inputFilename, 0)) == NULL)
+        return;
+
+    /* determine input file parameters */
+    sampleRate = infile->samplerate;
+    numChannels = infile->channels;
+
+    wav_close(infile);
+
+    SetDlgItemText (hWnd, IDC_INPUTFILENAME, inputFilename);
+
+    strncpy(outputFilename, inputFilename, sizeof(outputFilename) - 5);
+
+    pExt = strrchr(outputFilename, '.');
+
+    if (pExt == NULL) lstrcat(outputFilename, ".aac");
+    else lstrcpy(pExt, ".aac");
+
+    EnableWindow(GetDlgItem(hWnd, IDC_OUTPUTFILENAME), TRUE);
+    EnableWindow(GetDlgItem(hWnd, IDC_SELECT_OUTPUTFILE), TRUE);
+
+    SetDlgItemText(hWnd, IDC_OUTPUTFILENAME, outputFilename);
+
+    wsprintf(szTemp, "%iHz %ich", sampleRate, numChannels);
+    SetDlgItemText(hWnd, IDC_INPUTPARAMS, szTemp);
+
+    EnableWindow(GetDlgItem(hWnd, IDOK), TRUE);
+}
+
+static DWORD WINAPI EncodeFile(LPVOID pParam)
+{
+    HWND hWnd = (HWND) pParam;
+    pcmfile_t *infile = NULL;
+
+    GetDlgItemText(hWnd, IDC_INPUTFILENAME, inputFilename, sizeof(inputFilename));
+    GetDlgItemText(hWnd, IDC_OUTPUTFILENAME, outputFilename, sizeof(outputFilename));
+
+    /* open the input file */
+    if ((infile = wav_open_read(inputFilename, 0)) != NULL)
+    {
+        /* determine input file parameters */
+        unsigned int sampleRate = infile->samplerate;
+        unsigned int numChannels = infile->channels;
+
+        unsigned long inputSamples;
+        unsigned long maxOutputBytes;
+
+        /* open and setup the encoder */
+        faacEncHandle hEncoder = faacEncOpen(sampleRate, numChannels,
+            &inputSamples, &maxOutputBytes);
+
+        if (hEncoder)
+        {
+            HANDLE hOutfile;
+	    char szTemp[256];
+
+            /* set encoder configuration */
+            faacEncConfigurationPtr config = faacEncGetCurrentConfiguration(hEncoder);
+
+            config->jointmode = IsDlgButtonChecked(hWnd, IDC_ALLOWMIDSIDE) == BST_CHECKED ? 1 : 0;
+            config->useTns = IsDlgButtonChecked(hWnd, IDC_USETNS) == BST_CHECKED ? 1 : 0;
+            config->useLfe = IsDlgButtonChecked(hWnd, IDC_USELFE) == BST_CHECKED ? 1 : 0;
+            config->outputFormat = IsDlgButtonChecked(hWnd, IDC_USERAW) == BST_CHECKED ? 0 : 1;
+
+            config->mpegVersion = SendMessage(GetDlgItem(hWnd, IDC_MPEGVERSION), CB_GETCURSEL, 0, 0);
+            config->aacObjectType = SendMessage(GetDlgItem(hWnd, IDC_OBJECTTYPE), CB_GETCURSEL, 0, 0);
+            if (config->aacObjectType == SSR) /* Set to LTP */
+                config->aacObjectType = LTP;
+
+            GetDlgItemText(hWnd, IDC_QUALITY, szTemp, sizeof(szTemp));
+	    config->quantqual = atoi(szTemp);
+	    if (IsDlgButtonChecked(hWnd, IDC_BWCTL) == BST_CHECKED)
+	    {
+            GetDlgItemText(hWnd, IDC_BANDWIDTH, szTemp, sizeof(szTemp));
+            config->bandWidth = atoi(szTemp);
+	    }
+	    else
+	      config->bandWidth = 0;
+
+            if (!faacEncSetConfiguration(hEncoder, config))
+            {
+                faacEncClose(hEncoder);
+                wav_close(infile);
+
+                MessageBox (hWnd, "faacEncSetConfiguration failed!", "Error", MB_OK | MB_ICONSTOP);
+
+                SendMessage(hWnd,WM_SETTEXT,0,(long)"FAAC GUI");
+                Encoding = FALSE;
+                SetDlgItemText(hWnd, IDOK, "Encode");
+
+                return 0;
+            }
+
+	    sprintf(szTemp, "%ld", config->quantqual);
+	    SetDlgItemText(hWnd, IDC_QUALITY, szTemp);
+
+	    sprintf(szTemp, "%d", config->bandWidth);
+	    SetDlgItemText(hWnd, IDC_BANDWIDTH, szTemp);
+
+            /* open the output file */
+            hOutfile = CreateFile(outputFilename, GENERIC_WRITE, 0, NULL,
+                CREATE_ALWAYS, FILE_ATTRIBUTE_NORMAL, NULL);
+
+            if (hOutfile != INVALID_HANDLE_VALUE)
+            {
+                UINT startTime = GetTickCount(), lastUpdated = 50;
+                DWORD totalBytesRead = 0;
+
+                unsigned int bytesInput = 0;
+                DWORD numberOfBytesWritten = 0;
+                int *pcmbuf;
+                unsigned char *bitbuf;
+                char HeaderText[50];
+                char Percentage[5];
+
+                pcmbuf = (int*)LocalAlloc(0, inputSamples*sizeof(int));
+                bitbuf = (unsigned char*)LocalAlloc(0, maxOutputBytes*sizeof(unsigned char));
+
+                SendDlgItemMessage(hWnd, IDC_PROGRESS, PBM_SETRANGE, 0, MAKELPARAM(0, 1024));
+                SendDlgItemMessage(hWnd, IDC_PROGRESS, PBM_SETPOS, 0, 0);
+
+                for ( ;; )
+                {
+                    int bytesWritten;
+                    UINT timeElapsed, timeEncoded;
+
+                    bytesInput = wav_read_int24(infile, pcmbuf, inputSamples, NULL) * sizeof(int);
+
+                    SendDlgItemMessage (hWnd, IDC_PROGRESS, PBM_SETPOS, (unsigned long)((float)totalBytesRead * 1024.0f / (infile->samples*sizeof(int)*numChannels)), 0);
+
+                    /* Percentage for Dialog Output */
+                    _itoa((int)((float)totalBytesRead * 100.0f / (infile->samples*sizeof(int)*numChannels)),Percentage,10);
+                    lstrcpy(HeaderText,"FAAC GUI: ");
+                    lstrcat(HeaderText,Percentage);
+                    lstrcat(HeaderText,"%");
+                    SendMessage(hWnd,WM_SETTEXT,0,(long)HeaderText);
+
+                    totalBytesRead += bytesInput;
+
+                    timeElapsed = (GetTickCount () - startTime) / 10;
+                    timeEncoded = 100.0 * totalBytesRead / (sampleRate * numChannels * sizeof (int));
+
+                    if (timeElapsed > (lastUpdated + 20))
+                    {
+                        float factor;
+			unsigned timeLeft;
+
+                        lastUpdated = timeElapsed;
+
+                        factor = (float) timeEncoded / (float) (timeElapsed ? timeElapsed : 1);
+			timeLeft = 10.0 * infile->samples / sampleRate / factor - 0.1 * timeElapsed;
+
+			sprintf(szTemp, "Playing time: %2.2i:%04.1f\tEncoding time: %2.2i:%04.1f\n"
+				"Play/enc factor: %.2f\tEstimated time left: %2.2i:%04.1f",
+				timeEncoded / 6000, 0.01 * (timeEncoded % 6000),
+				timeElapsed / 6000, 0.01 * (timeElapsed % 6000),
+				factor,
+				timeLeft / 600, 0.1 * (timeLeft % 600)
+			       );
+
+                        SetDlgItemText(hWnd, IDC_TIME, szTemp);
+                    }
+
+                    /* call the actual encoding routine */
+                    bytesWritten = faacEncEncode(hEncoder,
+                        pcmbuf,
+                        bytesInput/sizeof(int),
+                        bitbuf,
+                        maxOutputBytes);
+
+                    /* Stop Pressed */
+                    if ( !Encoding )
+                        break;
+
+                    /* all done, bail out */
+                    if (!bytesInput && !bytesWritten)
+                        break;
+
+                    if (bytesWritten < 0)
+                    {
+                        MessageBox (hWnd, "faacEncEncodeFrame failed!", "Error", MB_OK | MB_ICONSTOP);
+                        break;
+                    }
+
+                    WriteFile(hOutfile, bitbuf, bytesWritten, &numberOfBytesWritten, NULL);
+
+                    }
+
+                CloseHandle(hOutfile);
+                if (pcmbuf) LocalFree(pcmbuf);
+                if (bitbuf) LocalFree(bitbuf);
+            }
+
+            faacEncClose(hEncoder);
+        }
+
+        wav_close(infile);
+        MessageBeep(1);
+
+        SendDlgItemMessage(hWnd, IDC_PROGRESS, PBM_SETPOS, 0, 0);
+    } else {
+        MessageBox(hWnd, "Couldn't open input file!", "Error", MB_OK | MB_ICONSTOP);
+    }
+
+    SendMessage(hWnd,WM_SETTEXT,0,(long)"FAAC GUI");
+    Encoding = FALSE;
+    SetDlgItemText(hWnd, IDOK, "Encode");
+    return 0;
+}
+
+static BOOL WINAPI DialogProc(HWND hWnd, UINT msg, WPARAM wParam, LPARAM lParam)
+{
+    switch (msg)
+    {
+    case WM_INITDIALOG:
+      {
+        unsigned long samplesInput, maxBytesOutput;
+	faacEncHandle hEncoder =
+	  faacEncOpen(44100, 2, &samplesInput, &maxBytesOutput);
+	faacEncConfigurationPtr myFormat =
+	  faacEncGetCurrentConfiguration(hEncoder);
+
+	if (myFormat->version == FAAC_CFG_VERSION)
+	{
+	  char txt[100];
+	  sprintf(txt, "libfaac version %s", myFormat->name);
+	  SetDlgItemText(hWnd, IDC_COMPILEDATE, txt);
+	}
+	else
+	{
+	  MessageBox(hWnd, "wrong libfaac version", "FAAC",
+		     MB_OK | MB_ICONERROR);
+          PostMessage(hWnd, WM_CLOSE, 0, 0);
+	}
+	faacEncClose(hEncoder);
+      }
+
+        inputFilename[0] = 0x00;
+
+        SendMessage(GetDlgItem(hWnd, IDC_MPEGVERSION), CB_ADDSTRING, 0, (LPARAM)(LPCTSTR)"MPEG4");
+        SendMessage(GetDlgItem(hWnd, IDC_MPEGVERSION), CB_ADDSTRING, 0, (LPARAM)(LPCTSTR)"MPEG2");
+        SendMessage(GetDlgItem(hWnd, IDC_MPEGVERSION), CB_SETCURSEL, 0, 0);
+
+//        SendMessage(GetDlgItem(hWnd, IDC_OBJECTTYPE), CB_ADDSTRING, 0, (LPARAM)(LPCTSTR)"Main");
+        SendMessage(GetDlgItem(hWnd, IDC_OBJECTTYPE), CB_ADDSTRING, 0, (LPARAM)(LPCTSTR)"Low Complexity");
+//        SendMessage(GetDlgItem(hWnd, IDC_OBJECTTYPE), CB_ADDSTRING, 0, (LPARAM)(LPCTSTR)"LTP");
+        SendMessage(GetDlgItem(hWnd, IDC_OBJECTTYPE), CB_SETCURSEL, 0, 0);
+
+        CheckDlgButton(hWnd, IDC_ALLOWMIDSIDE, TRUE);
+        CheckDlgButton(hWnd, IDC_USELFE, FALSE);
+        CheckDlgButton(hWnd, IDC_USERAW, FALSE);
+        CheckDlgButton(hWnd, IDC_USETNS, TRUE);
+        SetDlgItemText(hWnd, IDC_QUALITY, "100");
+        SetDlgItemText(hWnd, IDC_BANDWIDTH, "0");
+
+        DragAcceptFiles(hWnd, TRUE);
+        return TRUE;
+
+    case WM_DROPFILES:
+
+        if (DragQueryFile((HDROP) wParam, 0, (LPSTR) inputFilename, _MAX_PATH - 1))
+            AwakeDialogControls(hWnd);
+
+        DragFinish((HDROP) wParam);
+        return FALSE;
+
+    case WM_COMMAND:
+
+        switch (wParam)
+        {
+        case IDOK:
+
+            if ( !Encoding )
+            {
+                DWORD retval;
+                CreateThread(NULL,0,EncodeFile,hWnd,0,&retval);
+                Encoding = TRUE;
+                SetDlgItemText(hWnd, IDOK, "Stop");
+            }
+            else
+            {
+                Encoding = FALSE;
+                SetDlgItemText(hWnd, IDOK, "Encode");
+            }
+            return TRUE;
+
+        case IDCANCEL:
+
+            EndDialog(hWnd, TRUE);
+            return TRUE;
+
+        case IDC_SELECT_INPUTFILE:
+
+            if (SelectFileName(hWnd, inputFilename, TRUE))
+                AwakeDialogControls(hWnd);
+
+            break;
+
+        case IDC_SELECT_OUTPUTFILE:
+
+            if (SelectFileName(hWnd, outputFilename, FALSE))
+            {
+                SetDlgItemText(hWnd, IDC_OUTPUTFILENAME, outputFilename);
+            }
+
+            break;
+	case IDC_BWCTL:
+	  switch (IsDlgButtonChecked(hWnd, IDC_BWCTL))
+	  {
+	  case BST_CHECKED:
+	    EnableWindow(GetDlgItem(hWnd, IDC_BANDWIDTH), TRUE);
+	    //SetDlgItemText(hWnd, IDC_BANDWIDTH, "0");
+            break;
+	  case BST_UNCHECKED:
+	    EnableWindow(GetDlgItem(hWnd, IDC_BANDWIDTH), FALSE);
+	    //SetDlgItemText(hWnd, IDC_BANDWIDTH, "");
+            break;
+	  }
+	  break;
+        }
+
+        break;
+    }
+
+    return FALSE;
+}
+
+int WINAPI WinMain (HINSTANCE hInst, HINSTANCE hPrevInstance, LPSTR lpCmdLine, int nCmdShow)
+{
+    hInstance = hInst;
+
+    return DialogBox(hInstance, MAKEINTRESOURCE (IDD_MAINDIALOG), NULL, (DLGPROC) DialogProc);
+}

faac-1.29.7.8.tar.gz/frontend/mp4write.c -> faac-1.29.9.2.tar.gz/frontend/mp4write.c Changed

@@ -413,8 +413,8 @@
     size += u8out(0);
 #endif
     // bitrate
-    size += u32out(mp4config.bitratemax);
-    size += u32out(mp4config.bitrateavg);
+    size += u32out(mp4config.bitrate.max);
+    size += u32out(mp4config.bitrate.avg);
 
     size += u8out(TAG_DSI);
     size += u8out(0x80);
@@ -794,11 +794,21 @@
 {
     if (mp4config.framesamples <= samples)
     {
-        int bitrate = 8.0 * size * mp4config.samplerate / samples;
+        int bitrate;
 
-        if (mp4config.bitratemax < bitrate)
-            mp4config.bitratemax = bitrate;
+        mp4config.bitrate.samples += samples;
+        mp4config.bitrate.size += size;
 
+        if (mp4config.bitrate.samples >= mp4config.samplerate)
+        {
+            bitrate = 8.0 * mp4config.bitrate.size * mp4config.samplerate
+                / mp4config.bitrate.samples;
+            mp4config.bitrate.size = 0;
+            mp4config.bitrate.samples = 0;
+
+            if (mp4config.bitrate.max < bitrate)
+                mp4config.bitrate.max = bitrate;
+        }
         mp4config.framesamples = samples;
     }
     if (mp4config.buffersize < size)
@@ -870,8 +880,10 @@
 
 int mp4atom_tail(void)
 {
-    mp4config.bitrateavg = 8.0 * mp4config.mdatsize
+    mp4config.bitrate.avg = 8.0 * mp4config.mdatsize
         * mp4config.samplerate / mp4config.samples;
+    if (!mp4config.bitrate.max)
+        mp4config.bitrate.max = mp4config.bitrate.avg;
 
     g_atom = g_tail;
     while (g_atom->opcode != ATOM_STOP)

faac-1.29.7.8.tar.gz/frontend/mp4write.h -> faac-1.29.9.2.tar.gz/frontend/mp4write.h Changed

faac-1.29.9.2.tar.gz/frontend/resource.h Added

@@ -0,0 +1,36 @@
+//{{NO_DEPENDENCIES}}
+// Microsoft Developer Studio generated include file.
+// Used by faacgui.rc
+//
+#define ID_ICON1 200
+#define IDD_MAINDIALOG                  102
+#define IDC_INPUTFILENAME               1000
+#define IDC_SELECT_INPUTFILE            1001
+#define IDC_OUTPUTFILENAME              1002
+#define IDC_SELECT_OUTPUTFILE           1003
+#define IDC_INPUTPARAMS                 1004
+#define IDC_PROGRESS                    1006
+#define IDC_ALLOWMIDSIDE                1007
+#define IDC_TIME                        1008
+#define IDC_BANDWIDTH                   1009
+#define IDC_QUALITY                     1010
+#define IDC_USERAW                      1011
+#define IDC_USETNS                      1012
+#define IDC_USELFE2                     1013
+#define IDC_USELFE                      1013
+#define IDC_BWCTL                       1014
+
+#define IDC_COMPILEDATE                 1018
+#define IDC_MPEGVERSION                 1020
+#define IDC_OBJECTTYPE                  1021
+
+// Next default values for new objects
+// 
+#ifdef APSTUDIO_INVOKED
+#ifndef APSTUDIO_READONLY_SYMBOLS
+#define _APS_NEXT_RESOURCE_VALUE        104
+#define _APS_NEXT_COMMAND_VALUE         40001
+#define _APS_NEXT_CONTROL_VALUE         1022
+#define _APS_NEXT_SYMED_VALUE           101
+#endif
+#endif

faac-1.29.7.8.tar.gz/include/Makefile.in -> faac-1.29.9.2.tar.gz/include/Makefile.in Changed

faac-1.29.7.8.tar.gz/include/faaccfg.h -> faac-1.29.9.2.tar.gz/include/faaccfg.h Changed

faac-1.29.7.8.tar.gz/libfaac/Makefile.am -> faac-1.29.9.2.tar.gz/libfaac/Makefile.am Changed

faac-1.29.7.8.tar.gz/libfaac/Makefile.in -> faac-1.29.9.2.tar.gz/libfaac/Makefile.in Changed

@@ -88,6 +88,8 @@
 POST_UNINSTALL = :
 build_triplet = @build@
 host_triplet = @host@
+@CPUSSE_TRUE@am__append_1 = -msse2
+@MINGW_TRUE@am__append_2 = -Wl,--add-stdcall-alias
 subdir = libfaac
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/configure.ac
@@ -129,16 +131,17 @@
 LTLIBRARIES = $(lib_LTLIBRARIES)
 am__DEPENDENCIES_1 =
 @USE_DRM_FALSE@libfaac_la_DEPENDENCIES = $(am__DEPENDENCIES_1)
-am__libfaac_la_SOURCES_DIST = aacquant.c bitstream.c fft.c frame.c \
-	midside.c blockswitch.c util.c channels.c filtbank.c huffman.c \
-	tns.c quantize.c aacquant.h channels.h filtbank.h hufftab.h \
-	blockswitch.h coder.h frame.h midside.h tns.h bitstream.h \
-	fft.h huffman.h util.h quantize.h version.h
-am__objects_1 = libfaac_la-aacquant.lo libfaac_la-bitstream.lo \
-	libfaac_la-fft.lo libfaac_la-frame.lo libfaac_la-midside.lo \
-	libfaac_la-blockswitch.lo libfaac_la-util.lo \
-	libfaac_la-channels.lo libfaac_la-filtbank.lo \
-	libfaac_la-huffman.lo libfaac_la-tns.lo libfaac_la-quantize.lo
+am__libfaac_la_SOURCES_DIST = bitstream.c fft.c frame.c blockswitch.c \
+	util.c channels.c filtbank.c tns.c quantize.c huff2.c \
+	huffdata.c stereo.c channels.h filtbank.h blockswitch.h \
+	coder.h frame.h tns.h bitstream.h fft.h util.h quantize.h \
+	huffdata.h huff2.h stereo.h
+am__objects_1 = libfaac_la-bitstream.lo libfaac_la-fft.lo \
+	libfaac_la-frame.lo libfaac_la-blockswitch.lo \
+	libfaac_la-util.lo libfaac_la-channels.lo \
+	libfaac_la-filtbank.lo libfaac_la-tns.lo \
+	libfaac_la-quantize.lo libfaac_la-huff2.lo \
+	libfaac_la-huffdata.lo libfaac_la-stereo.lo
 am__objects_2 =
 @USE_DRM_FALSE@am_libfaac_la_OBJECTS = $(am__objects_1) \
 @USE_DRM_FALSE@	$(am__objects_2)
@@ -152,18 +155,18 @@
 	$(CFLAGS) $(libfaac_la_LDFLAGS) $(LDFLAGS) -o $@
 @USE_DRM_FALSE@am_libfaac_la_rpath = -rpath $(libdir)
 @USE_DRM_TRUE@libfaac_drm_la_DEPENDENCIES = $(am__DEPENDENCIES_1)
-am__libfaac_drm_la_SOURCES_DIST = aacquant.c bitstream.c fft.c frame.c \
-	midside.c blockswitch.c util.c channels.c filtbank.c huffman.c \
-	tns.c quantize.c aacquant.h channels.h filtbank.h hufftab.h \
-	blockswitch.h coder.h frame.h midside.h tns.h bitstream.h \
-	fft.h huffman.h util.h quantize.h version.h \
-	kiss_fft/kiss_fftr.c kiss_fft/kiss_fft.c kiss_fft/kiss_fft.h
-am__objects_3 = libfaac_drm_la-aacquant.lo libfaac_drm_la-bitstream.lo \
-	libfaac_drm_la-fft.lo libfaac_drm_la-frame.lo \
-	libfaac_drm_la-midside.lo libfaac_drm_la-blockswitch.lo \
+am__libfaac_drm_la_SOURCES_DIST = bitstream.c fft.c frame.c \
+	blockswitch.c util.c channels.c filtbank.c tns.c quantize.c \
+	huff2.c huffdata.c stereo.c channels.h filtbank.h \
+	blockswitch.h coder.h frame.h tns.h bitstream.h fft.h util.h \
+	quantize.h huffdata.h huff2.h stereo.h kiss_fft/kiss_fftr.c \
+	kiss_fft/kiss_fft.c kiss_fft/kiss_fft.h
+am__objects_3 = libfaac_drm_la-bitstream.lo libfaac_drm_la-fft.lo \
+	libfaac_drm_la-frame.lo libfaac_drm_la-blockswitch.lo \
 	libfaac_drm_la-util.lo libfaac_drm_la-channels.lo \
-	libfaac_drm_la-filtbank.lo libfaac_drm_la-huffman.lo \
-	libfaac_drm_la-tns.lo libfaac_drm_la-quantize.lo
+	libfaac_drm_la-filtbank.lo libfaac_drm_la-tns.lo \
+	libfaac_drm_la-quantize.lo libfaac_drm_la-huff2.lo \
+	libfaac_drm_la-huffdata.lo libfaac_drm_la-stereo.lo
 am__dirstamp = $(am__leading_dot)dirstamp
 @USE_DRM_TRUE@am_libfaac_drm_la_OBJECTS = $(am__objects_3) \
 @USE_DRM_TRUE@	$(am__objects_2) \
@@ -309,6 +312,7 @@
 SHELL = @SHELL@
 STRIP = @STRIP@
 VERSION = @VERSION@
+WINDRES = @WINDRES@
 abs_builddir = @abs_builddir@
 abs_srcdir = @abs_srcdir@
 abs_top_builddir = @abs_top_builddir@
@@ -363,10 +367,10 @@
 top_build_prefix = @top_build_prefix@
 top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
-common_SOURCES = aacquant.c bitstream.c fft.c frame.c midside.c blockswitch.c util.c channels.c filtbank.c huffman.c tns.c quantize.c
-common_INCLUDES = aacquant.h channels.h filtbank.h hufftab.h blockswitch.h coder.h frame.h midside.h tns.h bitstream.h fft.h huffman.h util.h quantize.h version.h
+common_SOURCES = bitstream.c fft.c frame.c blockswitch.c util.c channels.c filtbank.c tns.c quantize.c huff2.c huffdata.c stereo.c
+common_INCLUDES = channels.h filtbank.h blockswitch.h coder.h frame.h tns.h bitstream.h fft.h util.h quantize.h huffdata.h huff2.h stereo.h
 common_LIBADD = -lm
-common_CFLAGS = -fvisibility=hidden -msse2
+common_CFLAGS = -fvisibility=hidden $(am__append_1)
 @USE_DRM_FALSE@lib_LTLIBRARIES = libfaac.la
 @USE_DRM_TRUE@lib_LTLIBRARIES = libfaac_drm.la
 @USE_DRM_TRUE@libfaac_drm_la_SOURCES = ${common_SOURCES} ${common_INCLUDES} kiss_fft/kiss_fftr.c kiss_fft/kiss_fft.c kiss_fft/kiss_fft.h
@@ -376,7 +380,7 @@
 @USE_DRM_FALSE@libfaac_la_SOURCES = ${common_SOURCES} ${common_INCLUDES}
 @USE_DRM_FALSE@libfaac_la_LIBADD = ${common_LIBADD}
 @USE_DRM_FALSE@libfaac_la_CFLAGS = ${common_CFLAGS}
-libfaac_la_LDFLAGS = -no-undefined
+libfaac_la_LDFLAGS = -no-undefined $(am__append_2)
 AM_CPPFLAGS = -I$(top_srcdir)/include
 all: all-am
 
@@ -471,28 +475,28 @@
 distclean-compile:
 	-rm -f *.tab.c
 
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libfaac_drm_la-aacquant.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libfaac_drm_la-bitstream.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libfaac_drm_la-blockswitch.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libfaac_drm_la-channels.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libfaac_drm_la-fft.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libfaac_drm_la-filtbank.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libfaac_drm_la-frame.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libfaac_drm_la-huffman.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libfaac_drm_la-midside.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libfaac_drm_la-huff2.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libfaac_drm_la-huffdata.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libfaac_drm_la-quantize.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libfaac_drm_la-stereo.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libfaac_drm_la-tns.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libfaac_drm_la-util.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libfaac_la-aacquant.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libfaac_la-bitstream.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libfaac_la-blockswitch.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libfaac_la-channels.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libfaac_la-fft.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libfaac_la-filtbank.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libfaac_la-frame.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libfaac_la-huffman.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libfaac_la-midside.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libfaac_la-huff2.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libfaac_la-huffdata.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libfaac_la-quantize.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libfaac_la-stereo.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libfaac_la-tns.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libfaac_la-util.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@kiss_fft/$(DEPDIR)/libfaac_drm_la-kiss_fft.Plo@am__quote@
@@ -522,13 +526,6 @@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LTCOMPILE) -c -o $@ $<
 
-libfaac_la-aacquant.lo: aacquant.c
-@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libfaac_la_CFLAGS) $(CFLAGS) -MT libfaac_la-aacquant.lo -MD -MP -MF $(DEPDIR)/libfaac_la-aacquant.Tpo -c -o libfaac_la-aacquant.lo `test -f 'aacquant.c' || echo '$(srcdir)/'`aacquant.c
-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/libfaac_la-aacquant.Tpo $(DEPDIR)/libfaac_la-aacquant.Plo
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='aacquant.c' object='libfaac_la-aacquant.lo' libtool=yes @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libfaac_la_CFLAGS) $(CFLAGS) -c -o libfaac_la-aacquant.lo `test -f 'aacquant.c' || echo '$(srcdir)/'`aacquant.c
-
 libfaac_la-bitstream.lo: bitstream.c
 @am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libfaac_la_CFLAGS) $(CFLAGS) -MT libfaac_la-bitstream.lo -MD -MP -MF $(DEPDIR)/libfaac_la-bitstream.Tpo -c -o libfaac_la-bitstream.lo `test -f 'bitstream.c' || echo '$(srcdir)/'`bitstream.c
 @am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/libfaac_la-bitstream.Tpo $(DEPDIR)/libfaac_la-bitstream.Plo
@@ -550,13 +547,6 @@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libfaac_la_CFLAGS) $(CFLAGS) -c -o libfaac_la-frame.lo `test -f 'frame.c' || echo '$(srcdir)/'`frame.c
 
-libfaac_la-midside.lo: midside.c
-@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libfaac_la_CFLAGS) $(CFLAGS) -MT libfaac_la-midside.lo -MD -MP -MF $(DEPDIR)/libfaac_la-midside.Tpo -c -o libfaac_la-midside.lo `test -f 'midside.c' || echo '$(srcdir)/'`midside.c
-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/libfaac_la-midside.Tpo $(DEPDIR)/libfaac_la-midside.Plo
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='midside.c' object='libfaac_la-midside.lo' libtool=yes @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libfaac_la_CFLAGS) $(CFLAGS) -c -o libfaac_la-midside.lo `test -f 'midside.c' || echo '$(srcdir)/'`midside.c
-
 libfaac_la-blockswitch.lo: blockswitch.c
 @am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libfaac_la_CFLAGS) $(CFLAGS) -MT libfaac_la-blockswitch.lo -MD -MP -MF $(DEPDIR)/libfaac_la-blockswitch.Tpo -c -o libfaac_la-blockswitch.lo `test -f 'blockswitch.c' || echo '$(srcdir)/'`blockswitch.c
 @am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/libfaac_la-blockswitch.Tpo $(DEPDIR)/libfaac_la-blockswitch.Plo
@@ -585,13 +575,6 @@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libfaac_la_CFLAGS) $(CFLAGS) -c -o libfaac_la-filtbank.lo `test -f 'filtbank.c' || echo '$(srcdir)/'`filtbank.c
 
-libfaac_la-huffman.lo: huffman.c
-@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libfaac_la_CFLAGS) $(CFLAGS) -MT libfaac_la-huffman.lo -MD -MP -MF $(DEPDIR)/libfaac_la-huffman.Tpo -c -o libfaac_la-huffman.lo `test -f 'huffman.c' || echo '$(srcdir)/'`huffman.c
-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/libfaac_la-huffman.Tpo $(DEPDIR)/libfaac_la-huffman.Plo
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='huffman.c' object='libfaac_la-huffman.lo' libtool=yes @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libfaac_la_CFLAGS) $(CFLAGS) -c -o libfaac_la-huffman.lo `test -f 'huffman.c' || echo '$(srcdir)/'`huffman.c
-
 libfaac_la-tns.lo: tns.c
 @am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libfaac_la_CFLAGS) $(CFLAGS) -MT libfaac_la-tns.lo -MD -MP -MF $(DEPDIR)/libfaac_la-tns.Tpo -c -o libfaac_la-tns.lo `test -f 'tns.c' || echo '$(srcdir)/'`tns.c
 @am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/libfaac_la-tns.Tpo $(DEPDIR)/libfaac_la-tns.Plo
@@ -606,12 +589,26 @@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libfaac_la_CFLAGS) $(CFLAGS) -c -o libfaac_la-quantize.lo `test -f 'quantize.c' || echo '$(srcdir)/'`quantize.c
 
-libfaac_drm_la-aacquant.lo: aacquant.c
-@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libfaac_drm_la_CFLAGS) $(CFLAGS) -MT libfaac_drm_la-aacquant.lo -MD -MP -MF $(DEPDIR)/libfaac_drm_la-aacquant.Tpo -c -o libfaac_drm_la-aacquant.lo `test -f 'aacquant.c' || echo '$(srcdir)/'`aacquant.c
-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/libfaac_drm_la-aacquant.Tpo $(DEPDIR)/libfaac_drm_la-aacquant.Plo
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='aacquant.c' object='libfaac_drm_la-aacquant.lo' libtool=yes @AMDEPBACKSLASH@
+libfaac_la-huff2.lo: huff2.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libfaac_la_CFLAGS) $(CFLAGS) -MT libfaac_la-huff2.lo -MD -MP -MF $(DEPDIR)/libfaac_la-huff2.Tpo -c -o libfaac_la-huff2.lo `test -f 'huff2.c' || echo '$(srcdir)/'`huff2.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/libfaac_la-huff2.Tpo $(DEPDIR)/libfaac_la-huff2.Plo
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='huff2.c' object='libfaac_la-huff2.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libfaac_la_CFLAGS) $(CFLAGS) -c -o libfaac_la-huff2.lo `test -f 'huff2.c' || echo '$(srcdir)/'`huff2.c
+
+libfaac_la-huffdata.lo: huffdata.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libfaac_la_CFLAGS) $(CFLAGS) -MT libfaac_la-huffdata.lo -MD -MP -MF $(DEPDIR)/libfaac_la-huffdata.Tpo -c -o libfaac_la-huffdata.lo `test -f 'huffdata.c' || echo '$(srcdir)/'`huffdata.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/libfaac_la-huffdata.Tpo $(DEPDIR)/libfaac_la-huffdata.Plo
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='huffdata.c' object='libfaac_la-huffdata.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libfaac_la_CFLAGS) $(CFLAGS) -c -o libfaac_la-huffdata.lo `test -f 'huffdata.c' || echo '$(srcdir)/'`huffdata.c
+
+libfaac_la-stereo.lo: stereo.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libfaac_la_CFLAGS) $(CFLAGS) -MT libfaac_la-stereo.lo -MD -MP -MF $(DEPDIR)/libfaac_la-stereo.Tpo -c -o libfaac_la-stereo.lo `test -f 'stereo.c' || echo '$(srcdir)/'`stereo.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/libfaac_la-stereo.Tpo $(DEPDIR)/libfaac_la-stereo.Plo
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='stereo.c' object='libfaac_la-stereo.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libfaac_drm_la_CFLAGS) $(CFLAGS) -c -o libfaac_drm_la-aacquant.lo `test -f 'aacquant.c' || echo '$(srcdir)/'`aacquant.c
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libfaac_la_CFLAGS) $(CFLAGS) -c -o libfaac_la-stereo.lo `test -f 'stereo.c' || echo '$(srcdir)/'`stereo.c
 
 libfaac_drm_la-bitstream.lo: bitstream.c
 @am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libfaac_drm_la_CFLAGS) $(CFLAGS) -MT libfaac_drm_la-bitstream.lo -MD -MP -MF $(DEPDIR)/libfaac_drm_la-bitstream.Tpo -c -o libfaac_drm_la-bitstream.lo `test -f 'bitstream.c' || echo '$(srcdir)/'`bitstream.c
@@ -634,13 +631,6 @@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libfaac_drm_la_CFLAGS) $(CFLAGS) -c -o libfaac_drm_la-frame.lo `test -f 'frame.c' || echo '$(srcdir)/'`frame.c
 
-libfaac_drm_la-midside.lo: midside.c
-@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libfaac_drm_la_CFLAGS) $(CFLAGS) -MT libfaac_drm_la-midside.lo -MD -MP -MF $(DEPDIR)/libfaac_drm_la-midside.Tpo -c -o libfaac_drm_la-midside.lo `test -f 'midside.c' || echo '$(srcdir)/'`midside.c
-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/libfaac_drm_la-midside.Tpo $(DEPDIR)/libfaac_drm_la-midside.Plo
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='midside.c' object='libfaac_drm_la-midside.lo' libtool=yes @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libfaac_drm_la_CFLAGS) $(CFLAGS) -c -o libfaac_drm_la-midside.lo `test -f 'midside.c' || echo '$(srcdir)/'`midside.c
-
 libfaac_drm_la-blockswitch.lo: blockswitch.c
 @am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libfaac_drm_la_CFLAGS) $(CFLAGS) -MT libfaac_drm_la-blockswitch.lo -MD -MP -MF $(DEPDIR)/libfaac_drm_la-blockswitch.Tpo -c -o libfaac_drm_la-blockswitch.lo `test -f 'blockswitch.c' || echo '$(srcdir)/'`blockswitch.c
 @am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/libfaac_drm_la-blockswitch.Tpo $(DEPDIR)/libfaac_drm_la-blockswitch.Plo
@@ -669,13 +659,6 @@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libfaac_drm_la_CFLAGS) $(CFLAGS) -c -o libfaac_drm_la-filtbank.lo `test -f 'filtbank.c' || echo '$(srcdir)/'`filtbank.c
 
-libfaac_drm_la-huffman.lo: huffman.c
-@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libfaac_drm_la_CFLAGS) $(CFLAGS) -MT libfaac_drm_la-huffman.lo -MD -MP -MF $(DEPDIR)/libfaac_drm_la-huffman.Tpo -c -o libfaac_drm_la-huffman.lo `test -f 'huffman.c' || echo '$(srcdir)/'`huffman.c
-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/libfaac_drm_la-huffman.Tpo $(DEPDIR)/libfaac_drm_la-huffman.Plo
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='huffman.c' object='libfaac_drm_la-huffman.lo' libtool=yes @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libfaac_drm_la_CFLAGS) $(CFLAGS) -c -o libfaac_drm_la-huffman.lo `test -f 'huffman.c' || echo '$(srcdir)/'`huffman.c
-
 libfaac_drm_la-tns.lo: tns.c
 @am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libfaac_drm_la_CFLAGS) $(CFLAGS) -MT libfaac_drm_la-tns.lo -MD -MP -MF $(DEPDIR)/libfaac_drm_la-tns.Tpo -c -o libfaac_drm_la-tns.lo `test -f 'tns.c' || echo '$(srcdir)/'`tns.c
 @am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/libfaac_drm_la-tns.Tpo $(DEPDIR)/libfaac_drm_la-tns.Plo
@@ -690,6 +673,27 @@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libfaac_drm_la_CFLAGS) $(CFLAGS) -c -o libfaac_drm_la-quantize.lo `test -f 'quantize.c' || echo '$(srcdir)/'`quantize.c
 
+libfaac_drm_la-huff2.lo: huff2.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libfaac_drm_la_CFLAGS) $(CFLAGS) -MT libfaac_drm_la-huff2.lo -MD -MP -MF $(DEPDIR)/libfaac_drm_la-huff2.Tpo -c -o libfaac_drm_la-huff2.lo `test -f 'huff2.c' || echo '$(srcdir)/'`huff2.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/libfaac_drm_la-huff2.Tpo $(DEPDIR)/libfaac_drm_la-huff2.Plo
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='huff2.c' object='libfaac_drm_la-huff2.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libfaac_drm_la_CFLAGS) $(CFLAGS) -c -o libfaac_drm_la-huff2.lo `test -f 'huff2.c' || echo '$(srcdir)/'`huff2.c
+
+libfaac_drm_la-huffdata.lo: huffdata.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libfaac_drm_la_CFLAGS) $(CFLAGS) -MT libfaac_drm_la-huffdata.lo -MD -MP -MF $(DEPDIR)/libfaac_drm_la-huffdata.Tpo -c -o libfaac_drm_la-huffdata.lo `test -f 'huffdata.c' || echo '$(srcdir)/'`huffdata.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/libfaac_drm_la-huffdata.Tpo $(DEPDIR)/libfaac_drm_la-huffdata.Plo
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='huffdata.c' object='libfaac_drm_la-huffdata.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libfaac_drm_la_CFLAGS) $(CFLAGS) -c -o libfaac_drm_la-huffdata.lo `test -f 'huffdata.c' || echo '$(srcdir)/'`huffdata.c
+
+libfaac_drm_la-stereo.lo: stereo.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libfaac_drm_la_CFLAGS) $(CFLAGS) -MT libfaac_drm_la-stereo.lo -MD -MP -MF $(DEPDIR)/libfaac_drm_la-stereo.Tpo -c -o libfaac_drm_la-stereo.lo `test -f 'stereo.c' || echo '$(srcdir)/'`stereo.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/libfaac_drm_la-stereo.Tpo $(DEPDIR)/libfaac_drm_la-stereo.Plo
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='stereo.c' object='libfaac_drm_la-stereo.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libfaac_drm_la_CFLAGS) $(CFLAGS) -c -o libfaac_drm_la-stereo.lo `test -f 'stereo.c' || echo '$(srcdir)/'`stereo.c
+
 kiss_fft/libfaac_drm_la-kiss_fftr.lo: kiss_fft/kiss_fftr.c
 @am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libfaac_drm_la_CFLAGS) $(CFLAGS) -MT kiss_fft/libfaac_drm_la-kiss_fftr.lo -MD -MP -MF kiss_fft/$(DEPDIR)/libfaac_drm_la-kiss_fftr.Tpo -c -o kiss_fft/libfaac_drm_la-kiss_fftr.lo `test -f 'kiss_fft/kiss_fftr.c' || echo '$(srcdir)/'`kiss_fft/kiss_fftr.c
 @am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) kiss_fft/$(DEPDIR)/libfaac_drm_la-kiss_fftr.Tpo kiss_fft/$(DEPDIR)/libfaac_drm_la-kiss_fftr.Plo

faac-1.29.7.8.tar.gz/libfaac/bitstream.c -> faac-1.29.9.2.tar.gz/libfaac/bitstream.c Changed

@@ -26,10 +26,11 @@
 
 #include <stdio.h>
 #include <stdlib.h>
+#include <string.h>
 
 #include "coder.h"
 #include "channels.h"
-#include "huffman.h"
+#include "huff2.h"
 #include "bitstream.h"
 #include "util.h"
 
@@ -578,8 +579,8 @@
     bits += LEN_GLOB_GAIN;
 #endif
 
-    bits += SortBookNumbers(coderInfo, bitStream, writeFlag);
-    bits += WriteScalefactors(coderInfo, bitStream, writeFlag);
+    bits += writebooks(coderInfo, bitStream, writeFlag);
+    bits += writesf(coderInfo, bitStream, writeFlag);
 #ifdef DRM
     if (writeFlag) {
         /* length_of_reordered_spectral_data */
@@ -734,22 +735,18 @@
 {
     int i, bits = 0;
 
-    /* set up local pointers to data and len */
-    /* data array contains data to be written */
-    /* len array contains lengths of data words */
-    int* data = coderInfo->data;
-    int* len  = coderInfo->len;
-
     if (writeFlag) {
-        for(i = 0; i < coderInfo->spectral_count; i++) {
-            if (len[i] > 0) {  /* only send out non-zero codebook data */
-                PutBit(bitStream, data[i], len[i]); /* write data */
-                bits += len[i];
+        for(i = 0; i < coderInfo->datacnt; i++) {
+            int data = coderInfo->s[i].data;
+            int len = coderInfo->s[i].len;
+            if (len > 0) {
+                PutBit(bitStream, data, len);
+                bits += len;
             }
         }
     } else {
-        for(i = 0; i < coderInfo->spectral_count; i++) {
-            bits += len[i];
+        for(i = 0; i < coderInfo->datacnt; i++) {
+            bits += coderInfo->s[i].len;
         }
     }
 
@@ -992,7 +989,7 @@
     return tmp_W;
 }
 
-static int WriteReorderedSpectralData(CoderInfo *coderInfo,
+static int WriteReorderedSpectralData(CoderInfo *coder,
                                       BitStream *bitStream,
                                       int writeFlag)
 {
@@ -1001,13 +998,13 @@
     int segmcnt = 0;
     long startbitpos;
     segment_t segment[FRAME_LEN];
-    int* groups = coderInfo->groups.len;
-    int* sfb_offset = coderInfo->sfb_offset;
+    int* groups = coder->groups.len;
+    int* sfb_offset = coder->sfb_offset;
 
     cw_info_t cw_info[FRAME_LEN];
     cw_info_t cw_info_preso[FRAME_LEN];
 
-    int num_cw = coderInfo->cur_cw;
+    int num_cw = coder->cur_cw;
     int window_cw_cnt[MAX_SHORT_WINDOWS] = {0,0,0,0,0,0,0,0};
 
     int presort, set, num_sets;
@@ -1023,9 +1020,7 @@
     /* set up local pointers to data and len */
     /* data array contains data to be written */
     /* len array contains lengths of data words */
-    int* data = coderInfo->data;
-    int* len  = coderInfo->len;
-    int* num_data = coderInfo->num_data_cw;
+    int* num_data = coder->num_data_cw;
 
     if (writeFlag) {
         /* build offset table */
@@ -1034,7 +1029,7 @@
         for (i = 0; i < num_cw; i++) {
             cur_cw_len = 0;
             for (j = 0; j < num_data[i]; j++) {
-                cur_cw_len += len[cur_data++];
+                cur_cw_len += coder->s[cur_data++].len;
             }
 
             cw_info[i].num_data = num_data[i];
@@ -1047,7 +1042,7 @@
         /* classify codewords first */
         sfb_cnt = win_cnt = win_grp_cnt = coeff_cnt = last_sfb = acc_win_cnt = 0;
         cur_sfb_len = sfb_offset[1] / groups[0];
-        cur_cb = coderInfo->book_vector[0];
+        cur_cb = coder->book[0];
         for (i = 0; i < num_cw; i++) {
             /* Set codeword info parameters */
             cw_info[i].cb = cur_cb;
@@ -1066,7 +1061,7 @@
                     win_cnt = 0;
 
                     sfb_cnt++; /* next sfb */
-                    if (sfb_cnt == coderInfo->all_sfb) {
+                    if (sfb_cnt == coder->all_sfb) {
                         sfb_cnt = 0;
 
                         acc_win_cnt += groups[win_grp_cnt];
@@ -1074,7 +1069,7 @@
                     }
 
                     /* new codebook and sfb length */
-                    cur_cb = coderInfo->book_vector[sfb_cnt];
+                    cur_cb = coder->book[sfb_cnt];
                     if (last_sfb < FRAME_LEN) {
                         cur_sfb_len = (sfb_offset[sfb_cnt + 1] - sfb_offset[sfb_cnt])
                             / groups[win_grp_cnt];
@@ -1088,7 +1083,7 @@
 
 /* Somehow the second presorting step does not give expected results. Disabling the
    following code surprisingly gives good results. TODO: find the bug */
-        if (0) {//coderInfo->block_type == ONLY_SHORT_WINDOW) {
+        if (0) {//coder->block_type == ONLY_SHORT_WINDOW) {
             for (i = 0; i < MAX_SHORT_WINDOWS; i++)
                 window_cw_cnt[i] = 0; /* reset all counters */
 
@@ -1129,7 +1124,7 @@
             for (i = 0; i < num_cw; i++) {
                 /* process only codewords that are due now */
                 if ((cw_info_preso[i].cb == nextCB) ||
-                    ((nextCB < ESC_HCB) && (cw_info_preso[i].cb == nextCB + 1)))
+                    ((nextCB < HCB_ESC) && (cw_info_preso[i].cb == nextCB + 1)))
                 {
                     cw_info[cw_cnt++] = cw_info_preso[i];
                 }
@@ -1140,12 +1135,12 @@
         accsegmsize = 0;
         for (i = 0; i < num_cw; i++) {
             /* 8.5.3.3.3.2 Derivation of segment width */
-            cursegmsize = min(maxCwLen[cw_info[i].cb], coderInfo->iLenLongestCW);
+            cursegmsize = min(maxCwLen[cw_info[i].cb], coder->iLenLongestCW);
 
-            if (accsegmsize + cursegmsize > coderInfo->iLenReordSpData) {
+            if (accsegmsize + cursegmsize > coder->iLenReordSpData) {
                 /* the last segment is extended until iLenReordSpData */
-                segment[segmcnt - 1].right = coderInfo->iLenReordSpData - 1;
-                segment[segmcnt - 1].len = coderInfo->iLenReordSpData - segment[segmcnt - 1].left;
+                segment[segmcnt - 1].right = coder->iLenReordSpData - 1;
+                segment[segmcnt - 1].len = coder->iLenReordSpData - segment[segmcnt - 1].left;
                 break;
             }
 
@@ -1202,34 +1197,34 @@
                         for (cw_part_cnt = 0; cw_part_cnt < cw_info[codeword_index].num_data; cw_part_cnt++) {
                             cur_cw_part = cw_info[codeword_index].cw_offset + cw_part_cnt;
 
-                            if (len[cur_cw_part] <= tmplen) {
+                            if (coder->s[cur_cw_part].len <= tmplen) {
                                 /* write complete data, no partitioning */
                                 if (is_backwards) {
                                     /* write data in reversed bit-order */
-                                    PutBitHcr(bitStream, startbitpos + segment[segment_index].right - len[cur_cw_part] + 1,
-                                        rewind_word(data[cur_cw_part], len[cur_cw_part]), len[cur_cw_part]);
+                                    PutBitHcr(bitStream, startbitpos + segment[segment_index].right - coder->s[cur_cw_part].len + 1,
+                                        rewind_word(coder->s[cur_cw_part].data, coder->s[cur_cw_part].len), coder->s[cur_cw_part].len);
 
-                                    segment[segment_index].right -= len[cur_cw_part];
+                                    segment[segment_index].right -= coder->s[cur_cw_part].len;
                                 } else {
                                     PutBitHcr(bitStream, startbitpos + segment[segment_index].left,
-                                        data[cur_cw_part], len[cur_cw_part]);
+                                        coder->s[cur_cw_part].data, coder->s[cur_cw_part].len);
 
-                                    segment[segment_index].left += len[cur_cw_part];
+                                    segment[segment_index].left += coder->s[cur_cw_part].len;
                                 }
 
-                                tmplen -= len[cur_cw_part];
-                                len[cur_cw_part] = 0;
+                                tmplen -= coder->s[cur_cw_part].len;
+                                coder->s[cur_cw_part].len = 0;
                             } else {
                                 /* codeword part must be partitioned */
                                 /* data must be taken from the left side */
-                                tmp_data = data[cur_cw_part];
+                                tmp_data = coder->s[cur_cw_part].data;
 
-                                diff = len[cur_cw_part] - tmplen;
+                                diff = coder->s[cur_cw_part].len - tmplen;
                                 tmp_data >>= diff;
 
                                 /* remove bits which are already used */
-                                data[cur_cw_part] &= (1 << diff) - 1 /* diff number of ones */;
-                                len[cur_cw_part] = diff;
+                                coder->s[cur_cw_part].data &= (1 << diff) - 1 /* diff number of ones */;
+                                coder->s[cur_cw_part].len = diff;
 
                                 if (is_backwards) {
                                     /* write data in reversed bit-order */
@@ -1259,11 +1254,11 @@
         }
 
         /* set parameter for bit stream to current correct position */
-        bitStream->currentBit = startbitpos + coderInfo->iLenReordSpData;
+        bitStream->currentBit = startbitpos + coder->iLenReordSpData;
         bitStream->numBit = bitStream->currentBit;
     }
 
-    return coderInfo->iLenReordSpData;
+    return coder->iLenReordSpData;
 }
 
 /*

faac-1.29.7.8.tar.gz/libfaac/bitstream.h -> faac-1.29.9.2.tar.gz/libfaac/bitstream.h Changed

faac-1.29.7.8.tar.gz/libfaac/blockswitch.c -> faac-1.29.9.2.tar.gz/libfaac/blockswitch.c Changed

faac-1.29.7.8.tar.gz/libfaac/coder.h -> faac-1.29.9.2.tar.gz/libfaac/coder.h Changed

@@ -118,31 +118,28 @@
     int desired_block_type;
 
     int global_gain;
-    int scale_factor[MAX_SCFAC_BANDS];
-    int sfcnt;
+    int sf[MAX_SCFAC_BANDS];
+    int book[MAX_SCFAC_BANDS];
+    int bandcnt;
+    int sfbn;
+    int sfb_offset[NSFB_LONG + 1];
 
     struct {
         int n;
-        int len[8];
+        int len[MAX_SHORT_WINDOWS];
     } groups;
-    int sfbn;
-    int sfb_offset[250];
-    double avgenrg;
-
-    int spectral_count;
 
-    /* Huffman codebook selected for each sf band */
-    int book_vector[MAX_SCFAC_BANDS];
+    /* worst case: one codeword with two escapes per two spectral lines */
+#define DATASIZE (3*FRAME_LEN/2)
 
-    /* Data of spectral bitstream elements, for each spectral pair,
-       5 elements are required: 1*(esc)+2*(sign)+2*(esc value)=5 */
-    int *data;
-
-    /* Lengths of spectral bitstream elements */
-    int *len;
+    struct {
+        int data;
+        int len;
+    } s[DATASIZE];
+    int datacnt;
 
 #ifdef DRM
-    int *num_data_cw;
+    int num_data_cw[FRAME_LEN];
     int cur_cw;
     int all_sfb;

faac-1.29.7.8.tar.gz/libfaac/frame.c -> faac-1.29.9.2.tar.gz/libfaac/frame.c Changed

@@ -21,29 +21,22 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <assert.h>
-#include <math.h>
+#include <string.h>
 
 #include "frame.h"
 #include "coder.h"
-#include "midside.h"
 #include "channels.h"
 #include "bitstream.h"
 #include "filtbank.h"
-#include "aacquant.h"
 #include "util.h"
-#include "huffman.h"
 #include "tns.h"
-#include "version.h"
+#include "stereo.h"
 
-#if FAAC_RELEASE
-static char *libfaacName = FAAC_VERSION;
-#else
-static char *libfaacName = FAAC_VERSION ".1 (" __DATE__ ") UNSTABLE";
-#endif
+static char *libfaacName = PACKAGE_VERSION;
 static char *libCopyright =
-  "FAAC - Freeware Advanced Audio Coder (http://www.audiocoding.com/)\n"
+  "FAAC - Freeware Advanced Audio Coder (http://faac.sourceforge.net/)\n"
   " Copyright (C) 1999,2000,2001  Menno Bakker\n"
-  " Copyright (C) 2002,2003  Krzysztof Nikiel\n"
+  " Copyright (C) 2002,2003,2017  Krzysztof Nikiel\n"
   "This software is based on the ISO MPEG-4 reference source code.\n";
 
 static const psymodellist_t psymodellist[] = {
@@ -54,7 +47,10 @@
 static SR_INFO srInfo[12+1];
 
 // default bandwidth/samplerate ratio
-static const double bwfac = 0.42;
+static const struct {
+    double fac;
+    double freq;
+} g_bw = {0.42, 18000};
 
 int FAACAPI faacEncGetVersion( char **faac_id_string,
 			      				char **faac_copyright_string)
@@ -116,7 +112,7 @@
     int i;
     int maxqual = hEncoder->config.outputFormat ? MAXQUALADTS : MAXQUAL;
 
-    hEncoder->config.allowMidside = config->allowMidside;
+    hEncoder->config.jointmode = config->jointmode;
     hEncoder->config.useLfe = config->useLfe;
     hEncoder->config.useTns = config->useTns;
     hEncoder->config.aacObjectType = config->aacObjectType;
@@ -143,6 +139,10 @@
     if (hEncoder->config.aacObjectType != LOW)
         return 0;
 
+#ifdef DRM
+    config->pnslevel = 0;
+#endif
+
     /* Re-init TNS for new profile */
     TnsInit(hEncoder);
 
@@ -156,7 +156,10 @@
 
     if (config->bitRate && !config->bandWidth)
     {
-        config->bandWidth = (double)config->bitRate * hEncoder->sampleRate * bwfac / 60000.0;
+        config->bandWidth = (double)config->bitRate * hEncoder->sampleRate * g_bw.fac / 50000.0;
+        if (config->bandWidth > g_bw.freq)
+            config->bandWidth = g_bw.freq;
+
         if (!config->quantqual)
         {
             config->quantqual = (double)config->bitRate * hEncoder->numChannels / 1280;
@@ -172,7 +175,7 @@
 
     if (!config->bandWidth)
     {
-        config->bandWidth = bwfac * hEncoder->sampleRate;
+        config->bandWidth = g_bw.fac * hEncoder->sampleRate;
     }
 
     hEncoder->config.bandWidth = config->bandWidth;
@@ -190,9 +193,16 @@
 
     hEncoder->config.quantqual = config->quantqual;
 
+    if (config->jointmode == JOINT_MS)
+        config->pnslevel = 0;
+    if (config->pnslevel < 0)
+        config->pnslevel = 0;
+    if (config->pnslevel > 10)
+        config->pnslevel = 10;
+    hEncoder->aacquantCfg.pnslevel = config->pnslevel;
     /* set quantization quality */
     hEncoder->aacquantCfg.quality = config->quantqual;
-    BandLimit(&hEncoder->config.bandWidth,
+    CalcBW(&hEncoder->config.bandWidth,
               hEncoder->sampleRate,
               hEncoder->srInfo,
               &hEncoder->aacquantCfg);
@@ -252,11 +262,12 @@
     hEncoder->config.copyright = libCopyright;
     hEncoder->config.mpegVersion = MPEG4;
     hEncoder->config.aacObjectType = LOW;
-    hEncoder->config.allowMidside = 1;
+    hEncoder->config.jointmode = JOINT_IS;
+    hEncoder->config.pnslevel = 4;
     hEncoder->config.useLfe = 1;
     hEncoder->config.useTns = 0;
-    hEncoder->config.bitRate = 0; /* default bitrate / channel */
-    hEncoder->config.bandWidth = bwfac * hEncoder->sampleRate;
+    hEncoder->config.bitRate = 64000;
+    hEncoder->config.bandWidth = g_bw.fac * hEncoder->sampleRate;
     hEncoder->config.quantqual = 0;
     hEncoder->config.psymodellist = (psymodellist_t *)psymodellist;
     hEncoder->config.psymodelidx = 0;
@@ -303,13 +314,6 @@
 
     TnsInit(hEncoder);
 
-    AACQuantizeInit(hEncoder->coderInfo, hEncoder->numChannels,
-		    &(hEncoder->aacquantCfg));
-
-	
-
-    HuffmanInit(hEncoder->coderInfo, hEncoder->numChannels);
-
     /* Return handle */
     return hEncoder;
 }
@@ -324,12 +328,7 @@
 
     FilterBankEnd(hEncoder);
 
-    AACQuantizeEnd(hEncoder->coderInfo, hEncoder->numChannels,
-			&(hEncoder->aacquantCfg));
-
-    HuffmanEnd(hEncoder->coderInfo, hEncoder->numChannels);
-
-	fft_terminate( &hEncoder->fft_tables );
+    fft_terminate(&hEncoder->fft_tables);
 
     /* Free remaining buffer memory */
     for (channel = 0; channel < hEncoder->numChannels; channel++) 
@@ -348,6 +347,8 @@
     if (hEncoder) 
 		FreeMemory(hEncoder);
 
+    BlocStat();
+
     return 0;
 }
 
@@ -374,7 +375,7 @@
     unsigned int numChannels = hEncoder->numChannels;
     unsigned int useLfe = hEncoder->config.useLfe;
     unsigned int useTns = hEncoder->config.useTns;
-    unsigned int allowMidside = hEncoder->config.allowMidside;
+    unsigned int jointmode = hEncoder->config.jointmode;
     unsigned int bandWidth = hEncoder->config.bandWidth;
     unsigned int shortctl = hEncoder->config.shortctl;
     int maxqual = hEncoder->config.outputFormat ? MAXQUALADTS : MAXQUAL;
@@ -502,7 +503,7 @@
 			coderInfo[channel].block_type = ONLY_LONG_WINDOW;
 		}
     }
-    if (shortctl == SHORTCTL_NOLONG)
+    else if ((hEncoder->frameNum <= 4) || (shortctl == SHORTCTL_NOLONG))
     {
 		for (channel = 0; channel < numChannels; channel++)
 		{
@@ -520,29 +521,19 @@
             MOVERLAPPED);
     }
 
-    /* TMP: Build sfb offset table and other stuff */
     for (channel = 0; channel < numChannels; channel++) {
         channelInfo[channel].msInfo.is_present = 0;
 
         if (coderInfo[channel].block_type == ONLY_SHORT_WINDOW) {
             coderInfo[channel].sfbn = hEncoder->aacquantCfg.max_cbs;
 
-            coderInfo[channel].groups.n = 1;
-            coderInfo[channel].groups.len[0] = 8;
-            coderInfo[channel].groups.len[1] = 0;
-            coderInfo[channel].groups.len[2] = 0;
-            coderInfo[channel].groups.len[3] = 0;
-            coderInfo[channel].groups.len[4] = 0;
-            coderInfo[channel].groups.len[5] = 0;
-            coderInfo[channel].groups.len[6] = 0;
-            coderInfo[channel].groups.len[7] = 0;
-
             offset = 0;
             for (sb = 0; sb < coderInfo[channel].sfbn; sb++) {
                 coderInfo[channel].sfb_offset[sb] = offset;
                 offset += hEncoder->srInfo->cb_width_short[sb];
             }
             coderInfo[channel].sfb_offset[sb] = offset;
+            BlocGroup(hEncoder->freqBuff[channel], coderInfo + channel, &hEncoder->aacquantCfg);
         } else {
             coderInfo[channel].sfbn = hEncoder->aacquantCfg.max_cbl;
 
@@ -573,13 +564,6 @@
     }
 
     for (channel = 0; channel < numChannels; channel++) {
-		if (coderInfo[channel].block_type == ONLY_SHORT_WINDOW) {
-			SortForGrouping(&coderInfo[channel],
-					hEncoder->srInfo->cb_width_short,
-					hEncoder->freqBuff[channel]);
-		}
-		CalcAvgEnrg(&coderInfo[channel], hEncoder->freqBuff[channel]);
-
       // reduce LFE bandwidth
 		if (!channelInfo[channel].cpe && channelInfo[channel].lfe)
 		{
@@ -587,12 +571,8 @@
 		}
 	}
 
-    MSEncode(coderInfo, channelInfo, hEncoder->freqBuff, numChannels, allowMidside);
-
-    for (channel = 0; channel < numChannels; channel++)
-    {
-        CalcAvgEnrg(&coderInfo[channel], hEncoder->freqBuff[channel]);
-    }
+    AACstereo(coderInfo, channelInfo, hEncoder->freqBuff, numChannels,
+              (double)hEncoder->aacquantCfg.quality/DEFQUAL, jointmode);
 
 #ifdef DRM
     /* loop the quantization until the desired bit-rate is reached */
@@ -600,19 +580,9 @@
     hEncoder->aacquantCfg.quality = 120; /* init quality setting */
     while (diff > 0) { /* if too many bits, do it again */
 #endif
-    /* Quantize and code the signal */
     for (channel = 0; channel < numChannels; channel++) {
-        if (coderInfo[channel].block_type == ONLY_SHORT_WINDOW) {
-            AACQuantize(&coderInfo[channel],
-                        hEncoder->srInfo->cb_width_short,
-                        hEncoder->srInfo->num_cb_short, hEncoder->freqBuff[channel],
-                        &(hEncoder->aacquantCfg));
-        } else {
-            AACQuantize(&coderInfo[channel],
-                        hEncoder->srInfo->cb_width_long,
-                        hEncoder->srInfo->num_cb_long, hEncoder->freqBuff[channel],
-                        &(hEncoder->aacquantCfg));
-        }
+        BlocQuant(&coderInfo[channel], hEncoder->freqBuff[channel],
+                  &(hEncoder->aacquantCfg));
     }
 
 #ifdef DRM

faac-1.29.7.8.tar.gz/libfaac/frame.h -> faac-1.29.9.2.tar.gz/libfaac/frame.h Changed

faac-1.29.9.2.tar.gz/libfaac/huff2.c Added

@@ -0,0 +1,591 @@
+/****************************************************************************
+    Huffman coding
+
+    Copyright (C) 2017 Krzysztof Nikiel
+
+    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 3 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, see <http://www.gnu.org/licenses/>.
+****************************************************************************/
+
+#include <stdint.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include "coder.h"
+#include "huffdata.h"
+#include "huff2.h"
+#include "bitstream.h"
+
+#ifdef DRM
+static int vcb11;
+#endif
+
+static int escape(int x, int *code)
+{
+    int preflen = 0;
+    int base = 32;
+
+    if (x >= 8192)
+    {
+        fprintf(stderr, "%s(%d): x_quant >= 8192\n", __FILE__, __LINE__);
+        return 0;
+    }
+
+    *code = 0;
+    while (base <= x)
+    {
+        base <<= 1;
+        *code <<= 1;
+        *code |= 1;
+        preflen++;
+    }
+    base >>= 1;
+
+    // separator
+    *code <<= 1;
+
+    *code <<= (preflen + 4);
+    *code |= (x - base);
+
+    return (preflen << 1) + 5;
+}
+
+#ifdef DRM
+# define DRMDATA if(coder){coder->num_data_cw[coder->cur_cw++]=1;\
+    coder->iLenReordSpData+=blen;if(coder->iLenLongestCW<blen)\
+    coder->iLenLongestCW=blen;}
+#else
+# define DRMDATA
+#endif
+
+static int huffcode(int *qs /* quantized spectrum */,
+                    int len,
+                    int bnum,
+                    CoderInfo *coder)
+{
+    static hcode16_t * const hmap[12] = {0, book01, book02, book03, book04,
+      book05, book06, book07, book08, book09, book10, book11};
+    hcode16_t *book;
+    int cnt;
+    int bits = 0, blen;
+    int ofs, *qp;
+    int data;
+    int idx;
+    int datacnt;
+#ifdef DRM
+    int drmbits = 0;
+    int maxesc = 0;
+#endif
+
+    if (coder)
+        datacnt = coder->datacnt;
+    else
+        datacnt = 0;
+
+    book = hmap[bnum];
+    switch (bnum)
+    {
+#ifdef DRM
+    case HCB_ZERO:
+    case HCB_INTENSITY:
+    case HCB_INTENSITY2:
+        for(ofs = 0; ofs < len; ofs += 4)
+        {
+            coder->s[datacnt].data = 0;
+            coder->s[datacnt++].len = 0;
+            coder->num_data_cw[coder->cur_cw++] = 1;
+        }
+        break;
+#endif
+    case 1:
+    case 2:
+        for(ofs = 0; ofs < len; ofs += 4)
+        {
+            qp = qs+ofs;
+            idx = 27 * qp[0] + 9 * qp[1] + 3 * qp[2] + qp[3] + 40;
+            blen = book[idx].len;
+            if (coder)
+            {
+                data = book[idx].data;
+                coder->s[datacnt].data = data;
+                coder->s[datacnt++].len = blen;
+                DRMDATA;
+            }
+            bits += blen;
+        }
+        break;
+    case 3:
+    case 4:
+        for(ofs = 0; ofs < len; ofs += 4)
+        {
+            qp = qs+ofs;
+            idx = 27 * abs(qp[0]) + 9 * abs(qp[1]) + 3 * abs(qp[2]) + abs(qp[3]);
+            blen = book[idx].len;
+            if (!coder)
+            {
+                // add sign bits
+                for(cnt = 0; cnt < 4; cnt++)
+                    if(qp[cnt])
+                        blen++;
+            }
+            else
+            {
+                data = book[idx].data;
+                // add sign bits
+                for(cnt = 0; cnt < 4; cnt++)
+                {
+                    if(qp[cnt])
+                    {
+                        blen++;
+                        data <<= 1;
+                        if (qp[cnt] < 0)
+                            data |= 1;
+                    }
+                }
+                coder->s[datacnt].data = data;
+                coder->s[datacnt++].len = blen;
+                DRMDATA;
+            }
+            bits += blen;
+        }
+        break;
+    case 5:
+    case 6:
+        for(ofs = 0; ofs < len; ofs += 2)
+        {
+            qp = qs+ofs;
+            idx = 9 * qp[0] + qp[1] + 40;
+            blen = book[idx].len;
+            if (coder)
+            {
+                data = book[idx].data;
+                coder->s[datacnt].data = data;
+                coder->s[datacnt++].len = blen;
+                DRMDATA;
+            }
+            bits += blen;
+        }
+        break;
+    case 7:
+    case 8:
+        for(ofs = 0; ofs < len; ofs += 2)
+        {
+            qp = qs+ofs;
+            idx = 8 * abs(qp[0]) + abs(qp[1]);
+            blen = book[idx].len;
+            if (!coder)
+            {
+                for(cnt = 0; cnt < 2; cnt++)
+                    if(qp[cnt])
+                        blen++;
+            }
+            else
+            {
+                data = book[idx].data;
+                for(cnt = 0; cnt < 2; cnt++)
+                {
+                    if(qp[cnt])
+                    {
+                        blen++;
+                        data <<= 1;
+                        if (qp[cnt] < 0)
+                            data |= 1;
+                    }
+                }
+                coder->s[datacnt].data = data;
+                coder->s[datacnt++].len = blen;
+                DRMDATA;
+            }
+            bits += blen;
+        }
+        break;
+    case 9:
+    case 10:
+        for(ofs = 0; ofs < len; ofs += 2)
+        {
+            qp = qs+ofs;
+            idx = 13 * abs(qp[0]) + abs(qp[1]);
+            blen = book[idx].len;
+            if (!coder)
+            {
+                for(cnt = 0; cnt < 2; cnt++)
+                    if(qp[cnt])
+                        blen++;
+            }
+            else
+            {
+                data = book[idx].data;
+                for(cnt = 0; cnt < 2; cnt++)
+                {
+                    if(qp[cnt])
+                    {
+                        blen++;
+                        data <<= 1;
+                        if (qp[cnt] < 0)
+                            data |= 1;
+                    }
+                }
+                coder->s[datacnt].data = data;
+                coder->s[datacnt++].len = blen;
+                DRMDATA;
+            }
+            bits += blen;
+        }
+        break;
+    case HCB_ESC:
+        for(ofs = 0; ofs < len; ofs += 2)
+        {
+            int x0, x1;
+
+            qp = qs+ofs;
+
+            x0 = abs(qp[0]);
+            x1 = abs(qp[1]);
+            if (x0 > 16)
+                x0 = 16;
+            if (x1 > 16)
+                x1 = 16;
+            idx = 17 * x0 + x1;
+
+            blen = book[idx].len;
+            if (!coder)
+            {
+                for(cnt = 0; cnt < 2; cnt++)
+                    if(qp[cnt])
+                        blen++;
+            }
+            else
+            {
+                data = book[idx].data;
+                for(cnt = 0; cnt < 2; cnt++)
+                {
+                    if(qp[cnt])
+                    {
+                        blen++;
+                        data <<= 1;
+                        if (qp[cnt] < 0)
+                            data |= 1;
+                    }
+                }
+                coder->s[datacnt].data = data;
+                coder->s[datacnt++].len = blen;
+#ifdef DRM
+                coder->num_data_cw[coder->cur_cw] = 1;
+                drmbits = blen;
+#endif
+            }
+            bits += blen;
+
+            if (x0 >= 16)
+            {
+                blen = escape(abs(qp[0]), &data);
+                if (coder)
+                {
+                    coder->s[datacnt].data = data;
+                    coder->s[datacnt++].len = blen;
+#ifdef DRM
+                    coder->num_data_cw[coder->cur_cw]++;
+                    drmbits += blen;
+
+                    if (maxesc < data)
+                        maxesc = data;
+#endif
+                }
+                bits += blen;
+            }
+
+            if (x1 >= 16)
+            {
+                blen = escape(abs(qp[1]), &data);
+                if (coder)
+                {
+                    coder->s[datacnt].data = data;
+                    coder->s[datacnt++].len = blen;
+#ifdef DRM
+                    coder->num_data_cw[coder->cur_cw]++;
+                    drmbits += blen;
+
+                    if (maxesc < data)
+                        maxesc = data;
+#endif
+                }
+                bits += blen;
+            }
+#ifdef DRM
+            coder->iLenReordSpData += drmbits;
+            if (coder->iLenLongestCW < drmbits)
+                coder->iLenLongestCW = drmbits;
+
+            coder->cur_cw++;
+#endif
+        }
+#ifdef DRM
+        /* VCB11: check which codebook should be used using max escape sequence */
+        /* 8.5.3.1.3, table 157 */
+        if (maxesc <= 15)
+            vcb11 = 16;
+        else if (maxesc <= 31)
+            vcb11 = 17;
+        else if (maxesc <= 47)
+            vcb11 = 18;
+        else if (maxesc <= 63)
+            vcb11 = 19;
+        else if (maxesc <= 95)
+            vcb11 = 20;
+        else if (maxesc <= 127)
+            vcb11 = 21;
+        else if (maxesc <= 159)
+            vcb11 = 22;
+        else if (maxesc <= 191)
+            vcb11 = 23;
+        else if (maxesc <= 223)
+            vcb11 = 24;
+        else if (maxesc <= 255)
+            vcb11 = 25;
+        else if (maxesc <= 319)
+            vcb11 = 26;
+        else if (maxesc <= 383)
+            vcb11 = 27;
+        else if (maxesc <= 511)
+            vcb11 = 28;
+        else if (maxesc <= 767)
+            vcb11 = 29;
+        else if (maxesc <= 1023)
+            vcb11 = 30;
+        else if (maxesc <= 2047)
+            vcb11 = 31;
+        /* else: codebook 11 -> it is already 11 */
+#endif
+        break;
+    default:
+        fprintf(stderr, "%s(%d) book %d out of range\n", __FILE__, __LINE__, bnum);
+        return -1;
+    }
+
+    if (coder)
+        coder->datacnt = datacnt;
+
+    return bits;
+}
+
+
+int huffbook(CoderInfo *coder,
+             int *qs /* quantized spectrum */,
+             int len)
+{
+    int cnt;
+    int maxq = 0;
+    int bookmin, lenmin;
+
+    for (cnt = 0; cnt < len; cnt++)
+    {
+        int q = abs(qs[cnt]);
+        if (maxq < q)
+            maxq = q;
+    }
+
+#define BOOKMIN(n)bookmin=n;lenmin=huffcode(qs,len,bookmin,0);if(huffcode(qs,len,bookmin+1,0)<lenmin)bookmin++;
+
+    if (maxq < 1)
+    {
+        bookmin = HCB_ZERO;
+        lenmin = 0;
+    }
+    else if (maxq < 2)
+    {
+        BOOKMIN(1);
+    }
+    else if (maxq < 3)
+    {
+        BOOKMIN(3);
+    }
+    else if (maxq < 5)
+    {
+        BOOKMIN(5);
+    }
+    else if (maxq < 8)
+    {
+        BOOKMIN(7);
+    }
+    else if (maxq < 13)
+    {
+        BOOKMIN(9);
+    }
+    else
+    {
+        bookmin = HCB_ESC;
+    }
+
+#ifdef DRM
+    vcb11 = 0;
+    huffcode(qs, len, bookmin, coder);
+    if (vcb11)
+        bookmin = vcb11;
+#else
+    if (bookmin > HCB_ZERO)
+        huffcode(qs, len, bookmin, coder);
+#endif
+    coder->book[coder->bandcnt] = bookmin;
+
+    return 0;
+}
+
+int writebooks(CoderInfo *coder, BitStream *stream, int write)
+{
+    int bits = 0;
+    int maxcnt, cntbits;
+    int group;
+    int bookbits = 4;
+
+#ifdef DRM
+    bookbits = 5; /* 5 bits in case of VCB11 */
+#endif
+
+    if (coder->block_type == ONLY_SHORT_WINDOW){
+        maxcnt = 7;
+        cntbits = 3;
+    } else {
+        maxcnt = 31;
+        cntbits = 5;
+    }
+
+    for (group = 0; group < coder->groups.n; group++)
+    {
+        int band = group * coder->sfbn;
+        int maxband = band + coder->sfbn;
+
+        while (band < maxband)
+        {
+            int book = coder->book[band++];
+            int bookcnt = 1;
+            if (write) {
+                PutBit(stream, book, bookbits);
+            }
+            bits += bookbits;
+
+#ifdef DRM
+            /* sect_len is not transmitted in case the codebook for a */
+            /* section is 11 or in the range of 16 and 31 */
+            if ((book == 11) || ((book >= 16) && (book <= 32)))
+                continue;
+#endif
+
+            if (band < maxband)
+            {
+                while (book == coder->book[band])
+                {
+                    band++;
+                    bookcnt++;
+                    if (band >= maxband)
+                        break;
+                }
+            }
+
+            while (bookcnt >= maxcnt)
+            {
+                if (write)
+                    PutBit(stream, maxcnt, cntbits);
+                bits += cntbits;
+                bookcnt -= maxcnt;
+            }
+            if (write)
+                PutBit(stream, bookcnt, cntbits);
+            bits += cntbits;
+        }
+    }
+
+    return bits;
+}
+
+int writesf(CoderInfo *coder, BitStream *stream, int write)
+{
+    int cnt;
+    int bits = 0;
+    int diff, length;
+    int lastsf;
+    int lastis;
+    int lastpns;
+    int initpns = 1;
+
+    lastsf = coder->global_gain;
+    lastis = 0;
+    lastpns = coder->global_gain - 90;
+
+    // fixme: move range check to quantizer
+    for (cnt = 0; cnt < coder->bandcnt; cnt++)
+    {
+        int book = coder->book[cnt];
+
+        if ((book == HCB_INTENSITY) || (book== HCB_INTENSITY2))
+        {
+            diff = coder->sf[cnt] - lastis;
+            if (diff > 60)
+                diff = 60;
+            if (diff < -60)
+                diff = -60;
+            length = book12[60 + diff].len;
+
+            bits += length;
+
+            lastis += diff;
+
+            if (write)
+                PutBit(stream, book12[60 + diff].data, length);
+        }
+        else if (book == HCB_PNS)
+        {
+            diff = coder->sf[cnt] - lastpns;
+
+            if (initpns)
+            {
+                initpns = 0;
+
+                length = 9;
+                bits += length;
+                lastpns += diff;
+
+                if (write)
+                    PutBit(stream, diff + 256, length);
+                continue;
+            }
+
+            if (diff > 60)
+                diff = 60;
+            if (diff < -60)
+                diff = -60;
+
+            length = book12[60 + diff].len;
+            bits += length;
+            lastpns += diff;
+
+            if (write)
+                PutBit(stream, book12[60 + diff].data, length);
+        }
+        else if (book)
+        {
+            diff = coder->sf[cnt] - lastsf;
+            if (diff > 60)
+                diff = 60;
+            if (diff < -60)
+                diff = -60;
+            length = book12[60 + diff].len;
+
+            bits += length;
+            lastsf += diff;
+
+            if (write)
+                PutBit(stream, book12[60 + diff].data, length);
+        }
+
+    }
+    return bits;
+}

faac-1.29.9.2.tar.gz/libfaac/huff2.h Added

@@ -0,0 +1,35 @@
+/****************************************************************************
+    Huffman coding
+
+    Copyright (C) 2017 Krzysztof Nikiel
+
+    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 3 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, see <http://www.gnu.org/licenses/>.
+****************************************************************************/
+
+#include "bitstream.h"
+
+enum {
+    HCB_ZERO = 0,
+    HCB_ESC = 11,
+    HCB_PNS = 13,
+    HCB_INTENSITY2 = 14,
+    HCB_INTENSITY = 15,
+    HCB_NONE
+};
+
+int huffbook(CoderInfo *coderInfo,
+             int *qs /* quantized spectrum */,
+             int len);
+int writebooks(CoderInfo *coder, BitStream *stream, int writeFlag);
+int writesf(CoderInfo *coder, BitStream *bitStream, int writeFlag);

faac-1.29.9.2.tar.gz/libfaac/huffdata.c Added

@@ -0,0 +1,234 @@
+/****************************************************************************
+    Copyright (C) 2017 Krzysztof Nikiel
+
+    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 3 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, see <http://www.gnu.org/licenses/>.
+****************************************************************************/
+
+#include "huffdata.h"
+
+hcode16_t book01[81] = {
+ {11,2040},{9,497},{11,2045},{10,1013},{7,104},{10,1008},{11,2039},{9,492},
+ {11,2037},{10,1009},{7,114},{10,1012},{7,116},{5,17},{7,118},{9,491},
+ {7,108},{10,1014},{11,2044},{9,481},{11,2033},{9,496},{7,97},{9,502},
+ {11,2034},{9,490},{11,2043},{9,498},{7,105},{9,493},{7,119},{5,23},
+ {7,111},{9,486},{7,100},{9,485},{7,103},{5,21},{7,98},{5,18},
+ {1,0},{5,20},{7,101},{5,22},{7,109},{9,489},{7,99},{9,484},
+ {7,107},{5,19},{7,113},{9,483},{7,112},{9,499},{11,2046},{9,487},
+ {11,2035},{9,495},{7,96},{9,494},{11,2032},{9,482},{11,2042},{10,1011},
+ {7,106},{9,488},{7,117},{5,16},{7,115},{9,500},{7,110},{10,1015},
+ {11,2038},{9,480},{11,2041},{10,1010},{7,102},{9,501},{11,2047},{9,503},
+ {11,2036},
+};
+
+hcode16_t book02[81] = {
+ {9,499},{7,111},{9,509},{8,235},{6,35},{8,234},{9,503},{8,232},
+ {9,506},{8,242},{6,45},{7,112},{6,32},{5,6},{6,43},{7,110},
+ {6,40},{8,233},{9,505},{7,102},{8,248},{8,231},{6,27},{8,241},
+ {9,500},{7,107},{9,501},{8,236},{6,42},{7,108},{6,44},{5,10},
+ {6,39},{7,103},{6,26},{8,245},{6,36},{5,8},{6,31},{5,9},
+ {3,0},{5,7},{6,29},{5,11},{6,48},{8,239},{6,28},{7,100},
+ {6,30},{5,12},{6,41},{8,243},{6,47},{8,240},{9,508},{7,113},
+ {9,498},{8,244},{6,33},{8,230},{8,247},{7,104},{9,504},{8,238},
+ {6,34},{7,101},{6,49},{4,2},{6,38},{8,237},{6,37},{7,106},
+ {9,507},{7,114},{9,510},{7,105},{6,46},{8,246},{9,511},{7,109},
+ {9,502},
+};
+
+hcode16_t book03[81] = {
+ {1,0},{4,9},{8,239},{4,11},{5,25},{8,240},{9,491},{9,486},
+ {10,1010},{4,10},{6,53},{9,495},{6,52},{6,55},{9,489},{9,493},
+ {9,487},{10,1011},{9,494},{10,1005},{13,8186},{9,492},{9,498},{11,2041},
+ {11,2040},{10,1016},{12,4088},{4,8},{6,56},{10,1014},{6,54},{7,117},
+ {10,1009},{10,1003},{10,1004},{12,4084},{5,24},{7,118},{11,2036},{6,57},
+ {7,116},{10,1007},{9,499},{9,500},{11,2038},{9,488},{10,1002},{13,8188},
+ {8,242},{9,497},{12,4091},{10,1013},{11,2035},{12,4092},{8,238},{10,1015},
+ {15,32766},{9,496},{11,2037},{15,32765},{13,8187},{14,16378},{16,65535},{8,241},
+ {10,1008},{14,16380},{9,490},{10,1006},{14,16379},{12,4086},{12,4090},{15,32764},
+ {11,2034},{12,4085},{16,65534},{10,1012},{11,2039},{15,32763},{12,4087},{12,4089},
+ {15,32762},
+};
+
+hcode16_t book04[81] = {
+ {4,7},{5,22},{8,246},{5,24},{4,8},{8,239},{9,495},{8,243},
+ {11,2040},{5,25},{5,23},{8,237},{5,21},{4,1},{8,226},{8,240},
+ {7,112},{10,1008},{9,494},{8,241},{11,2042},{8,238},{8,228},{10,1010},
+ {11,2038},{10,1007},{11,2045},{4,5},{5,20},{8,242},{4,9},{4,4},
+ {8,229},{8,244},{8,232},{10,1012},{4,6},{4,2},{8,231},{4,3},
+ {4,0},{7,107},{8,227},{7,105},{9,499},{8,235},{8,230},{10,1014},
+ {7,110},{7,106},{9,500},{10,1004},{9,496},{10,1017},{8,245},{8,236},
+ {11,2043},{8,234},{7,111},{10,1015},{11,2041},{10,1011},{12,4095},{8,233},
+ {7,109},{10,1016},{7,108},{7,104},{9,501},{10,1006},{9,498},{11,2036},
+ {11,2039},{10,1009},{12,4094},{10,1005},{9,497},{11,2037},{11,2046},{10,1013},
+ {11,2044},
+};
+
+hcode16_t book05[81] = {
+ {13,8191},{12,4087},{11,2036},{11,2024},{10,1009},{11,2030},{11,2041},{12,4088},
+ {13,8189},{12,4093},{11,2033},{10,1000},{9,488},{8,240},{9,492},{10,1006},
+ {11,2034},{12,4090},{12,4084},{10,1007},{9,498},{8,232},{7,112},{8,236},
+ {9,496},{10,1002},{11,2035},{11,2027},{9,491},{8,234},{5,26},{4,8},
+ {5,25},{8,238},{9,495},{11,2029},{10,1008},{8,242},{7,115},{4,11},
+ {1,0},{4,10},{7,113},{8,243},{11,2025},{11,2031},{9,494},{8,239},
+ {5,24},{4,9},{5,27},{8,235},{9,489},{11,2028},{11,2038},{10,1003},
+ {9,499},{8,237},{7,114},{8,233},{9,497},{10,1005},{11,2039},{12,4086},
+ {11,2032},{10,1001},{9,493},{8,241},{9,490},{10,1004},{11,2040},{12,4089},
+ {13,8188},{12,4092},{12,4085},{11,2026},{10,1011},{10,1010},{11,2037},{12,4091},
+ {13,8190},
+};
+
+hcode16_t book06[81] = {
+ {11,2046},{10,1021},{9,497},{9,491},{9,500},{9,490},{9,496},{10,1020},
+ {11,2045},{10,1014},{9,485},{8,234},{7,108},{7,113},{7,104},{8,240},
+ {9,486},{10,1015},{9,499},{8,239},{6,50},{6,39},{6,40},{6,38},
+ {6,49},{8,235},{9,503},{9,488},{7,111},{6,46},{4,8},{4,4},
+ {4,6},{6,41},{7,107},{9,494},{9,495},{7,114},{6,45},{4,2},
+ {4,0},{4,3},{6,47},{7,115},{9,506},{9,487},{7,110},{6,43},
+ {4,7},{4,1},{4,5},{6,44},{7,109},{9,492},{9,505},{8,238},
+ {6,48},{6,36},{6,42},{6,37},{6,51},{8,236},{9,498},{10,1016},
+ {9,484},{8,237},{7,106},{7,112},{7,105},{7,116},{8,241},{10,1018},
+ {11,2047},{10,1017},{9,502},{9,493},{9,504},{9,489},{9,501},{10,1019},
+ {11,2044},
+};
+
+hcode16_t book07[64] = {
+ {1,0},{3,5},{6,55},{7,116},{8,242},{9,491},{10,1005},{11,2039},
+ {3,4},{4,12},{6,53},{7,113},{8,236},{8,238},{9,494},{9,501},
+ {6,54},{6,52},{7,114},{8,234},{8,241},{9,489},{9,499},{10,1013},
+ {7,115},{7,112},{8,235},{8,240},{9,497},{9,496},{10,1004},{10,1018},
+ {8,243},{8,237},{9,488},{9,495},{10,1007},{10,1009},{10,1017},{11,2043},
+ {9,493},{8,239},{9,490},{9,498},{10,1011},{10,1016},{11,2041},{11,2044},
+ {10,1006},{9,492},{9,500},{10,1012},{10,1015},{11,2040},{12,4093},{12,4094},
+ {11,2038},{10,1008},{10,1010},{10,1014},{11,2042},{11,2045},{12,4092},{12,4095},
+};
+
+hcode16_t book08[64] = {
+ {5,14},{4,5},{5,16},{6,48},{7,111},{8,241},{9,506},{10,1022},
+ {4,3},{3,0},{4,4},{5,18},{6,44},{7,106},{7,117},{8,248},
+ {5,15},{4,2},{4,6},{5,20},{6,46},{7,105},{7,114},{8,245},
+ {6,47},{5,17},{5,19},{6,42},{6,50},{7,108},{8,236},{8,250},
+ {7,113},{6,43},{6,45},{6,49},{7,109},{7,112},{8,242},{9,505},
+ {8,239},{7,104},{6,51},{7,107},{7,110},{8,238},{8,249},{10,1020},
+ {9,504},{7,116},{7,115},{8,237},{8,240},{8,246},{9,502},{9,509},
+ {10,1021},{8,243},{8,244},{8,247},{9,503},{9,507},{9,508},{10,1023},
+};
+
+hcode16_t book09[169] = {
+ {1,0},{3,5},{6,55},{8,231},{9,478},{10,974},{10,985},{11,1992},
+ {11,1997},{12,4040},{12,4061},{13,8164},{13,8172},{3,4},{4,12},{6,53},
+ {7,114},{8,234},{8,237},{9,482},{10,977},{10,979},{10,992},{11,2008},
+ {12,4047},{12,4053},{6,54},{6,52},{7,113},{8,232},{8,236},{9,481},
+ {10,975},{10,989},{10,987},{11,2000},{12,4039},{12,4052},{12,4068},{8,230},
+ {7,112},{8,233},{9,477},{9,483},{10,978},{10,988},{11,1996},{11,1994},
+ {11,2014},{12,4056},{12,4074},{13,8155},{9,479},{8,235},{9,476},{9,486},
+ {10,981},{10,990},{11,1995},{11,2013},{11,2012},{12,4045},{12,4066},{12,4071},
+ {13,8161},{10,976},{9,480},{9,484},{10,982},{11,1989},{11,2001},{11,2011},
+ {12,4050},{11,2016},{12,4057},{12,4075},{13,8163},{13,8169},{11,1988},{9,485},
+ {10,983},{11,1990},{11,1999},{11,2010},{12,4043},{12,4058},{12,4067},{12,4073},
+ {13,8166},{13,8179},{13,8183},{11,2003},{10,984},{10,993},{11,2004},{11,2009},
+ {12,4051},{12,4062},{13,8157},{13,8153},{13,8162},{13,8170},{13,8177},{13,8182},
+ {11,2002},{10,980},{10,986},{11,1991},{11,2007},{11,2018},{12,4046},{12,4059},
+ {13,8152},{13,8174},{14,16368},{13,8180},{14,16370},{11,2017},{10,991},{11,1993},
+ {11,2006},{12,4042},{12,4048},{12,4069},{12,4070},{13,8171},{13,8175},{14,16371},
+ {14,16372},{14,16373},{12,4064},{11,1998},{11,2005},{12,4038},{12,4049},{12,4065},
+ {13,8160},{13,8168},{13,8176},{14,16369},{14,16376},{14,16374},{15,32764},{12,4072},
+ {11,2015},{12,4041},{12,4055},{12,4060},{13,8156},{13,8159},{13,8173},{13,8181},
+ {14,16377},{14,16379},{15,32765},{15,32766},{13,8167},{12,4044},{12,4054},{12,4063},
+ {13,8158},{13,8154},{13,8165},{13,8178},{14,16378},{14,16375},{14,16380},{14,16381},
+ {15,32767},
+};
+
+hcode16_t book10[169] = {
+ {6,34},{5,8},{6,29},{6,38},{7,95},{8,211},{9,463},{10,976},
+ {10,983},{10,1005},{11,2032},{11,2038},{12,4093},{5,7},{4,0},{4,1},
+ {5,9},{6,32},{7,84},{7,96},{8,213},{8,220},{9,468},{10,973},
+ {10,990},{11,2023},{6,28},{4,2},{5,6},{5,12},{6,30},{6,40},
+ {7,91},{8,205},{8,217},{9,462},{9,476},{10,985},{10,1009},{6,37},
+ {5,11},{5,10},{5,13},{6,36},{7,87},{7,97},{8,204},{8,221},
+ {9,460},{9,478},{10,979},{10,999},{7,93},{6,33},{6,31},{6,35},
+ {6,39},{7,89},{7,100},{8,216},{8,223},{9,466},{9,482},{10,989},
+ {10,1006},{8,209},{7,85},{6,41},{7,86},{7,88},{7,98},{8,206},
+ {8,224},{8,226},{9,474},{10,980},{10,995},{11,2027},{9,457},{7,94},
+ {7,90},{7,92},{7,99},{8,202},{8,218},{9,455},{9,458},{9,480},
+ {10,987},{10,1000},{11,2028},{9,483},{8,210},{8,203},{8,208},{8,215},
+ {8,219},{9,454},{9,469},{9,472},{10,970},{10,986},{11,2026},{11,2033},
+ {9,481},{8,212},{8,207},{8,214},{8,222},{8,225},{9,464},{9,470},
+ {10,977},{10,981},{10,1010},{11,2030},{11,2043},{10,1001},{9,461},{9,456},
+ {9,459},{9,465},{9,471},{9,479},{10,975},{10,992},{10,1007},{11,2022},
+ {11,2040},{12,4090},{10,1003},{9,477},{9,467},{9,473},{9,475},{10,978},
+ {10,972},{10,988},{10,1002},{11,2029},{11,2035},{11,2041},{12,4089},{11,2034},
+ {10,974},{9,484},{10,971},{10,984},{10,982},{10,994},{10,997},{11,2024},
+ {11,2036},{11,2037},{11,2039},{12,4091},{11,2042},{10,1004},{10,991},{10,993},
+ {10,996},{10,998},{10,1008},{11,2025},{11,2031},{12,4088},{12,4094},{12,4092},
+ {12,4095},
+};
+
+hcode16_t book11[289] = {
+ {4,0},{5,6},{6,25},{7,61},{8,156},{8,198},{9,423},{10,912},
+ {10,962},{10,991},{11,2022},{11,2035},{12,4091},{11,2028},{12,4090},{12,4094},
+ {10,910},{5,5},{4,1},{5,8},{6,20},{7,55},{7,66},{8,146},
+ {8,175},{9,401},{9,421},{9,437},{10,926},{10,960},{10,930},{10,973},
+ {11,2006},{8,174},{6,23},{5,7},{5,9},{6,24},{7,57},{7,64},
+ {8,142},{8,163},{8,184},{9,409},{9,428},{9,449},{10,945},{10,918},
+ {10,958},{10,970},{8,157},{7,60},{6,21},{6,22},{6,26},{7,59},
+ {7,68},{8,145},{8,165},{8,190},{9,406},{9,430},{9,441},{10,929},
+ {10,913},{10,933},{10,981},{8,148},{8,154},{7,54},{7,56},{7,58},
+ {7,65},{8,140},{8,155},{8,176},{8,195},{9,414},{9,427},{9,444},
+ {10,927},{10,911},{10,937},{10,975},{8,147},{8,191},{7,62},{7,63},
+ {7,67},{7,69},{8,158},{8,167},{8,185},{9,404},{9,418},{9,442},
+ {9,451},{10,934},{10,935},{10,955},{10,980},{8,159},{9,416},{8,143},
+ {8,141},{8,144},{8,152},{8,166},{8,182},{8,196},{9,415},{9,431},
+ {9,447},{10,921},{10,959},{10,948},{10,969},{10,999},{8,168},{9,438},
+ {8,171},{8,164},{8,170},{8,178},{8,194},{8,197},{9,408},{9,420},
+ {9,440},{10,908},{10,932},{10,964},{10,966},{10,989},{10,1000},{8,173},
+ {10,943},{9,402},{8,189},{8,188},{9,398},{9,407},{9,410},{9,419},
+ {9,433},{10,909},{10,920},{10,951},{10,979},{10,977},{10,987},{11,2013},
+ {8,180},{10,990},{9,425},{9,411},{9,412},{9,417},{9,426},{9,429},
+ {9,435},{10,907},{10,946},{10,952},{10,974},{10,993},{10,992},{11,2002},
+ {11,2021},{8,183},{11,2019},{9,443},{9,424},{9,422},{9,432},{9,434},
+ {9,439},{10,923},{10,922},{10,954},{10,949},{10,982},{11,2007},{10,996},
+ {11,2008},{11,2026},{8,186},{11,2024},{10,928},{9,445},{9,436},{10,906},
+ {9,452},{10,914},{10,938},{10,944},{10,956},{10,983},{11,2004},{11,2012},
+ {11,2011},{11,2005},{11,2032},{8,193},{11,2043},{10,968},{10,931},{10,917},
+ {10,925},{10,940},{10,942},{10,965},{10,984},{10,994},{10,998},{11,2020},
+ {11,2023},{11,2016},{11,2025},{11,2039},{9,400},{11,2034},{10,915},{9,446},
+ {9,448},{10,916},{10,919},{10,941},{10,963},{10,961},{10,978},{11,2010},
+ {11,2009},{11,2015},{11,2027},{11,2036},{11,2042},{9,405},{11,2040},{10,957},
+ {10,924},{10,939},{10,936},{10,947},{10,953},{10,976},{10,995},{10,997},
+ {11,2018},{11,2014},{11,2029},{11,2033},{11,2041},{11,2044},{9,403},{12,4093},
+ {10,988},{10,950},{10,967},{10,972},{10,971},{10,985},{10,986},{11,2003},
+ {11,2017},{11,2030},{11,2031},{11,2037},{11,2038},{12,4092},{12,4095},{9,413},
+ {9,450},{8,181},{8,161},{8,150},{8,151},{8,149},{8,153},{8,160},
+ {8,162},{8,172},{8,169},{8,177},{8,179},{8,187},{8,192},{9,399},
+ {5,4},
+};
+
+hcode32_t book12[121] = {
+ {18,262120},{18,262118},{18,262119},{18,262117},{19,524277},{19,524273},{19,524269},{19,524278},
+ {19,524270},{19,524271},{19,524272},{19,524284},{19,524285},{19,524287},{19,524286},{19,524279},
+ {19,524280},{19,524283},{19,524281},{18,262116},{19,524282},{18,262115},{17,131055},{17,131056},
+ {16,65525},{17,131054},{16,65522},{16,65523},{16,65524},{16,65521},{15,32758},{15,32759},
+ {14,16377},{14,16373},{14,16375},{14,16371},{14,16374},{14,16370},{13,8183},{13,8181},
+ {12,4089},{12,4087},{12,4086},{11,2041},{12,4084},{11,2040},{10,1017},{10,1015},
+ {10,1013},{9,504},{9,503},{8,250},{8,248},{8,246},{7,121},{6,58},
+ {6,56},{5,26},{4,11},{3,4},{1,0},{4,10},{4,12},{5,27},
+ {6,57},{6,59},{7,120},{7,122},{8,247},{8,249},{9,502},{9,505},
+ {10,1012},{10,1014},{10,1016},{11,2037},{11,2036},{11,2038},{11,2039},{12,4085},
+ {12,4088},{13,8180},{13,8182},{13,8184},{14,16376},{14,16372},{16,65520},{15,32756},
+ {16,65526},{15,32757},{18,262114},{19,524249},{19,524250},{19,524251},{19,524252},{19,524253},
+ {19,524254},{19,524248},{19,524242},{19,524243},{19,524244},{19,524245},{19,524246},{19,524274},
+ {19,524255},{19,524263},{19,524264},{19,524265},{19,524266},{19,524267},{19,524262},{19,524256},
+ {19,524257},{19,524258},{19,524259},{19,524260},{19,524261},{19,524247},{19,524268},{19,524276},
+ {19,524275},
+};
+

faac-1.29.9.2.tar.gz/libfaac/huffdata.h Added

@@ -0,0 +1,41 @@
+/****************************************************************************
+    Copyright (C) 2017 Krzysztof Nikiel
+
+    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 3 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, see <http://www.gnu.org/licenses/>.
+****************************************************************************/
+
+#include <stdint.h>
+
+typedef struct {
+    const uint16_t len;
+    const uint16_t data;
+} hcode16_t;
+
+typedef struct {
+    const uint32_t len;
+    const uint32_t data;
+} hcode32_t;
+
+extern hcode16_t book01[81];
+extern hcode16_t book02[81];
+extern hcode16_t book03[81];
+extern hcode16_t book04[81];
+extern hcode16_t book05[81];
+extern hcode16_t book06[81];
+extern hcode16_t book07[64];
+extern hcode16_t book08[64];
+extern hcode16_t book09[169];
+extern hcode16_t book10[169];
+extern hcode16_t book11[289];
+extern hcode32_t book12[121];

faac-1.29.7.8.tar.gz/libfaac/quantize.c -> faac-1.29.9.2.tar.gz/libfaac/quantize.c Changed

@@ -19,24 +19,71 @@
 ****************************************************************************/
 
 #include <math.h>
-#include "util.h"
+#include <stdio.h>
 #include "quantize.h"
+#include "huff2.h"
+
+#ifdef HAVE_IMMINTRIN_H
+# include <immintrin.h>
+#endif
+
+#ifdef __SSE2__
+# ifdef __GNUC__
+#  include <cpuid.h>
+# endif
+#endif
+
+#ifdef _MSC_VER
+# include <immintrin.h>
+# include <intrin.h>
+# define __SSE2__
+# define bit_SSE2 (1 << 26)
+#endif
 
 #define MAGIC_NUMBER  0.4054
-enum {NULL_SF = 0};
+#define NOISEFLOOR 0.4
 
 // band sound masking
-static void bmask(CoderInfo *coderInfo, double *xr, double *bandqual,
-                  AACQuantCfg *aacquantCfg)
+static void bmask(CoderInfo *coderInfo, double *xr0, double *bandqual,
+                  int gnum, double quality)
 {
   int sfb, start, end, cnt;
   int *cb_offset = coderInfo->sfb_offset;
   int last;
-  double avgenrg = coderInfo->avgenrg;
+  double avgenrg;
   double powm = 0.4;
-  double quality = (double)aacquantCfg->quality/DEFQUAL;
+  double totenrg = 0.0;
+  int gsize = coderInfo->groups.len[gnum];
+  double *xr;
+  int win;
+  int enrgcnt = 0;
 
-  last = BLOCK_LEN_LONG;
+
+  for (sfb = 0; sfb < coderInfo->sfbn; sfb++)
+  {
+      start = coderInfo->sfb_offset[sfb];
+      end = coderInfo->sfb_offset[sfb + 1];
+
+      xr = xr0;
+      for (win = 0; win < gsize; win++)
+      {
+          for (cnt = start; cnt < end; cnt++)
+          {
+              totenrg += xr[cnt] * xr[cnt];
+              enrgcnt++;
+          }
+
+          xr += BLOCK_LEN_SHORT;
+      }
+  }
+
+  if (totenrg < ((NOISEFLOOR * NOISEFLOOR) * (double)enrgcnt))
+  {
+      for (sfb = 0; sfb < coderInfo->sfbn; sfb++)
+          bandqual[sfb] = 0.0;
+
+      return;
+  }
 
   for (sfb = 0; sfb < coderInfo->sfbn; sfb++)
   {
@@ -48,27 +95,40 @@
 
     avge = 0.0;
     maxe = 0.0;
-    for (cnt = start; cnt < end; cnt++)
+    xr = xr0;
+    for (win = 0; win < gsize; win++)
     {
-        double e = xr[cnt]*xr[cnt];
-        avge += e;
-        if (maxe < e)
-            maxe = e;
+        for (cnt = start; cnt < end; cnt++)
+        {
+            double e = xr[cnt]*xr[cnt];
+            avge += e;
+            if (maxe < e)
+                maxe = e;
+        }
+        xr += BLOCK_LEN_SHORT;
     }
-    avge /= (end - start);
+    maxe *= gsize;
 
 #define NOISETONE 0.2
     if (coderInfo->block_type == ONLY_SHORT_WINDOW)
     {
+        last = BLOCK_LEN_SHORT;
+        avgenrg = totenrg / last;
+        avgenrg *= end - start;
+
         target = NOISETONE * pow(avge/avgenrg, powm);
         target += (1.0 - NOISETONE) * 0.45 * pow(maxe/avgenrg, powm);
+
+        target *= 1.5;
     }
     else
     {
+        last = BLOCK_LEN_LONG;
+        avgenrg = totenrg / last;
+        avgenrg *= end - start;
+
         target = NOISETONE * pow(avge/avgenrg, powm);
         target += (1.0 - NOISETONE) * 0.45 * pow(maxe/avgenrg, powm);
-
-        target *= 0.45;
     }
 
     target *= 10.0 / (1.0 + ((double)(start+end)/last));
@@ -77,120 +137,226 @@
   }
 }
 
-// use band quality levels to quantize a block
+enum {MAXSHORTBAND = 36};
+// use band quality levels to quantize a group of windows
 static void qlevel(CoderInfo *coderInfo,
-                   const double *xr,
-                   int *xi,
-                   const double *bandqual, double *pow43)
+                   const double *xr0,
+                   const double *bandqual,
+                   int gnum,
+                   int pnslevel
+                  )
 {
     int sb, cnt;
-    int start, end;
-    // 1.5dB step
-    static const double sfstep = 20.0 / 1.5 / M_LN10;
+#ifndef __clang__
+    /* 2^0.25 (1.50515 dB) step from AAC specs */
+    static const double sfstep = 1.0 / log10(sqrt(sqrt(2.0)));
+#else
+    static const double sfstep = 20 / 1.50515;
+#endif
+    int gsize = coderInfo->groups.len[gnum];
+    double pnsthr = 0.1 * pnslevel;
+#ifdef __SSE2__
+    int cpuid[4];
+    int sse2 = 0;
+
+    cpuid[3] = 0;
+# ifdef __GNUC__
+    __cpuid(1, cpuid[0], cpuid[1], cpuid[2], cpuid[3]);
+# endif
+# ifdef _MSC_VER
+    __cpuid(cpuid, 1);
+# endif
+    if (cpuid[3] & bit_SSE2)
+        sse2 = 1;
+#endif
 
     for (sb = 0; sb < coderInfo->sfbn; sb++)
     {
       double sfacfix;
       int sfac;
-      double maxx;
       double rmsx;
+      double etot;
+      int xitab[8 * MAXSHORTBAND];
+      int *xi;
+      int start, end;
+      const double *xr;
+      int win;
+
+      if (coderInfo->book[coderInfo->bandcnt] != HCB_NONE)
+      {
+          coderInfo->bandcnt++;
+          continue;
+      }
 
       start = coderInfo->sfb_offset[sb];
       end = coderInfo->sfb_offset[sb+1];
 
-      maxx = 0.0;
-      rmsx = 0.0;
-      for (cnt = start; cnt < end; cnt++)
+      etot = 0.0;
+      xr = xr0;
+      for (win = 0; win < gsize; win++)
       {
-          double e = xr[cnt] * xr[cnt];
-          if (maxx < e)
-            maxx = e;
-          rmsx += e;
+          for (cnt = start; cnt < end; cnt++)
+          {
+              double e = xr[cnt] * xr[cnt];
+              etot += e;
+          }
+          xr += BLOCK_LEN_SHORT;
       }
-      rmsx /= (end - start);
-      rmsx = sqrt(rmsx);
-      maxx = sqrt(maxx);
+      etot /= (double)gsize;
+      rmsx = sqrt(etot / (end - start));
 
-      if (maxx < 10.0)
+      if ((rmsx < NOISEFLOOR) || (!bandqual[sb]))
       {
-          for (cnt = start; cnt < end; cnt++)
-              xi[cnt] = 0;
-          coderInfo->scale_factor[coderInfo->sfcnt++] = NULL_SF;
+          coderInfo->book[coderInfo->bandcnt++] = HCB_ZERO;
           continue;
       }
 
-      sfac = lrint(log(bandqual[sb] / rmsx) * sfstep);
-      sfacfix = exp(sfac / sfstep);
-      coderInfo->scale_factor[coderInfo->sfcnt++] = sfac;
-
-#ifdef __GNUC__
-typedef float v4sf __attribute__ ((vector_size (16)));
-typedef int v4si __attribute__ ((vector_size (16)));
-      if (__builtin_cpu_supports("sse2"))
+#ifndef DRM
+      if (bandqual[sb] < pnsthr)
       {
-          static const v4sf zero = {0, 0, 0, 0};
-          static const v4sf magic = {MAGIC_NUMBER, MAGIC_NUMBER, MAGIC_NUMBER, MAGIC_NUMBER};
-
-          for (cnt = start; cnt < end; cnt += 4)
-          {
-              float fin[4];
-              fin[0] = xr[cnt];
-              fin[1] = xr[cnt+1];
-              fin[2] = xr[cnt+2];
-              fin[3] = xr[cnt+3];
-
-              v4sf x = __builtin_ia32_loadups(fin);
-              x = __builtin_ia32_maxps(x, __builtin_ia32_subps(zero, x));
-
-              v4sf fix = {sfacfix, sfacfix, sfacfix, sfacfix};
-              x = __builtin_ia32_mulps(x, fix);
-              x = __builtin_ia32_mulps(x , __builtin_ia32_sqrtps(x));
-              x = __builtin_ia32_sqrtps(x);
-
-              x = __builtin_ia32_addps(x, magic);
-              v4si vi = __builtin_ia32_cvttps2dq(x);
-              memcpy(xi+cnt,&vi,16);
-          }
-
+          coderInfo->book[coderInfo->bandcnt] = HCB_PNS;
+          coderInfo->sf[coderInfo->bandcnt] +=
+              lrint(log10(etot) * (0.5 * sfstep));
+          coderInfo->bandcnt++;
           continue;
       }
 #endif
 
-      for (cnt = start; cnt < end; cnt++)
+      sfac = lrint(log10(bandqual[sb] / rmsx) * sfstep);
+      if ((SF_OFFSET - sfac) < 10)
+          sfacfix = 0.0;
+      else
+          sfacfix = pow(10, sfac / sfstep);
+
+      xr = xr0 + start;
+      end -= start;
+      xi = xitab;
+      for (win = 0; win < gsize; win++)
       {
-          double tmp = fabs(xr[cnt]);
+#ifdef __SSE2__
+          if (sse2)
+          {
+              for (cnt = 0; cnt < end; cnt += 4)
+              {
+                  __m128 x = {xr[cnt], xr[cnt + 1], xr[cnt + 2], xr[cnt + 3]};
+
+                  x = _mm_max_ps(x, -x);
+                  x *= (__m128){sfacfix, sfacfix, sfacfix, sfacfix};
+                  x *= _mm_sqrt_ps(x);
+                  x = _mm_sqrt_ps(x);
+                  x += (__m128){MAGIC_NUMBER, MAGIC_NUMBER, MAGIC_NUMBER, MAGIC_NUMBER};
+
+                  *(__m128i*)(xi + cnt) = _mm_cvttps_epi32(x);
+              }
+              for (cnt = 0; cnt < end; cnt++)
+              {
+                  if (xr[cnt] < 0)
+                      xi[cnt] = -xi[cnt];
+              }
+              xi += cnt;
+              xr += BLOCK_LEN_SHORT;
+              continue;
+          }
+#endif
+
+          for (cnt = 0; cnt < end; cnt++)
+          {
+              double tmp = fabs(xr[cnt]);
 
-          tmp *= sfacfix;
-          tmp = sqrt(tmp * sqrt(tmp));
+              tmp *= sfacfix;
+              tmp = sqrt(tmp * sqrt(tmp));
 
-          xi[cnt] = (int)(tmp + MAGIC_NUMBER);
+              xi[cnt] = (int)(tmp + MAGIC_NUMBER);
+              if (xr[cnt] < 0)
+                  xi[cnt] = -xi[cnt];
+          }
+          xi += cnt;
+          xr += BLOCK_LEN_SHORT;
       }
+      huffbook(coderInfo, xitab, gsize * end);
+      coderInfo->sf[coderInfo->bandcnt++] += SF_OFFSET - sfac;
     }
 }
 
-int BlocQuant(CoderInfo *coderInfo, double *xr, int *xi, AACQuantCfg *aacquantCfg)
+int BlocQuant(CoderInfo *coder, double *xr, AACQuantCfg *aacquantCfg)
 {
     double bandlvl[MAX_SCFAC_BANDS];
     int cnt;
-    int nonzero = 0;
+    double *gxr;
 
-    coderInfo->sfcnt = 0;
+    coder->global_gain = 0;
 
-    for (cnt = 0; cnt < FRAME_LEN; cnt++)
-        nonzero += (fabs(xr[cnt]) > 1E-20);
+    coder->bandcnt = 0;
+    coder->datacnt = 0;
+#ifdef DRM
+    coder->iLenReordSpData = 0; /* init length of reordered spectral data */
+    coder->iLenLongestCW = 0; /* init length of longest codeword */
+    coder->cur_cw = 0; /* init codeword counter */
+#endif
 
-    SetMemory(xi, 0, FRAME_LEN*sizeof(xi[0]));
-    if (nonzero)
     {
-        bmask(coderInfo, xr, bandlvl, aacquantCfg);
-        qlevel(coderInfo, xr, xi, bandlvl, aacquantCfg->pow43);
+        int lastis;
+        int lastsf;
+
+        gxr = xr;
+        for (cnt = 0; cnt < coder->groups.n; cnt++)
+        {
+            bmask(coder, gxr, bandlvl, cnt,
+                  (double)aacquantCfg->quality/DEFQUAL);
+            qlevel(coder, gxr, bandlvl, cnt, aacquantCfg->pnslevel);
+            gxr += coder->groups.len[cnt] * BLOCK_LEN_SHORT;
+        }
+
+        coder->global_gain = 0;
+        for (cnt = 0; cnt < coder->bandcnt; cnt++)
+        {
+            int book = coder->book[cnt];
+            if (!book)
+                continue;
+            if ((book != HCB_INTENSITY) && (book != HCB_INTENSITY2))
+            {
+                coder->global_gain = coder->sf[cnt];
+                break;
+            }
+        }
+
+        lastsf = coder->global_gain;
+        lastis = 0;
+        // fixme: move SF range check to quantizer
+        for (cnt = 0; cnt < coder->bandcnt; cnt++)
+        {
+            int book = coder->book[cnt];
+            if ((book == HCB_INTENSITY) || (book == HCB_INTENSITY2))
+            {
+                int diff = coder->sf[cnt] - lastis;
+
+                if (diff < -60)
+                    diff = -60;
+                if (diff > 60)
+                    diff = 60;
+
+                lastis += diff;
+                coder->sf[cnt] = lastis;
+            }
+            else if (book != HCB_PNS)
+            {
+                int diff = coder->sf[cnt] - lastsf;
+
+                if (diff < -60)
+                    diff = -60;
+                if (diff > 60)
+                    diff = 60;
+
+                lastsf += diff;
+                coder->sf[cnt] = lastsf;
+            }
+        }
         return 1;
     }
-
     return 0;
 }
 
-void BandLimit(unsigned *bw, int rate, SR_INFO *sr, AACQuantCfg *aacquantCfg)
+void CalcBW(unsigned *bw, int rate, SR_INFO *sr, AACQuantCfg *aacquantCfg)
 {
     // find max short frame band
     int max = *bw * (BLOCK_LEN_SHORT << 1) / rate;
@@ -205,7 +371,8 @@
         l += sr->cb_width_short[cnt];
     }
     aacquantCfg->max_cbs = cnt;
-    *bw = (double)l * rate / (BLOCK_LEN_SHORT << 1);
+    if (aacquantCfg->pnslevel)
+        *bw = (double)l * rate / (BLOCK_LEN_SHORT << 1);
 
     // find max long frame band
     max = *bw * (BLOCK_LEN_LONG << 1) / rate;
@@ -217,6 +384,110 @@
         l += sr->cb_width_long[cnt];
     }
     aacquantCfg->max_cbl = cnt;
+    aacquantCfg->max_l = l;
 
     *bw = (double)l * rate / (BLOCK_LEN_LONG << 1);
 }
+
+enum {MINSFB = 2};
+
+static void calce(double *xr, int *bands, double e[NSFB_SHORT], int maxsfb,
+                  int maxl)
+{
+    int sfb;
+    int l;
+
+    // mute lines above cutoff freq
+    for (l = maxl; l < bands[maxsfb]; l++)
+        xr[l] = 0.0;
+
+    for (sfb = MINSFB; sfb < maxsfb; sfb++)
+    {
+        e[sfb] = 0;
+        for (l = bands[sfb]; l < bands[sfb + 1]; l++)
+            e[sfb] += xr[l] * xr[l];
+    }
+}
+
+static void resete(double min[NSFB_SHORT], double max[NSFB_SHORT],
+                   double e[NSFB_SHORT], int maxsfb)
+{
+    int sfb;
+    for (sfb = MINSFB; sfb < maxsfb; sfb++)
+        min[sfb] = max[sfb] = e[sfb];
+}
+
+#define PRINTSTAT 0
+#if PRINTSTAT
+static int groups = 0;
+static int frames = 0;
+#endif
+void BlocGroup(double *xr, CoderInfo *coderInfo, AACQuantCfg *cfg)
+{
+    int win, sfb;
+    double e[NSFB_SHORT];
+    double min[NSFB_SHORT];
+    double max[NSFB_SHORT];
+    const double thr = 3.0;
+    int win0;
+    int fastmin;
+    int maxsfb, maxl;
+
+    if (coderInfo->block_type != ONLY_SHORT_WINDOW)
+    {
+        coderInfo->groups.n = 1;
+        coderInfo->groups.len[0] = 1;
+        return;
+    }
+
+    maxl = cfg->max_l / 8;
+    maxsfb = cfg->max_cbs;
+    fastmin = ((maxsfb - MINSFB) * 3) >> 2;
+
+#ifdef DRM
+    coderInfo->groups.n = 1;
+    coderInfo->groups.len[0] = 8;
+    return;
+#endif
+
+#if PRINTSTAT
+    frames++;
+#endif
+    calce(xr, coderInfo->sfb_offset, e, maxsfb, maxl);
+    resete(min, max, e, maxsfb);
+    win0 = 0;
+    coderInfo->groups.n = 0;
+    for (win = 1; win < MAX_SHORT_WINDOWS; win++)
+    {
+        int fast = 0;
+
+        calce(xr + win * BLOCK_LEN_SHORT, coderInfo->sfb_offset, e, maxsfb, maxl);
+        for (sfb = MINSFB; sfb < maxsfb; sfb++)
+        {
+            if (min[sfb] > e[sfb])
+                min[sfb] = e[sfb];
+            if (max[sfb] < e[sfb])
+                max[sfb] = e[sfb];
+
+            if (max[sfb] > thr * min[sfb])
+                fast++;
+        }
+        if (fast > fastmin)
+        {
+            coderInfo->groups.len[coderInfo->groups.n++] = win - win0;
+            win0 = win;
+            resete(min, max, e, maxsfb);
+        }
+    }
+    coderInfo->groups.len[coderInfo->groups.n++] = win - win0;
+#if PRINTSTAT
+    groups += coderInfo->groups.n;
+#endif
+}
+
+void BlocStat(void)
+{
+#if PRINTSTAT
+    printf("frames:%d; groups:%d; g/f:%f\n", frames, groups, (double)groups/frames);
+#endif
+}

faac-1.29.7.8.tar.gz/libfaac/quantize.h -> faac-1.29.9.2.tar.gz/libfaac/quantize.h Changed

faac-1.29.9.2.tar.gz/libfaac/stereo.c Added

@@ -0,0 +1,373 @@
+/****************************************************************************
+    Intensity Stereo
+
+    Copyright (C) 2017 Krzysztof Nikiel
+
+    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 3 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, see <http://www.gnu.org/licenses/>.
+****************************************************************************/
+
+#include <math.h>
+#include "stereo.h"
+#include "huff2.h"
+
+
+static void stereo(CoderInfo *cl, CoderInfo *cr,
+                   double *sl0, double *sr0, int *sfcnt,
+                   int wstart, int wend, double phthr
+                  )
+{
+    int sfb;
+    int win;
+    int sfmin;
+
+    if (!phthr)
+        return;
+
+    phthr = 1.0 / phthr;
+
+    if (cl->block_type == ONLY_SHORT_WINDOW)
+        sfmin = 1;
+    else
+        sfmin = 8;
+
+    (*sfcnt) += sfmin;
+
+    for (sfb = sfmin; sfb < cl->sfbn; sfb++)
+    {
+        int l, start, end;
+        double sum, diff;
+        double enrgs, enrgd, enrgl, enrgr;
+        int hcb = HCB_NONE;
+        const double step = 10/1.50515;
+        double ethr;
+        double vfix, efix;
+
+        start = cl->sfb_offset[sfb];
+        end = cl->sfb_offset[sfb + 1];
+
+        enrgs = enrgd = enrgl = enrgr = 0.0;
+        for (win = wstart; win < wend; win++)
+        {
+            double *sl = sl0 + win * BLOCK_LEN_SHORT;
+            double *sr = sr0 + win * BLOCK_LEN_SHORT;
+
+            for (l = start; l < end; l++)
+            {
+                double lx = sl[l];
+                double rx = sr[l];
+
+                sum = lx + rx;
+                diff = lx - rx;
+
+                enrgs += sum * sum;
+                enrgd += diff * diff;
+                enrgl += lx * lx;
+                enrgr += rx * rx;
+            }
+        }
+
+        ethr = sqrt(enrgl) + sqrt(enrgr);
+        ethr *= ethr;
+        ethr *= phthr;
+        efix = enrgl + enrgr;
+        if (enrgs >= ethr)
+        {
+            hcb = HCB_INTENSITY;
+            vfix = sqrt(efix / enrgs);
+        }
+        else if (enrgd >= ethr)
+        {
+            hcb = HCB_INTENSITY2;
+            vfix = sqrt(efix / enrgd);
+        }
+
+        if (hcb != HCB_NONE)
+        {
+            int sf = lrint(log10(enrgl / efix) * step);
+            int pan = lrint(log10(enrgr/efix) * step) - sf;
+
+            if (pan > 30)
+            {
+                cl->book[*sfcnt] = HCB_ZERO;
+                (*sfcnt)++;
+                continue;
+            }
+            if (pan < -30)
+            {
+                cr->book[*sfcnt] = HCB_ZERO;
+                (*sfcnt)++;
+                continue;
+            }
+            cl->sf[*sfcnt] = sf;
+            cr->sf[*sfcnt] = -pan;
+            cr->book[*sfcnt] = hcb;
+
+            for (win = wstart; win < wend; win++)
+            {
+                double *sl = sl0 + win * BLOCK_LEN_SHORT;
+                double *sr = sr0 + win * BLOCK_LEN_SHORT;
+                for (l = start; l < end; l++)
+                {
+                    if (hcb == HCB_INTENSITY)
+                        sum = sl[l] + sr[l];
+                    else
+                        sum = sl[l] - sr[l];
+
+                    sl[l] = sum * vfix;
+                }
+            }
+        }
+        (*sfcnt)++;
+    }
+}
+
+static void midside(CoderInfo *coder, ChannelInfo *channel,
+                    double *sl0, double *sr0, int *sfcnt,
+                    int wstart, int wend,
+                    double thrmid, double thrside
+                   )
+{
+    int sfb;
+    int win;
+    int sfmin;
+
+    if (coder->block_type == ONLY_SHORT_WINDOW)
+        sfmin = 1;
+    else
+        sfmin = 8;
+
+    for (sfb = 0; sfb < sfmin; sfb++)
+    {
+        channel->msInfo.ms_used[*sfcnt] = 0;
+        (*sfcnt)++;
+    }
+    for (sfb = sfmin; sfb < coder->sfbn; sfb++)
+    {
+        int ms = 0;
+        int l, start, end;
+        double sum, diff;
+        double enrgs, enrgd, enrgl, enrgr;
+
+        start = coder->sfb_offset[sfb];
+        end = coder->sfb_offset[sfb + 1];
+
+        enrgs = enrgd = enrgl = enrgr = 0.0;
+        for (win = wstart; win < wend; win++)
+        {
+            double *sl = sl0 + win * BLOCK_LEN_SHORT;
+            double *sr = sr0 + win * BLOCK_LEN_SHORT;
+
+            for (l = start; l < end; l++)
+            {
+                double lx = sl[l];
+                double rx = sr[l];
+
+                sum = 0.5 * (lx + rx);
+                diff = 0.5 * (lx - rx);
+
+                enrgs += sum * sum;
+                enrgd += diff * diff;
+                enrgl += lx * lx;
+                enrgr += rx * rx;
+            }
+        }
+
+        if ((min(enrgl, enrgr) * thrmid) >= max(enrgs, enrgd))
+        {
+            enum {PH_NONE, PH_IN, PH_OUT};
+            int phase = PH_NONE;
+
+            if ((enrgs * thrmid * 2.0) >= (enrgl + enrgr))
+            {
+                ms = 1;
+                phase = PH_IN;
+            }
+            else if ((enrgd * thrmid * 2.0) >= (enrgl + enrgr))
+            {
+                ms = 1;
+                phase = PH_OUT;
+            }
+
+            if (ms)
+            {
+                for (win = wstart; win < wend; win++)
+                {
+                    double *sl = sl0 + win * BLOCK_LEN_SHORT;
+                    double *sr = sr0 + win * BLOCK_LEN_SHORT;
+                    for (l = start; l < end; l++)
+                    {
+                        if (phase == PH_IN)
+                        {
+                            sum = sl[l] + sr[l];
+                            diff = 0;
+                        }
+                        else
+                        {
+                            sum = 0;
+                            diff = sl[l] - sr[l];
+                        }
+
+                        sl[l] = 0.5 * sum;
+                        sr[l] = 0.5 * diff;
+                    }
+                }
+            }
+        }
+
+        if (min(enrgl, enrgr) <= (thrside * max(enrgl, enrgr)))
+        {
+            for (win = wstart; win < wend; win++)
+            {
+                double *sl = sl0 + win * BLOCK_LEN_SHORT;
+                double *sr = sr0 + win * BLOCK_LEN_SHORT;
+                for (l = start; l < end; l++)
+                {
+                    if (enrgl < enrgr)
+                        sl[l] = 0.0;
+                    else
+                        sr[l] = 0.0;
+                }
+            }
+        }
+
+        channel->msInfo.ms_used[*sfcnt] = ms;
+        (*sfcnt)++;
+    }
+}
+
+
+void AACstereo(CoderInfo *coder,
+               ChannelInfo *channel,
+               double *s[MAX_CHANNELS],
+               int maxchan,
+               double quality,
+               int mode
+              )
+{
+    int chn;
+    static const double thr075 = 1.09 /* ~0.75dB */ - 1.0;
+    static const double thrmax = 1.25 /* ~2dB */ - 1.0;
+    static const double sidemin = 0.1; /* -20dB */
+    static const double sidemax = 0.3; /* ~-10.5dB */
+    static const double isthrmax = M_SQRT2 - 1.0;
+    double thrmid, thrside;
+    double isthr;
+
+    thrmid = 1.0;
+    thrside = 0.0;
+    isthr = 1.0;
+
+    switch (mode)
+    {
+    case JOINT_MS:
+        thrmid = thr075 / quality;
+        if (thrmid > thrmax)
+            thrmid = thrmax;
+
+        thrside = sidemin / quality;
+        if (thrside > sidemax)
+            thrside = sidemax;
+
+        thrmid += 1.0;
+        break;
+    case JOINT_IS:
+        isthr = 0.18 / (quality * quality);
+        if (isthr > isthrmax)
+            isthr = isthrmax;
+
+        isthr += 1.0;
+        break;
+    }
+
+    // convert into energy
+    thrmid *= thrmid;
+    thrside *= thrside;
+    isthr *= isthr;
+
+    for (chn = 0; chn < maxchan; chn++)
+    {
+        int group;
+        int bookcnt = 0;
+        CoderInfo *cp = coder + chn;
+
+        if (!channel[chn].present)
+            continue;
+
+        for (group = 0; group < cp->groups.n; group++)
+        {
+            int band;
+            for (band = 0; band < cp->sfbn; band++)
+            {
+                cp->book[bookcnt] = HCB_NONE;
+                cp->sf[bookcnt] = 0;
+                bookcnt++;
+            }
+        }
+    }
+    for (chn = 0; chn < maxchan; chn++)
+    {
+        int rch;
+        int cnt;
+        int group;
+        int sfcnt = 0;
+        int start = 0;
+
+        if (!channel[chn].present)
+            continue;
+        if (!((channel[chn].cpe) && (channel[chn].ch_is_left)))
+            continue;
+
+        rch = channel[chn].paired_ch;
+
+        channel[chn].common_window = 0;
+        channel[chn].msInfo.is_present = 0;
+        channel[rch].msInfo.is_present = 0;
+
+        if (coder[chn].block_type != coder[rch].block_type)
+            continue;
+        if (coder[chn].groups.n != coder[rch].groups.n)
+            continue;
+
+        channel[chn].common_window = 1;
+        for (cnt = 0; cnt < coder[chn].groups.n; cnt++)
+            if (coder[chn].groups.len[cnt] != coder[rch].groups.len[cnt])
+            {
+                channel[chn].common_window = 0;
+                goto skip;
+            }
+
+        if (mode == JOINT_MS)
+        {
+            channel[chn].common_window = 1;
+            channel[chn].msInfo.is_present = 1;
+            channel[rch].msInfo.is_present = 1;
+        }
+
+        for (group = 0; group < coder->groups.n; group++)
+        {
+            int end = start + coder->groups.len[group];
+            switch(mode) {
+            case JOINT_MS:
+                midside(coder + chn, channel + chn, s[chn], s[rch], &sfcnt,
+                        start, end, thrmid, thrside);
+                break;
+            case JOINT_IS:
+                stereo(coder + chn, coder + rch, s[chn], s[rch], &sfcnt, start, end, isthr);
+                break;
+            }
+            start = end;
+        }
+        skip:;
+    }
+}

faac-1.29.9.2.tar.gz/libfaac/stereo.h Added

@@ -0,0 +1,29 @@
+/****************************************************************************
+    Intensity Stereo
+
+    Copyright (C) 2017 Krzysztof Nikiel
+
+    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 3 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, see <http://www.gnu.org/licenses/>.
+****************************************************************************/
+
+#include "channels.h"
+#include "util.h"
+
+void AACstereo(CoderInfo *coder,
+               ChannelInfo *channel,
+               double *s[MAX_CHANNELS],
+               int maxchan,
+               double quality,
+               int mode
+              );

faac-1.29.7.8.tar.gz/libfaac/tns.c -> faac-1.29.9.2.tar.gz/libfaac/tns.c Changed

Build Results
RPM Lint

Refresh

Comments for request 4050 0

Request History

zaitor created request over 6 years ago

Versionbump

olh accepted request over 6 years ago