diff options
| author | Ronghua Wu <ronghuawu@google.com> | 2015-04-15 03:11:13 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2015-04-15 03:11:14 +0000 |
| commit | a5bf4e0339a10b7db936c739fbfd6cf3cb00fbb8 (patch) | |
| tree | fea070a835cfb6fc870072331926020623bce8bf /include | |
| parent | 7233234a32d22d2ffb63ed4e92df339458047887 (diff) | |
| parent | 99acce4526db0f14be6e516ecb3920d5ed66877b (diff) | |
| download | frameworks_av-a5bf4e0339a10b7db936c739fbfd6cf3cb00fbb8.zip frameworks_av-a5bf4e0339a10b7db936c739fbfd6cf3cb00fbb8.tar.gz frameworks_av-a5bf4e0339a10b7db936c739fbfd6cf3cb00fbb8.tar.bz2 | |
Merge "Revert "stagefright: define CB_CODEC_RELEASED and ReleaseReason enum.""
Diffstat (limited to 'include')
| -rw-r--r-- | include/media/stagefright/MediaCodec.h | 8 |
1 files changed, 1 insertions, 7 deletions
diff --git a/include/media/stagefright/MediaCodec.h b/include/media/stagefright/MediaCodec.h index 012a8f4..d98fa1a 100644 --- a/include/media/stagefright/MediaCodec.h +++ b/include/media/stagefright/MediaCodec.h @@ -56,13 +56,7 @@ struct MediaCodec : public AHandler { CB_OUTPUT_AVAILABLE = 2, CB_ERROR = 3, CB_OUTPUT_FORMAT_CHANGED = 4, - 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 + CB_RESOURCE_RECLAIMED = 5, }; struct BatteryNotifier; |