rename the strategy to enum

Sijia Chen committed 11 years ago

Commit d9502aa1 parent 7d1d2d69 files · +166 −74Browse files

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

Unified · Split

codec/encoder/core/src/svc_encode_slice.cpp+2−2

@@ -730,11 +730,11 @@ int32_t WelsCodeOneSlice (sWelsEncCtx* pEncCtx, const int32_t kiSliceIdx, const · 729 unmodified lines
730	730	WelsSliceHeaderExtInit (pEncCtx, pCurLayer, pCurSlice);
731	731
732	732	g_pWelsWriteSliceHeader[pCurSlice->bSliceHeaderExtFlag] (pEncCtx, pBs, pCurLayer, pCurSlice,
733		− ((SPS_PPS_LISTING != pEncCtx->pSvcParam->iSpsPpsIdStrategy) ? (&
	733	+ ((SPS_PPS_LISTING != pEncCtx->pSvcParam->eSpsPpsIdStrategy) ? (&
734	734	(pEncCtx->sPSOVector.sParaSetOffsetVariable[PARA_SET_TYPE_PPS].iParaSetIdDelta[0])) : NULL));
735	735
736	736	#if _DEBUG
737		− if (INCREASING_ID & pEncCtx->sPSOVector.iSpsPpsIdStrategy) {
	737	+ if (INCREASING_ID & pEncCtx->sPSOVector.eSpsPpsIdStrategy) {
738	738	const int32_t kiEncoderPpsId = pCurSlice->sSliceHeaderExt.sSliceHeader.pPps->iPpsId;
739	739	const int32_t kiTmpPpsIdInBs = kiEncoderPpsId +
740	740	pEncCtx->sPSOVector.sParaSetOffsetVariable[PARA_SET_TYPE_PPS].iParaSetIdDelta[ kiEncoderPpsId ];