Snap for 6433119 from 8fc0d93712d12e3a12049214f326eea5529f137f to mainline-release (2d9ff84a) · Commits · e / os / android_frameworks_av

media/libstagefright/ACodec.cpp

+25 −8

Original line number	Diff line number	Diff line
		@@ -2053,17 +2053,34 @@ status_t ACodec::configureCodec(
		if (mIsVideo \|\| mIsImage) {
		// determine need for software renderer
		bool usingSwRenderer = false;
		if (haveNativeWindow && mComponentName.startsWith("OMX.google.")) {
		if (haveNativeWindow) {
		bool requiresSwRenderer = false;
		OMX_PARAM_U32TYPE param;
		InitOMXParams(&param);
		param.nPortIndex = kPortIndexOutput;

		status_t err = mOMXNode->getParameter(
		(OMX_INDEXTYPE)OMX_IndexParamVideoAndroidRequiresSwRenderer,
		&param, sizeof(param));

		if (err == OK && param.nU32 == 1) {
		requiresSwRenderer = true;
		}

		if (mComponentName.startsWith("OMX.google.") \|\| requiresSwRenderer) {
		usingSwRenderer = true;
		haveNativeWindow = false;
		(void)setPortMode(kPortIndexOutput, IOMX::kPortModePresetByteBuffer);
		} else if (haveNativeWindow && !storingMetadataInDecodedBuffers()) {
		} else if (!storingMetadataInDecodedBuffers()) {
		err = setPortMode(kPortIndexOutput, IOMX::kPortModePresetANWBuffer);
		if (err != OK) {
		return err;
		}
		}

		}


		if (encoder) {
		err = setupVideoEncoder(mime, msg, outputFormat, inputFormat);
		} else {