diff options
| -rw-r--r-- | camera/Camera.cpp | 6 | ||||
| -rw-r--r-- | include/camera/Camera.h | 6 | ||||
| -rw-r--r-- | media/libstagefright/CameraSource.cpp | 2 |
3 files changed, 7 insertions, 7 deletions
diff --git a/camera/Camera.cpp b/camera/Camera.cpp index bbc4aa4..22199fa 100644 --- a/camera/Camera.cpp +++ b/camera/Camera.cpp @@ -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"); diff --git a/include/camera/Camera.h b/include/camera/Camera.h index b1b2e95..79682b8 100644 --- a/include/camera/Camera.h +++ b/include/camera/Camera.h @@ -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 diff --git a/media/libstagefright/CameraSource.cpp b/media/libstagefright/CameraSource.cpp index 5a26b06..3017fe7 100644 --- a/media/libstagefright/CameraSource.cpp +++ b/media/libstagefright/CameraSource.cpp @@ -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 |