From 8e087bf394c5ceddcdb8b1d029795aff3026eea0 Mon Sep 17 00:00:00 2001
From: Jean-Michel Trivi <jmtrivi@google.com>
Date: Tue, 20 May 2014 17:29:03 -0700
Subject: AAC-Decoder: DRC metadata in stream info

Provide relevant DRC metadata information via API needed for DRC
  presentation mode wrapper.

Bug 9428126

Change-Id: I827cd6bdfd2a8799c21935ae32af23739c90a9b6
---
 libAACdec/src/aacdecoder.cpp | 11 +++++++++++
 1 file changed, 11 insertions(+)

(limited to 'libAACdec/src/aacdecoder.cpp')

diff --git a/libAACdec/src/aacdecoder.cpp b/libAACdec/src/aacdecoder.cpp
index 15b47ab..e19c501 100644
--- a/libAACdec/src/aacdecoder.cpp
+++ b/libAACdec/src/aacdecoder.cpp
@@ -719,6 +719,10 @@ void CStreamInfoInit(CStreamInfo *pStreamInfo)
   pStreamInfo->frameSize = 0;
 
   pStreamInfo->outputDelay = 0;
+
+  /* DRC */
+  pStreamInfo->drcProgRefLev = -1;                           /* set program reference level to not indicated */
+  pStreamInfo->drcPresMode = -1;                             /* default: presentation mode not indicated */
 }
 
 /*!
@@ -1785,6 +1789,13 @@ LINKSPEC_CPP AAC_DECODER_ERROR CAacDecoder_DecodeFrame(
   /* Add additional concealment delay */
   self->streamInfo.outputDelay += CConcealment_GetDelay(&self->concealCommonData) * self->streamInfo.aacSamplesPerFrame;
 
+  /* Map DRC data to StreamInfo structure */
+  aacDecoder_drcGetInfo (
+            self->hDrcInfo,
+           &self->streamInfo.drcPresMode,
+           &self->streamInfo.drcProgRefLev
+          );
+
   /* Reorder channel type information tables.  */
   {
     AUDIO_CHANNEL_TYPE types[(8)];
-- 
cgit v1.2.3