summaryrefslogtreecommitdiffstats
path: root/include/media
diff options
context:
space:
mode:
authorAndreas Huber <andih@google.com>2011-08-16 13:48:44 -0700
committerAndreas Huber <andih@google.com>2011-08-16 13:48:44 -0700
commitd84fd7927eaf70fb7b9a55dd6c2adccfa66009ac (patch)
treee6051a1e65e85f1d6db1a1cd50b4c55b7153e9c4 /include/media
parent7a9effebcf84dcbd820cafe6886a5562cb3d8e22 (diff)
downloadframeworks_base-d84fd7927eaf70fb7b9a55dd6c2adccfa66009ac.zip
frameworks_base-d84fd7927eaf70fb7b9a55dd6c2adccfa66009ac.tar.gz
frameworks_base-d84fd7927eaf70fb7b9a55dd6c2adccfa66009ac.tar.bz2
Error handling in ACodec and Nuplayer.
Codec errors (and codec not found errors) now trigger a controlled shutdown of playback and signal errors to the MediaPlayer client. Change-Id: I2ee23ff2a1422d05a1a21e50ecb87d7c7ab958cc
Diffstat (limited to 'include/media')
-rw-r--r--include/media/stagefright/ACodec.h3
1 files changed, 1 insertions, 2 deletions
diff --git a/include/media/stagefright/ACodec.h b/include/media/stagefright/ACodec.h
index f13e9bb..e965f14 100644
--- a/include/media/stagefright/ACodec.h
+++ b/include/media/stagefright/ACodec.h
@@ -36,6 +36,7 @@ struct ACodec : public AHierarchicalStateMachine {
kWhatShutdownCompleted = 'scom',
kWhatFlushCompleted = 'fcom',
kWhatOutputFormatChanged = 'outC',
+ kWhatError = 'erro',
};
ACodec();
@@ -58,7 +59,6 @@ private:
struct OutputPortSettingsChangedState;
struct ExecutingToIdleState;
struct IdleToLoadedState;
- struct ErrorState;
struct FlushingState;
enum {
@@ -102,7 +102,6 @@ private:
sp<OutputPortSettingsChangedState> mOutputPortSettingsChangedState;
sp<ExecutingToIdleState> mExecutingToIdleState;
sp<IdleToLoadedState> mIdleToLoadedState;
- sp<ErrorState> mErrorState;
sp<FlushingState> mFlushingState;
AString mComponentName;