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

Commit bc14f3c5 authored by Derek Sollenberger's avatar Derek Sollenberger
Browse files

Return to previous RenderEngine behavior for protected buffers 

This reverts to the old RenderEngine behavior of not keeping
protected buffers bound as GPU textures. Doing so cause us to
bind the buffer to a GPU texture every frame, but prevents us
from exhausting the protected resources.

Test: atest com.google.android.media.gts.WidevineDashPolicyTests
Bug: 187870007
Change-Id: I5cc95d47fbc0bdfa239fe99dd479aef5c87c0495
parent d01b8e9a

libs/renderengine/skia/SkiaGLRenderEngine.cpp

+5 −4
Original line number Diff line number Diff line
@@ -505,10 +505,11 @@ void SkiaGLRenderEngine::mapExternalTextureBuffer(const sp<GraphicBuffer>& buffe 
    if (mRenderEngineType != RenderEngineType::SKIA_GL_THREADED) {

        return;

    }

    // we currently don't attempt to map a buffer if the buffer contains protected content

    // because GPU resources for protected buffers is much more limited.

    // We currently don't attempt to map a buffer if the buffer contains protected content

    // or we are using a protected context because GPU resources for protected buffers is

    // much more limited.

    const bool isProtectedBuffer = buffer->getUsage() & GRALLOC_USAGE_PROTECTED;

    if (isProtectedBuffer) {

    if (isProtectedBuffer || mInProtectedContext) {

        return;

    }

    ATRACE_CALL();
@@ -517,7 +518,7 @@ void SkiaGLRenderEngine::mapExternalTextureBuffer(const sp<GraphicBuffer>& buffe 
    // bound context if we are not already using the protected context (and subsequently switch

    // back after the buffer is cached).

    auto grContext = getActiveGrContext();

    auto& cache = mInProtectedContext ? mProtectedTextureCache : mTextureCache;

    auto& cache = mTextureCache;



    std::lock_guard<std::mutex> lock(mRenderingMutex);

    mGraphicBufferExternalRefs[buffer->getId()]++;