diff options
| author | James Dong <jdong@google.com> | 2011-01-26 14:45:41 -0800 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2011-01-26 14:45:41 -0800 |
| commit | 94eda03f76175dee88cf7941fcbdb6aec43a0d5d (patch) | |
| tree | 6916297fd803a1cb1b04d8345d36400e71d058de /include | |
| parent | ac571749a577c3575793f870e95012ce6637f977 (diff) | |
| parent | 7757f5010a771fb8824b6fdf9788f588a1577e3f (diff) | |
| download | frameworks_av-94eda03f76175dee88cf7941fcbdb6aec43a0d5d.zip frameworks_av-94eda03f76175dee88cf7941fcbdb6aec43a0d5d.tar.gz frameworks_av-94eda03f76175dee88cf7941fcbdb6aec43a0d5d.tar.bz2 | |
am 7fb232c4: Merge "Make sure that key frame is generated for timelapse video recording if there are at least two input video frames from camera source." into honeycomb
* commit '7fb232c40cde91d0958be1694db2d97a126b95f9':
Make sure that key frame is generated for timelapse video recording if there are at least two input video frames from camera source.
Diffstat (limited to 'include')
| -rw-r--r-- | include/media/stagefright/CameraSource.h | 2 | ||||
| -rw-r--r-- | include/media/stagefright/OMXCodec.h | 4 |
2 files changed, 5 insertions, 1 deletions
diff --git a/include/media/stagefright/CameraSource.h b/include/media/stagefright/CameraSource.h index 794355b..4a39fbf 100644 --- a/include/media/stagefright/CameraSource.h +++ b/include/media/stagefright/CameraSource.h @@ -158,6 +158,7 @@ protected: int32_t mNumFramesReceived; int64_t mLastFrameTimestampUs; bool mStarted; + int32_t mNumFramesEncoded; CameraSource(const sp<ICamera>& camera, int32_t cameraId, Size videoSize, int32_t frameRate, @@ -189,7 +190,6 @@ private: List<int64_t> mFrameTimes; int64_t mFirstFrameTimeUs; - int32_t mNumFramesEncoded; int32_t mNumFramesDropped; int32_t mNumGlitches; int64_t mGlitchDurationThresholdUs; diff --git a/include/media/stagefright/OMXCodec.h b/include/media/stagefright/OMXCodec.h index 3251c28..82948cb 100644 --- a/include/media/stagefright/OMXCodec.h +++ b/include/media/stagefright/OMXCodec.h @@ -47,6 +47,9 @@ struct OMXCodec : public MediaSource, // Store meta data in video buffers kStoreMetaDataInVideoBuffers = 32, + + // Only submit one input buffer at one time. + kOnlySubmitOneInputBufferAtOneTime = 64, }; static sp<MediaSource> Create( const sp<IOMX> &omx, @@ -192,6 +195,7 @@ private: Condition mBufferFilled; bool mIsMetaDataStoredInVideoBuffers; + bool mOnlySubmitOneBufferAtOneTime; OMXCodec(const sp<IOMX> &omx, IOMX::node_id node, uint32_t quirks, bool isEncoder, const char *mime, const char *componentName, |