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

Commit 02e542fd authored by Omprakash Dhyade c_odhyad@quicinc.com's avatar Omprakash Dhyade c_odhyad@quicinc.com Committed by Steve Kondik
Browse files

frameworks/base: Adjust width and height according to copybit 

limtations

If the buffer width and height are not adjusted as per copybit
limitations, copybit fails. This causes black screen on the display.
Change width and height according to copybit limitations.

Change-Id: Icdd2d838fe492e39351ca20871192c030f93c282
CRs-fixed: 230014
parent fbb4bf87

libs/surfaceflinger/LayerBuffer.cpp

+28 −6
Original line number Diff line number Diff line
@@ -456,7 +456,31 @@ void LayerBuffer::BufferSource::onDraw(const Region& clip) const 
        copybit_device_t* copybit = mLayer.mBlitEngine;

        if (copybit) {

            // create our EGLImageKHR the first time

            err = initTempBuffer();

            // Ensure that we honor copybit limitations

            uint32_t w = mLayer.mTransformedBounds.width();

            uint32_t h = mLayer.mTransformedBounds.height();



            const float min = copybit->get(copybit, COPYBIT_MINIFICATION_LIMIT);

            const float mag = copybit->get(copybit, COPYBIT_MAGNIFICATION_LIMIT);



            float xscale = 1.0f;

            if ((src.crop.r-src.crop.l) > w*min)

                xscale = 1.0f / min;

            else if ((src.crop.r-src.crop.l)*mag < w)

                xscale = mag;



            float yscale = 1.0f;

            if ((src.crop.b-src.crop.t) > h*min)

                yscale = 1.0f / min;

            else if ((src.crop.b-src.crop.t)*mag < h)

                yscale = mag;



            w = floorf((src.crop.r-src.crop.l) * xscale);

            h = floorf((src.crop.b-src.crop.t) * yscale);



            // create our EGLImageKHR the first time

            err = initTempBuffer(w, h);



            if (err == NO_ERROR) {

                // NOTE: Assume the buffer is allocated with the proper USAGE flags

                const NativeBuffer& dst(mTempBuffer);
@@ -496,13 +520,10 @@ void LayerBuffer::BufferSource::onDraw(const Region& clip) const 
    mLayer.drawWithOpenGL(clip, mTexture);

}



status_t LayerBuffer::BufferSource::initTempBuffer() const

status_t LayerBuffer::BufferSource::initTempBuffer(int w, int h) const

{

    // figure out the size we need now

    const ISurface::BufferHeap& buffers(mBufferHeap);

    uint32_t w = mLayer.mTransformedBounds.width();

    uint32_t h = mLayer.mTransformedBounds.height();

    if (buffers.w * h != buffers.h * w) {

    if (mLayer.getOrientation() & Transform::ROT_90) {

        int t = w; w = h; h = t;

    }
@@ -514,6 +535,7 @@ status_t LayerBuffer::BufferSource::initTempBuffer() const 
            glDeleteTextures(1, &mTexture.name);

            eglDestroyImageKHR(dpy, mTexture.image);

            Texture defaultTexture;

            mTexture = defaultTexture;

            mTexture.name = mLayer.createTexture();

            mTempGraphicBuffer.clear();

        } else if (!mLayer.mInvalidEGLImage) {

libs/surfaceflinger/LayerBuffer.h

+1 −1
Original line number Diff line number Diff line
@@ -130,7 +130,7 @@ private: 
        virtual bool transformed() const;

        virtual void destroy() { }

    private:

        status_t initTempBuffer() const;

        status_t initTempBuffer(int w, int h) const;

        mutable Mutex                   mBufferSourceLock;

        sp<Buffer>                      mBuffer;

        status_t                        mStatus;