commit 47279e630f47ce1e220ceda4da90e94de273d2eb
author TreeHugger Robot <treehugger-gerrit@google.com> Wed Jan 23 23:05:26 2019 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Wed Jan 23 23:05:26 2019 +0000
tree 9456315b48270a9dc1a9a8a82f223f959c6761af
parent 9a0a53f48a0b09437f13f806ec5dab6bd62af3b2
parent dc3ad9abfe646cbbac5e2d14647cf52c74a72641

Merge "audio: Add type conversion entries for audio formats"

media/libmedia/TypeConverter.cpp

diff --git a/media/libmedia/TypeConverter.cpp b/media/libmedia/TypeConverter.cpp
index c24e046..b4ceeb0 100644
--- a/media/libmedia/TypeConverter.cpp
+++ b/media/libmedia/TypeConverter.cpp
@@ -209,6 +209,12 @@
     MAKE_STRING_FROM_ENUM(AUDIO_FORMAT_MAT_1_0),
     MAKE_STRING_FROM_ENUM(AUDIO_FORMAT_MAT_2_0),
     MAKE_STRING_FROM_ENUM(AUDIO_FORMAT_MAT_2_1),
+    MAKE_STRING_FROM_ENUM(AUDIO_FORMAT_AAC_LATM),
+    MAKE_STRING_FROM_ENUM(AUDIO_FORMAT_AAC_LATM_LC),
+    MAKE_STRING_FROM_ENUM(AUDIO_FORMAT_AAC_LATM_HE_V1),
+    MAKE_STRING_FROM_ENUM(AUDIO_FORMAT_AAC_LATM_HE_V2),
+    MAKE_STRING_FROM_ENUM(AUDIO_FORMAT_CELT),
+    MAKE_STRING_FROM_ENUM(AUDIO_FORMAT_APTX_ADAPTIVE),
     TERMINATOR
 };