commit 7712a4be1507698f66663ae6ce5f04806c16ce74
author Ray Essick <essick@google.com> Fri Sep 06 17:06:29 2019 -0700
committer Ray Essick <essick@google.com> Wed Sep 11 14:29:35 2019 +0000
tree 55167f614845acefacac3b5dc0dfe57a85c3c421
parent d4473d4ed29d61a1134a21e0523c3fb0eac100be

Allow codec2/g711 codec to handle 6 channels

OMX allowed 6, but codec2 was restricting to 1 channel.

Bug: 140469404
Test: playback clip from bug
(cherry picked from commit edba5005d9012e809cb08f8864e073c57f392421)

Change-Id: I9d86c40741f1442ca8147e2802a9ce54df31bbd1

media/codec2/components/g711/C2SoftG711Dec.cpp

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