diff options
| author | James Dong <jdong@google.com> | 2010-06-07 10:19:58 -0700 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2010-06-07 10:19:58 -0700 |
| commit | 7a68d3686aace4781ee6c25d8ab8704bebee34af (patch) | |
| tree | 481ffa2e47ec1ca726e7043219e2f0e60039f81f /include | |
| parent | a8ebe8b3f5aea0d3f09a62d6d255f99c1f911f7b (diff) | |
| parent | c2f328d0d2821e402823d6e17589da2849b67d0d (diff) | |
| download | frameworks_base-7a68d3686aace4781ee6c25d8ab8704bebee34af.zip frameworks_base-7a68d3686aace4781ee6c25d8ab8704bebee34af.tar.gz frameworks_base-7a68d3686aace4781ee6c25d8ab8704bebee34af.tar.bz2 | |
Merge "Remove hard-coded pixel format for recording frames in CameraSource. Retrieve the pixel format from Camera HAL at runtime." into kraken
Diffstat (limited to 'include')
| -rw-r--r-- | include/media/stagefright/CameraSource.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/media/stagefright/CameraSource.h b/include/media/stagefright/CameraSource.h index 0c7bf6f..0a7023a 100644 --- a/include/media/stagefright/CameraSource.h +++ b/include/media/stagefright/CameraSource.h @@ -51,6 +51,7 @@ private: friend class CameraSourceListener; sp<Camera> mCamera; + sp<MetaData> mMeta; Mutex mLock; Condition mFrameAvailableCondition; @@ -59,7 +60,6 @@ private: List<sp<IMemory> > mFramesBeingEncoded; List<int64_t> mFrameTimes; - int mWidth, mHeight; int64_t mFirstFrameTimeUs; int64_t mLastFrameTimestampUs; int32_t mNumFramesReceived; |