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

Commit 9bc7af17 authored by Mathias Agopian's avatar Mathias Agopian
Browse files

use SurfaceTexture new scaling mode in SF 

SF now obeys SurfaceTexture's scaling mode instead
of inferring it from the buffer's size

Change-Id: I4d50e9851abedd7e64bfcfc8af9eefb9fb668529
parent 2e460c5b

media/libstagefright/ACodec.cpp

+7 −0
Original line number Diff line number Diff line
@@ -445,6 +445,13 @@ status_t ACodec::allocateOutputBuffersFromNativeWindow() { 
        return err;

    }



    err = native_window_set_scaling_mode(mNativeWindow.get(),

            NATIVE_WINDOW_SCALING_MODE_SCALE_TO_WINDOW);



    if (err != OK) {

        return err;

    }



    err = native_window_set_buffers_geometry(

            mNativeWindow.get(),

            def.format.video.nFrameWidth,

media/libstagefright/OMXCodec.cpp

+7 −0
Original line number Diff line number Diff line
@@ -1765,6 +1765,13 @@ status_t OMXCodec::allocateOutputBuffersFromNativeWindow() { 
        return err;

    }



    err = native_window_set_scaling_mode(mNativeWindow.get(),

            NATIVE_WINDOW_SCALING_MODE_SCALE_TO_WINDOW);



    if (err != OK) {

        return err;

    }



    err = native_window_set_buffers_geometry(

            mNativeWindow.get(),

            def.format.video.nFrameWidth,

media/libstagefright/colorconversion/SoftwareRenderer.cpp

+5 −0
Original line number Diff line number Diff line
@@ -93,6 +93,11 @@ SoftwareRenderer::SoftwareRenderer( 
            GRALLOC_USAGE_SW_READ_NEVER | GRALLOC_USAGE_SW_WRITE_OFTEN

            | GRALLOC_USAGE_HW_TEXTURE | GRALLOC_USAGE_EXTERNAL_DISP));



    CHECK_EQ(0,

            native_window_set_scaling_mode(

            mNativeWindow.get(),

            NATIVE_WINDOW_SCALING_MODE_SCALE_TO_WINDOW));



    // Width must be multiple of 32???

    CHECK_EQ(0, native_window_set_buffers_geometry(

                mNativeWindow.get(),

services/camera/libcameraservice/CameraService.cpp

+4 −0
Original line number Diff line number Diff line
@@ -536,6 +536,8 @@ status_t CameraService::Client::setPreviewWindow(const sp<IBinder>& binder, 
    // If preview has been already started, register preview buffers now.

    if (mHardware->previewEnabled()) {

        if (window != 0) {

            native_window_set_scaling_mode(window.get(),

                    NATIVE_WINDOW_SCALING_MODE_SCALE_TO_WINDOW);

            native_window_set_buffers_transform(window.get(), mOrientation);

            result = mHardware->setPreviewWindow(window);

        }
@@ -642,6 +644,8 @@ status_t CameraService::Client::startPreviewMode() { 
    }



    if (mPreviewWindow != 0) {

        native_window_set_scaling_mode(mPreviewWindow.get(),

                NATIVE_WINDOW_SCALING_MODE_SCALE_TO_WINDOW);

        native_window_set_buffers_transform(mPreviewWindow.get(),

                mOrientation);

    }