am 0fb4e73f: am 3a9f5143: am 66380f76: Stagefright: authenticate ANativeWindow. (0741b1ae) · Commits · e / os / android_frameworks_base

media/libstagefright/OMXCodec.cpp

+24 −0

Original line number	Diff line number	Diff line
		@@ -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);