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

Commit 98ccd61f authored by ramindani's avatar ramindani Committed by Ram Indani
Browse files

Use the height as width when there is a rotation needs to be applied for 

the dst rect.

Removed if condition check for dstRect and srcRect.

The AOSP camera for a split second sends the actual dstRect while
switching camera and that when the image scales because I wasn't doing
the conversion of the rect from width to height.
This scaling basically gives the perception that switch is slow, while
last few frames are basically still frames aka last buffer queue.

BUG: 197262426
Test: Verified manually on AOSP that camera switch is smooth.
Change-Id: Ic4b0b2ff3be2056a0c90841ed880e49c34ea2781
parent 60a7931d

libs/hwui/pipeline/skia/LayerDrawable.cpp

+50 −51
Original line number Diff line number Diff line
@@ -101,7 +101,6 @@ bool LayerDrawable::DrawLayer(GrRecordingContext* context, 
        paint.setBlendMode(layer->getMode());

        paint.setColorFilter(layer->getColorFilter());

        const SkMatrix& totalMatrix = canvas->getTotalMatrix();

        if (srcRect || dstRect) {

        SkRect skiaSrcRect;

        if (srcRect && !srcRect->isEmpty()) {

            skiaSrcRect = *srcRect;
@@ -110,7 +109,9 @@ bool LayerDrawable::DrawLayer(GrRecordingContext* context, 
        }

        SkRect skiaDestRect;

        if (dstRect && !dstRect->isEmpty()) {

                skiaDestRect = *dstRect;

            skiaDestRect = (windowTransform & NATIVE_WINDOW_TRANSFORM_ROT_90)

                                   ? SkRect::MakeIWH(dstRect->height(), dstRect->width())

                                   : SkRect::MakeIWH(dstRect->width(), dstRect->height());

        } else {

            skiaDestRect = (windowTransform & NATIVE_WINDOW_TRANSFORM_ROT_90)

                                   ? SkRect::MakeIWH(layerHeight, layerWidth)
@@ -145,15 +146,13 @@ bool LayerDrawable::DrawLayer(GrRecordingContext* context, 
        // Skia TextureOp has the above logic build-in, but not NonAAFillRectOp. TextureOp works

        // only for SrcOver blending and without color filter (readback uses Src blending).

        SkSamplingOptions sampling(SkFilterMode::kNearest);

            if (layer->getForceFilter() ||

                shouldFilterRect(totalMatrix, skiaSrcRect, skiaDestRect)) {

        if (layer->getForceFilter() || shouldFilterRect(totalMatrix, skiaSrcRect, skiaDestRect)) {

            sampling = SkSamplingOptions(SkFilterMode::kLinear);

        }



        canvas->drawImageRect(layerImage.get(), skiaSrcRect, skiaDestRect, sampling, &paint,

                              constraint);

        canvas->restore();

        }

        // restore the original matrix

        if (useLayerTransform) {

            canvas->restore();