commit f8d993d22b081f34660c993d5b1fd04645b81153
author Mikhail Naganov <mnaganov@google.com> Fri Mar 09 06:28:05 2018 +0000
committer android-build-merger <android-build-merger@google.com> Fri Mar 09 06:28:05 2018 +0000
tree a63c6ebf14bf155e667299dfa70861d870e9351d
parent 660ae209f170f4709cecd93f0dc5574bb9ec9db3
parent 765c492f0d488ccb97046d1e99e67890b0196b83

Merge "Add AUDIO_FORMAT_AAC_XHE to type converter" into pi-dev am: 4706f6af73
am: 765c492f0d

Change-Id: I945f0b93cc54e3a79521da5886bbc0f974d7098e

media/libmedia/TypeConverter.cpp

diff --git a/media/libmedia/TypeConverter.cpp b/media/libmedia/TypeConverter.cpp
index 96dd004..9323d6d 100644
--- a/media/libmedia/TypeConverter.cpp
+++ b/media/libmedia/TypeConverter.cpp
@@ -158,6 +158,7 @@
     MAKE_STRING_FROM_ENUM(AUDIO_FORMAT_AAC_LD),
     MAKE_STRING_FROM_ENUM(AUDIO_FORMAT_AAC_HE_V2),
     MAKE_STRING_FROM_ENUM(AUDIO_FORMAT_AAC_ELD),
+    MAKE_STRING_FROM_ENUM(AUDIO_FORMAT_AAC_XHE),
     MAKE_STRING_FROM_ENUM(AUDIO_FORMAT_AAC_ADTS_MAIN),
     MAKE_STRING_FROM_ENUM(AUDIO_FORMAT_AAC_ADTS_LC),
     MAKE_STRING_FROM_ENUM(AUDIO_FORMAT_AAC_ADTS_SSR),