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

Commit eb0ad057 authored by Lajos Molnar's avatar Lajos Molnar Committed by Android Git Automerger
Browse files

am a63caa19: Merge "omx: add (temporary) index for automatic video frc support" into lmp-mr1-dev 

* commit 'a63caa19':
  omx: add (temporary) index for automatic video frc support
  Fix issue #18356768: some app process may hang at Runtime#exit...
parents c1ced8bb a63caa19

include/media/openmax/OMX_AsString.h

+1 −1
Original line number Diff line number Diff line
@@ -520,7 +520,7 @@ inline static const char *asString(OMX_INDEXEXTTYPE i, const char *def = "??") { 
        case OMX_IndexParamVideoAndroidVp8Encoder:      return "ParamVideoAndroidVp8Encoder";

        case OMX_IndexParamVideoHevc:                   return "ParamVideoHevc";

//      case OMX_IndexParamSliceSegments:               return "ParamSliceSegments";

//      case OMX_IndexConfigAutoFramerateConversion:    return "ConfigAutoFramerateConversion";

        case OMX_IndexConfigAutoFramerateConversion:    return "ConfigAutoFramerateConversion";

        default:                                        return asString((OMX_INDEXTYPE)i, def);

    }

}

include/media/openmax/OMX_IndexExt.h

+1 −0
Original line number Diff line number Diff line
@@ -81,6 +81,7 @@ typedef enum OMX_INDEXEXTTYPE { 


    /* Other configurations */

    OMX_IndexExtOtherStartUnused = OMX_IndexKhronosExtensions + 0x00800000,

    OMX_IndexConfigAutoFramerateConversion,         /**< reference: OMX_CONFIG_BOOLEANTYPE */



    /* Time configurations */

    OMX_IndexExtTimeStartUnused = OMX_IndexKhronosExtensions + 0x00900000,