summaryrefslogtreecommitdiff
path: root/media/libstagefright/ACodec.cpp
diff options
context:
space:
mode:
authorAndreas Huber <andih@google.com>2012-05-21 09:51:14 -0700
committerAndreas Huber <andih@google.com>2012-05-21 09:51:14 -0700
commit91bfadb4aa75444c60e9949232de3c184cfe060a (patch)
tree93f0aa64f7008ee6fc40c103338a295811f5fcd7 /media/libstagefright/ACodec.cpp
parent8370c7ad4136ad7e0787d5a91ccfa3d63cfbe5cc (diff)
If we encounter an error during buffer allocation change state back
to LOADED instead of remaining in the transitional state LOADED->IDLE that won't properly handle flush or shutdown requests. Change-Id: Ica1bf22eb884b220f18ed2a4f7a9c56eec228796 related-to-bug: 6516512
Diffstat (limited to 'media/libstagefright/ACodec.cpp')
-rw-r--r--media/libstagefright/ACodec.cpp2
1 files changed, 2 insertions, 0 deletions
diff --git a/media/libstagefright/ACodec.cpp b/media/libstagefright/ACodec.cpp
index dc8b33d9..2a8b3b68 100644
--- a/media/libstagefright/ACodec.cpp
+++ b/media/libstagefright/ACodec.cpp
@@ -2972,6 +2972,8 @@ void ACodec::LoadedToIdleState::stateEntered() {
err);
mCodec->signalError(OMX_ErrorUndefined, err);
+
+ mCodec->changeState(mCodec->mLoadedState);
}
}