From a3d4847794daab80adb1f189294d6cdd0bf895aa Mon Sep 17 00:00:00 2001 From: Shraddha Basantwani Date: Tue, 9 Jan 2024 10:34:04 +0000 Subject: [PATCH] Audio Effect : Add checks to validate the channel count Bug: 302036943 Test: atest audioeffect_analysis Change-Id: Ic64394e646fa23e02e499c2f01ef3bd4490450d2 --- audio/aidl/default/include/effect-impl/EffectContext.h | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/audio/aidl/default/include/effect-impl/EffectContext.h b/audio/aidl/default/include/effect-impl/EffectContext.h index 698e7a50ce..89d0c7cf3c 100644 --- a/audio/aidl/default/include/effect-impl/EffectContext.h +++ b/audio/aidl/default/include/effect-impl/EffectContext.h @@ -46,6 +46,14 @@ class EffectContext { LOG_ALWAYS_FATAL_IF(output.base.format.pcm != aidl::android::media::audio::common::PcmType::FLOAT_32_BIT, "outputFormatNotFloat"); + + size_t inputChannelCount = + ::aidl::android::hardware::audio::common::getChannelCount(input.base.channelMask); + LOG_ALWAYS_FATAL_IF(inputChannelCount == 0, "inputChannelCountNotValid"); + size_t outputChannelCount = + ::aidl::android::hardware::audio::common::getChannelCount(output.base.channelMask); + LOG_ALWAYS_FATAL_IF(outputChannelCount == 0, "outputChannelCountNotValid"); + mInputFrameSize = ::aidl::android::hardware::audio::common::getFrameSizeInBytes( input.base.format, input.base.channelMask); mOutputFrameSize = ::aidl::android::hardware::audio::common::getFrameSizeInBytes(