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

Commit faba0dc1 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Add AudioPresentation selection support for MediaCodec"

parents 132e0e82 f39e9ea7

headers/media_plugin/media/openmax/OMX_AsString.h

+1 −0
Original line number Diff line number Diff line
@@ -535,6 +535,7 @@ inline static const char *asString(OMX_INDEXEXTTYPE i, const char *def = "??") { 
//      case OMX_IndexConfigCommit:                     return "ConfigCommit";

        case OMX_IndexConfigAndroidVendorExtension:     return "ConfigAndroidVendorExtension";

        case OMX_IndexParamAudioAndroidAc3:             return "ParamAudioAndroidAc3";

        case OMX_IndexConfigAudioPresentation:          return "ConfigAudioPresentation";

        case OMX_IndexParamAudioAndroidOpus:            return "ParamAudioAndroidOpus";

        case OMX_IndexParamAudioAndroidAacPresentation: return "ParamAudioAndroidAacPresentation";

        case OMX_IndexParamAudioAndroidEac3:            return "ParamAudioAndroidEac3";

headers/media_plugin/media/openmax/OMX_AudioExt.h

+7 −0
Original line number Diff line number Diff line
@@ -127,6 +127,13 @@ typedef struct OMX_AUDIO_PARAM_ANDROID_PROFILETYPE { 
   OMX_U32 nProfileIndex; /**< Used to query for individual profile support information */

} OMX_AUDIO_PARAM_ANDROID_PROFILETYPE;



typedef struct OMX_AUDIO_CONFIG_ANDROID_AUDIOPRESENTATION {

    OMX_U32 nSize;                 /**< size of the structure in bytes */

    OMX_VERSIONTYPE nVersion;      /**< OMX specification version information */

    OMX_S32 nPresentationId;       /**< presentation id */

    OMX_S32 nProgramId;            /**< program id */

} OMX_AUDIO_CONFIG_ANDROID_AUDIOPRESENTATION;



#ifdef __cplusplus

}

#endif /* __cplusplus */

headers/media_plugin/media/openmax/OMX_IndexExt.h

+1 −0
Original line number Diff line number Diff line
@@ -65,6 +65,7 @@ typedef enum OMX_INDEXEXTTYPE { 
    OMX_IndexParamAudioProfileQuerySupported,       /**< reference: OMX_AUDIO_PARAM_ANDROID_PROFILETYPE */

    OMX_IndexParamAudioAndroidAacDrcPresentation,   /**< reference: OMX_AUDIO_PARAM_ANDROID_AACDRCPRESENTATIONTYPE */

    OMX_IndexParamAudioAndroidAc4,                  /**< reference: OMX_AUDIO_PARAM_ANDROID_AC4TYPE */

    OMX_IndexConfigAudioPresentation,               /**< reference: OMX_AUDIO_CONFIG_ANDROID_AUDIOPRESENTATION */

    OMX_IndexExtAudioEndUnused,



    /* Image parameters and configurations */