Merge \\\\"SoftHEVC: Exit gracefully in case of decoder errors\\\\" into... (075a815a) · Commits · e / os / android_frameworks_av

media/libstagefright/codecs/hevcdec/SoftHEVC.cpp

+22 −0

Original line number	Diff line number	Diff line
		@@ -444,6 +444,9 @@ void SoftHEVC::onQueueFilled(OMX_U32 portIndex) {

		if (NULL == mCodecCtx) {
		if (OK != initDecoder()) {
		ALOGE("Failed to initialize decoder");
		notify(OMX_EventError, OMX_ErrorUnsupportedSetting, 0, NULL);
		mSignalledError = true;
		return;
		}
		}
		@@ -530,6 +533,25 @@ void SoftHEVC::onQueueFilled(OMX_U32 portIndex) {
		IV_API_CALL_STATUS_T status;
		status = ivdec_api_function(mCodecCtx, (void )&s_dec_ip, (void )&s_dec_op);

		bool unsupportedResolution =
		(IVD_STREAM_WIDTH_HEIGHT_NOT_SUPPORTED == (s_dec_op.u4_error_code & 0xFF));

		/* Check for unsupported dimensions */
		if (unsupportedResolution) {
		ALOGE("Unsupported resolution : %dx%d", mWidth, mHeight);
		notify(OMX_EventError, OMX_ErrorUnsupportedSetting, 0, NULL);
		mSignalledError = true;
		return;
		}

		bool allocationFailed = (IVD_MEM_ALLOC_FAILED == (s_dec_op.u4_error_code & 0xFF));
		if (allocationFailed) {
		ALOGE("Allocation failure in decoder");
		notify(OMX_EventError, OMX_ErrorUnsupportedSetting, 0, NULL);
		mSignalledError = true;
		return;
		}

		bool resChanged = (IVD_RES_CHANGED == (s_dec_op.u4_error_code & 0xFF));

		GETTIME(&mTimeEnd, NULL);