diff options
| author | Ronghua Wu <ronghuawu@google.com> | 2015-07-14 15:22:06 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2015-07-14 15:22:08 +0000 |
| commit | 710c8e9d3ebe9d3687c4cb0cfdae83e4dc7d628a (patch) | |
| tree | ce91ba0801c078de8571396f44437a1774d9847d | |
| parent | 6a8995e020e76ee7ffd0f1c9bb8e51d5881cf7e6 (diff) | |
| parent | 3bb9e7444850eb999fdc924496b237693856ef24 (diff) | |
| download | frameworks_av-710c8e9d3ebe9d3687c4cb0cfdae83e4dc7d628a.zip frameworks_av-710c8e9d3ebe9d3687c4cb0cfdae83e4dc7d628a.tar.gz frameworks_av-710c8e9d3ebe9d3687c4cb0cfdae83e4dc7d628a.tar.bz2 | |
Merge "libstagefright: get secure and non-secure codec policy from mediacodec list global settings" into mnc-dev
| -rw-r--r-- | media/libstagefright/MediaCodecList.cpp | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/media/libstagefright/MediaCodecList.cpp b/media/libstagefright/MediaCodecList.cpp index 7ea5cbd..5edc04c 100644 --- a/media/libstagefright/MediaCodecList.cpp +++ b/media/libstagefright/MediaCodecList.cpp @@ -216,6 +216,12 @@ void MediaCodecList::parseTopLevelXMLFile(const char *codecs_xml, bool ignore_er String8(kPolicySupportsMultipleSecureCodecs), String8(value.c_str()))); } + if (mGlobalSettings->findString(kPolicySupportsSecureWithNonSecureCodec, &value)) { + policies.push_back( + MediaResourcePolicy( + String8(kPolicySupportsSecureWithNonSecureCodec), + String8(value.c_str()))); + } if (policies.size() > 0) { sp<IServiceManager> sm = defaultServiceManager(); sp<IBinder> binder = sm->getService(String16("media.resource_manager")); |