Add multichannel support am: c678d51bdc am: 9886d749d4
am: b0da0bce66
Change-Id: I2b701daf2c12a7b0454c46d48910671f10ccb2b6
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);
}