Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "When using "secure input buffer mode" we instantiate a different OMX component"

Browse Source
This commit is contained in:
Andreas Huber
2011-08-10 13:03:29 -07:00
committed by Android (Google) Code Review
parent 96d8a6f8ec 753fd9a3c7
commit e963ebdb44
1 changed files with 11 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
media/libstagefright/OMXCodec.cpp
View File

@@ -442,9 +442,17 @@ sp<MediaSource> OMXCodec::Create(
sp<OMXCodecObserver> observer = new OMXCodecObserver;
IOMX::node_id node = 0;
const char *componentName;
for (size_t i = 0; i < matchingCodecs.size(); ++i) {
componentName = matchingCodecs[i].string();
const char *componentNameBase = matchingCodecs[i].string();
const char *componentName = componentNameBase;
AString tmp;
if (flags & kUseSecureInputBuffers) {
tmp = componentNameBase;
tmp.append(".secure");
componentName = tmp.c_str();
}
if (createEncoder) {
sp<MediaSource> softwareCodec =
@@ -459,7 +467,7 @@ sp<MediaSource> OMXCodec::Create(
LOGV("Attempting to allocate OMX node '%s'", componentName);
uint32_t quirks = getComponentQuirks(componentName, createEncoder);
uint32_t quirks = getComponentQuirks(componentNameBase, createEncoder);
if (!createEncoder
&& (quirks & kOutputBuffersAreUnreadable)