summaryrefslogtreecommitdiffstats
path: root/include
diff options
context:
space:
mode:
authorRonghua Wu <ronghuawu@google.com>2015-04-09 22:28:53 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2015-04-09 22:28:54 +0000
commit079e121934106860af5ff5491bd3884453d1fdb3 (patch)
tree9e632f4ac530466a4d98ddde47b8f44f8378679c /include
parentbd903e363faeacaeae98252bfc753d5cac9de602 (diff)
parentea20d117ef9b4e867ec3982c7d070e719617ba2f (diff)
downloadframeworks_av-079e121934106860af5ff5491bd3884453d1fdb3.zip
frameworks_av-079e121934106860af5ff5491bd3884453d1fdb3.tar.gz
frameworks_av-079e121934106860af5ff5491bd3884453d1fdb3.tar.bz2
Merge "stagefright: define CB_CODEC_RELEASED and ReleaseReason enum."
Diffstat (limited to 'include')
-rw-r--r--include/media/stagefright/MediaCodec.h8
1 files changed, 7 insertions, 1 deletions
diff --git a/include/media/stagefright/MediaCodec.h b/include/media/stagefright/MediaCodec.h
index 3bc6391..0786fb9 100644
--- a/include/media/stagefright/MediaCodec.h
+++ b/include/media/stagefright/MediaCodec.h
@@ -53,7 +53,13 @@ struct MediaCodec : public AHandler {
CB_OUTPUT_AVAILABLE = 2,
CB_ERROR = 3,
CB_OUTPUT_FORMAT_CHANGED = 4,
- CB_RESOURCE_RECLAIMED = 5,
+ CB_CODEC_RELEASED = 5,
+ };
+
+ // used by CB_CODEC_RELEASED to tell the upper layer the cause of the release.
+ enum ReleaseReason {
+ REASON_UNKNOWN = 0,
+ REASON_RECLAIMED, // resources reclaimed by resource manager
};
struct BatteryNotifier;