Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 39b588a7 authored by Andy Hung's avatar Andy Hung Committed by Automerger Merge Worker
Browse files

Merge "Visualizer: Resolve multichannel capture" into main am: f64cb030 am:... 

Merge "Visualizer: Resolve multichannel capture" into main am: f64cb030 am: d53b6f9e am: 3d56d046

Original change: https://android-review.googlesource.com/c/platform/frameworks/av/+/2673539



Change-Id: If8581853d789e3374abb0c0d10e5f31dc3d9d6e7
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents d29f8891 3d56d046

media/libeffects/visualizer/EffectVisualizer.cpp

+1 −2
Original line number Diff line number Diff line
@@ -165,6 +165,7 @@ int Visualizer_setConfig(VisualizerContext *pContext, effect_config_t *pConfig) 
            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 @@ int Visualizer_init(VisualizerContext *pContext) 
    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;