diff options
| author | Jean-Michel Trivi <jmtrivi@google.com> | 2012-08-13 17:46:40 -0700 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2012-08-13 17:46:40 -0700 |
| commit | 0088e930b17228f23ddfff4840ed6172da354730 (patch) | |
| tree | 44b3ec3b449b948bf6092b44ed2f876735a7cf26 /media/libstagefright/codecs | |
| parent | 93b68548124ec9b01b9bf4ddf010afa06a503547 (diff) | |
| parent | 5696a4efef79ee474ac6bcf2639c741e159bed1b (diff) | |
| download | frameworks_av-0088e930b17228f23ddfff4840ed6172da354730.zip frameworks_av-0088e930b17228f23ddfff4840ed6172da354730.tar.gz frameworks_av-0088e930b17228f23ddfff4840ed6172da354730.tar.bz2 | |
Merge "Fix AAC DRC metadata being ignored" into jb-mr1-dev
Diffstat (limited to 'media/libstagefright/codecs')
| -rw-r--r-- | media/libstagefright/codecs/aacdec/SoftAAC2.cpp | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/media/libstagefright/codecs/aacdec/SoftAAC2.cpp b/media/libstagefright/codecs/aacdec/SoftAAC2.cpp index 566b1db..040a7be 100644 --- a/media/libstagefright/codecs/aacdec/SoftAAC2.cpp +++ b/media/libstagefright/codecs/aacdec/SoftAAC2.cpp @@ -26,6 +26,8 @@ #define FILEREAD_MAX_LAYERS 2 +#define DRC_DEFAULT_REF_LEVEL 108 /* 108*0.25dB = -27 dB below full scale (typical for movies) */ + namespace android { template<class T> @@ -110,6 +112,9 @@ status_t SoftAAC2::initDecoder() { } } mIsFirst = true; + // the decoder will bypass all DRC processing during decode unless any of the DRC parameters + // is set, so here we just reset the DRC reference level to its default value. + aacDecoder_SetParam(mAACDecoder, AAC_DRC_REFERENCE_LEVEL, DRC_DEFAULT_REF_LEVEL); return status; } |