summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPawin Vongmasa2018-05-10 20:39:25 -0500
committerPawin Vongmasa2018-05-10 20:39:25 -0500
commitc678d51bdce5c0c20f2629aa991ae4df5efd4002 (patch)
treea910caa78437bfc46c33858fff5c2bf7d7c382d7 /media/omx/1.0
parent14ad821b0ab347e82c7edac4c92396adf0443edd (diff)
downloadplatform-hardware-interfaces-c678d51bdce5c0c20f2629aa991ae4df5efd4002.tar.gz
platform-hardware-interfaces-c678d51bdce5c0c20f2629aa991ae4df5efd4002.tar.xz
platform-hardware-interfaces-c678d51bdce5c0c20f2629aa991ae4df5efd4002.zip
Add multichannel support
Test: make vts -j123 && vts-tradefed run commandAndExit vts \ --skip-all-system-status-check \ --skip-preconditions -m VtsHalMediaOmxStoreV1_0Host \ -l INFO Bug: 69811887 Change-Id: I6ddf882d5a0d991acc8123ed6d220835fc6cce5c
Diffstat (limited to 'media/omx/1.0')
-rw-r--r--media/omx/1.0/vts/functional/audio/media_audio_hidl_test_common.cpp45
1 files changed, 45 insertions, 0 deletions
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 4c68219b..99671d41 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
@@ -90,6 +90,51 @@ void setupPCMPort(sp<IOmxNode> omxNode, OMX_U32 portIndex, int32_t nChannels,
90 param.eChannelMapping[0] = OMX_AUDIO_ChannelLF; 90 param.eChannelMapping[0] = OMX_AUDIO_ChannelLF;
91 param.eChannelMapping[1] = OMX_AUDIO_ChannelRF; 91 param.eChannelMapping[1] = OMX_AUDIO_ChannelRF;
92 break; 92 break;
93 case 3:
94 param.eChannelMapping[0] = OMX_AUDIO_ChannelLF;
95 param.eChannelMapping[1] = OMX_AUDIO_ChannelRF;
96 param.eChannelMapping[2] = OMX_AUDIO_ChannelCF;
97 break;
98 case 4:
99 param.eChannelMapping[0] = OMX_AUDIO_ChannelLF;
100 param.eChannelMapping[1] = OMX_AUDIO_ChannelRF;
101 param.eChannelMapping[2] = OMX_AUDIO_ChannelLR;
102 param.eChannelMapping[3] = OMX_AUDIO_ChannelRR;
103 break;
104 case 5:
105 param.eChannelMapping[0] = OMX_AUDIO_ChannelLF;
106 param.eChannelMapping[1] = OMX_AUDIO_ChannelRF;
107 param.eChannelMapping[2] = OMX_AUDIO_ChannelCF;
108 param.eChannelMapping[3] = OMX_AUDIO_ChannelLR;
109 param.eChannelMapping[4] = OMX_AUDIO_ChannelRR;
110 break;
111 case 6:
112 param.eChannelMapping[0] = OMX_AUDIO_ChannelLF;
113 param.eChannelMapping[1] = OMX_AUDIO_ChannelRF;
114 param.eChannelMapping[2] = OMX_AUDIO_ChannelCF;
115 param.eChannelMapping[3] = OMX_AUDIO_ChannelLFE;
116 param.eChannelMapping[4] = OMX_AUDIO_ChannelLR;
117 param.eChannelMapping[5] = OMX_AUDIO_ChannelRR;
118 break;
119 case 7:
120 param.eChannelMapping[0] = OMX_AUDIO_ChannelLF;
121 param.eChannelMapping[1] = OMX_AUDIO_ChannelRF;
122 param.eChannelMapping[2] = OMX_AUDIO_ChannelCF;
123 param.eChannelMapping[3] = OMX_AUDIO_ChannelLFE;
124 param.eChannelMapping[4] = OMX_AUDIO_ChannelLR;
125 param.eChannelMapping[5] = OMX_AUDIO_ChannelRR;
126 param.eChannelMapping[6] = OMX_AUDIO_ChannelCS;
127 break;
128 case 8:
129 param.eChannelMapping[0] = OMX_AUDIO_ChannelLF;
130 param.eChannelMapping[1] = OMX_AUDIO_ChannelRF;
131 param.eChannelMapping[2] = OMX_AUDIO_ChannelCF;
132 param.eChannelMapping[3] = OMX_AUDIO_ChannelLFE;
133 param.eChannelMapping[4] = OMX_AUDIO_ChannelLR;
134 param.eChannelMapping[5] = OMX_AUDIO_ChannelRR;
135 param.eChannelMapping[6] = OMX_AUDIO_ChannelLS;
136 param.eChannelMapping[7] = OMX_AUDIO_ChannelRS;
137 break;
93 default: 138 default:
94 EXPECT_TRUE(false); 139 EXPECT_TRUE(false);
95 } 140 }