diff options
author | Wu-cheng Li <wuchengli@google.com> | 2011-06-01 17:22:24 +0800 |
---|---|---|
committer | Wu-cheng Li <wuchengli@google.com> | 2011-06-27 15:44:57 +0800 |
commit | 4ca2c7c913f8bd4ada13aca56d36045d42d1e00f (patch) | |
tree | d65d0cadafa63bd9ab2aa9e8fbb6704b27a13fbc /include/media/stagefright/CameraSource.h | |
parent | c5a57efb706ec79032fc09c43b16d11ed0876604 (diff) | |
download | frameworks_av-4ca2c7c913f8bd4ada13aca56d36045d42d1e00f.zip frameworks_av-4ca2c7c913f8bd4ada13aca56d36045d42d1e00f.tar.gz frameworks_av-4ca2c7c913f8bd4ada13aca56d36045d42d1e00f.tar.bz2 |
Add framework support for camcorder zoom.
The purpose of ICameraRecordingProxy and ICameraRecordingProxyListener is to
allow applications using the camera during recording.
Camera service allows only one client at a time. Since camcorder application
needs to own the camera to do things like zoom, the media recorder cannot
access the camera directly during recording. So ICameraRecordingProxy is a proxy
of ICamera, which allows the media recorder to start/stop the recording and
release recording frames. ICameraRecordingProxyListener is an interface that
allows the recorder to receive video frames during recording.
ICameraRecordingProxy
startRecording()
stopRecording()
releaseRecordingFrame()
ICameraRecordingProxyListener
dataCallbackTimestamp()
The camcorder app opens the camera and starts the preview. The app passes
ICamera and ICameraRecordingProxy to the media recorder by
MediaRecorder::setCamera(). The recorder uses ICamera to setup the camera in
MediaRecorder::start(). After setup, the recorder disconnects from camera
service. The recorder calls ICameraRecordingProxy::startRecording() and
passes a ICameraRecordingProxyListener to the app. The app connects back to
camera service and starts the recording. The app owns the camera and can do
things like zoom. The media recorder receives the video frames from the
listener and releases them by ICameraRecordingProxy::releaseRecordingFrame.
The recorder calls ICameraRecordingProxy::stopRecording() to stop the
recording.
The call sequences are as follows:
1. The app: Camera.unlock().
2. The app: MediaRecorder.setCamera().
3. Start recording
(1) The app: MediaRecorder.start().
(2) The recorder: ICamera.unlock() and ICamera.disconnect().
(3) The recorder: ICameraRecordingProxy.startRecording().
(4) The app: ICamera.reconnect().
(5) The app: ICamera.startRecording().
4. During recording
(1) The recorder: receive frames from ICameraRecordingProxyListener.dataCallbackTimestamp()
(2) The recorder: release frames by ICameraRecordingProxy.releaseRecordingFrame().
5. Stop recording
(1) The app: MediaRecorder.stop()
(2) The recorder: ICameraRecordingProxy.stopRecording().
(3) The app: ICamera.stopRecording().
bug:2644213
Change-Id: I15269397defc25cbbcae16abc071c8349c123122
Diffstat (limited to 'include/media/stagefright/CameraSource.h')
-rw-r--r-- | include/media/stagefright/CameraSource.h | 34 |
1 files changed, 29 insertions, 5 deletions
diff --git a/include/media/stagefright/CameraSource.h b/include/media/stagefright/CameraSource.h index bb25bae..80b7c1c 100644 --- a/include/media/stagefright/CameraSource.h +++ b/include/media/stagefright/CameraSource.h @@ -21,6 +21,7 @@ #include <media/stagefright/MediaBuffer.h> #include <media/stagefright/MediaSource.h> #include <camera/ICamera.h> +#include <camera/ICameraRecordingProxyListener.h> #include <camera/CameraParameters.h> #include <utils/List.h> #include <utils/RefBase.h> @@ -68,6 +69,7 @@ public: * @return NULL on error. */ static CameraSource *CreateFromCamera(const sp<ICamera> &camera, + const sp<ICameraRecordingProxy> &proxy, int32_t cameraId, Size videoSize, int32_t frameRate, @@ -111,6 +113,23 @@ public: virtual void signalBufferReturned(MediaBuffer* buffer); protected: + class ProxyListener: public BnCameraRecordingProxyListener { + public: + ProxyListener(const sp<CameraSource>& source); + virtual void dataCallbackTimestamp(int64_t timestampUs, int32_t msgType, + const sp<IMemory> &data); + + private: + sp<CameraSource> mSource; + }; + + // isBinderAlive needs linkToDeath to work. + class DeathNotifier: public IBinder::DeathRecipient { + public: + DeathNotifier() {} + virtual void binderDied(const wp<IBinder>& who); + }; + enum CameraFlags { FLAGS_SET_CAMERA = 1L << 0, FLAGS_HOT_CAMERA = 1L << 1, @@ -123,6 +142,8 @@ protected: status_t mInitCheck; sp<Camera> mCamera; + sp<ICameraRecordingProxy> mCameraRecordingProxy; + sp<DeathNotifier> mDeathNotifier; sp<Surface> mSurface; sp<MetaData> mMeta; @@ -132,7 +153,8 @@ protected: bool mStarted; int32_t mNumFramesEncoded; - CameraSource(const sp<ICamera>& camera, int32_t cameraId, + CameraSource(const sp<ICamera>& camera, const sp<ICameraRecordingProxy>& proxy, + int32_t cameraId, Size videoSize, int32_t frameRate, const sp<Surface>& surface, bool storeMetaDataInVideoBuffers); @@ -172,10 +194,12 @@ private: void releaseOneRecordingFrame(const sp<IMemory>& frame); - status_t init(const sp<ICamera>& camera, int32_t cameraId, - Size videoSize, int32_t frameRate, - bool storeMetaDataInVideoBuffers); - status_t isCameraAvailable(const sp<ICamera>& camera, int32_t cameraId); + status_t init(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); status_t isCameraColorFormatSupported(const CameraParameters& params); status_t configureCamera(CameraParameters* params, int32_t width, int32_t height, |