Merge remote-tracking branch 'origin/lineage-19.1' into v1-s (2ece4811) · Commits · e / os / android_frameworks_av

media/libstagefright/codecs/m4v_h263/dec/SoftMPEG4.cpp

+5 −2

Original line number	Diff line number	Diff line
		@@ -312,9 +312,12 @@ void SoftMPEG4::onQueueFilled(OMX_U32 /* portIndex */) {
		outHeader->nFilledLen = frameSize;

		List<BufferInfo *>::iterator it = outQueue.begin();
		while ((*it)->mHeader != outHeader) {
		while (it != outQueue.end() && (*it)->mHeader != outHeader) {
		++it;
		}
		if (it == outQueue.end()) {
		return;
		}

		BufferInfo outInfo = it;
		outInfo->mOwnedByUs = false;

+10 −0

Original line number	Diff line number	Diff line
		@@ -120,6 +120,11 @@ OMX_ERRORTYPE SoftVP8Encoder::internalSetParameter(OMX_INDEXTYPE index,

		OMX_ERRORTYPE SoftVP8Encoder::internalGetVp8Params(
		OMX_VIDEO_PARAM_VP8TYPE* vp8Params) {
		if (!isValidOMXParam(vp8Params)) {
		android_errorWriteLog(0x534e4554, "273936274");
		return OMX_ErrorBadParameter;
		}

		if (vp8Params->nPortIndex != kOutputPortIndex) {
		return OMX_ErrorUnsupportedIndex;
		}
		@@ -133,6 +138,11 @@ OMX_ERRORTYPE SoftVP8Encoder::internalGetVp8Params(

		OMX_ERRORTYPE SoftVP8Encoder::internalSetVp8Params(
		const OMX_VIDEO_PARAM_VP8TYPE* vp8Params) {
		if (!isValidOMXParam(vp8Params)) {
		android_errorWriteLog(0x534e4554, "273937171");
		return OMX_ErrorBadParameter;
		}

		if (vp8Params->nPortIndex != kOutputPortIndex) {
		return OMX_ErrorUnsupportedIndex;
		}

+10 −0

Original line number	Diff line number	Diff line
		@@ -119,6 +119,11 @@ OMX_ERRORTYPE SoftVP9Encoder::internalSetParameter(

		OMX_ERRORTYPE SoftVP9Encoder::internalGetVp9Params(
		OMX_VIDEO_PARAM_VP9TYPE *vp9Params) {
		if (!isValidOMXParam(vp9Params)) {
		android_errorWriteLog(0x534e4554, "273936553");
		return OMX_ErrorBadParameter;
		}

		if (vp9Params->nPortIndex != kOutputPortIndex) {
		return OMX_ErrorUnsupportedIndex;
		}
		@@ -133,6 +138,11 @@ OMX_ERRORTYPE SoftVP9Encoder::internalGetVp9Params(

		OMX_ERRORTYPE SoftVP9Encoder::internalSetVp9Params(
		const OMX_VIDEO_PARAM_VP9TYPE *vp9Params) {
		if (!isValidOMXParam(vp9Params)) {
		android_errorWriteLog(0x534e4554, "273937136");
		return OMX_ErrorBadParameter;
		}

		if (vp9Params->nPortIndex != kOutputPortIndex) {
		return OMX_ErrorUnsupportedIndex;
		}

+9 −0

Original line number	Diff line number	Diff line
		@@ -485,6 +485,11 @@ OMX_ERRORTYPE SoftVPXEncoder::internalSetBitrateParams(

		OMX_ERRORTYPE SoftVPXEncoder::internalGetAndroidVpxParams(
		OMX_VIDEO_PARAM_ANDROID_VP8ENCODERTYPE *vpxAndroidParams) {
		if (!isValidOMXParam(vpxAndroidParams)) {
		android_errorWriteLog(0x534e4554, "273936601");
		return OMX_ErrorBadParameter;
		}

		if (vpxAndroidParams->nPortIndex != kOutputPortIndex) {
		return OMX_ErrorUnsupportedIndex;
		}
		@@ -501,6 +506,10 @@ OMX_ERRORTYPE SoftVPXEncoder::internalGetAndroidVpxParams(

		OMX_ERRORTYPE SoftVPXEncoder::internalSetAndroidVpxParams(
		const OMX_VIDEO_PARAM_ANDROID_VP8ENCODERTYPE *vpxAndroidParams) {
		if (!isValidOMXParam(vpxAndroidParams)) {
		android_errorWriteLog(0x534e4554, "273937551");
		return OMX_ErrorBadParameter;
		}
		if (vpxAndroidParams->nPortIndex != kOutputPortIndex) {
		return OMX_ErrorUnsupportedIndex;
		}

+8 −0

Original line number	Diff line number	Diff line
		@@ -616,6 +616,10 @@ OMX_ERRORTYPE SoftVideoDecoderOMXComponent::getConfig(
		DescribeHDR10PlusInfoParams* outParams =
		(DescribeHDR10PlusInfoParams *)params;

		if (!isValidOMXParam(outParams)) {
		return OMX_ErrorBadParameter;
		}

		outParams->nParamSizeUsed = info->size();

		// If the buffer provided by the client does not have enough
		@@ -694,6 +698,10 @@ OMX_ERRORTYPE SoftVideoDecoderOMXComponent::internalSetConfig(
		const DescribeHDR10PlusInfoParams* inParams =
		(DescribeHDR10PlusInfoParams *)params;

		if (!isValidOMXParam(inParams)) {
		return OMX_ErrorBadParameter;
		}

		if (*frameConfig) {
		// This is a request to append to the current frame config set.
		// For now, we only support kDescribeHdr10PlusInfoIndex, which