summaryrefslogtreecommitdiffstats
path: root/include/media/stagefright/CameraSource.h
diff options
context:
space:
mode:
authorJames Dong <jdong@google.com>2011-07-08 17:59:29 -0700
committerJames Dong <jdong@google.com>2011-07-10 14:19:26 -0700
commitae4c1ac6401185539c03ce0819e174fd1b04b136 (patch)
treeae4becf79ad28f3f47136894468fa090bc893d79 /include/media/stagefright/CameraSource.h
parent9b186a44051d0ef7f4ca67150f204299b15a448e (diff)
downloadframeworks_av-ae4c1ac6401185539c03ce0819e174fd1b04b136.zip
frameworks_av-ae4c1ac6401185539c03ce0819e174fd1b04b136.tar.gz
frameworks_av-ae4c1ac6401185539c03ce0819e174fd1b04b136.tar.bz2
Release camera if CameraSource::start() has not been called
Change-Id: I2f7e4b8501db3d80b9aa6f99d896d778bec29e8c
Diffstat (limited to 'include/media/stagefright/CameraSource.h')
-rw-r--r--include/media/stagefright/CameraSource.h6
1 files changed, 6 insertions, 0 deletions
diff --git a/include/media/stagefright/CameraSource.h b/include/media/stagefright/CameraSource.h
index 80b7c1c..8c1c593 100644
--- a/include/media/stagefright/CameraSource.h
+++ b/include/media/stagefright/CameraSource.h
@@ -197,6 +197,12 @@ private:
status_t init(const sp<ICamera>& camera, const sp<ICameraRecordingProxy>& proxy,
int32_t cameraId, Size videoSize, int32_t frameRate,
bool storeMetaDataInVideoBuffers);
+
+ status_t initWithCameraAccess(
+ const sp<ICamera>& camera, const sp<ICameraRecordingProxy>& proxy,
+ int32_t cameraId, Size videoSize, int32_t frameRate,
+ bool storeMetaDataInVideoBuffers);
+
status_t isCameraAvailable(const sp<ICamera>& camera,
const sp<ICameraRecordingProxy>& proxy,
int32_t cameraId);