commit 7045366dd267f0545058eea74ddcb0875b12f004
author Ray Essick <essick@google.com> Thu Feb 27 22:51:32 2020 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Thu Feb 27 22:51:32 2020 +0000
tree 1c9c4fca7e7f9699b5175c25b842ba182742746b
parent 904b623c8cdbd43a2089c5d3b45240757bd3bc81
parent c2b73fa88fb9c526737d33ce638e77e61c67202f

Merge "made g711 codec xml reflect the CDD rules" into rvc-dev

media/libstagefright/data/media_codecs_sw.xml

diff --git a/media/libstagefright/data/media_codecs_sw.xml b/media/libstagefright/data/media_codecs_sw.xml
index 67d3f1a..f5e422a 100644
--- a/media/libstagefright/data/media_codecs_sw.xml
+++ b/media/libstagefright/data/media_codecs_sw.xml
@@ -48,13 +48,13 @@
         </MediaCodec>
         <MediaCodec name="c2.android.g711.alaw.decoder" type="audio/g711-alaw">
             <Alias name="OMX.google.g711.alaw.decoder" />
-            <Limit name="channel-count" max="1" />
+            <Limit name="channel-count" max="6" />
             <Limit name="sample-rate" ranges="8000-48000" />
             <Limit name="bitrate" range="64000" />
         </MediaCodec>
         <MediaCodec name="c2.android.g711.mlaw.decoder" type="audio/g711-mlaw">
             <Alias name="OMX.google.g711.mlaw.decoder" />
-            <Limit name="channel-count" max="1" />
+            <Limit name="channel-count" max="6" />
             <Limit name="sample-rate" ranges="8000-48000" />
             <Limit name="bitrate" range="64000" />
         </MediaCodec>