commit bd49dcfd9b4633fc2245ccf8c7d56211ed34719e
author Pawin Vongmasa <pawin@google.com> Fri May 25 00:50:01 2018 -0700
committer android-build-merger <android-build-merger@google.com> Fri May 25 00:50:01 2018 -0700
tree 18f9ef758f966be794081c456b7bfe38328f0301
parent 5366d34febcbb07a75bf6f3e7c6a5f6378d23203
parent 86e4c2cfd8db35871e4209fb9cbc8e4a8e05e370

Add multichannel support am: c678d51bdc am: 9886d749d4 am: b0da0bce66 am: 5ed6bca916
am: 86e4c2cfd8

Change-Id: I8eb5a776aa7a08a2eac5466f12ffc844f0b649db

media/omx/1.0/vts/functional/audio/media_audio_hidl_test_common.cpp

diff --git a/media/omx/1.0/vts/functional/audio/media_audio_hidl_test_common.cpp b/media/omx/1.0/vts/functional/audio/media_audio_hidl_test_common.cpp
index 9500094..e7ae083 100644
--- a/media/omx/1.0/vts/functional/audio/media_audio_hidl_test_common.cpp
+++ b/media/omx/1.0/vts/functional/audio/media_audio_hidl_test_common.cpp
@@ -94,6 +94,51 @@
             param.eChannelMapping[0] = OMX_AUDIO_ChannelLF;
             param.eChannelMapping[1] = OMX_AUDIO_ChannelRF;
             break;
+        case 3:
+            param.eChannelMapping[0] = OMX_AUDIO_ChannelLF;
+            param.eChannelMapping[1] = OMX_AUDIO_ChannelRF;
+            param.eChannelMapping[2] = OMX_AUDIO_ChannelCF;
+            break;
+        case 4:
+            param.eChannelMapping[0] = OMX_AUDIO_ChannelLF;
+            param.eChannelMapping[1] = OMX_AUDIO_ChannelRF;
+            param.eChannelMapping[2] = OMX_AUDIO_ChannelLR;
+            param.eChannelMapping[3] = OMX_AUDIO_ChannelRR;
+            break;
+        case 5:
+            param.eChannelMapping[0] = OMX_AUDIO_ChannelLF;
+            param.eChannelMapping[1] = OMX_AUDIO_ChannelRF;
+            param.eChannelMapping[2] = OMX_AUDIO_ChannelCF;
+            param.eChannelMapping[3] = OMX_AUDIO_ChannelLR;
+            param.eChannelMapping[4] = OMX_AUDIO_ChannelRR;
+            break;
+        case 6:
+            param.eChannelMapping[0] = OMX_AUDIO_ChannelLF;
+            param.eChannelMapping[1] = OMX_AUDIO_ChannelRF;
+            param.eChannelMapping[2] = OMX_AUDIO_ChannelCF;
+            param.eChannelMapping[3] = OMX_AUDIO_ChannelLFE;
+            param.eChannelMapping[4] = OMX_AUDIO_ChannelLR;
+            param.eChannelMapping[5] = OMX_AUDIO_ChannelRR;
+            break;
+        case 7:
+            param.eChannelMapping[0] = OMX_AUDIO_ChannelLF;
+            param.eChannelMapping[1] = OMX_AUDIO_ChannelRF;
+            param.eChannelMapping[2] = OMX_AUDIO_ChannelCF;
+            param.eChannelMapping[3] = OMX_AUDIO_ChannelLFE;
+            param.eChannelMapping[4] = OMX_AUDIO_ChannelLR;
+            param.eChannelMapping[5] = OMX_AUDIO_ChannelRR;
+            param.eChannelMapping[6] = OMX_AUDIO_ChannelCS;
+            break;
+        case 8:
+            param.eChannelMapping[0] = OMX_AUDIO_ChannelLF;
+            param.eChannelMapping[1] = OMX_AUDIO_ChannelRF;
+            param.eChannelMapping[2] = OMX_AUDIO_ChannelCF;
+            param.eChannelMapping[3] = OMX_AUDIO_ChannelLFE;
+            param.eChannelMapping[4] = OMX_AUDIO_ChannelLR;
+            param.eChannelMapping[5] = OMX_AUDIO_ChannelRR;
+            param.eChannelMapping[6] = OMX_AUDIO_ChannelLS;
+            param.eChannelMapping[7] = OMX_AUDIO_ChannelRS;
+            break;
         default:
             EXPECT_TRUE(false);
     }