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

Commit bb375dd6 authored by Jean-Michel Trivi's avatar Jean-Michel Trivi Committed by Android (Google) Code Review
Browse files

Merge "Define OMX_AUDIO_AACObjectER_Scalable"

parents f028a974 a1adfb7a

include/media/openmax/OMX_AsString.h

+1 −0
Original line number Diff line number Diff line
@@ -107,6 +107,7 @@ inline static const char *asString(OMX_AUDIO_AACPROFILETYPE i, const char *def = 
        case OMX_AUDIO_AACObjectLTP:      return "LTP";

        case OMX_AUDIO_AACObjectHE:       return "HE";

        case OMX_AUDIO_AACObjectScalable: return "Scalable";

        case OMX_AUDIO_AACObjectER_Scalable: return "ER_Scalable";

        case OMX_AUDIO_AACObjectERLC:     return "ERLC";

        case OMX_AUDIO_AACObjectLD:       return "LD";

        case OMX_AUDIO_AACObjectHE_PS:    return "HE_PS";

include/media/openmax/OMX_Audio.h

+1 −0
Original line number Diff line number Diff line
@@ -259,6 +259,7 @@ typedef enum OMX_AUDIO_AACPROFILETYPE{ 
  OMX_AUDIO_AACObjectHE,            /**< AAC High Efficiency (object type SBR, HE-AAC profile) */

  OMX_AUDIO_AACObjectScalable,      /**< AAC Scalable object */

  OMX_AUDIO_AACObjectERLC = 17,     /**< ER AAC Low Complexity object (Error Resilient AAC-LC) */

  OMX_AUDIO_AACObjectER_Scalable = 20, /**< ER AAC scalable object */

  OMX_AUDIO_AACObjectLD = 23,       /**< AAC Low Delay object (Error Resilient) */

  OMX_AUDIO_AACObjectHE_PS = 29,    /**< AAC High Efficiency with Parametric Stereo coding (HE-AAC v2, object type PS) */

  OMX_AUDIO_AACObjectELD = 39,      /** AAC Enhanced Low Delay. NOTE: Pending Khronos standardization **/