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

Commit a5893ca1 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Automerger Merge Worker
Browse files

Merge "SF: Fix NATIVE_WINDOW_SCALING_MODE_SCALE_CROP" into rvc-dev am: 33eb6fa8 am: 408d7d5d 

Change-Id: I2be676a628a780355435037442584c146d99b799
parents 12e5c366 408d7d5d

services/surfaceflinger/BufferLayerConsumer.cpp

+10 −1
Original line number Diff line number Diff line
@@ -407,8 +407,17 @@ Rect BufferLayerConsumer::getCurrentCrop() const { 
}



Rect BufferLayerConsumer::getCurrentCropLocked() const {

    uint32_t width = mDefaultWidth;

    uint32_t height = mDefaultHeight;

    // If the buffer comes with a rotated bit for 90 (or 270) degrees, switch width/height in order

    // to scale and crop correctly.

    if (mCurrentTransform & NATIVE_WINDOW_TRANSFORM_ROT_90) {

        width = mDefaultHeight;

        height = mDefaultWidth;

    }



    return (mCurrentScalingMode == NATIVE_WINDOW_SCALING_MODE_SCALE_CROP)

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

            ? GLConsumer::scaleDownCrop(mCurrentCrop, width, height)

            : mCurrentCrop;

}