commit 4b820b0e1fa069714b123fc35784541d0f94d267
author Eino-Ville Talvala <etalvala@google.com> Wed Aug 21 14:39:05 2013 -0700
committer Eino-Ville Talvala <etalvala@google.com> Wed Aug 21 14:56:46 2013 -0700
tree 3418113d8ce7eca26303d6dce7d147e07003a0e9
parent 1ce7c34e67c2cf58dd88c31f36f4bd62e375f7f0

Camera1: Rename setPreviewTexture to ...Target for clarity

Bug: 10312644
Change-Id: I19976188f0359bfd177209fb40145defdae9c740

camera/Camera.cpp

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 @@
 }
 
 // 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 @@
     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

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 @@
             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 @@
             // 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

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 @@
     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