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

Commit 6c20ee04 authored by android-build-team Robot's avatar android-build-team Robot
Browse files

Snap for 4754571 from 8d4954c5 to pi-release 

Change-Id: I4675d9b66187b415d4fa5bda272aef23dcdc69e2
parents bd00a203 8d4954c5

headers/media_plugin/media/openmax/OMX_Audio.h

+1 −0
Original line number Diff line number Diff line
@@ -263,6 +263,7 @@ typedef enum OMX_AUDIO_AACPROFILETYPE{ 
  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 **/

  OMX_AUDIO_AACObjectXHE = 42,      /** extended High Efficiency AAC. NOTE: Pending Khronos standardization */

  OMX_AUDIO_AACObjectKhronosExtensions = 0x6F000000, /**< Reserved region for introducing Khronos Standard Extensions */

  OMX_AUDIO_AACObjectVendorStartUnused = 0x7F000000, /**< Reserved region for introducing Vendor Extensions */

  OMX_AUDIO_AACObjectMax = 0x7FFFFFFF

headers/media_plugin/media/openmax/OMX_AudioExt.h

+14 −0
Original line number Diff line number Diff line
@@ -82,6 +82,7 @@ typedef struct OMX_AUDIO_PARAM_ANDROID_OPUSTYPE { 
                                   limit the audio signal. Use 0 to let encoder decide */

} OMX_AUDIO_PARAM_ANDROID_OPUSTYPE;



/** deprecated. use OMX_AUDIO_PARAM_ANDROID_AACDRCPRESENTATIONTYPE */

typedef struct OMX_AUDIO_PARAM_ANDROID_AACPRESENTATIONTYPE {

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

    OMX_VERSIONTYPE nVersion; /**< OMX specification version information */
@@ -94,6 +95,19 @@ typedef struct OMX_AUDIO_PARAM_ANDROID_AACPRESENTATIONTYPE { 
    OMX_S32 nPCMLimiterEnable;     /**< Signal level limiting, 0 for disable, 1 for enable, -1 if unspecified */

} OMX_AUDIO_PARAM_ANDROID_AACPRESENTATIONTYPE;



typedef struct OMX_AUDIO_PARAM_ANDROID_AACDRCPRESENTATIONTYPE {

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

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

    OMX_S32 nMaxOutputChannels;    /**< Maximum channel count to be output, -1 if unspecified, 0 if downmixing disabled */

    OMX_S32 nDrcCut;               /**< The DRC attenuation factor, between 0 and 127, -1 if unspecified */

    OMX_S32 nDrcBoost;             /**< The DRC amplification factor, between 0 and 127, -1 if unspecified */

    OMX_S32 nHeavyCompression;     /**< 0 for light compression, 1 for heavy compression, -1 if unspecified */

    OMX_S32 nTargetReferenceLevel; /**< Target reference level, between 0 and 127, -1 if unspecified */

    OMX_S32 nEncodedTargetLevel;   /**< Target reference level assumed at the encoder, between 0 and 127, -1 if unspecified */

    OMX_S32 nPCMLimiterEnable;     /**< Signal level limiting, 0 for disable, 1 for enable, -1 if unspecified */

    OMX_S32 nDrcEffectType;        /**< MPEG-D DRC effect type, between -1 and 6, -2 if unspecified */

} OMX_AUDIO_PARAM_ANDROID_AACDRCPRESENTATIONTYPE;



typedef struct OMX_AUDIO_PARAM_ANDROID_PROFILETYPE {

   OMX_U32 nSize;

   OMX_VERSIONTYPE nVersion;

headers/media_plugin/media/openmax/OMX_IndexExt.h

+1 −0
Original line number Diff line number Diff line
@@ -63,6 +63,7 @@ typedef enum OMX_INDEXEXTTYPE { 
    OMX_IndexParamAudioAndroidAacPresentation,      /**< reference: OMX_AUDIO_PARAM_ANDROID_AACPRESENTATIONTYPE */

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



    /* Image parameters and configurations */

libs/gui/BufferItemConsumer.cpp

+4 −1
Original line number Diff line number Diff line
@@ -92,10 +92,13 @@ status_t BufferItemConsumer::releaseBuffer(const BufferItem &item, 
    Mutex::Autolock _l(mMutex);



    err = addReleaseFenceLocked(item.mSlot, item.mGraphicBuffer, releaseFence);

    if (err != OK) {

        BI_LOGE("Failed to addReleaseFenceLocked");

    }



    err = releaseBufferLocked(item.mSlot, item.mGraphicBuffer, EGL_NO_DISPLAY,

            EGL_NO_SYNC_KHR);

    if (err != OK) {

    if (err != OK && err != IGraphicBufferConsumer::STALE_BUFFER_SLOT) {

        BI_LOGE("Failed to release buffer: %s (%d)",

                strerror(-err), err);

    }

opengl/libs/EGL/eglApi.cpp

+19 −1
Original line number Diff line number Diff line
@@ -1733,13 +1733,31 @@ EGLImageKHR eglCreateImageKHR(EGLDisplay dpy, EGLContext ctx, EGLenum target, 
    ContextRef _c(dp.get(), ctx);

    egl_context_t * const c = _c.get();



    // Temporary hack: eglImageCreateKHR should accept EGL_GL_COLORSPACE_LINEAR_KHR,

    // EGL_GL_COLORSPACE_SRGB_KHR and EGL_GL_COLORSPACE_DEFAULT_EXT if

    // EGL_EXT_image_gl_colorspace is supported, but some drivers don't like

    // the DEFAULT value and generate an error.

    std::vector<EGLint> strippedAttribList;

    for (const EGLint *attr = attrib_list; attr && attr[0] != EGL_NONE; attr += 2) {

        if (attr[0] == EGL_GL_COLORSPACE_KHR &&

            dp->haveExtension("EGL_EXT_image_gl_colorspace")) {

            if (attr[1] != EGL_GL_COLORSPACE_LINEAR_KHR &&

                attr[1] != EGL_GL_COLORSPACE_SRGB_KHR) {

                continue;

            }

        }

        strippedAttribList.push_back(attr[0]);

        strippedAttribList.push_back(attr[1]);

    }

    strippedAttribList.push_back(EGL_NONE);



    EGLImageKHR result = EGL_NO_IMAGE_KHR;

    egl_connection_t* const cnx = &gEGLImpl;

    if (cnx->dso && cnx->egl.eglCreateImageKHR) {

        result = cnx->egl.eglCreateImageKHR(

                dp->disp.dpy,

                c ? c->context : EGL_NO_CONTEXT,

                target, buffer, attrib_list);

                target, buffer, strippedAttribList.data());

    }

    return result;

}