summaryrefslogtreecommitdiffstats
path: root/include
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
commit9c0096378820e5a61db26e52a7e6df50ba9c872d (patch)
tree29f4953a4816d4e4b09cf11d1681b98a3d666708 /include
parent8473bb556421ac08f4e03abd5d149852114c9238 (diff)
downloadframeworks_av-9c0096378820e5a61db26e52a7e6df50ba9c872d.zip
frameworks_av-9c0096378820e5a61db26e52a7e6df50ba9c872d.tar.gz
frameworks_av-9c0096378820e5a61db26e52a7e6df50ba9c872d.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')
-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;