diff options
author | James Dong <jdong@google.com> | 2010-06-19 09:04:18 -0700 |
---|---|---|
committer | James Dong <jdong@google.com> | 2010-06-21 17:34:01 -0700 |
commit | 36e573bf7db5888f92c52eda26e0771aaa2406e4 (patch) | |
tree | bb100aa50b9fb34e74898c6b7e41b96cfc57d3e2 /include/media | |
parent | 04b243d0f5470cfaf67cce5534f9a9fb2e30855c (diff) | |
download | frameworks_base-36e573bf7db5888f92c52eda26e0771aaa2406e4.zip frameworks_base-36e573bf7db5888f92c52eda26e0771aaa2406e4.tar.gz frameworks_base-36e573bf7db5888f92c52eda26e0771aaa2406e4.tar.bz2 |
Audio/video sync during recording (second part)
Change-Id: Iba0b35f57fdeac7ee1da16899406bf4b957a2c8c
Diffstat (limited to 'include/media')
-rw-r--r-- | include/media/stagefright/AudioSource.h | 1 | ||||
-rw-r--r-- | include/media/stagefright/CameraSource.h | 4 | ||||
-rw-r--r-- | include/media/stagefright/MPEG4Writer.h | 4 |
3 files changed, 7 insertions, 2 deletions
diff --git a/include/media/stagefright/AudioSource.h b/include/media/stagefright/AudioSource.h index 860384e..f2001e1 100644 --- a/include/media/stagefright/AudioSource.h +++ b/include/media/stagefright/AudioSource.h @@ -56,6 +56,7 @@ private: int64_t mTotalReadTimeUs; int64_t mTotalReadBytes; int64_t mTotalReads; + int64_t mStartTimeUs; MediaBufferGroup *mGroup; diff --git a/include/media/stagefright/CameraSource.h b/include/media/stagefright/CameraSource.h index b2134b4..3192d03 100644 --- a/include/media/stagefright/CameraSource.h +++ b/include/media/stagefright/CameraSource.h @@ -60,11 +60,14 @@ private: List<sp<IMemory> > mFramesBeingEncoded; List<int64_t> mFrameTimes; + int64_t mStartTimeUs; int64_t mFirstFrameTimeUs; int64_t mLastFrameTimestampUs; int32_t mNumFramesReceived; int32_t mNumFramesEncoded; int32_t mNumFramesDropped; + int32_t mNumGlitches; + int64_t mGlitchDurationThresholdUs; bool mCollectStats; bool mStarted; @@ -74,6 +77,7 @@ private: int64_t timestampUs, int32_t msgType, const sp<IMemory> &data); void releaseQueuedFrames(); + void releaseOneRecordingFrame(const sp<IMemory>& frame); CameraSource(const CameraSource &); CameraSource &operator=(const CameraSource &); diff --git a/include/media/stagefright/MPEG4Writer.h b/include/media/stagefright/MPEG4Writer.h index 3d90434..9812e41 100644 --- a/include/media/stagefright/MPEG4Writer.h +++ b/include/media/stagefright/MPEG4Writer.h @@ -78,8 +78,8 @@ private: List<off_t> mBoxes; - void setStartTimestamp(int64_t timeUs); - int64_t getStartTimestamp(); // Not const + void setStartTimestampUs(int64_t timeUs); + int64_t getStartTimestampUs(); // Not const status_t startTracks(); void lock(); |