Merge "Call storeMetaDataInVideoBuffers() before get/setParameters() on index... (d5fee4df) · Commits · e / os / android_frameworks_av

media/libstagefright/OMXCodec.cpp

+10 −9

Original line number	Diff line number	Diff line
		@@ -1643,25 +1643,26 @@ status_t OMXCodec::allocateBuffersOnPort(OMX_U32 portIndex) {
		return PERMISSION_DENIED;
		}

		status_t err = OK;
		if (mIsMetaDataStoredInVideoBuffers && portIndex == kPortIndexInput) {
		err = mOMX->storeMetaDataInBuffers(mNode, kPortIndexInput, OMX_TRUE);
		if (err != OK) {
		LOGE("Storing meta data in video buffers is not supported");
		return err;
		}
		}

		OMX_PARAM_PORTDEFINITIONTYPE def;
		InitOMXParams(&def);
		def.nPortIndex = portIndex;

		status_t err = mOMX->getParameter(
		err = mOMX->getParameter(
		mNode, OMX_IndexParamPortDefinition, &def, sizeof(def));

		if (err != OK) {
		return err;
		}

		if (mIsMetaDataStoredInVideoBuffers && portIndex == kPortIndexInput) {
		err = mOMX->storeMetaDataInBuffers(mNode, kPortIndexInput, OMX_TRUE);
		if (err != OK) {
		LOGE("Storing meta data in video buffers is not supported");
		return err;
		}
		}

		CODEC_LOGI("allocating %lu buffers of size %lu on %s port",
		def.nBufferCountActual, def.nBufferSize,
		portIndex == kPortIndexInput ? "input" : "output");