diff options
| author | Pawin Vongmasa <pawin@google.com> | 2018-05-25 00:50:01 -0700 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2018-05-25 00:50:01 -0700 |
| commit | bd49dcfd9b4633fc2245ccf8c7d56211ed34719e (patch) | |
| tree | 18f9ef758f966be794081c456b7bfe38328f0301 /media | |
| parent | 5366d34febcbb07a75bf6f3e7c6a5f6378d23203 (diff) | |
| parent | 86e4c2cfd8db35871e4209fb9cbc8e4a8e05e370 (diff) | |
| download | android_hardware_interfaces-bd49dcfd9b4633fc2245ccf8c7d56211ed34719e.tar.gz android_hardware_interfaces-bd49dcfd9b4633fc2245ccf8c7d56211ed34719e.tar.bz2 android_hardware_interfaces-bd49dcfd9b4633fc2245ccf8c7d56211ed34719e.zip | |
Add multichannel support am: c678d51bdc am: 9886d749d4 am: b0da0bce66 am: 5ed6bca916
am: 86e4c2cfd8
Change-Id: I8eb5a776aa7a08a2eac5466f12ffc844f0b649db
Diffstat (limited to 'media')
| -rw-r--r-- | media/omx/1.0/vts/functional/audio/media_audio_hidl_test_common.cpp | 45 |
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 9500094d6..e7ae08301 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, 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); } |