diff options
author | Mathias Agopian <mathias@google.com> | 2013-03-13 21:42:14 +0000 |
---|---|---|
committer | Android (Google) Code Review <android-gerrit@google.com> | 2013-03-13 21:42:14 +0000 |
commit | 8fb6f96e1cc246bc5630e1f5a0eb90f5459331b7 (patch) | |
tree | 50f65eabb52b7f241baa88268178021bcff5a156 /include | |
parent | 27d11e240dad419f08e7edcd0857ee7806c65d76 (diff) | |
parent | 33da402287605e40e189289b11a08b8f5d515818 (diff) | |
download | frameworks_av-8fb6f96e1cc246bc5630e1f5a0eb90f5459331b7.zip frameworks_av-8fb6f96e1cc246bc5630e1f5a0eb90f5459331b7.tar.gz frameworks_av-8fb6f96e1cc246bc5630e1f5a0eb90f5459331b7.tar.bz2 |
Merge "remove uses of Surface in favor or IGraphicBufferProducer" into jb-mr2-dev
Diffstat (limited to 'include')
-rw-r--r-- | include/camera/Camera.h | 3 | ||||
-rw-r--r-- | include/camera/ICamera.h | 3 | ||||
-rw-r--r-- | include/media/IMediaRecorder.h | 2 | ||||
-rw-r--r-- | include/media/MediaRecorderBase.h | 2 | ||||
-rw-r--r-- | include/media/mediarecorder.h | 2 | ||||
-rw-r--r-- | include/media/stagefright/CameraSource.h | 6 | ||||
-rw-r--r-- | include/media/stagefright/CameraSourceTimeLapse.h | 4 |
7 files changed, 8 insertions, 14 deletions
diff --git a/include/camera/Camera.h b/include/camera/Camera.h index 71c66ce..37626a4 100644 --- a/include/camera/Camera.h +++ b/include/camera/Camera.h @@ -74,9 +74,6 @@ public: status_t lock(); status_t unlock(); - // pass the buffered Surface to the camera service - status_t setPreviewDisplay(const sp<Surface>& surface); - // pass the buffered IGraphicBufferProducer to the camera service status_t setPreviewTexture(const sp<IGraphicBufferProducer>& bufferProducer); diff --git a/include/camera/ICamera.h b/include/camera/ICamera.h index eccaa41..2236c1f 100644 --- a/include/camera/ICamera.h +++ b/include/camera/ICamera.h @@ -46,9 +46,6 @@ public: // allow other processes to use this ICamera interface virtual status_t unlock() = 0; - // pass the buffered Surface to the camera service - virtual status_t setPreviewDisplay(const sp<Surface>& surface) = 0; - // pass the buffered IGraphicBufferProducer to the camera service virtual status_t setPreviewTexture( const sp<IGraphicBufferProducer>& bufferProducer) = 0; diff --git a/include/media/IMediaRecorder.h b/include/media/IMediaRecorder.h index 8d7f11d..3e67550 100644 --- a/include/media/IMediaRecorder.h +++ b/include/media/IMediaRecorder.h @@ -35,7 +35,7 @@ public: virtual status_t setCamera(const sp<ICamera>& camera, const sp<ICameraRecordingProxy>& proxy) = 0; - virtual status_t setPreviewSurface(const sp<Surface>& surface) = 0; + virtual status_t setPreviewSurface(const sp<IGraphicBufferProducer>& surface) = 0; virtual status_t setVideoSource(int vs) = 0; virtual status_t setAudioSource(int as) = 0; virtual status_t setOutputFormat(int of) = 0; diff --git a/include/media/MediaRecorderBase.h b/include/media/MediaRecorderBase.h index 8dd40d2..d7ac302 100644 --- a/include/media/MediaRecorderBase.h +++ b/include/media/MediaRecorderBase.h @@ -42,7 +42,7 @@ struct MediaRecorderBase { virtual status_t setVideoFrameRate(int frames_per_second) = 0; virtual status_t setCamera(const sp<ICamera>& camera, const sp<ICameraRecordingProxy>& proxy) = 0; - virtual status_t setPreviewSurface(const sp<Surface>& surface) = 0; + virtual status_t setPreviewSurface(const sp<IGraphicBufferProducer>& surface) = 0; virtual status_t setOutputFile(const char *path) = 0; virtual status_t setOutputFile(int fd, int64_t offset, int64_t length) = 0; virtual status_t setOutputFileAuxiliary(int fd) {return INVALID_OPERATION;} diff --git a/include/media/mediarecorder.h b/include/media/mediarecorder.h index 3b33479..88a42a0 100644 --- a/include/media/mediarecorder.h +++ b/include/media/mediarecorder.h @@ -207,7 +207,7 @@ public: void died(); status_t initCheck(); status_t setCamera(const sp<ICamera>& camera, const sp<ICameraRecordingProxy>& proxy); - status_t setPreviewSurface(const sp<Surface>& surface); + status_t setPreviewSurface(const sp<IGraphicBufferProducer>& surface); status_t setVideoSource(int vs); status_t setAudioSource(int as); status_t setOutputFormat(int of); diff --git a/include/media/stagefright/CameraSource.h b/include/media/stagefright/CameraSource.h index cf38b14..a829916 100644 --- a/include/media/stagefright/CameraSource.h +++ b/include/media/stagefright/CameraSource.h @@ -82,7 +82,7 @@ public: uid_t clientUid, Size videoSize, int32_t frameRate, - const sp<Surface>& surface, + const sp<IGraphicBufferProducer>& surface, bool storeMetaDataInVideoBuffers = false); virtual ~CameraSource(); @@ -154,7 +154,7 @@ protected: sp<Camera> mCamera; sp<ICameraRecordingProxy> mCameraRecordingProxy; sp<DeathNotifier> mDeathNotifier; - sp<Surface> mSurface; + sp<IGraphicBufferProducer> mSurface; sp<MetaData> mMeta; int64_t mStartTimeUs; @@ -169,7 +169,7 @@ protected: CameraSource(const sp<ICamera>& camera, const sp<ICameraRecordingProxy>& proxy, int32_t cameraId, const String16& clientName, uid_t clientUid, Size videoSize, int32_t frameRate, - const sp<Surface>& surface, + const sp<IGraphicBufferProducer>& surface, bool storeMetaDataInVideoBuffers); virtual void startCameraRecording(); diff --git a/include/media/stagefright/CameraSourceTimeLapse.h b/include/media/stagefright/CameraSourceTimeLapse.h index 774772b..6b7a63c 100644 --- a/include/media/stagefright/CameraSourceTimeLapse.h +++ b/include/media/stagefright/CameraSourceTimeLapse.h @@ -40,7 +40,7 @@ public: uid_t clientUid, Size videoSize, int32_t videoFrameRate, - const sp<Surface>& surface, + const sp<IGraphicBufferProducer>& surface, int64_t timeBetweenTimeLapseFrameCaptureUs); virtual ~CameraSourceTimeLapse(); @@ -115,7 +115,7 @@ private: uid_t clientUid, Size videoSize, int32_t videoFrameRate, - const sp<Surface>& surface, + const sp<IGraphicBufferProducer>& surface, int64_t timeBetweenTimeLapseFrameCaptureUs); // Wrapper over CameraSource::signalBufferReturned() to implement quick stop. |