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

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

Merge "Add AC-4 support in OpenMAX definition"

parents 8ff3b3eb a2af29e4

headers/media_plugin/media/openmax/OMX_AsString.h

+2 −0
Original line number Diff line number Diff line
@@ -189,6 +189,7 @@ inline static const char *asString(OMX_AUDIO_CODINGEXTTYPE i, const char *def = 
    switch (i) {

        case OMX_AUDIO_CodingAndroidAC3:  return "AndroidAC3";

        case OMX_AUDIO_CodingAndroidOPUS: return "AndroidOPUS";

        case OMX_AUDIO_CodingAndroidAC4:  return "AndroidAC4";

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

    }

}
@@ -536,6 +537,7 @@ inline static const char *asString(OMX_INDEXEXTTYPE i, const char *def = "??") { 
        case OMX_IndexParamAudioAndroidOpus:            return "ParamAudioAndroidOpus";

        case OMX_IndexParamAudioAndroidAacPresentation: return "ParamAudioAndroidAacPresentation";

        case OMX_IndexParamAudioAndroidEac3:            return "ParamAudioAndroidEac3";

        case OMX_IndexParamAudioAndroidAc4:             return "ParamAudioAndroidAc4";

        case OMX_IndexParamAudioProfileQuerySupported:  return "ParamAudioProfileQuerySupported";

//      case OMX_IndexParamNalStreamFormatSupported:    return "ParamNalStreamFormatSupported";

//      case OMX_IndexParamNalStreamFormat:             return "ParamNalStreamFormat";

headers/media_plugin/media/openmax/OMX_AudioExt.h

+10 −0
Original line number Diff line number Diff line
@@ -48,6 +48,7 @@ typedef enum OMX_AUDIO_CODINGEXTTYPE { 
    OMX_AUDIO_CodingAndroidAC3,         /**< AC3 encoded data */

    OMX_AUDIO_CodingAndroidOPUS,        /**< OPUS encoded data */

    OMX_AUDIO_CodingAndroidEAC3,        /**< EAC3 encoded data */

    OMX_AUDIO_CodingAndroidAC4,         /**< AC4 encoded data */

} OMX_AUDIO_CODINGEXTTYPE;



typedef struct OMX_AUDIO_PARAM_ANDROID_AC3TYPE {
@@ -68,6 +69,15 @@ typedef struct OMX_AUDIO_PARAM_ANDROID_EAC3TYPE { 
                                        variable or unknown sampling rate. */

} OMX_AUDIO_PARAM_ANDROID_EAC3TYPE;



typedef struct OMX_AUDIO_PARAM_ANDROID_AC4TYPE {

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

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

    OMX_U32 nPortIndex;            /**< port that this structure applies to */

    OMX_U32 nChannels;             /**< Number of channels */

    OMX_U32 nSampleRate;           /**< Sampling rate of the source data.  Use 0 for

                                        variable or unknown sampling rate. */

} OMX_AUDIO_PARAM_ANDROID_AC4TYPE;



typedef struct OMX_AUDIO_PARAM_ANDROID_OPUSTYPE {

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

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

headers/media_plugin/media/openmax/OMX_IndexExt.h

+1 −0
Original line number Diff line number Diff line
@@ -64,6 +64,7 @@ typedef enum OMX_INDEXEXTTYPE { 
    OMX_IndexParamAudioAndroidEac3,                 /**< reference: OMX_AUDIO_PARAM_ANDROID_EAC3TYPE */

    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_IndexExtAudioEndUnused,



    /* Image parameters and configurations */