From 79e23b41fad961008bfde6e26b3c6f86878ca69d Mon Sep 17 00:00:00 2001 From: James Dong Date: Sat, 11 Dec 2010 10:43:41 -0800 Subject: 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 --- media/libstagefright/MediaSource.cpp | 16 ---------------- 1 file changed, 16 deletions(-) (limited to 'media/libstagefright/MediaSource.cpp') diff --git a/media/libstagefright/MediaSource.cpp b/media/libstagefright/MediaSource.cpp index b4ef338..fd0e79c 100644 --- a/media/libstagefright/MediaSource.cpp +++ b/media/libstagefright/MediaSource.cpp @@ -32,7 +32,6 @@ void MediaSource::ReadOptions::reset() { mOptions = 0; mSeekTimeUs = 0; mLatenessUs = 0; - mSkipFrameUntilTimeUs = 0; } void MediaSource::ReadOptions::setSeekTo(int64_t time_us, SeekMode mode) { @@ -54,21 +53,6 @@ bool MediaSource::ReadOptions::getSeekTo( return (mOptions & kSeekTo_Option) != 0; } -void MediaSource::ReadOptions::clearSkipFrame() { - mOptions &= ~kSkipFrame_Option; - mSkipFrameUntilTimeUs = 0; -} - -void MediaSource::ReadOptions::setSkipFrame(int64_t timeUs) { - mOptions |= kSkipFrame_Option; - mSkipFrameUntilTimeUs = timeUs; -} - -bool MediaSource::ReadOptions::getSkipFrame(int64_t *timeUs) const { - *timeUs = mSkipFrameUntilTimeUs; - return (mOptions & kSkipFrame_Option) != 0; -} - void MediaSource::ReadOptions::setLateBy(int64_t lateness_us) { mLatenessUs = lateness_us; } -- cgit v1.1