diff options
| author | Jean-Michel Trivi <jmtrivi@google.com> | 2013-08-29 15:51:31 -0700 |
|---|---|---|
| committer | Jean-Michel Trivi <jmtrivi@google.com> | 2013-08-29 15:51:31 -0700 |
| commit | 1b02586f0f41d82c80619cfc0d16cd3feb5eaec7 (patch) | |
| tree | 1ff03d8ff7fbb7a959a26bf4ea9c0f4984d01612 /media/libstagefright/codecs | |
| parent | 3bd3690fb0a423f9d0ba635e8db1c148ac9e93fc (diff) | |
| download | frameworks_av-1b02586f0f41d82c80619cfc0d16cd3feb5eaec7.zip frameworks_av-1b02586f0f41d82c80619cfc0d16cd3feb5eaec7.tar.gz frameworks_av-1b02586f0f41d82c80619cfc0d16cd3feb5eaec7.tar.bz2 | |
AAC encoder: handle missing object types
The audio object type for parametric stereo and lowdelay was not passed
to the FDK AAC encoder.
Bug 9428126
Change-Id: Ic32822afff8b1da6a2d80c1b65d514f24059fb29
Diffstat (limited to 'media/libstagefright/codecs')
| -rw-r--r-- | media/libstagefright/codecs/aacenc/SoftAACEncoder2.cpp | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/media/libstagefright/codecs/aacenc/SoftAACEncoder2.cpp b/media/libstagefright/codecs/aacenc/SoftAACEncoder2.cpp index 5749733..ff2b503 100644 --- a/media/libstagefright/codecs/aacenc/SoftAACEncoder2.cpp +++ b/media/libstagefright/codecs/aacenc/SoftAACEncoder2.cpp @@ -292,6 +292,10 @@ static AUDIO_OBJECT_TYPE getAOTFromProfile(OMX_U32 profile) { return AOT_AAC_LC; } else if (profile == OMX_AUDIO_AACObjectHE) { return AOT_SBR; + } else if (profile == OMX_AUDIO_AACObjectHE_PS) { + return AOT_PS; + } else if (profile == OMX_AUDIO_AACObjectLD) { + return AOT_ER_AAC_LD; } else if (profile == OMX_AUDIO_AACObjectELD) { return AOT_ER_AAC_ELD; } else { |