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

Commit e1e1187a authored by Chia-I Wu's avatar Chia-I Wu
Browse files

surfaceflinger: remove BufferLayerConsumer::scaleDownCrop 

Use the one from GLConsumer.

Test: boots
Change-Id: I739afb2f82b3a311f09b39da8193de0269e30796
parent 243b74a9

services/surfaceflinger/BufferLayerConsumer.cpp

+1 −41
Original line number Diff line number Diff line
@@ -422,46 +422,6 @@ void BufferLayerConsumer::computeCurrentTransformMatrixLocked() { 
                                       mCurrentTransform, mFilteringEnabled);

}



Rect BufferLayerConsumer::scaleDownCrop(const Rect& crop, uint32_t bufferWidth,

                                        uint32_t bufferHeight) {

    Rect outCrop = crop;



    uint32_t newWidth = static_cast<uint32_t>(crop.width());

    uint32_t newHeight = static_cast<uint32_t>(crop.height());



    if (newWidth * bufferHeight > newHeight * bufferWidth) {

        newWidth = newHeight * bufferWidth / bufferHeight;

        ALOGV("too wide: newWidth = %d", newWidth);

    } else if (newWidth * bufferHeight < newHeight * bufferWidth) {

        newHeight = newWidth * bufferHeight / bufferWidth;

        ALOGV("too tall: newHeight = %d", newHeight);

    }



    uint32_t currentWidth = static_cast<uint32_t>(crop.width());

    uint32_t currentHeight = static_cast<uint32_t>(crop.height());



    // The crop is too wide

    if (newWidth < currentWidth) {

        uint32_t dw = currentWidth - newWidth;

        auto halfdw = dw / 2;

        outCrop.left += halfdw;

        // Not halfdw because it would subtract 1 too few when dw is odd

        outCrop.right -= (dw - halfdw);

        // The crop is too tall

    } else if (newHeight < currentHeight) {

        uint32_t dh = currentHeight - newHeight;

        auto halfdh = dh / 2;

        outCrop.top += halfdh;

        // Not halfdh because it would subtract 1 too few when dh is odd

        outCrop.bottom -= (dh - halfdh);

    }



    ALOGV("getCurrentCrop final crop [%d,%d,%d,%d]", outCrop.left, outCrop.top, outCrop.right,

          outCrop.bottom);



    return outCrop;

}



nsecs_t BufferLayerConsumer::getTimestamp() {

    BLC_LOGV("getTimestamp");

    Mutex::Autolock lock(mMutex);
@@ -493,7 +453,7 @@ sp<GraphicBuffer> BufferLayerConsumer::getCurrentBuffer(int* outSlot) const { 
Rect BufferLayerConsumer::getCurrentCrop() const {

    Mutex::Autolock lock(mMutex);

    return (mCurrentScalingMode == NATIVE_WINDOW_SCALING_MODE_SCALE_CROP)

            ? scaleDownCrop(mCurrentCrop, mDefaultWidth, mDefaultHeight)

            ? GLConsumer::scaleDownCrop(mCurrentCrop, mDefaultWidth, mDefaultHeight)

            : mCurrentCrop;

}

services/surfaceflinger/BufferLayerConsumer.h

+0 −4
Original line number Diff line number Diff line
@@ -96,10 +96,6 @@ public: 
    // functions.

    void getTransformMatrix(float mtx[16]);



    // Scale the crop down horizontally or vertically such that it has the

    // same aspect ratio as the buffer does.

    static Rect scaleDownCrop(const Rect& crop, uint32_t bufferWidth, uint32_t bufferHeight);



    // getTimestamp retrieves the timestamp associated with the texture image

    // set by the most recent call to updateTexImage.

    //