summaryrefslogtreecommitdiffstats
path: root/camera/Camera.cpp
diff options
context:
space:
mode:
authorEino-Ville Talvala <etalvala@google.com>2013-08-21 13:57:21 -0700
committerEino-Ville Talvala <etalvala@google.com>2013-08-21 14:35:48 -0700
commit1ce7c34e67c2cf58dd88c31f36f4bd62e375f7f0 (patch)
tree4febd2dd2325c391977d64c9d78a8ee955277e80 /camera/Camera.cpp
parent99ad37a47628b1ea1f8981bf974de38a49c653a0 (diff)
downloadframeworks_av-1ce7c34e67c2cf58dd88c31f36f4bd62e375f7f0.zip
frameworks_av-1ce7c34e67c2cf58dd88c31f36f4bd62e375f7f0.tar.gz
frameworks_av-1ce7c34e67c2cf58dd88c31f36f4bd62e375f7f0.tar.bz2
Camera1: Set preview to be asynchronous, and remove dead code
- Use the controlledByApp flag to make sure application-bound preview buffer queue is asynchronous as before - Remove setPreviewDisplay in service, since it is no longer in the binder interface - Rename setPreviewTexture to setPreviewTarget, to make it clear it's the only game in town now. Rename only on the binder level and service for now. Bug: 10312644 Change-Id: Icd33a462022f9729a63dc65c69b755cb7969857e
Diffstat (limited to 'camera/Camera.cpp')
-rw-r--r--camera/Camera.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/camera/Camera.cpp b/camera/Camera.cpp
index 22016a9..bbc4aa4 100644
--- a/camera/Camera.cpp
+++ b/camera/Camera.cpp
@@ -106,7 +106,7 @@ status_t Camera::setPreviewTexture(const sp<IGraphicBufferProducer>& bufferProdu
sp <ICamera> c = mCamera;
if (c == 0) return NO_INIT;
ALOGD_IF(bufferProducer == 0, "app passed NULL surface");
- return c->setPreviewTexture(bufferProducer);
+ return c->setPreviewTarget(bufferProducer);
}
// start preview mode
@@ -127,7 +127,7 @@ status_t Camera::storeMetaDataInBuffers(bool enabled)
return c->storeMetaDataInBuffers(enabled);
}
-// start recording mode, must call setPreviewDisplay first
+// start recording mode, must call setPreviewTexture first
status_t Camera::startRecording()
{
ALOGV("startRecording");