commit 7a34a8bd9e15ea2b19b08087600bedf6806b8300
author Ray Essick <essick@google.com> Tue Oct 22 13:33:29 2019 -0700
committer Ray Essick <essick@google.com> Tue Oct 22 13:33:29 2019 -0700
tree b1acf17d2cd293e40782dd5ee231a9455500eca4
parent f6581aaac9469864be4bd915bca0c1ae9f37d55d

g711 channel count limits

correct 'default to 6 channels' to 'default 1; max 6 channels'

Bug: 143163373
Test: vts-tradefed run vts --module VtsHalMediaC2V1_0Host

media/codec2/components/g711/C2SoftG711Dec.cpp

diff --git a/media/codec2/components/g711/C2SoftG711Dec.cpp b/media/codec2/components/g711/C2SoftG711Dec.cpp
index b6cc32e..4ff0793 100644
--- a/media/codec2/components/g711/C2SoftG711Dec.cpp
+++ b/media/codec2/components/g711/C2SoftG711Dec.cpp
@@ -73,8 +73,8 @@
 
         addParameter(
                 DefineParam(mChannelCount, C2_PARAMKEY_CHANNEL_COUNT)
-                .withDefault(new C2StreamChannelCountInfo::output(0u, 6))
-                .withFields({C2F(mChannelCount, value).equalTo(1)})
+                .withDefault(new C2StreamChannelCountInfo::output(0u, 1))
+                .withFields({C2F(mChannelCount, value).inRange(1, 6)})
                 .withSetter(Setter<decltype(*mChannelCount)>::StrictValueWithNoDeps)
                 .build());