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

Commit 8e0792bb authored by Wu-cheng Li's avatar Wu-cheng Li
Browse files

Do not set camera preview display if the surface is null. 

MediaRecorder.setPreviewDisplay() is not required if applications
use MediaRecorder.setCamera(). Besides, this causes a problem when
apps use Camera.setPreviewTexture. Camera service thinks the
surface texture from Camera.setPreviewTexture and the surface from
MediaRecorder.setPreviewDisplay are different.

bug:5988937

Change-Id: Ia345705b6679ef349db6e354feaa3cc0fe8bcd8c
parent d64f3a37

media/libstagefright/CameraSource.cpp

+7 −3
Original line number Diff line number Diff line
@@ -515,9 +515,13 @@ status_t CameraSource::initWithCameraAccess( 
        return err;

    }



    // Set the preview display. Skip this if mSurface is null because

    // applications may already set a surface to the camera.

    if (mSurface != NULL) {

        // This CHECK is good, since we just passed the lock/unlock

        // check earlier by calling mCamera->setParameters().

        CHECK_EQ((status_t)OK, mCamera->setPreviewDisplay(mSurface));

    }



    // By default, do not store metadata in video buffers

    mIsMetaDataStoredInVideoBuffers = false;