Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 2cafacda authored by Chong Zhang's avatar Chong Zhang Committed by Android (Google) Code Review
Browse files

Merge "media: max channel capability is extended to 6"

parents 8851bff7 837c360d

media/libstagefright/codecs/g711/dec/SoftG711.cpp

+3 −1
Original line number Diff line number Diff line
@@ -23,6 +23,8 @@ 
#include <media/stagefright/foundation/ADebug.h>

#include <media/stagefright/MediaDefs.h>



#define MAX_CHANNEL_COUNT            6  /* maximum number of audio channels that can be decoded */



namespace android {



template<class T>
@@ -184,7 +186,7 @@ OMX_ERRORTYPE SoftG711::internalSetParameter( 
                return OMX_ErrorUndefined;

            }



            if (pcmParams->nChannels < 1 || pcmParams->nChannels > 2) {

            if (pcmParams->nChannels < 1 || pcmParams->nChannels > MAX_CHANNEL_COUNT) {

                return OMX_ErrorUndefined;

            }