fix for a slicing and multi-threading setting

Sijia Chen committed 11 years ago

Commit 2dab8bf1 parent 597adfd2 files · +69 −0Browse files

Showing the changes to codec/encoder/core/src/encoder_ext.cpp (1 of 2 files). Show all

Unified · Split

codec/encoder/core/src/encoder_ext.cpp+5−0

@@ -3975,6 +3975,11 @@ int32_t WelsEncoderEncodeExt (sWelsEncCtx* pCtx, SFrameBSInfo* pFbi, const SSour · 3974 unmodified lines
3975		3975
3976	WelsLoadNal (pCtx->pOut, eNalType, eNalRefIdc);	3976	WelsLoadNal (pCtx->pOut, eNalType, eNalRefIdc);
3977		3977
		3978	//the following line is to fix a problem with a specific setting as in test DiffSlicingInDlayerMixed:
		3979	// (multi-th on with SM_SINGLE_SLICE in one of the D layers)
		3980	//TODO: this may not be needed any more after the slice buffer refactoring
		3981	pCtx->pCurDqLayer->sLayerInfo.pSliceInLayer[0].pSliceBsa = &(pCtx->pOut->sBsWrite);
		3982
3978	pCtx->iEncoderError = WelsCodeOneSlice (pCtx, 0, eNalType);	3983	pCtx->iEncoderError = WelsCodeOneSlice (pCtx, 0, eNalType);
3979	WELS_VERIFY_RETURN_IFNEQ (pCtx->iEncoderError, ENC_RETURN_SUCCESS)	3984	WELS_VERIFY_RETURN_IFNEQ (pCtx->iEncoderError, ENC_RETURN_SUCCESS)
3980		3985