commit 96cf0a59adc029b877154ee56906edb8855fd0c8
author Mikhail Naganov <mnaganov@google.com> Mon Jan 23 10:45:03 2017 -0800
committer Mikhail Naganov <mnaganov@google.com> Thu Jan 26 17:53:45 2017 -0800
tree 0e6d25b235ac6488c6ae651b37c2108318f9ed5a
parent c0461f5b18eb6d5516804810f315e6c23879a09d

Audio HAL: extensions for new SoC features

Extend audio channel mask.

Added AC4 format.

Change-Id: Id65423396a84a84b418aa01937f55359498ae4a1
Test: make

media/libmedia/TypeConverter.cpp

diff --git a/media/libmedia/TypeConverter.cpp b/media/libmedia/TypeConverter.cpp
index 25c29f2..8ce2b9f 100644
--- a/media/libmedia/TypeConverter.cpp
+++ b/media/libmedia/TypeConverter.cpp
@@ -186,6 +186,7 @@
     MAKE_STRING_FROM_ENUM(AUDIO_FORMAT_SBC),
     MAKE_STRING_FROM_ENUM(AUDIO_FORMAT_APTX),
     MAKE_STRING_FROM_ENUM(AUDIO_FORMAT_APTX_HD),
+    MAKE_STRING_FROM_ENUM(AUDIO_FORMAT_AC4),
     MAKE_STRING_FROM_ENUM(AUDIO_FORMAT_LDAC),
     TERMINATOR
 };
@@ -211,6 +212,7 @@
     MAKE_STRING_FROM_ENUM(AUDIO_CHANNEL_IN_MONO),
     MAKE_STRING_FROM_ENUM(AUDIO_CHANNEL_IN_STEREO),
     MAKE_STRING_FROM_ENUM(AUDIO_CHANNEL_IN_FRONT_BACK),
+    MAKE_STRING_FROM_ENUM(AUDIO_CHANNEL_IN_6),
     MAKE_STRING_FROM_ENUM(AUDIO_CHANNEL_IN_VOICE_UPLINK_MONO),
     MAKE_STRING_FROM_ENUM(AUDIO_CHANNEL_IN_VOICE_DNLINK_MONO),
     MAKE_STRING_FROM_ENUM(AUDIO_CHANNEL_IN_VOICE_CALL_MONO),