summaryrefslogtreecommitdiffstats
path: root/include/camera
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 /include/camera
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 'include/camera')
-rw-r--r--include/camera/Camera.h4
-rw-r--r--include/camera/ICamera.h4
2 files changed, 4 insertions, 4 deletions
diff --git a/include/camera/Camera.h b/include/camera/Camera.h
index 81848b3..b1b2e95 100644
--- a/include/camera/Camera.h
+++ b/include/camera/Camera.h
@@ -83,7 +83,7 @@ public:
// pass the buffered IGraphicBufferProducer to the camera service
status_t setPreviewTexture(const sp<IGraphicBufferProducer>& bufferProducer);
- // start preview mode, must call setPreviewDisplay first
+ // start preview mode, must call setPreviewTexture first
status_t startPreview();
// stop preview mode
@@ -92,7 +92,7 @@ public:
// get preview state
bool previewEnabled();
- // start recording mode, must call setPreviewDisplay first
+ // start recording mode, must call setPreviewTexture first
status_t startRecording();
// stop recording mode
diff --git a/include/camera/ICamera.h b/include/camera/ICamera.h
index f3a186e..b025735 100644
--- a/include/camera/ICamera.h
+++ b/include/camera/ICamera.h
@@ -50,7 +50,7 @@ public:
virtual status_t unlock() = 0;
// pass the buffered IGraphicBufferProducer to the camera service
- virtual status_t setPreviewTexture(
+ virtual status_t setPreviewTarget(
const sp<IGraphicBufferProducer>& bufferProducer) = 0;
// set the preview callback flag to affect how the received frames from
@@ -64,7 +64,7 @@ public:
virtual status_t setPreviewCallbackTarget(
const sp<IGraphicBufferProducer>& callbackProducer) = 0;
- // start preview mode, must call setPreviewDisplay first
+ // start preview mode, must call setPreviewTarget first
virtual status_t startPreview() = 0;
// stop preview mode