History

add blockstaticidc pointer for MD

lyao2 committed 12 years ago

Commit bfa16ba1 parent e57e19f4 files · +41 −10Browse files

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

Unified · Split

codec/encoder/core/src/wels_preprocess.cpp+2−4
@@ -927,6 +927,7 @@ void CWelsPreProcess::SaveBestRefToLocal (SRefInfoParam* pRefPicInfo, const SSce · 926 unmodified lines
927927 SRefInfoParam* pRefSaved) {
928928 pRefSaved->iSrcListIdx = pRefPicInfo->iSrcListIdx;
929929 pRefSaved->bSceneLtrFlag = pRefPicInfo->bSceneLtrFlag;
930+ pRefSaved->pBestBlockStaticIdc = sSceneChangeResult.pStaticBlockIdc;
930931 }
931932
932933 void CWelsPreProcess::SaveBestRefToVaa (SRefInfoParam& sRefSaved, SRefInfoParam* pVaaBestRef) {
@@ -974,8 +975,6 @@ ESceneChangeIdc CWelsPreProcess::DetectSceneChangeScreen (sWelsEncCtx* pCtx, SPi · 41 unmodified lines
974975 SPicture* pRefPic = NULL;
975976 SRefInfoParam* pRefPicInfo = NULL;
976977 uint8_t* pCurBlockStaticPointer = NULL;
977− uint8_t* pBestStrBlockStaticPointer = NULL;
978− uint8_t* pBestLtrBlockStaticPointer = NULL;
979978
980979 const int32_t iNegligibleMotionBlocks = (static_cast<int32_t> ((pCurPicture->iWidthInPixel >> 3) *
981980 (pCurPicture->iHeightInPixel >> 3) * STATIC_SCENE_MOTION_RATIO));
@@ -1046,12 +1045,10 @@ ESceneChangeIdc CWelsPreProcess::DetectSceneChangeScreen (sWelsEncCtx* pCtx, SPi · 64 unmodified lines
10461045 SaveBestRefToJudgement (iRefPicAvQP, iFrameComplexity, &sLtrJudgement);
10471046 SaveBestRefToLocal (pRefPicInfo, sSceneChangeResult, &sLtrSaved);
10481047 bBestRefIsLtr = bCurRefIsLtr;
1049− pBestStrBlockStaticPointer = sSceneChangeResult.pStaticBlockIdc;
10501048 }
10511049 if (bCurRefIsLtr && JudgeBestRef (pRefPic, sSceneLtrJudgement, iFrameComplexity, bIsClosestLtrFrame)) {
10521050 SaveBestRefToJudgement (iRefPicAvQP, iFrameComplexity, &sSceneLtrJudgement);
10531051 SaveBestRefToLocal (pRefPicInfo, sSceneChangeResult, &sSceneLtrSaved);
1054− pBestLtrBlockStaticPointer = sSceneChangeResult.pStaticBlockIdc;
10551052 }
10561053
10571054 if (iMotionBlockNum <= iNegligibleMotionBlocks) {
@@ -1072,6 +1069,7 @@ ESceneChangeIdc CWelsPreProcess::DetectSceneChangeScreen (sWelsEncCtx* pCtx, SPi · 14 unmodified lines
10721069 pCtx->iCodingIndex);
10731070
10741071 SaveBestRefToVaa (sLtrSaved, & (pVaaExt->sVaaStrBestRefCandidate[0]));
1072+ pVaaExt->pVaaBestBlockStaticIdc = sLtrSaved.pBestBlockStaticIdc;
10751073
10761074 if (0 == iAvailableSceneRefNum) {
10771075 SaveBestRefToVaa (sSceneLtrSaved, & (pVaaExt->sVaaStrBestRefCandidate[1]));

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