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 | 79e23b41fad961008bfde6e26b3c6f86878ca69d (patch) | |
tree | 590d806e7ff9da6341c5185a4d7291d1de428e43 /media/libstagefright/OMXCodec.cpp | |
parent | 8d45a37ff076814db39471f15d309567605b3416 (diff) | |
download | frameworks_av-79e23b41fad961008bfde6e26b3c6f86878ca69d.zip frameworks_av-79e23b41fad961008bfde6e26b3c6f86878ca69d.tar.gz frameworks_av-79e23b41fad961008bfde6e26b3c6f86878ca69d.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 'media/libstagefright/OMXCodec.cpp')
-rw-r--r-- | media/libstagefright/OMXCodec.cpp | 15 |
1 files changed, 3 insertions, 12 deletions
diff --git a/media/libstagefright/OMXCodec.cpp b/media/libstagefright/OMXCodec.cpp index 4bf922f..b954be7 100644 --- a/media/libstagefright/OMXCodec.cpp +++ b/media/libstagefright/OMXCodec.cpp @@ -1426,7 +1426,6 @@ OMXCodec::OMXCodec( mSeekTimeUs(-1), mSeekMode(ReadOptions::SEEK_CLOSEST_SYNC), mTargetTimeUs(-1), - mSkipTimeUs(-1), mLeftOverBuffer(NULL), mPaused(false), mNativeWindow(nativeWindow) { @@ -2635,15 +2634,13 @@ bool OMXCodec::drainInputBuffer(BufferInfo *info) { for (;;) { MediaBuffer *srcBuffer; - MediaSource::ReadOptions options; - if (mSkipTimeUs >= 0) { - options.setSkipFrame(mSkipTimeUs); - } if (mSeekTimeUs >= 0) { if (mLeftOverBuffer) { mLeftOverBuffer->release(); mLeftOverBuffer = NULL; } + + MediaSource::ReadOptions options; options.setSeekTo(mSeekTimeUs, mSeekMode); mSeekTimeUs = -1; @@ -2668,7 +2665,7 @@ bool OMXCodec::drainInputBuffer(BufferInfo *info) { err = OK; } else { - err = mSource->read(&srcBuffer, &options); + err = mSource->read(&srcBuffer); } if (err != OK) { @@ -3304,12 +3301,6 @@ status_t OMXCodec::read( if (options && options->getSeekTo(&seekTimeUs, &seekMode)) { seeking = true; } - int64_t skipTimeUs; - if (options && options->getSkipFrame(&skipTimeUs)) { - mSkipTimeUs = skipTimeUs; - } else { - mSkipTimeUs = -1; - } if (mInitialBufferSubmit) { mInitialBufferSubmit = false; |