diff options
| author | Jean-Michel Trivi <jmtrivi@google.com> | 2014-05-20 17:29:03 -0700 |
|---|---|---|
| committer | Jean-Michel Trivi <jmtrivi@google.com> | 2014-05-20 17:29:03 -0700 |
| commit | 8e087bf394c5ceddcdb8b1d029795aff3026eea0 (patch) | |
| tree | e280804f0e5c2f36d575f430b7f897b1b0b5bc06 /libAACdec/src/aacdecoder.cpp | |
| parent | af967fcc55656a0d3c2a05982713f1ca43c1252b (diff) | |
| download | android_external_aac-8e087bf394c5ceddcdb8b1d029795aff3026eea0.tar.gz android_external_aac-8e087bf394c5ceddcdb8b1d029795aff3026eea0.tar.bz2 android_external_aac-8e087bf394c5ceddcdb8b1d029795aff3026eea0.zip | |
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
Diffstat (limited to 'libAACdec/src/aacdecoder.cpp')
| -rw-r--r-- | libAACdec/src/aacdecoder.cpp | 11 |
1 files changed, 11 insertions, 0 deletions
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)]; |