Request 4237 (accepted)

fdk-aac.changes Changed

fdk-aac.spec Changed

@@ -1,7 +1,7 @@
 #
 # spec file for package fdk-aac
 #
-# Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany.
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -15,19 +15,19 @@
 # Please submit bugfixes or comments via http://bugs.opensuse.org/
 #
 
+
 Name:           fdk-aac
-Version:	0.1.5
-Release:	0
-License: SUSE-NonFree
-Summary:	A standalone library of the Fraunhofer FDK AAC code from Android
-Url:		https://github.com/mstorsjo/fdk-aac
-Group:		System/Libraries
-Source0:	https://github.com/mstorsjo/fdk-aac/archive/v%{version}.tar.gz
-Source1:	baselibs.conf
-BuildRequires:	gcc-c++
+Version:        0.1.6
+Release:        0
+Summary:        A standalone library of the Fraunhofer FDK AAC code from Android
+License:        SUSE-NonFree
+Group:          System/Libraries
+URL:            https://github.com/mstorsjo/fdk-aac
+Source0:        https://github.com/mstorsjo/fdk-aac/archive/v%{version}.tar.gz
+Source1:        baselibs.conf
+BuildRequires:  gcc-c++
 BuildRequires:  libtool
-BuildRequires:	pkg-config
-BuildRoot:      %{_tmppath}/%{name}-%{version}-build
+BuildRequires:  pkgconfig
 
 %description
 A standalone library of the Fraunhofer FDK AAC code from Android
@@ -36,16 +36,19 @@
 wiki.hydrogenaud.io/Fraunhofer_FDK_AAC
 
 %package -n libfdk-aac1
-Summary:	A standalone library of the Fraunhofer FDK AAC code from Android
-Group:		System/Libraries
+Summary:        A standalone library of the Fraunhofer FDK AAC code from Android
+Group:          System/Libraries
 
 %description -n libfdk-aac1
 A standalone library of the Fraunhofer FDK AAC code from Android
 
+For further information, read:
+wiki.hydrogenaud.io/Fraunhofer_FDK_AAC
+
 %package devel
-Summary:	Development headers for Fraunhofer FDK AAC
-Group:		Development/Libraries/C and C++
-Requires:	libfdk-aac1 = %{version}
+Summary:        Development headers for Fraunhofer FDK AAC
+Group:          Development/Libraries/C and C++
+Requires:       libfdk-aac1 = %{version}
 
 %description devel
 This package provides development headers for Fraunhofer FDK AAC code
@@ -58,28 +61,24 @@
 sed -i "s/__TIME__/\"$FAKE_BUILDTIME\"/g" lib*/src/{*.cpp,version}
 
 %build
-NOCONFIGURE=1 ./autogen.sh 
+NOCONFIGURE=1 ./autogen.sh
 %configure --disable-static
 make %{?_smp_mflags}
 
 %install
-make install DESTDIR=%{buildroot} %{?_smp_mflags}
+%make_install
 find %{buildroot} -type f -name "*.la" -delete -print
 
 %post -n libfdk-aac1  -p /sbin/ldconfig
-
 %postun -n libfdk-aac1 -p /sbin/ldconfig
 
 %files -n libfdk-aac1
-%defattr(-,root,root)
 %doc ChangeLog NOTICE
-%{_libdir}/libfdk-aac.so.1
-%{_libdir}/libfdk-aac.so.1.0.0
+%{_libdir}/libfdk-aac.so.*
 
 %files devel
-%defattr(-,root,root)
 %{_includedir}/fdk-aac
 %{_libdir}/libfdk-aac.so
 %{_libdir}/pkgconfig/fdk-aac.pc
 
-
+%changelog

v0.1.5.tar.gz/Android.mk Deleted

