commit f64cb0309a450b3ba4b6a63995d0f310e7b7c1d8
author Andy Hung <hunga@google.com> Tue Jul 25 21:17:16 2023 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Tue Jul 25 21:17:16 2023 +0000
tree bc9d427f1b0187e82f1c5d5d5005abea96790484
parent d758be4c3f93841b2d5391cbcb115cdc2d562477
parent c0b05da74ea6e8f563e4846482ee9f3821582df0

Merge "Visualizer: Resolve multichannel capture" into main

media/libeffects/visualizer/EffectVisualizer.cpp

diff --git a/media/libeffects/visualizer/EffectVisualizer.cpp b/media/libeffects/visualizer/EffectVisualizer.cpp
index 1551e33..8d408dd 100644
--- a/media/libeffects/visualizer/EffectVisualizer.cpp
+++ b/media/libeffects/visualizer/EffectVisualizer.cpp
@@ -165,6 +165,7 @@
             pConfig->outputCfg.accessMode != EFFECT_BUFFER_ACCESS_ACCUMULATE) return -EINVAL;
     if (pConfig->inputCfg.format != kProcessFormat) return -EINVAL;
 
+    pContext->mChannelCount = channelCount;
     pContext->mConfig = *pConfig;
 
     Visualizer_reset(pContext);
@@ -229,8 +230,6 @@
     pContext->mScalingMode = VISUALIZER_SCALING_MODE_NORMALIZED;
 
     // measurement initialization
-    pContext->mChannelCount =
-            audio_channel_count_from_out_mask(pContext->mConfig.inputCfg.channels);
     pContext->mMeasurementMode = MEASUREMENT_MODE_NONE;
     pContext->mMeasurementWindowSizeInBuffers = MEASUREMENT_WINDOW_MAX_SIZE_IN_BUFFERS;
     pContext->mMeasurementBufferIdx = 0;