diff options
author | Lajos Molnar <lajos@google.com> | 2014-08-12 17:05:56 +0000 |
---|---|---|
committer | Android (Google) Code Review <android-gerrit@google.com> | 2014-08-12 16:54:46 +0000 |
commit | d018b8ffd84452a7a4b992b5325713b3256e48ff (patch) | |
tree | a338c848af9b637f9879a7f0293d0fafbfef4489 /media/libmedia | |
parent | 2461e0cf6ae3fe5c9b52ce9e3ac764f4aff5e5eb (diff) | |
parent | 6ff58f04f78886b07c72c0118eb71a78d08f5651 (diff) | |
download | frameworks_av-d018b8ffd84452a7a4b992b5325713b3256e48ff.zip frameworks_av-d018b8ffd84452a7a4b992b5325713b3256e48ff.tar.gz frameworks_av-d018b8ffd84452a7a4b992b5325713b3256e48ff.tar.bz2 |
Merge "MediaCodecList: handle errors gracefully" into lmp-dev
Diffstat (limited to 'media/libmedia')
-rw-r--r-- | media/libmedia/MediaCodecInfo.cpp | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/media/libmedia/MediaCodecInfo.cpp b/media/libmedia/MediaCodecInfo.cpp index 5ea0519..446c582 100644 --- a/media/libmedia/MediaCodecInfo.cpp +++ b/media/libmedia/MediaCodecInfo.cpp @@ -206,6 +206,14 @@ status_t MediaCodecInfo::addMime(const char *mime) { return OK; } +void MediaCodecInfo::removeMime(const char *mime) { + ssize_t ix = getCapabilityIndex(mime); + if (ix >= 0) { + mCaps.removeItemsAt(ix); + // mCurrentCaps will be removed when completed + } +} + status_t MediaCodecInfo::initializeCapabilities(const CodecCapabilities &caps) { mCurrentCaps->mProfileLevels.clear(); mCurrentCaps->mColorFormats.clear(); |