commit d1dfcf8480136fd3ed65e4f1caec593943516696
author Harish Mahendrakar <harish.mahendrakar@ittiam.com> Wed Dec 02 15:19:59 2020 -0800
committer Andy Hung <hunga@google.com> Mon Dec 14 19:39:37 2020 -0800
tree 5ce82f57db365dc1453f5e777a73e8b60dade0f0
parent 577e477d239bd5e1de58490b7d95caa418fa8fa7

lvm wrapper: Set SourceFormat as per number of channels

Bug: 171585865
Test: poc in bug
Test: AudioEffectTest, AudioPreProcessingTest, BassBoostTest
Test: EnvReverbTest, EqualizerTest, LoudnessEnhancerTest
Test: PresetReverbTest, VirtualizerTest, VisualizerTest
Change-Id: I9bcf11110c0da052b6a142289570da40a6f409d1

media/libeffects/lvm/wrapper/Bundle/EffectBundle.cpp

diff --git a/media/libeffects/lvm/wrapper/Bundle/EffectBundle.cpp b/media/libeffects/lvm/wrapper/Bundle/EffectBundle.cpp
index 670b415..865baad 100644
--- a/media/libeffects/lvm/wrapper/Bundle/EffectBundle.cpp
+++ b/media/libeffects/lvm/wrapper/Bundle/EffectBundle.cpp
@@ -1021,6 +1021,16 @@
         ActiveParams.NrChannels = NrChannels;
         ActiveParams.ChMask = pConfig->inputCfg.channels;
 
+        if (NrChannels == 1) {
+            ActiveParams.SourceFormat = LVM_MONO;
+        } else if (NrChannels == 2) {
+            ActiveParams.SourceFormat = LVM_STEREO;
+        } else if (NrChannels > 2 && NrChannels <= LVM_MAX_CHANNELS) {
+            ActiveParams.SourceFormat = LVM_MULTICHANNEL;
+        } else {
+            return -EINVAL;
+        }
+
         LvmStatus = LVM_SetControlParameters(pContext->pBundledContext->hInstance, &ActiveParams);
 
         LVM_ERROR_CHECK(LvmStatus, "LVM_SetControlParameters", "Effect_setConfig")