fix deblockIDC and mutithread logic error

lyao2 committed 12 years ago

Commit 6047ff91 parent 47f1ac72 files · +3 −4Browse 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+3−1

@@ -1860,7 +1860,9 @@ int32_t InitSliceSettings (SLogContext* pLogCtx, SWelsSvcCodingParam* pCodingPar · 1859 unmodified lines
1860		1860
1861	pCodingParam->iCountThreadsNum = WELS_MIN (kiCpuCores, iMaxSliceCount);	1861	pCodingParam->iCountThreadsNum = WELS_MIN (kiCpuCores, iMaxSliceCount);
1862	pCodingParam->iMultipleThreadIdc = pCodingParam->iCountThreadsNum;	1862	pCodingParam->iMultipleThreadIdc = pCodingParam->iCountThreadsNum;
1863		1863	if (pCodingParam->iLoopFilterDisableIdc == 0
		1864	&& pCodingParam->iMultipleThreadIdc != 1) // Loop filter requested to be enabled, with threading enabled
		1865	pCodingParam->iLoopFilterDisableIdc = 2; // Disable loop filter on slice boundaries since that's not allowed with multithreading
1864	*pMaxSliceCount = iMaxSliceCount;	1866	*pMaxSliceCount = iMaxSliceCount;
1865		1867
1866	return 0;	1868	return 0;