diff options
author | Andreas Huber <andih@google.com> | 2009-10-28 10:36:57 -0700 |
---|---|---|
committer | Android Git Automerger <android-git-automerger@android.com> | 2009-10-28 10:36:57 -0700 |
commit | b1e3bc7933e29b668bcf5caf59bc46e848d6c875 (patch) | |
tree | d3d428089993441b0767f1753b434a69e5d6ca14 /include | |
parent | 62620ec08bd983c777d6534685f9dd55d450dc2a (diff) | |
parent | 636df899721d7da23fc792f20df29937e628ab2f (diff) | |
download | frameworks_av-b1e3bc7933e29b668bcf5caf59bc46e848d6c875.zip frameworks_av-b1e3bc7933e29b668bcf5caf59bc46e848d6c875.tar.gz frameworks_av-b1e3bc7933e29b668bcf5caf59bc46e848d6c875.tar.bz2 |
am 76a54294: Merge change I155e2ad0 into eclair-mr2
Merge commit '76a5429407e821c22508eca92e7475b6433cd668' into eclair-mr2-plus-aosp
* commit '76a5429407e821c22508eca92e7475b6433cd668':
Re-enable CameraSource.
Diffstat (limited to 'include')
-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 &); }; |