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

Commit 4b820b0e authored by Eino-Ville Talvala's avatar Eino-Ville Talvala
Browse files

Camera1: Rename setPreviewTexture to ...Target for clarity 

Bug: 10312644
Change-Id: I19976188f0359bfd177209fb40145defdae9c740
parent 1ce7c34e

camera/Camera.cpp

+3 −3
Original line number Diff line number Diff line
@@ -100,9 +100,9 @@ status_t Camera::unlock() 
}



// pass the buffered IGraphicBufferProducer to the camera service

status_t Camera::setPreviewTexture(const sp<IGraphicBufferProducer>& bufferProducer)

status_t Camera::setPreviewTarget(const sp<IGraphicBufferProducer>& bufferProducer)

{

    ALOGV("setPreviewTexture(%p)", bufferProducer.get());

    ALOGV("setPreviewTarget(%p)", bufferProducer.get());

    sp <ICamera> c = mCamera;

    if (c == 0) return NO_INIT;

    ALOGD_IF(bufferProducer == 0, "app passed NULL surface");
@@ -127,7 +127,7 @@ status_t Camera::storeMetaDataInBuffers(bool enabled) 
    return c->storeMetaDataInBuffers(enabled);

}



// start recording mode, must call setPreviewTexture first

// start recording mode, must call setPreviewTarget first

status_t Camera::startRecording()

{

    ALOGV("startRecording");

include/camera/Camera.h

+3 −3
Original line number Diff line number Diff line
@@ -81,9 +81,9 @@ public: 
            status_t    unlock();



            // pass the buffered IGraphicBufferProducer to the camera service

            status_t    setPreviewTexture(const sp<IGraphicBufferProducer>& bufferProducer);

            status_t    setPreviewTarget(const sp<IGraphicBufferProducer>& bufferProducer);



            // start preview mode, must call setPreviewTexture first

            // start preview mode, must call setPreviewTarget first

            status_t    startPreview();



            // stop preview mode
@@ -92,7 +92,7 @@ public: 
            // get preview state

            bool        previewEnabled();



            // start recording mode, must call setPreviewTexture first

            // start recording mode, must call setPreviewTarget first

            status_t    startRecording();



            // stop recording mode

media/libstagefright/CameraSource.cpp

+1 −1
Original line number Diff line number Diff line
@@ -536,7 +536,7 @@ status_t CameraSource::initWithCameraAccess( 
    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->setPreviewTexture(mSurface));

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

    }



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