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

am 3a9f5143: am 66380f76: Stagefright: authenticate ANativeWindow.

Browse Source 
* commit '3a9f5143efe63b4b94a1bd1312e0ba618a58674f':
  Stagefright: authenticate ANativeWindow.
This commit is contained in:
Jamie Gennis
2011-04-08 17:41:38 -07:00
committed by Android Git Automerger
parent da2790fa0a 3a9f5143ef
commit 0fb4e73f5f
1 changed files with 24 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
media/libstagefright/OMXCodec.cpp
View File

@@ -1593,6 +1593,11 @@ status_t OMXCodec::allocateBuffersOnPort(OMX_U32 portIndex) {
return allocateOutputBuffersFromNativeWindow();
}
if (mEnableGrallocUsageProtected && portIndex == kPortIndexOutput) {
LOGE("protected output buffers must be stent to an ANativeWindow");
return PERMISSION_DENIED;
}
OMX_PARAM_PORTDEFINITIONTYPE def;
InitOMXParams(&def);
def.nPortIndex = portIndex;
@@ -1761,6 +1766,25 @@ status_t OMXCodec::allocateOutputBuffersFromNativeWindow() {
usage |= GRALLOC_USAGE_PROTECTED;
}
// Make sure to check whether either Stagefright or the video decoder
// requested protected buffers.
if (usage & GRALLOC_USAGE_PROTECTED) {
// Verify that the ANativeWindow sends images directly to
// SurfaceFlinger.
int queuesToNativeWindow = 0;
err = mNativeWindow->query(
mNativeWindow.get(), NATIVE_WINDOW_QUEUES_TO_WINDOW_COMPOSER,
&queuesToNativeWindow);
if (err != 0) {
LOGE("error authenticating native window: %d", err);
return err;
}
if (queuesToNativeWindow != 1) {
LOGE("native window could not be authenticated");
return PERMISSION_DENIED;
}
}
LOGV("native_window_set_usage usage=0x%x", usage);
err = native_window_set_usage(
mNativeWindow.get(), usage | GRALLOC_USAGE_HW_TEXTURE | GRALLOC_USAGE_EXTERNAL_DISP);