summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPawin Vongmasa2018-05-24 12:33:18 -0500
committerandroid-build-merger2018-05-24 12:33:18 -0500
commit5ed6bca9162bb44e8b3d00019221ba2f37fe1bba (patch)
treeb5e0abde332b59d307b09f6288e413c9721a7e13 /media/omx/1.0
parent1f74538cdb297a0a2ecd4ac1cc40214e83edb11f (diff)
parentb0da0bce66814838b9f7f0834bb94930895cfc95 (diff)
downloadplatform-hardware-interfaces-5ed6bca9162bb44e8b3d00019221ba2f37fe1bba.tar.gz
platform-hardware-interfaces-5ed6bca9162bb44e8b3d00019221ba2f37fe1bba.tar.xz
platform-hardware-interfaces-5ed6bca9162bb44e8b3d00019221ba2f37fe1bba.zip
Add multichannel support am: c678d51bdc am: 9886d749d4
am: b0da0bce66 Change-Id: I2b701daf2c12a7b0454c46d48910671f10ccb2b6
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 9500094d..e7ae0830 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 @@ void setupPCMPort(sp<IOmxNode> omxNode, OMX_U32 portIndex, int32_t nChannels,
94 param.eChannelMapping[0] = OMX_AUDIO_ChannelLF; 94 param.eChannelMapping[0] = OMX_AUDIO_ChannelLF;
95 param.eChannelMapping[1] = OMX_AUDIO_ChannelRF; 95 param.eChannelMapping[1] = OMX_AUDIO_ChannelRF;
96 break; 96 break;
97 case 3:
98 param.eChannelMapping[0] = OMX_AUDIO_ChannelLF;
99 param.eChannelMapping[1] = OMX_AUDIO_ChannelRF;
100 param.eChannelMapping[2] = OMX_AUDIO_ChannelCF;
101 break;
102 case 4:
103 param.eChannelMapping[0] = OMX_AUDIO_ChannelLF;
104 param.eChannelMapping[1] = OMX_AUDIO_ChannelRF;
105 param.eChannelMapping[2] = OMX_AUDIO_ChannelLR;
106 param.eChannelMapping[3] = OMX_AUDIO_ChannelRR;
107 break;
108 case 5:
109 param.eChannelMapping[0] = OMX_AUDIO_ChannelLF;
110 param.eChannelMapping[1] = OMX_AUDIO_ChannelRF;
111 param.eChannelMapping[2] = OMX_AUDIO_ChannelCF;
112 param.eChannelMapping[3] = OMX_AUDIO_ChannelLR;
113 param.eChannelMapping[4] = OMX_AUDIO_ChannelRR;
114 break;
115 case 6:
116 param.eChannelMapping[0] = OMX_AUDIO_ChannelLF;
117 param.eChannelMapping[1] = OMX_AUDIO_ChannelRF;
118 param.eChannelMapping[2] = OMX_AUDIO_ChannelCF;
119 param.eChannelMapping[3] = OMX_AUDIO_ChannelLFE;
120 param.eChannelMapping[4] = OMX_AUDIO_ChannelLR;
121 param.eChannelMapping[5] = OMX_AUDIO_ChannelRR;
122 break;
123 case 7:
124 param.eChannelMapping[0] = OMX_AUDIO_ChannelLF;
125 param.eChannelMapping[1] = OMX_AUDIO_ChannelRF;
126 param.eChannelMapping[2] = OMX_AUDIO_ChannelCF;
127 param.eChannelMapping[3] = OMX_AUDIO_ChannelLFE;
128 param.eChannelMapping[4] = OMX_AUDIO_ChannelLR;
129 param.eChannelMapping[5] = OMX_AUDIO_ChannelRR;
130 param.eChannelMapping[6] = OMX_AUDIO_ChannelCS;
131 break;
132 case 8:
133 param.eChannelMapping[0] = OMX_AUDIO_ChannelLF;
134 param.eChannelMapping[1] = OMX_AUDIO_ChannelRF;
135 param.eChannelMapping[2] = OMX_AUDIO_ChannelCF;
136 param.eChannelMapping[3] = OMX_AUDIO_ChannelLFE;
137 param.eChannelMapping[4] = OMX_AUDIO_ChannelLR;
138 param.eChannelMapping[5] = OMX_AUDIO_ChannelRR;
139 param.eChannelMapping[6] = OMX_AUDIO_ChannelLS;
140 param.eChannelMapping[7] = OMX_AUDIO_ChannelRS;
141 break;
97 default: 142 default:
98 EXPECT_TRUE(false); 143 EXPECT_TRUE(false);
99 } 144 }