diff options
author | Android (Google) Code Review <android-gerrit@google.com> | 2009-10-28 13:25:09 -0400 |
---|---|---|
committer | Android (Google) Code Review <android-gerrit@google.com> | 2009-10-28 13:25:09 -0400 |
commit | 636df899721d7da23fc792f20df29937e628ab2f (patch) | |
tree | dac95b12590f7def3e0fb9e0ecaa2feab2c2f8e8 /include/media | |
parent | 1eea7f529c1c25901a7749fed4792ed68379d841 (diff) | |
parent | be5c74f5da6a93b0d23f96e11848acfcc3b4d1d9 (diff) | |
download | frameworks_av-636df899721d7da23fc792f20df29937e628ab2f.zip frameworks_av-636df899721d7da23fc792f20df29937e628ab2f.tar.gz frameworks_av-636df899721d7da23fc792f20df29937e628ab2f.tar.bz2 |
Merge change I155e2ad0 into eclair-mr2
* changes:
Re-enable CameraSource.
Diffstat (limited to 'include/media')
-rw-r--r-- | include/media/stagefright/CameraSource.h | 26 |
1 files changed, 13 insertions, 13 deletions
diff --git a/include/media/stagefright/CameraSource.h b/include/media/stagefright/CameraSource.h index 7042e1a..ff3ea05 100644 --- a/include/media/stagefright/CameraSource.h +++ b/include/media/stagefright/CameraSource.h @@ -26,12 +26,11 @@ namespace android { -class ICamera; -class ICameraClient; class IMemory; +class ISurface; +class Camera; -class CameraSource : public MediaSource, - public MediaBufferObserver { +class CameraSource : public MediaSource { public: static CameraSource *Create(); @@ -45,24 +44,25 @@ public: virtual status_t read( MediaBuffer **buffer, const ReadOptions *options = NULL); - virtual void notifyCallback(int32_t msgType, int32_t ext1, int32_t ext2); - virtual void dataCallback(int32_t msgType, const sp<IMemory>& data); - - virtual void signalBufferReturned(MediaBuffer *buffer); - private: - CameraSource(const sp<ICamera> &camera, const sp<ICameraClient> &client); + friend class CameraSourceListener; - sp<ICamera> mCamera; - sp<ICameraClient> mCameraClient; + sp<Camera> mCamera; Mutex mLock; Condition mFrameAvailableCondition; List<sp<IMemory> > mFrames; + List<int64_t> mFrameTimes; - int mNumFrames; + int mWidth, mHeight; + int64_t mFirstFrameTimeUs; + int32_t mNumFrames; bool mStarted; + CameraSource(const sp<Camera> &camera); + + void dataCallback(int32_t msgType, const sp<IMemory> &data); + CameraSource(const CameraSource &); CameraSource &operator=(const CameraSource &); }; |