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

Commit e30d039f authored by James Dong's avatar James Dong Committed by Android Git Automerger
Browse files

am a7f5e476: Merge "Fixed a bug in the query to the supported profiles and levels" into gingerbread 

Merge commit 'a7f5e476' into gingerbread-plus-aosp

* commit 'a7f5e476':
  Fixed a bug in the query to the supported profiles and levels
parents 62d4ebc0 a7f5e476

media/libstagefright/OMXCodec.cpp

+5 −2
Original line number Original line Diff line number Diff line
@@ -1035,7 +1035,7 @@ status_t OMXCodec::getVideoProfileLevel( 
                mNode, OMX_IndexParamVideoProfileLevelQuerySupported,

                mNode, OMX_IndexParamVideoProfileLevelQuerySupported,

                &param, sizeof(param));

                &param, sizeof(param));





        if (err != OK) return err;

        if (err != OK) break;





        int32_t supportedProfile = static_cast<int32_t>(param.eProfile);

        int32_t supportedProfile = static_cast<int32_t>(param.eProfile);

        int32_t supportedLevel = static_cast<int32_t>(param.eLevel);

        int32_t supportedLevel = static_cast<int32_t>(param.eLevel);
@@ -1043,7 +1043,10 @@ status_t OMXCodec::getVideoProfileLevel( 
            supportedProfile, supportedLevel);

            supportedProfile, supportedLevel);





        if (profile == supportedProfile &&

        if (profile == supportedProfile &&

            level == supportedLevel) {

            level <= supportedLevel) {

            // We can further check whether the level is a valid

            // value; but we will leave that to the omx encoder component

            // via OMX_SetParameter call.

            profileLevel.mProfile = profile;

            profileLevel.mProfile = profile;

            profileLevel.mLevel = level;

            profileLevel.mLevel = level;

            return OK;

            return OK;