diff options
| author | James Dong <jdong@google.com> | 2011-11-21 21:08:55 -0800 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2011-11-21 21:08:55 -0800 |
| commit | 7c56bb3ac1fb758a222a0c23805704a2789657b6 (patch) | |
| tree | 9eadb09e607c361c36f37218f8121433eaff2574 /include | |
| parent | c637289fdfbea45a322601ce74f743595c477339 (diff) | |
| parent | 88b00e9b79a0242251435b399971be4ca9738395 (diff) | |
| download | frameworks_av-7c56bb3ac1fb758a222a0c23805704a2789657b6.zip frameworks_av-7c56bb3ac1fb758a222a0c23805704a2789657b6.tar.gz frameworks_av-7c56bb3ac1fb758a222a0c23805704a2789657b6.tar.bz2 | |
am d0a25456: am 02740dc4: Merge "Fix log spamming during time lapse video recording" into ics-mr1
* commit 'd0a254566f5f0be5607b4d64839a575c888c94f6':
Fix log spamming during time lapse video recording
Diffstat (limited to 'include')
| -rw-r--r-- | include/media/stagefright/CameraSource.h | 3 | ||||
| -rw-r--r-- | include/media/stagefright/CameraSourceTimeLapse.h | 4 |
2 files changed, 3 insertions, 4 deletions
diff --git a/include/media/stagefright/CameraSource.h b/include/media/stagefright/CameraSource.h index 8c1c593..446720b 100644 --- a/include/media/stagefright/CameraSource.h +++ b/include/media/stagefright/CameraSource.h @@ -153,6 +153,9 @@ protected: bool mStarted; int32_t mNumFramesEncoded; + // Time between capture of two frames. + int64_t mTimeBetweenFrameCaptureUs; + CameraSource(const sp<ICamera>& camera, const sp<ICameraRecordingProxy>& proxy, int32_t cameraId, Size videoSize, int32_t frameRate, diff --git a/include/media/stagefright/CameraSourceTimeLapse.h b/include/media/stagefright/CameraSourceTimeLapse.h index 0e264c7..b060691 100644 --- a/include/media/stagefright/CameraSourceTimeLapse.h +++ b/include/media/stagefright/CameraSourceTimeLapse.h @@ -57,10 +57,6 @@ private: int32_t mVideoWidth; int32_t mVideoHeight; - // Time between capture of two frames during time lapse recording - // Negative value indicates that timelapse is disabled. - int64_t mTimeBetweenTimeLapseFrameCaptureUs; - // Time between two frames in final video (1/frameRate) int64_t mTimeBetweenTimeLapseVideoFramesUs; |