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/aacdec_drc.cpp | 32 +++++++++++++++++++++++++++++++-
 1 file changed, 31 insertions(+), 1 deletion(-)

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

diff --git a/libAACdec/src/aacdec_drc.cpp b/libAACdec/src/aacdec_drc.cpp
index ba7419d..0c33a2b 100644
--- a/libAACdec/src/aacdec_drc.cpp
+++ b/libAACdec/src/aacdec_drc.cpp
@@ -145,6 +145,8 @@ void aacDecoder_drcInit (
 
   /* initial program ref level = target ref level */
   self->progRefLevel = pParams->targetRefLevel;
+  self->progRefLevelPresent = 0;
+  self->presMode = -1;
 }
 
 
@@ -572,7 +574,7 @@ static int aacDecoder_drcReadCompression (
     return 0;
   }
   FDKreadBits(bs, 2);                          /* dolby_surround_mode */
-  FDKreadBits(bs, 2);                          /* presentation_mode */
+  pDrcBs->presMode = FDKreadBits(bs, 2);       /* presentation_mode */
   FDKreadBits(bs, 1);                          /* stereo_downmix_mode */
   if (FDKreadBits(bs, 1) != 0) {               /* reserved, set to 0 */
     return 0;
@@ -803,9 +805,15 @@ static int aacDecoder_drcExtractAndMap (
      */
     if (pThreadBs->progRefLevel >= 0) {
       self->progRefLevel = pThreadBs->progRefLevel;
+      self->progRefLevelPresent = 1;
       self->prlExpiryCount = 0;  /* Got a new value -> Reset counter */
     }
 
+    if (drcPayloadType == DVB_DRC_ANC_DATA) {
+      /* Announce the presentation mode of this valid thread. */
+      self->presMode = pThreadBs->presMode;
+    }
+
     /* SCE, CPE and LFE */
     for (ch = 0; ch < validChannels; ch++) {
       int mapedChannel = channelMapping[ch];
@@ -825,6 +833,7 @@ static int aacDecoder_drcExtractAndMap (
   if ( (pParams->expiryFrame > 0)
     && (self->prlExpiryCount++ > pParams->expiryFrame) )
   { /* The program reference level is too old, so set it back to the target level. */
+    self->progRefLevelPresent = 0;
     self->progRefLevel = pParams->targetRefLevel;
     self->prlExpiryCount = 0;
   }
@@ -1156,3 +1165,24 @@ int aacDecoder_drcEpilog (
   return err;
 }
 
+/*
+ * Export relevant metadata info from bitstream payload.
+ */
+void aacDecoder_drcGetInfo (
+        HANDLE_AAC_DRC  self,
+        SCHAR          *pPresMode,
+        SCHAR          *pProgRefLevel )
+{
+  if (self != NULL) {
+    if (pPresMode != NULL) {
+      *pPresMode = self->presMode;
+    }
+    if (pProgRefLevel != NULL) {
+      if (self->progRefLevelPresent) {
+        *pProgRefLevel = self->progRefLevel;
+      } else {
+        *pProgRefLevel = -1;
+      }
+    }
+  }
+}
-- 
cgit v1.2.3