From 698b536f3b34a7cfc41a80e1034cc359456bdd66 Mon Sep 17 00:00:00 2001
From: Dave Burke <daveburke@google.com>
Date: Sat, 12 May 2012 13:17:25 -0700
Subject: Update to 2012_05_11 version.

Fixes:
- Don't throw error for invalid bitrate but limit to functional value
- More robust ASC parsing
- More robust handling of corrupt bitstreams
- Handle multiple raw access units

Change-Id: Ib49fe2545ff4185fe924126da702fe84ac5c2d87
---
 libSBRdec/src/sbr_dec.cpp | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

(limited to 'libSBRdec/src/sbr_dec.cpp')

diff --git a/libSBRdec/src/sbr_dec.cpp b/libSBRdec/src/sbr_dec.cpp
index a075ca3..6be3c00 100644
--- a/libSBRdec/src/sbr_dec.cpp
+++ b/libSBRdec/src/sbr_dec.cpp
@@ -25,7 +25,7 @@
 *******************************************************************************/
 /*!
   \file
-  \brief  Sbr decoder $Revision: 36841 $
+  \brief  Sbr decoder $Revision: 37646 $
   This module provides the actual decoder implementation. The SBR data (side information) is already
   decoded. Only three functions are provided:
 
@@ -537,6 +537,9 @@ sbr_dec ( HANDLE_SBR_DEC hSbrDec,            /*!< handle to Decoder channel */
         maxShift = hSbrDec->sbrDrcChannel.nextFact_exp;
       }
 
+      /* copy DRC data to right channel (with PS both channels use the same DRC gains) */
+      FDKmemcpy(&hSbrDecRight->sbrDrcChannel, &hSbrDec->sbrDrcChannel, sizeof(SBRDEC_DRC_CHANNEL));
+
       for (i = 0; i < synQmf->no_col; i++) {  /* ----- no_col loop ----- */
 
         INT outScalefactorR, outScalefactorL;
@@ -565,7 +568,7 @@ sbr_dec ( HANDLE_SBR_DEC hSbrDec,            /*!< handle to Decoder channel */
 
 
         sbrDecoder_drcApplySlot ( /* right channel */
-                                 &hSbrDec->sbrDrcChannel,
+                                 &hSbrDecRight->sbrDrcChannel,
                                   rQmfReal,
                                   rQmfImag,
                                   i,
-- 
cgit v1.2.3