@@ -1,59 +0,0 @@
-LOCAL_PATH:= $(call my-dir)
-include $(CLEAR_VARS)
-
-aacdec_sources := $(sort $(wildcard $(LOCAL_PATH)/libAACdec/src/*.cpp))
-aacdec_sources := $(aacdec_sources:$(LOCAL_PATH)/libAACdec/src/%=%)
-
-aacenc_sources := $(sort $(wildcard $(LOCAL_PATH)/libAACenc/src/*.cpp))
-aacenc_sources := $(aacenc_sources:$(LOCAL_PATH)/libAACenc/src/%=%)
-
-pcmutils_sources := $(sort $(wildcard $(LOCAL_PATH)/libPCMutils/src/*.cpp))
-pcmutils_sources := $(pcmutils_sources:$(LOCAL_PATH)/libPCMutils/src/%=%)
-
-fdk_sources := $(sort $(wildcard $(LOCAL_PATH)/libFDK/src/*.cpp))
-fdk_sources := $(fdk_sources:$(LOCAL_PATH)/libFDK/src/%=%)
-
-sys_sources := $(sort $(wildcard $(LOCAL_PATH)/libSYS/src/*.cpp))
-sys_sources := $(sys_sources:$(LOCAL_PATH)/libSYS/src/%=%)
-
-mpegtpdec_sources := $(sort $(wildcard $(LOCAL_PATH)/libMpegTPDec/src/*.cpp))
-mpegtpdec_sources := $(mpegtpdec_sources:$(LOCAL_PATH)/libMpegTPDec/src/%=%)
-
-mpegtpenc_sources := $(sort $(wildcard $(LOCAL_PATH)/libMpegTPEnc/src/*.cpp))
-mpegtpenc_sources := $(mpegtpenc_sources:$(LOCAL_PATH)/libMpegTPEnc/src/%=%)
-
-sbrdec_sources := $(sort $(wildcard $(LOCAL_PATH)/libSBRdec/src/*.cpp))
-sbrdec_sources := $(sbrdec_sources:$(LOCAL_PATH)/libSBRdec/src/%=%)
-
-sbrenc_sources := $(sort $(wildcard $(LOCAL_PATH)/libSBRenc/src/*.cpp))
-sbrenc_sources := $(sbrenc_sources:$(LOCAL_PATH)/libSBRenc/src/%=%)
-
-LOCAL_SRC_FILES := \
-        $(aacdec_sources:%=libAACdec/src/%) \
-        $(aacenc_sources:%=libAACenc/src/%) \
-        $(pcmutils_sources:%=libPCMutils/src/%) \
-        $(fdk_sources:%=libFDK/src/%) \
-        $(sys_sources:%=libSYS/src/%) \
-        $(mpegtpdec_sources:%=libMpegTPDec/src/%) \
-        $(mpegtpenc_sources:%=libMpegTPEnc/src/%) \
-        $(sbrdec_sources:%=libSBRdec/src/%) \
-        $(sbrenc_sources:%=libSBRenc/src/%)
-
-LOCAL_CFLAGS += -Wno-sequence-point -Wno-extra
-LOCAL_CFLAGS += "-Wno-\#warnings" -Wno-constant-logical-operand -Wno-self-assign
-
-LOCAL_C_INCLUDES := \
-        $(LOCAL_PATH)/libAACdec/include \
-        $(LOCAL_PATH)/libAACenc/include \
-        $(LOCAL_PATH)/libPCMutils/include \
-        $(LOCAL_PATH)/libFDK/include \
-        $(LOCAL_PATH)/libSYS/include \
-        $(LOCAL_PATH)/libMpegTPDec/include \
-        $(LOCAL_PATH)/libMpegTPEnc/include \
-        $(LOCAL_PATH)/libSBRdec/include \
-        $(LOCAL_PATH)/libSBRenc/include
-
-
-LOCAL_MODULE:= libFraunhoferAAC
-
-include $(BUILD_STATIC_LIBRARY)

v0.1.6.tar.gz/Android.bp Added

v0.1.5.tar.gz/ChangeLog -> v0.1.6.tar.gz/ChangeLog Changed

v0.1.5.tar.gz/Makefile.am -> v0.1.6.tar.gz/Makefile.am Changed

v0.1.6.tar.gz/OWNERS Added

v0.1.5.tar.gz/configure.ac -> v0.1.6.tar.gz/configure.ac Changed

v0.1.5.tar.gz/libAACdec/src/aacdecoder_lib.cpp -> v0.1.6.tar.gz/libAACdec/src/aacdecoder_lib.cpp Changed

@@ -791,36 +791,29 @@
         const UINT         flags)
 {
     AAC_DECODER_ERROR ErrorStatus;
-    INT layer;
-    INT nBits;
-    INT interleaved = self->outputInterleaved;
-    HANDLE_FDK_BITSTREAM hBs;
     int fTpInterruption = 0;  /* Transport originated interruption detection. */
     int fTpConceal = 0;       /* Transport originated concealment. */
-    INT_PCM *pTimeData = NULL;
-    INT timeDataSize = 0;
-
 
     if (self == NULL) {
       return AAC_DEC_INVALID_HANDLE;
     }
-
-    pTimeData = self->pcmOutputBuffer;
-    timeDataSize = sizeof(self->pcmOutputBuffer)/sizeof(*self->pcmOutputBuffer);
+    INT interleaved = self->outputInterleaved;
+    INT_PCM *pTimeData = self->pcmOutputBuffer;
+    INT timeDataSize = sizeof(self->pcmOutputBuffer)/sizeof(*self->pcmOutputBuffer);
 
     if (flags & AACDEC_INTR) {
       self->streamInfo.numLostAccessUnits = 0;
     }
 
-    hBs = transportDec_GetBitstream(self->hInput, 0);
+    HANDLE_FDK_BITSTREAM hBs = transportDec_GetBitstream(self->hInput, 0);
 
     /* Get current bits position for bitrate calculation. */
-    nBits = FDKgetValidBits(hBs);
+    INT nBits = FDKgetValidBits(hBs);
     if (! (flags & (AACDEC_CONCEAL | AACDEC_FLUSH) ) )
     {
       TRANSPORTDEC_ERROR err;
 
-      for(layer = 0; layer < self->nrOfLayers; layer++)
+      for(INT layer = 0; layer < self->nrOfLayers; layer++)
       {
         err = transportDec_ReadAccessUnit(self->hInput, layer);
         if (err != TRANSPORTDEC_OK) {

v0.1.5.tar.gz/libAACdec/src/block.cpp -> v0.1.6.tar.gz/libAACdec/src/block.cpp Changed

v0.1.5.tar.gz/libAACdec/src/channel.cpp -> v0.1.6.tar.gz/libAACdec/src/channel.cpp Changed

v0.1.5.tar.gz/libAACenc/src/aacenc_tns.cpp -> v0.1.6.tar.gz/libAACenc/src/aacenc_tns.cpp Changed

v0.1.5.tar.gz/libAACenc/src/adj_thr.cpp -> v0.1.6.tar.gz/libAACenc/src/adj_thr.cpp Changed

v0.1.5.tar.gz/libAACenc/src/metadata_main.cpp -> v0.1.6.tar.gz/libAACenc/src/metadata_main.cpp Changed

@@ -488,14 +488,12 @@
 {
     FDK_METADATA_ERROR err = METADATA_OK;
 
-    INT dynrng, compr;
-    DRC_PROFILE profileDrc  = convertProfile(pMetadata->mpegDrc.drc_profile);
-    DRC_PROFILE profileComp = convertProfile(pMetadata->etsiAncData.comp_profile);
-
     if ( (pMetadata==NULL) || (hDrcComp==NULL) ) {
       err = METADATA_INVALID_HANDLE;
       return err;
     }
+    DRC_PROFILE profileDrc  = convertProfile(pMetadata->mpegDrc.drc_profile);
+    DRC_PROFILE profileComp = convertProfile(pMetadata->etsiAncData.comp_profile);
 
     /* first, check if profile is same as last frame
      * otherwise, update setup */
@@ -511,8 +509,8 @@
     }
 
     /* in case of embedding external values, copy this now (limiter may overwrite them) */
-    dynrng = decodeDynrng(pMetadata->mpegDrc.dyn_rng_ctl[0], pMetadata->mpegDrc.dyn_rng_sgn[0]);
-    compr  = decodeCompr(pMetadata->etsiAncData.compression_value);
+    INT dynrng = decodeDynrng(pMetadata->mpegDrc.dyn_rng_ctl[0], pMetadata->mpegDrc.dyn_rng_sgn[0]);
+    INT compr  = decodeCompr(pMetadata->etsiAncData.compression_value);
 
     /* Call compressor */
     if (FDK_DRC_Generator_Calc(hDrcComp,

v0.1.5.tar.gz/libAACenc/src/sf_estim.cpp -> v0.1.6.tar.gz/libAACenc/src/sf_estim.cpp Changed

v0.1.5.tar.gz/libFDK/include/FDK_bitstream.h -> v0.1.6.tar.gz/libFDK/include/FDK_bitstream.h Changed

@@ -212,9 +212,28 @@
   INT missingBits = numberOfBits - hBitStream->BitsInCache;
   if (missingBits > 0)
   {
-    UINT bits = hBitStream->CacheWord << missingBits;
-    hBitStream->CacheWord = FDK_get32 (&hBitStream->hBitBuf) ;
-    hBitStream->BitsInCache = CACHE_BITS - missingBits;
+    const UINT bits	 = hBitStream->CacheWord << missingBits;
+    const UINT validBits = FDK_getValidBits (&hBitStream->hBitBuf);
+
+    if (validBits >= 32)
+    {
+      hBitStream->CacheWord = FDK_get32 (&hBitStream->hBitBuf) ;
+      hBitStream->BitsInCache = CACHE_BITS - missingBits;
+    }
+    else
+    {
+      hBitStream->CacheWord = FDK_get (&hBitStream->hBitBuf,validBits) ;
+      if (validBits >= missingBits)
+      {
+        hBitStream->BitsInCache = validBits - missingBits;
+      }
+      else
+      {
+        hBitStream->BitsInCache = 0;
+        hBitStream->CacheWord <<= missingBits - validBits;
+      }
+    }
+
     return ( bits | (hBitStream->CacheWord >> hBitStream->BitsInCache)) & BitMask[numberOfBits];
   }
 
@@ -226,10 +245,18 @@
 
   if (hBitStream->BitsInCache <= numberOfBits)
   {
-    const INT freeBits = (CACHE_BITS-1) - hBitStream->BitsInCache ;
-
-    hBitStream->CacheWord = (hBitStream->CacheWord << freeBits) | FDK_get (&hBitStream->hBitBuf,freeBits) ;
-    hBitStream->BitsInCache += freeBits ;
+    const INT  validBits  = FDK_getValidBits (&hBitStream->hBitBuf) ;
+    const INT  freeBits   = (CACHE_BITS-1) - hBitStream->BitsInCache ;
+    const INT  bitsToRead = (freeBits <= validBits) ? freeBits : validBits ;
+
+    hBitStream->CacheWord = (hBitStream->CacheWord << bitsToRead) | FDK_get (&hBitStream->hBitBuf,bitsToRead) ;
+    hBitStream->BitsInCache += bitsToRead ;
+    if (hBitStream->BitsInCache < numberOfBits)
+    {
+      hBitStream->CacheWord <<= numberOfBits - hBitStream->BitsInCache;
+      hBitStream->BitsInCache = 0;
+      return (hBitStream->CacheWord >> hBitStream->BitsInCache) & validMask ;
+    }
   }
 
   hBitStream->BitsInCache -= numberOfBits ;
@@ -243,8 +270,22 @@
 #ifdef OPTIMIZE_FDKREADBITS
   if (!hBitStream->BitsInCache)
   {
-    hBitStream->CacheWord = FDK_get32 (&hBitStream->hBitBuf);
-    hBitStream->BitsInCache = CACHE_BITS;
+    const UINT validBits = FDK_getValidBits (&hBitStream->hBitBuf);
+
+    if (validBits >= 32)
+    {
+      hBitStream->CacheWord = FDK_get32 (&hBitStream->hBitBuf);
+      hBitStream->BitsInCache = CACHE_BITS;
+    }
+    else if (validBits > 0)
+    {
+      hBitStream->CacheWord = FDK_get (&hBitStream->hBitBuf,validBits);
+      hBitStream->BitsInCache = validBits;
+    }
+    else
+    {
+      return 0;
+    }
   }
   hBitStream->BitsInCache--;
 
@@ -268,10 +309,12 @@
   UINT BitsInCache = hBitStream->BitsInCache;
   if (BitsInCache < 2)  /* Comparison changed from 'less-equal' to 'less' */
   {
-    const INT freeBits = (CACHE_BITS-1) - BitsInCache ;
+    const INT  validBits  = FDK_getValidBits (&hBitStream->hBitBuf) ;
+    const INT  freeBits   = (CACHE_BITS-1) - BitsInCache ;
+    const INT  bitsToRead = (freeBits <= validBits) ? freeBits : validBits ;
 
-    hBitStream->CacheWord = (hBitStream->CacheWord << freeBits) | FDK_get (&hBitStream->hBitBuf,freeBits) ;
-    BitsInCache += freeBits;
+    hBitStream->CacheWord = (hBitStream->CacheWord << bitsToRead) | FDK_get (&hBitStream->hBitBuf,bitsToRead) ;
+    BitsInCache += bitsToRead;
   }
   hBitStream->BitsInCache = BitsInCache - 2;
   return (hBitStream->CacheWord >> hBitStream->BitsInCache) & 0x3;

v0.1.5.tar.gz/libFDK/src/FDK_bitbuffer.cpp -> v0.1.6.tar.gz/libFDK/src/FDK_bitbuffer.cpp Changed

@@ -157,6 +157,8 @@
 
 INT  FDK_get (HANDLE_FDK_BITBUF hBitBuf, const UINT numberOfBits)
 {
+  if (numberOfBits == 0 || numberOfBits > hBitBuf->ValidBits) return 0;
+
   UINT byteOffset = hBitBuf->BitNdx >> 3 ;
   UINT bitOffset  = hBitBuf->BitNdx & 0x07 ;
 
@@ -166,22 +168,20 @@
 
   UINT byteMask = hBitBuf->bufSize - 1 ;
 
-  UINT tx = (hBitBuf->Buffer [ byteOffset    & byteMask] << 24) |
-            (hBitBuf->Buffer [(byteOffset+1) & byteMask] << 16) |
-            (hBitBuf->Buffer [(byteOffset+2) & byteMask] <<  8) |
-             hBitBuf->Buffer [(byteOffset+3) & byteMask];
+  UINT tx =                                hBitBuf->Buffer [ byteOffset    & byteMask] << 24 << bitOffset;
 
-  if (bitOffset)
-  {
-    tx <<= bitOffset;
-    tx |= hBitBuf->Buffer [(byteOffset+4) & byteMask] >> (8-bitOffset);
-  }
+  if (numberOfBits + bitOffset >  8) tx |= hBitBuf->Buffer [(byteOffset+1) & byteMask] << 16 << bitOffset;
+  if (numberOfBits + bitOffset > 16) tx |= hBitBuf->Buffer [(byteOffset+2) & byteMask] <<  8 << bitOffset;
+  if (numberOfBits + bitOffset > 24) tx |= hBitBuf->Buffer [(byteOffset+3) & byteMask]       << bitOffset;
+  if (numberOfBits + bitOffset > 32) tx |= hBitBuf->Buffer [(byteOffset+4) & byteMask] >> (8 - bitOffset);
 
   return (tx >> (32 - numberOfBits)) ;
 }
 
 INT FDK_get32 (HANDLE_FDK_BITBUF hBitBuf)
 {
+  if (hBitBuf->ValidBits < 32) return 0;
+
   UINT BitNdx = hBitBuf->BitNdx + 32;
   if (BitNdx <= hBitBuf->bufBits)
   {

v0.1.5.tar.gz/libFDK/src/qmf.cpp -> v0.1.6.tar.gz/libFDK/src/qmf.cpp Changed

v0.1.5.tar.gz/libMpegTPDec/src/tpdec_adts.cpp -> v0.1.6.tar.gz/libMpegTPDec/src/tpdec_adts.cpp Changed

v0.1.5.tar.gz/libMpegTPDec/src/tpdec_asc.cpp -> v0.1.6.tar.gz/libMpegTPDec/src/tpdec_asc.cpp Changed

@@ -650,6 +650,8 @@
         /* search in front channels */
         for (i = 0; i < pPce->NumFrontChannelElements; i++) {
           int heightLayer = pPce->FrontElementHeightInfo[i];
+          if (heightLayer >= PC_NUM_HEIGHT_LAYER)
+            return 0;
           if (isCpe == pPce->FrontElementIsCpe[i] && pPce->FrontElementTagSelect[i] == tag) {
             int h, elIdx = ec[heightLayer], chIdx = cc[heightLayer];
             AUDIO_CHANNEL_TYPE aChType = (AUDIO_CHANNEL_TYPE)((heightLayer<<4) | ACT_FRONT);
@@ -704,6 +706,8 @@
         /* search in side channels */
         for (i = 0; i < pPce->NumSideChannelElements; i++) {
           int heightLayer = pPce->SideElementHeightInfo[i];
+          if (heightLayer >= PC_NUM_HEIGHT_LAYER)
+            return 0;
           if (isCpe == pPce->SideElementIsCpe[i] && pPce->SideElementTagSelect[i] == tag) {
             int h, elIdx = ec[heightLayer], chIdx = cc[heightLayer];
             AUDIO_CHANNEL_TYPE aChType = (AUDIO_CHANNEL_TYPE)((heightLayer<<4) | ACT_SIDE);
@@ -758,6 +762,8 @@
         /* search in back channels */
         for (i = 0; i < pPce->NumBackChannelElements; i++) {
           int heightLayer = pPce->BackElementHeightInfo[i];
+          if (heightLayer >= PC_NUM_HEIGHT_LAYER)
+            return 0;
           if (isCpe == pPce->BackElementIsCpe[i] && pPce->BackElementTagSelect[i] == tag) {
             int h, elIdx = ec[heightLayer], chIdx = cc[heightLayer];
             AUDIO_CHANNEL_TYPE aChType = (AUDIO_CHANNEL_TYPE)((heightLayer<<4) | ACT_BACK);
@@ -817,18 +823,24 @@
            Start with counting the front channels/elements at normal height */
         for (i = 0; i < pPce->NumFrontChannelElements; i+=1) {
           int heightLayer = pPce->FrontElementHeightInfo[i];
+          if (heightLayer >= PC_NUM_HEIGHT_LAYER)
+            return 0;
           ec[heightLayer] += 1;
           cc[heightLayer] += (pPce->FrontElementIsCpe[i]) ? 2 : 1;
         }
         /* Count side channels/elements at normal height */
         for (i = 0; i < pPce->NumSideChannelElements; i+=1) {
           int heightLayer = pPce->SideElementHeightInfo[i];
+          if (heightLayer >= PC_NUM_HEIGHT_LAYER)
+            return 0;
           ec[heightLayer] += 1;
           cc[heightLayer] += (pPce->SideElementIsCpe[i]) ? 2 : 1;
         }
         /* Count back channels/elements at normal height */
         for (i = 0; i < pPce->NumBackChannelElements; i+=1) {
           int heightLayer = pPce->BackElementHeightInfo[i];
+          if (heightLayer >= PC_NUM_HEIGHT_LAYER)
+            return 0;
           ec[heightLayer] += 1;
           cc[heightLayer] += (pPce->BackElementIsCpe[i]) ? 2 : 1;
         }

v0.1.5.tar.gz/libMpegTPDec/src/tpdec_lib.cpp -> v0.1.6.tar.gz/libMpegTPDec/src/tpdec_lib.cpp Changed

v0.1.5.tar.gz/libSBRdec/src/psbitdec.cpp -> v0.1.6.tar.gz/libSBRdec/src/psbitdec.cpp Changed

v0.1.5.tar.gz/libSBRdec/src/psdec.cpp -> v0.1.6.tar.gz/libSBRdec/src/psdec.cpp Changed

@@ -938,13 +938,13 @@
 
   INT     group = 0;
   INT     bin =  0;
-  INT     noIidSteps;
+  INT     noIidSteps, noFactors;
 
 /*  const UCHAR *pQuantizedIIDs;*/
 
   FIXP_SGL  invL;
   FIXP_DBL  ScaleL, ScaleR;
-  FIXP_DBL  Alpha, Beta;
+  FIXP_DBL  Alpha, Beta, AlphasValue;
   FIXP_DBL  h11r, h12r, h21r, h22r;
 
   const FIXP_DBL  *PScaleFactors;
@@ -984,6 +984,7 @@
   {
     PScaleFactors = ScaleFactorsFine; /* values are shiftet right by one */
     noIidSteps = NO_IID_STEPS_FINE;
+    noFactors = NO_IID_LEVELS_FINE;
     /*pQuantizedIIDs = quantizedIIDsFine;*/
   }
 
@@ -991,6 +992,7 @@
   {
     PScaleFactors = ScaleFactors; /* values are shiftet right by one */
     noIidSteps = NO_IID_STEPS;
+    noFactors = NO_IID_LEVELS;
     /*pQuantizedIIDs = quantizedIIDs;*/
   }
 
@@ -1012,11 +1014,17 @@
 
     /* ScaleR and ScaleL are scaled by 1 shift right */
 
-    ScaleR = PScaleFactors[noIidSteps + h_ps_d->specificTo.mpeg.coef.aaIidIndexMapped[env][bin]];
-    ScaleL = PScaleFactors[noIidSteps - h_ps_d->specificTo.mpeg.coef.aaIidIndexMapped[env][bin]];
-
-    Beta   = fMult (fMult( Alphas[h_ps_d->specificTo.mpeg.coef.aaIccIndexMapped[env][bin]], ( ScaleR - ScaleL )), FIXP_SQRT05);
-    Alpha  = Alphas[h_ps_d->specificTo.mpeg.coef.aaIccIndexMapped[env][bin]]>>1;
+    ScaleL = ScaleR = 0;
+    if (noIidSteps + h_ps_d->specificTo.mpeg.coef.aaIidIndexMapped[env][bin] >= 0 && noIidSteps + h_ps_d->specificTo.mpeg.coef.aaIidIndexMapped[env][bin] < noFactors)
+      ScaleR = PScaleFactors[noIidSteps + h_ps_d->specificTo.mpeg.coef.aaIidIndexMapped[env][bin]];
+    if (noIidSteps - h_ps_d->specificTo.mpeg.coef.aaIidIndexMapped[env][bin] >= 0 && noIidSteps - h_ps_d->specificTo.mpeg.coef.aaIidIndexMapped[env][bin] < noFactors)
+      ScaleL = PScaleFactors[noIidSteps - h_ps_d->specificTo.mpeg.coef.aaIidIndexMapped[env][bin]];
+
+    AlphasValue = 0;
+    if (h_ps_d->specificTo.mpeg.coef.aaIccIndexMapped[env][bin] >= 0)
+      AlphasValue = Alphas[h_ps_d->specificTo.mpeg.coef.aaIccIndexMapped[env][bin]];
+    Beta   = fMult (fMult( AlphasValue, ( ScaleR - ScaleL )), FIXP_SQRT05);
+    Alpha  = AlphasValue>>1;
 
     /* Alpha and Beta are now both scaled by 2 shifts right */

v0.1.5.tar.gz/libSBRdec/src/sbr_dec.cpp -> v0.1.6.tar.gz/libSBRdec/src/sbr_dec.cpp Changed

v0.1.5.tar.gz/libSBRdec/src/sbrdecoder.cpp -> v0.1.6.tar.gz/libSBRdec/src/sbrdecoder.cpp Changed

v0.1.5.tar.gz/libSBRenc/src/tran_det.cpp -> v0.1.6.tar.gz/libSBRenc/src/tran_det.cpp Changed

Overview

Request 4237 (accepted)

Request History