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

Commit 188b9f00 authored by Craig Donner's avatar Craig Donner Committed by Android (Google) Code Review
Browse files

Merge "Support EGL_EXT_protected_content in GLConsumer." into nyc-dev

parents 1992e943 aec8697f

libs/gui/GLConsumer.cpp

+27 −0
Original line number Diff line number Diff line
@@ -44,6 +44,8 @@ 


EGLAPI const char* eglQueryStringImplementationANDROID(EGLDisplay dpy, EGLint name);

#define CROP_EXT_STR "EGL_ANDROID_image_crop"

#define PROT_CONTENT_EXT_STR "EGL_EXT_protected_content"

#define EGL_PROTECTED_CONTENT_EXT 0x32C0



namespace android {
@@ -123,6 +125,26 @@ static bool hasEglAndroidImageCrop() { 
    return hasIt;

}



static bool hasEglProtectedContentImpl() {

    EGLDisplay dpy = eglGetDisplay(EGL_DEFAULT_DISPLAY);

    const char* exts = eglQueryString(dpy, EGL_EXTENSIONS);

    size_t cropExtLen = strlen(PROT_CONTENT_EXT_STR);

    size_t extsLen = strlen(exts);

    bool equal = !strcmp(PROT_CONTENT_EXT_STR, exts);

    bool atStart = !strncmp(PROT_CONTENT_EXT_STR " ", exts, cropExtLen+1);

    bool atEnd = (cropExtLen+1) < extsLen &&

            !strcmp(" " PROT_CONTENT_EXT_STR, exts + extsLen - (cropExtLen+1));

    bool inMiddle = strstr(exts, " " PROT_CONTENT_EXT_STR " ");

    return equal || atStart || atEnd || inMiddle;

}



static bool hasEglProtectedContent() {

    // Only compute whether the extension is present once the first time this

    // function is called.

    static bool hasIt = hasEglProtectedContentImpl();

    return hasIt;

}



static bool isEglImageCroppable(const Rect& crop) {

    return hasEglAndroidImageCrop() && (crop.left == 0 && crop.top == 0);

}
@@ -1178,12 +1200,17 @@ EGLImageKHR GLConsumer::EglImage::createImage(EGLDisplay dpy, 
        const sp<GraphicBuffer>& graphicBuffer, const Rect& crop) {

    EGLClientBuffer cbuf =

            static_cast<EGLClientBuffer>(graphicBuffer->getNativeBuffer());

    const bool createProtectedImage =

            (graphicBuffer->getUsage() & GRALLOC_USAGE_PROTECTED) &&

            hasEglProtectedContent();

    EGLint attrs[] = {

        EGL_IMAGE_PRESERVED_KHR,        EGL_TRUE,

        EGL_IMAGE_CROP_LEFT_ANDROID,    crop.left,

        EGL_IMAGE_CROP_TOP_ANDROID,     crop.top,

        EGL_IMAGE_CROP_RIGHT_ANDROID,   crop.right,

        EGL_IMAGE_CROP_BOTTOM_ANDROID,  crop.bottom,

        createProtectedImage ? EGL_PROTECTED_CONTENT_EXT : EGL_NONE,

        createProtectedImage ? EGL_TRUE : EGL_NONE,

        EGL_NONE,

    };

    if (!crop.isValid()) {

opengl/libs/EGL/eglApi.cpp

+1 −0
Original line number Diff line number Diff line
@@ -117,6 +117,7 @@ extern char const * const gExtensionString = 
        "EGL_KHR_create_context_no_error "

        "EGL_KHR_mutable_render_buffer "

        "EGL_EXT_yuv_surface "

        "EGL_EXT_protected_content "

        ;



// extensions not exposed to applications but used by the ANDROID system