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

Commit 619eea30 authored by bsears's avatar bsears
Browse files

Revert "Adds out parameters for crop rectangle and transform" 

Revert "Add test to crop TextureView and verify if outer edge ha..."

Revert submission 15339442-1texelcrop

Reason for revert: Bisection identified these CLs as the likely cause of Droidfood blocking bugs b/195620803 and b/195637414

Bug: 195637414
Bug: 195620803

Reverted Changes:
If1f448a94:Added crop rect to LayerDrawable to not crop Textu...
Iefde6bdf7:Add test to crop TextureView and verify if outer e...
Icf0ee20e8:Adds out parameters for crop rectangle and transfo...

Change-Id: Ibf58514e70c15470b17a64a8182614dc42c1bc71
parent d699e621

libs/nativedisplay/include/surfacetexture/SurfaceTexture.h

+2 −3
Original line number Diff line number Diff line
@@ -272,11 +272,10 @@ public: 
    status_t attachToContext(uint32_t tex);



    sp<GraphicBuffer> dequeueBuffer(int* outSlotid, android_dataspace* outDataspace,

                                    bool* outQueueEmpty,

                                    float* outTransformMatrix, bool* outQueueEmpty,

                                    SurfaceTexture_createReleaseFence createFence,

                                    SurfaceTexture_fenceWait fenceWait,

                                    void* fencePassThroughHandle, ARect* cropRect,

                                    uint32_t* transform);

                                    void* fencePassThroughHandle);



    /**

     * takeConsumerOwnership attaches a SurfaceTexture that is currently in the

libs/nativedisplay/include/surfacetexture/surface_texture_platform.h

+3 −3
Original line number Diff line number Diff line
@@ -83,11 +83,11 @@ typedef int (*ASurfaceTexture_fenceWait)(int fence, void* fencePassThroughHandle 
 * AHardwareBuffer_release.

 */

AHardwareBuffer* ASurfaceTexture_dequeueBuffer(ASurfaceTexture* st, int* outSlotid,

                                               android_dataspace* outDataspace, bool* outNewContent,

                                               android_dataspace* outDataspace,

                                               float* outTransformMatrix, bool* outNewContent,

                                               ASurfaceTexture_createReleaseFence createFence,

                                               ASurfaceTexture_fenceWait fenceWait,

                                               void* fencePassThroughHandle, ARect* cropRect,

                                               uint32_t* transform);

                                               void* fencePassThroughHandle);



} // namespace android

libs/nativedisplay/surfacetexture/SurfaceTexture.cpp

+3 −5
Original line number Diff line number Diff line
@@ -464,11 +464,10 @@ void SurfaceTexture::dumpLocked(String8& result, const char* prefix) const { 
}



sp<GraphicBuffer> SurfaceTexture::dequeueBuffer(int* outSlotid, android_dataspace* outDataspace,

                                                bool* outQueueEmpty,

                                                float* outTransformMatrix, bool* outQueueEmpty,

                                                SurfaceTexture_createReleaseFence createFence,

                                                SurfaceTexture_fenceWait fenceWait,

                                                void* fencePassThroughHandle, ARect* cropRect,

                                                uint32_t* transform) {

                                                void* fencePassThroughHandle) {

    Mutex::Autolock _l(mMutex);

    sp<GraphicBuffer> buffer;
@@ -484,8 +483,7 @@ sp<GraphicBuffer> SurfaceTexture::dequeueBuffer(int* outSlotid, android_dataspac 


    buffer = mImageConsumer.dequeueBuffer(outSlotid, outDataspace, outQueueEmpty, *this,

                                          createFence, fenceWait, fencePassThroughHandle);

    *transform = mCurrentTransform;

    *cropRect = mCurrentCrop;

    memcpy(outTransformMatrix, mCurrentTransformMatrix, sizeof(mCurrentTransformMatrix));

    return buffer;

}

libs/nativedisplay/surfacetexture/surface_texture.cpp

+5 −5
Original line number Diff line number Diff line
@@ -193,16 +193,16 @@ void ASurfaceTexture_releaseConsumerOwnership(ASurfaceTexture* texture) { 
}



AHardwareBuffer* ASurfaceTexture_dequeueBuffer(ASurfaceTexture* st, int* outSlotid,

                                               android_dataspace* outDataspace, bool* outNewContent,

                                               android_dataspace* outDataspace,

                                               float* outTransformMatrix, bool* outNewContent,

                                               ASurfaceTexture_createReleaseFence createFence,

                                               ASurfaceTexture_fenceWait fenceWait, void* handle,

                                               ARect* cropRect, uint32_t* transform) {

                                               ASurfaceTexture_fenceWait fenceWait, void* handle) {

    sp<GraphicBuffer> buffer;

    *outNewContent = false;

    bool queueEmpty;

    do {

        buffer = st->consumer->dequeueBuffer(outSlotid, outDataspace, &queueEmpty, createFence,

                                             fenceWait, handle, cropRect, transform);

        buffer = st->consumer->dequeueBuffer(outSlotid, outDataspace, outTransformMatrix,

                                             &queueEmpty, createFence, fenceWait, handle);

        if (!queueEmpty) {

            *outNewContent = true;

        }