summaryrefslogtreecommitdiffstats
path: root/include/media
diff options
context:
space:
mode:
authorAndreas Huber <andih@google.com>2011-02-08 13:10:25 -0800
committerAndreas Huber <andih@google.com>2011-02-08 13:10:25 -0800
commitb9289833341ec19e016891d0ca9638f0973b9647 (patch)
tree2d5733d68fcc3dee05ac911db1b295bef38e9604 /include/media
parent5a50351cf33dcfc9a21f393521885cd3f248952d (diff)
downloadframeworks_base-b9289833341ec19e016891d0ca9638f0973b9647.zip
frameworks_base-b9289833341ec19e016891d0ca9638f0973b9647.tar.gz
frameworks_base-b9289833341ec19e016891d0ca9638f0973b9647.tar.bz2
Handle some edge cases when seeking while starting up OMXCodec
These were exposed by the new preview-seekframe while paused code. In particular, the codec may have been in state RECONFIGURING when attempting to seek, or we may have initiated flushing of the output port and this may not have completed yet by the time we want to reconfigure the output port. Change-Id: Id7640ade11dbc7205a22f648ea0b5e3e9b49cf4b related-to-bug: 3392259
Diffstat (limited to 'include/media')
-rw-r--r--include/media/stagefright/OMXCodec.h1
1 files changed, 1 insertions, 0 deletions
diff --git a/include/media/stagefright/OMXCodec.h b/include/media/stagefright/OMXCodec.h
index 82948cb..f7d837a 100644
--- a/include/media/stagefright/OMXCodec.h
+++ b/include/media/stagefright/OMXCodec.h
@@ -175,6 +175,7 @@ private:
int64_t mSeekTimeUs;
ReadOptions::SeekMode mSeekMode;
int64_t mTargetTimeUs;
+ bool mOutputPortSettingsChangedPending;
MediaBuffer *mLeftOverBuffer;