History

Merge pull request #415 from volvet/remove-useless-mgs-code

remove un-supported mgs code

ruil2 committed 12 years ago

Commit 28a56a62 parents 8313e01 e9395bb2 files · +1 −11Browse 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+1−6
@@ -892,11 +892,7 @@ static inline int32_t InitDqLayers (sWelsEncCtx** ppCtx) { · 891 unmodified lines
892 }892 }
893 893
894 // for dynamically malloc for parameter sets memory instead of maximal items for standard to reduce size, 3/18/2010894 // for dynamically malloc for parameter sets memory instead of maximal items for standard to reduce size, 3/18/2010
895 if (& (*ppCtx)->pSvcParam->bMgsT0OnlyStrategy) {895 (*ppCtx)->pPPSArray = (SWelsPPS*)pMa->WelsMalloc (iDlayerCount * sizeof (SWelsPPS), "pPPSArray");
896 (*ppCtx)->pPPSArray = (SWelsPPS*)pMa->WelsMalloc ((1 + iDlayerCount) * sizeof (SWelsPPS), "pPPSArray");
897 } else {
898 (*ppCtx)->pPPSArray = (SWelsPPS*)pMa->WelsMalloc (iDlayerCount * sizeof (SWelsPPS), "pPPSArray");
899 }
900 WELS_VERIFY_RETURN_PROC_IF (1, (NULL == (*ppCtx)->pPPSArray), FreeMemorySvc (ppCtx))896 WELS_VERIFY_RETURN_PROC_IF (1, (NULL == (*ppCtx)->pPPSArray), FreeMemorySvc (ppCtx))
901 897
902 (*ppCtx)->pSpsArray = (SWelsSPS*)pMa->WelsMalloc (sizeof (SWelsSPS), "pSpsArray");898 (*ppCtx)->pSpsArray = (SWelsSPS*)pMa->WelsMalloc (sizeof (SWelsSPS), "pSpsArray");
@@ -3498,7 +3494,6 @@ int32_t WelsEncoderEncodeExt (sWelsEncCtx* pCtx, SFrameBSInfo * pFbi, const SSou · 2595 unmodified lines
3498 3494
3499#endif//MB_TYPES_CHECK3495#endif//MB_TYPES_CHECK
3500 {3496 {
3501 //no pCtx->pSvcParam->bMgsT0OnlyStrategy
3502 ++ pCtx->sStatData[iCurDid][0].sSliceData.iSliceCount[pCtx->eSliceType]; // for multiple slices coding3497 ++ pCtx->sStatData[iCurDid][0].sSliceData.iSliceCount[pCtx->eSliceType]; // for multiple slices coding
3503 pCtx->sStatData[iCurDid][0].sSliceData.iSliceSize[pCtx->eSliceType] += (iLayerSize << 3); // bits3498 pCtx->sStatData[iCurDid][0].sSliceData.iSliceSize[pCtx->eSliceType] += (iLayerSize << 3); // bits
3504 }3499 }

Keyboard shortcuts

General

Show keyboard shortcuts
?
Focus the current search
/

Issues and pull requests

Open filters
f

Issues, pull requests and Inbox

Select next item
j↓
Select previous item
k↑
Open selected item
Enter
Dismiss filters or clear selection
Esc

Repository code

Go to file
t