diff options
author | James Dong <jdong@google.com> | 2010-12-11 10:43:41 -0800 |
---|---|---|
committer | James Dong <jdong@google.com> | 2010-12-11 10:57:03 -0800 |
commit | 2144f6316d9c993ba20c7de2a6cac35265291cc5 (patch) | |
tree | 97bb957fca144202183ad1a3beaa970e1ab04271 /include/media | |
parent | 086c0611d3680fbc2951f2b469bf78257ef4aed7 (diff) | |
download | frameworks_base-2144f6316d9c993ba20c7de2a6cac35265291cc5.zip frameworks_base-2144f6316d9c993ba20c7de2a6cac35265291cc5.tar.gz frameworks_base-2144f6316d9c993ba20c7de2a6cac35265291cc5.tar.bz2 |
Revert "Allows the authoring engine to skip frame."
o Skipping frames could lead to a lot of issues such as I frames is lost etc.
It is not being used anyway.
This reverts commit 53d4e0d58e2d5c18f6e026c705af833b9bdd7aba.
Conflicts:
media/libstagefright/AudioSource.cpp
media/libstagefright/CameraSource.cpp
Change-Id: I3abba1647de48db25bdc369066eb2a7ae4dedec2
Diffstat (limited to 'include/media')
-rw-r--r-- | include/media/stagefright/MediaSource.h | 13 | ||||
-rw-r--r-- | include/media/stagefright/OMXCodec.h | 1 |
2 files changed, 0 insertions, 14 deletions
diff --git a/include/media/stagefright/MediaSource.h b/include/media/stagefright/MediaSource.h index dafc621..a31395e 100644 --- a/include/media/stagefright/MediaSource.h +++ b/include/media/stagefright/MediaSource.h @@ -78,31 +78,18 @@ struct MediaSource : public RefBase { void clearSeekTo(); bool getSeekTo(int64_t *time_us, SeekMode *mode) const; - // Option allows encoder to skip some frames until the specified - // time stamp. - // To prevent from being abused, when the skipFrame timestamp is - // found to be more than 1 second later than the current timestamp, - // an error will be returned from read(). - void clearSkipFrame(); - bool getSkipFrame(int64_t *timeUs) const; - void setSkipFrame(int64_t timeUs); - void setLateBy(int64_t lateness_us); int64_t getLateBy() const; private: enum Options { - // Bit map kSeekTo_Option = 1, - kSkipFrame_Option = 2, }; uint32_t mOptions; int64_t mSeekTimeUs; SeekMode mSeekMode; int64_t mLatenessUs; - - int64_t mSkipFrameUntilTimeUs; }; // Causes this source to suspend pulling data from its upstream source diff --git a/include/media/stagefright/OMXCodec.h b/include/media/stagefright/OMXCodec.h index d37c22d..bba5b53 100644 --- a/include/media/stagefright/OMXCodec.h +++ b/include/media/stagefright/OMXCodec.h @@ -167,7 +167,6 @@ private: int64_t mSeekTimeUs; ReadOptions::SeekMode mSeekMode; int64_t mTargetTimeUs; - int64_t mSkipTimeUs; MediaBuffer *mLeftOverBuffer; |