Merge "Audio Effect : Add checks to validate the channel count" into main am: a10d3c536f am: 7f56477a4e am: cb2e389605

Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2902252

Change-Id: I18ec37e502764ea63b7a04fb65f8af69f0b1ac44
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
diff --git a/audio/aidl/default/include/effect-impl/EffectContext.h b/audio/aidl/default/include/effect-impl/EffectContext.h
index 698e7a5..89d0c7c 100644
--- a/audio/aidl/default/include/effect-impl/EffectContext.h
+++ b/audio/aidl/default/include/effect-impl/EffectContext.h
@@ -46,6 +46,14 @@
         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(