History

re-structure SWelsDecoderContext and others and prepare for the support of multi-threading support.

xiaotiansf committed 7 years ago

Commit 2f5ecec1 parent 9ed97c729 files · +2285 −1568Browse files

Showing the changes to codec/decoder/core/src/rec_mb.cpp (1 of 29 files). Show all

Unified · Split

codec/decoder/core/src/rec_mb.cpp+120−120
@@ -44,20 +44,20 @@ · 43 unmodified lines
4444
4545 namespace WelsDec {
4646
47−void WelsFillRecNeededMbInfo (PWelsDecoderContext pCtx, bool bOutput, PDqLayer pCurLayer) {
47+void WelsFillRecNeededMbInfo (PWelsDecoderContext pCtx, bool bOutput, PDqLayer pCurDqLayer) {
4848 PPicture pCurPic = pCtx->pDec;
4949 int32_t iLumaStride = pCurPic->iLinesize[0];
5050 int32_t iChromaStride = pCurPic->iLinesize[1];
51− int32_t iMbX = pCurLayer->iMbX;
52− int32_t iMbY = pCurLayer->iMbY;
51+ int32_t iMbX = pCurDqLayer->iMbX;
52+ int32_t iMbY = pCurDqLayer->iMbY;
5353
54− pCurLayer->iLumaStride = iLumaStride;
55− pCurLayer->iChromaStride = iChromaStride;
54+ pCurDqLayer->iLumaStride = iLumaStride;
55+ pCurDqLayer->iChromaStride = iChromaStride;
5656
5757 if (bOutput) {
58− pCurLayer->pPred[0] = pCurPic->pData[0] + ((iMbY * iLumaStride + iMbX) << 4);
59− pCurLayer->pPred[1] = pCurPic->pData[1] + ((iMbY * iChromaStride + iMbX) << 3);
60− pCurLayer->pPred[2] = pCurPic->pData[2] + ((iMbY * iChromaStride + iMbX) << 3);
58+ pCurDqLayer->pPred[0] = pCurPic->pData[0] + ((iMbY * iLumaStride + iMbX) << 4);
59+ pCurDqLayer->pPred[1] = pCurPic->pData[1] + ((iMbY * iChromaStride + iMbX) << 3);
60+ pCurDqLayer->pPred[2] = pCurPic->pData[2] + ((iMbY * iChromaStride + iMbX) << 3);
6161 }
6262 }
6363
@@ -446,7 +446,7 @@ int32_t GetInterPred (uint8_t* pPredY, uint8_t* pPredCb, uint8_t* pPredCr, PWels · 382 unmodified lines
446446
447447 int16_t iMVs[2] = {0};
448448
449− uint32_t iMBType = pCurDqLayer->pMbType[iMBXY];
449+ uint32_t iMBType = pCurDqLayer->pDec->pMbType[iMBXY];
450450
451451 int32_t iMBOffsetX = pCurDqLayer->iMbX << 4;
452452 int32_t iMBOffsetY = pCurDqLayer->iMbY << 4;
@@ -471,60 +471,60 @@ int32_t GetInterPred (uint8_t* pPredY, uint8_t* pPredCb, uint8_t* pPredCr, PWels · 18 unmodified lines
471471 switch (iMBType) {
472472 case MB_TYPE_SKIP:
473473 case MB_TYPE_16x16:
474− iMVs[0] = pCurDqLayer->pMv[0][iMBXY][0][0];
475− iMVs[1] = pCurDqLayer->pMv[0][iMBXY][0][1];
476− WELS_B_MB_REC_VERIFY (GetRefPic (&pMCRefMem, pCtx, pCurDqLayer->pRefIndex[0][iMBXY], 0, LIST_0));
474+ iMVs[0] = pCurDqLayer->pDec->pMv[0][iMBXY][0][0];
475+ iMVs[1] = pCurDqLayer->pDec->pMv[0][iMBXY][0][1];
476+ WELS_B_MB_REC_VERIFY (GetRefPic (&pMCRefMem, pCtx, pCurDqLayer->pDec->pRefIndex[0][iMBXY], 0, LIST_0));
477477 BaseMC (&pMCRefMem, iMBOffsetX, iMBOffsetY, pMCFunc, 16, 16, iMVs);
478478
479479 if (pCurDqLayer->bUseWeightPredictionFlag) {
480− iRefIndex = pCurDqLayer->pRefIndex[0][iMBXY][0];
480+ iRefIndex = pCurDqLayer->pDec->pRefIndex[0][iMBXY][0];
481481 WeightPrediction (pCurDqLayer, &pMCRefMem, LIST_0, iRefIndex, 16, 16);
482482 }
483483 break;
484484 case MB_TYPE_16x8:
485− iMVs[0] = pCurDqLayer->pMv[0][iMBXY][0][0];
486− iMVs[1] = pCurDqLayer->pMv[0][iMBXY][0][1];
487− WELS_B_MB_REC_VERIFY (GetRefPic (&pMCRefMem, pCtx, pCurDqLayer->pRefIndex[0][iMBXY], 0, LIST_0));
485+ iMVs[0] = pCurDqLayer->pDec->pMv[0][iMBXY][0][0];
486+ iMVs[1] = pCurDqLayer->pDec->pMv[0][iMBXY][0][1];
487+ WELS_B_MB_REC_VERIFY (GetRefPic (&pMCRefMem, pCtx, pCurDqLayer->pDec->pRefIndex[0][iMBXY], 0, LIST_0));
488488 BaseMC (&pMCRefMem, iMBOffsetX, iMBOffsetY, pMCFunc, 16, 8, iMVs);
489489
490490 if (pCurDqLayer->bUseWeightPredictionFlag) {
491− iRefIndex = pCurDqLayer->pRefIndex[0][iMBXY][0];
491+ iRefIndex = pCurDqLayer->pDec->pRefIndex[0][iMBXY][0];
492492 WeightPrediction (pCurDqLayer, &pMCRefMem, LIST_0, iRefIndex, 16, 8);
493493 }
494494
495− iMVs[0] = pCurDqLayer->pMv[0][iMBXY][8][0];
496− iMVs[1] = pCurDqLayer->pMv[0][iMBXY][8][1];
497− WELS_B_MB_REC_VERIFY (GetRefPic (&pMCRefMem, pCtx, pCurDqLayer->pRefIndex[0][iMBXY], 8, LIST_0));
495+ iMVs[0] = pCurDqLayer->pDec->pMv[0][iMBXY][8][0];
496+ iMVs[1] = pCurDqLayer->pDec->pMv[0][iMBXY][8][1];
497+ WELS_B_MB_REC_VERIFY (GetRefPic (&pMCRefMem, pCtx, pCurDqLayer->pDec->pRefIndex[0][iMBXY], 8, LIST_0));
498498 pMCRefMem.pDstY = pPredY + (iDstLineLuma << 3);
499499 pMCRefMem.pDstU = pPredCb + (iDstLineChroma << 2);
500500 pMCRefMem.pDstV = pPredCr + (iDstLineChroma << 2);
501501 BaseMC (&pMCRefMem, iMBOffsetX, iMBOffsetY + 8, pMCFunc, 16, 8, iMVs);
502502
503503 if (pCurDqLayer->bUseWeightPredictionFlag) {
504− iRefIndex = pCurDqLayer->pRefIndex[0][iMBXY][8];
504+ iRefIndex = pCurDqLayer->pDec->pRefIndex[0][iMBXY][8];
505505 WeightPrediction (pCurDqLayer, &pMCRefMem, LIST_0, iRefIndex, 16, 8);
506506 }
507507 break;
508508 case MB_TYPE_8x16:
509− iMVs[0] = pCurDqLayer->pMv[0][iMBXY][0][0];
510− iMVs[1] = pCurDqLayer->pMv[0][iMBXY][0][1];
511− WELS_B_MB_REC_VERIFY (GetRefPic (&pMCRefMem, pCtx, pCurDqLayer->pRefIndex[0][iMBXY], 0, LIST_0));
509+ iMVs[0] = pCurDqLayer->pDec->pMv[0][iMBXY][0][0];
510+ iMVs[1] = pCurDqLayer->pDec->pMv[0][iMBXY][0][1];
511+ WELS_B_MB_REC_VERIFY (GetRefPic (&pMCRefMem, pCtx, pCurDqLayer->pDec->pRefIndex[0][iMBXY], 0, LIST_0));
512512 BaseMC (&pMCRefMem, iMBOffsetX, iMBOffsetY, pMCFunc, 8, 16, iMVs);
513513 if (pCurDqLayer->bUseWeightPredictionFlag) {
514− iRefIndex = pCurDqLayer->pRefIndex[0][iMBXY][0];
514+ iRefIndex = pCurDqLayer->pDec->pRefIndex[0][iMBXY][0];
515515 WeightPrediction (pCurDqLayer, &pMCRefMem, LIST_0, iRefIndex, 8, 16);
516516 }
517517
518− iMVs[0] = pCurDqLayer->pMv[0][iMBXY][2][0];
519− iMVs[1] = pCurDqLayer->pMv[0][iMBXY][2][1];
520− WELS_B_MB_REC_VERIFY (GetRefPic (&pMCRefMem, pCtx, pCurDqLayer->pRefIndex[0][iMBXY], 2, LIST_0));
518+ iMVs[0] = pCurDqLayer->pDec->pMv[0][iMBXY][2][0];
519+ iMVs[1] = pCurDqLayer->pDec->pMv[0][iMBXY][2][1];
520+ WELS_B_MB_REC_VERIFY (GetRefPic (&pMCRefMem, pCtx, pCurDqLayer->pDec->pRefIndex[0][iMBXY], 2, LIST_0));
521521 pMCRefMem.pDstY = pPredY + 8;
522522 pMCRefMem.pDstU = pPredCb + 4;
523523 pMCRefMem.pDstV = pPredCr + 4;
524524 BaseMC (&pMCRefMem, iMBOffsetX + 8, iMBOffsetY, pMCFunc, 8, 16, iMVs);
525525
526526 if (pCurDqLayer->bUseWeightPredictionFlag) {
527− iRefIndex = pCurDqLayer->pRefIndex[0][iMBXY][2];
527+ iRefIndex = pCurDqLayer->pDec->pRefIndex[0][iMBXY][2];
528528 WeightPrediction (pCurDqLayer, &pMCRefMem, LIST_0, iRefIndex, 8, 16);
529529 }
530530 break;
@@ -541,8 +541,8 @@ int32_t GetInterPred (uint8_t* pPredY, uint8_t* pPredCb, uint8_t* pPredCr, PWels · 10 unmodified lines
541541 iYOffset = iMBOffsetY + iBlk8Y;
542542
543543 iIIdx = ((i >> 1) << 3) + ((i & 1) << 1);
544− WELS_B_MB_REC_VERIFY (GetRefPic (&pMCRefMem, pCtx, pCurDqLayer->pRefIndex[0][iMBXY], iIIdx, LIST_0));
545− iRefIndex = pCurDqLayer->bUseWeightPredictionFlag ? pCurDqLayer->pRefIndex[0][iMBXY][iIIdx] : 0;
544+ WELS_B_MB_REC_VERIFY (GetRefPic (&pMCRefMem, pCtx, pCurDqLayer->pDec->pRefIndex[0][iMBXY], iIIdx, LIST_0));
545+ iRefIndex = pCurDqLayer->bUseWeightPredictionFlag ? pCurDqLayer->pDec->pRefIndex[0][iMBXY][iIIdx] : 0;
546546
547547 pDstY = pPredY + iBlk8X + iBlk8Y * iDstLineLuma;
548548 pDstU = pPredCb + (iBlk8X >> 1) + (iBlk8Y >> 1) * iDstLineChroma;
@@ -552,8 +552,8 @@ int32_t GetInterPred (uint8_t* pPredY, uint8_t* pPredCb, uint8_t* pPredCr, PWels · 3 unmodified lines
552552 pMCRefMem.pDstV = pDstV;
553553 switch (iSubMBType) {
554554 case SUB_MB_TYPE_8x8:
555− iMVs[0] = pCurDqLayer->pMv[0][iMBXY][iIIdx][0];
556− iMVs[1] = pCurDqLayer->pMv[0][iMBXY][iIIdx][1];
555+ iMVs[0] = pCurDqLayer->pDec->pMv[0][iMBXY][iIIdx][0];
556+ iMVs[1] = pCurDqLayer->pDec->pMv[0][iMBXY][iIIdx][1];
557557 BaseMC (&pMCRefMem, iXOffset, iYOffset, pMCFunc, 8, 8, iMVs);
558558 if (pCurDqLayer->bUseWeightPredictionFlag) {
559559
@@ -562,8 +562,8 @@ int32_t GetInterPred (uint8_t* pPredY, uint8_t* pPredCb, uint8_t* pPredCr, PWels · 2 unmodified lines
562562
563563 break;
564564 case SUB_MB_TYPE_8x4:
565− iMVs[0] = pCurDqLayer->pMv[0][iMBXY][iIIdx][0];
566− iMVs[1] = pCurDqLayer->pMv[0][iMBXY][iIIdx][1];
565+ iMVs[0] = pCurDqLayer->pDec->pMv[0][iMBXY][iIIdx][0];
566+ iMVs[1] = pCurDqLayer->pDec->pMv[0][iMBXY][iIIdx][1];
567567 BaseMC (&pMCRefMem, iXOffset, iYOffset, pMCFunc, 8, 4, iMVs);
568568 if (pCurDqLayer->bUseWeightPredictionFlag) {
569569
@@ -571,8 +571,8 @@ int32_t GetInterPred (uint8_t* pPredY, uint8_t* pPredCb, uint8_t* pPredCr, PWels · 1 unmodified line
571571 }
572572
573573
574− iMVs[0] = pCurDqLayer->pMv[0][iMBXY][iIIdx + 4][0];
575− iMVs[1] = pCurDqLayer->pMv[0][iMBXY][iIIdx + 4][1];
574+ iMVs[0] = pCurDqLayer->pDec->pMv[0][iMBXY][iIIdx + 4][0];
575+ iMVs[1] = pCurDqLayer->pDec->pMv[0][iMBXY][iIIdx + 4][1];
576576 pMCRefMem.pDstY += (iDstLineLuma << 2);
577577 pMCRefMem.pDstU += (iDstLineChroma << 1);
578578 pMCRefMem.pDstV += (iDstLineChroma << 1);
@@ -584,8 +584,8 @@ int32_t GetInterPred (uint8_t* pPredY, uint8_t* pPredCb, uint8_t* pPredCr, PWels · 5 unmodified lines
584584
585585 break;
586586 case SUB_MB_TYPE_4x8:
587− iMVs[0] = pCurDqLayer->pMv[0][iMBXY][iIIdx][0];
588− iMVs[1] = pCurDqLayer->pMv[0][iMBXY][iIIdx][1];
587+ iMVs[0] = pCurDqLayer->pDec->pMv[0][iMBXY][iIIdx][0];
588+ iMVs[1] = pCurDqLayer->pDec->pMv[0][iMBXY][iIIdx][1];
589589 BaseMC (&pMCRefMem, iXOffset, iYOffset, pMCFunc, 4, 8, iMVs);
590590 if (pCurDqLayer->bUseWeightPredictionFlag) {
591591
@@ -593,8 +593,8 @@ int32_t GetInterPred (uint8_t* pPredY, uint8_t* pPredCb, uint8_t* pPredCr, PWels · 1 unmodified line
593593 }
594594
595595
596− iMVs[0] = pCurDqLayer->pMv[0][iMBXY][iIIdx + 1][0];
597− iMVs[1] = pCurDqLayer->pMv[0][iMBXY][iIIdx + 1][1];
596+ iMVs[0] = pCurDqLayer->pDec->pMv[0][iMBXY][iIIdx + 1][0];
597+ iMVs[1] = pCurDqLayer->pDec->pMv[0][iMBXY][iIIdx + 1][1];
598598 pMCRefMem.pDstY += 4;
599599 pMCRefMem.pDstU += 2;
600600 pMCRefMem.pDstV += 2;
@@ -618,8 +618,8 @@ int32_t GetInterPred (uint8_t* pPredY, uint8_t* pPredCb, uint8_t* pPredCr, PWels · 17 unmodified lines
618618 pMCRefMem.pDstU = pDstU + iUVLineStride;
619619 pMCRefMem.pDstV = pDstV + iUVLineStride;
620620
621− iMVs[0] = pCurDqLayer->pMv[0][iMBXY][iIIdx + iJIdx][0];
622− iMVs[1] = pCurDqLayer->pMv[0][iMBXY][iIIdx + iJIdx][1];
621+ iMVs[0] = pCurDqLayer->pDec->pMv[0][iMBXY][iIIdx + iJIdx][0];
622+ iMVs[1] = pCurDqLayer->pDec->pMv[0][iMBXY][iIIdx + iJIdx][1];
623623 BaseMC (&pMCRefMem, iXOffset + iBlk4X, iYOffset + iBlk4Y, pMCFunc, 4, 4, iMVs);
624624 if (pCurDqLayer->bUseWeightPredictionFlag) {
625625
@@ -652,7 +652,7 @@ int32_t GetInterBPred (uint8_t* pPredYCbCr[3], uint8_t* pTempPredYCbCr[3], PWels · 26 unmodified lines
652652
653653 int16_t iMVs[2] = { 0 };
654654
655− uint32_t iMBType = pCurDqLayer->pMbType[iMBXY];
655+ uint32_t iMBType = pCurDqLayer->pDec->pMbType[iMBXY];
656656
657657 int32_t iMBOffsetX = pCurDqLayer->iMbX << 4;
658658 int32_t iMBOffsetY = pCurDqLayer->iMbY << 4;
@@ -684,17 +684,17 @@ int32_t GetInterBPred (uint8_t* pPredYCbCr[3], uint8_t* pTempPredYCbCr[3], PWels · 25 unmodified lines
684684
685685 if (IS_INTER_16x16 (iMBType)) {
686686 if (IS_TYPE_L0 (iMBType) && IS_TYPE_L1 (iMBType)) {
687− iMVs[0] = pCurDqLayer->pMv[LIST_0][iMBXY][0][0];
688− iMVs[1] = pCurDqLayer->pMv[LIST_0][iMBXY][0][1];
689− WELS_B_MB_REC_VERIFY (GetRefPic (&pMCRefMem, pCtx, pCurDqLayer->pRefIndex[LIST_0][iMBXY], 0, LIST_0));
687+ iMVs[0] = pCurDqLayer->pDec->pMv[LIST_0][iMBXY][0][0];
688+ iMVs[1] = pCurDqLayer->pDec->pMv[LIST_0][iMBXY][0][1];
689+ WELS_B_MB_REC_VERIFY (GetRefPic (&pMCRefMem, pCtx, pCurDqLayer->pDec->pRefIndex[LIST_0][iMBXY], 0, LIST_0));
690690 BaseMC (&pMCRefMem, iMBOffsetX, iMBOffsetY, pMCFunc, 16, 16, iMVs);
691691
692− iMVs[0] = pCurDqLayer->pMv[LIST_1][iMBXY][0][0];
693− iMVs[1] = pCurDqLayer->pMv[LIST_1][iMBXY][0][1];
694− WELS_B_MB_REC_VERIFY (GetRefPic (&pTempMCRefMem, pCtx, pCurDqLayer->pRefIndex[LIST_1][iMBXY], 0, LIST_1));
692+ iMVs[0] = pCurDqLayer->pDec->pMv[LIST_1][iMBXY][0][0];
693+ iMVs[1] = pCurDqLayer->pDec->pMv[LIST_1][iMBXY][0][1];
694+ WELS_B_MB_REC_VERIFY (GetRefPic (&pTempMCRefMem, pCtx, pCurDqLayer->pDec->pRefIndex[LIST_1][iMBXY], 0, LIST_1));
695695 BaseMC (&pTempMCRefMem, iMBOffsetX, iMBOffsetY, pMCFunc, 16, 16, iMVs);
696− iRefIndex1 = pCurDqLayer->pRefIndex[LIST_0][iMBXY][0];
697− iRefIndex2 = pCurDqLayer->pRefIndex[LIST_1][iMBXY][0];
696+ iRefIndex1 = pCurDqLayer->pDec->pRefIndex[LIST_0][iMBXY][0];
697+ iRefIndex2 = pCurDqLayer->pDec->pRefIndex[LIST_1][iMBXY][0];
698698 if (pCurDqLayer->bUseWeightedBiPredIdc) {
699699 BiWeightPrediction (pCurDqLayer, &pMCRefMem, &pTempMCRefMem, iRefIndex1, iRefIndex2, bWeightedBipredIdcIs1, 16, 16);
700700 } else {
@@ -702,12 +702,12 @@ int32_t GetInterBPred (uint8_t* pPredYCbCr[3], uint8_t* pTempPredYCbCr[3], PWels · 1 unmodified line
702702 }
703703 } else {
704704 int32_t listIdx = (iMBType & MB_TYPE_P0L0) ? LIST_0 : LIST_1;
705− iMVs[0] = pCurDqLayer->pMv[listIdx][iMBXY][0][0];
706− iMVs[1] = pCurDqLayer->pMv[listIdx][iMBXY][0][1];
707− WELS_B_MB_REC_VERIFY (GetRefPic (&pMCRefMem, pCtx, pCurDqLayer->pRefIndex[listIdx][iMBXY], 0, listIdx));
705+ iMVs[0] = pCurDqLayer->pDec->pMv[listIdx][iMBXY][0][0];
706+ iMVs[1] = pCurDqLayer->pDec->pMv[listIdx][iMBXY][0][1];
707+ WELS_B_MB_REC_VERIFY (GetRefPic (&pMCRefMem, pCtx, pCurDqLayer->pDec->pRefIndex[listIdx][iMBXY], 0, listIdx));
708708 BaseMC (&pMCRefMem, iMBOffsetX, iMBOffsetY, pMCFunc, 16, 16, iMVs);
709709 if (bWeightedBipredIdcIs1) {
710− int32_t iRefIndex = pCurDqLayer->pRefIndex[listIdx][iMBXY][0];
710+ int32_t iRefIndex = pCurDqLayer->pDec->pRefIndex[listIdx][iMBXY][0];
711711 WeightPrediction (pCurDqLayer, &pMCRefMem, listIdx, iRefIndex, 16, 16);
712712 }
713713 }
@@ -719,9 +719,9 @@ int32_t GetInterBPred (uint8_t* pPredYCbCr[3], uint8_t* pTempPredYCbCr[3], PWels · 5 unmodified lines
719719 for (int32_t listIdx = LIST_0; listIdx < LIST_A; ++listIdx) {
720720 if (IS_DIR (iMBType, i, listIdx)) {
721721 lastListIdx = listIdx;
722− iMVs[0] = pCurDqLayer->pMv[listIdx][iMBXY][iPartIdx][0];
723− iMVs[1] = pCurDqLayer->pMv[listIdx][iMBXY][iPartIdx][1];
724− WELS_B_MB_REC_VERIFY (GetRefPic (&pMCRefMem, pCtx, pCurDqLayer->pRefIndex[listIdx][iMBXY], iPartIdx, listIdx));
722+ iMVs[0] = pCurDqLayer->pDec->pMv[listIdx][iMBXY][iPartIdx][0];
723+ iMVs[1] = pCurDqLayer->pDec->pMv[listIdx][iMBXY][iPartIdx][1];
724+ WELS_B_MB_REC_VERIFY (GetRefPic (&pMCRefMem, pCtx, pCurDqLayer->pDec->pRefIndex[listIdx][iMBXY], iPartIdx, listIdx));
725725 if (i) {
726726 pMCRefMem.pDstY += (iDstLineLuma << 3);
727727 pMCRefMem.pDstU += (iDstLineChroma << 2);
@@ -729,9 +729,9 @@ int32_t GetInterBPred (uint8_t* pPredYCbCr[3], uint8_t* pTempPredYCbCr[3], PWels · 1 unmodified line
729729 }
730730 BaseMC (&pMCRefMem, iMBOffsetX, iMBOffsetY + iPartIdx, pMCFunc, 16, 8, iMVs);
731731 if (++listCount == 2) {
732− iMVs[0] = pCurDqLayer->pMv[LIST_1][iMBXY][iPartIdx][0];
733− iMVs[1] = pCurDqLayer->pMv[LIST_1][iMBXY][iPartIdx][1];
734− WELS_B_MB_REC_VERIFY (GetRefPic (&pTempMCRefMem, pCtx, pCurDqLayer->pRefIndex[LIST_1][iMBXY], iPartIdx, LIST_1));
732+ iMVs[0] = pCurDqLayer->pDec->pMv[LIST_1][iMBXY][iPartIdx][0];
733+ iMVs[1] = pCurDqLayer->pDec->pMv[LIST_1][iMBXY][iPartIdx][1];
734+ WELS_B_MB_REC_VERIFY (GetRefPic (&pTempMCRefMem, pCtx, pCurDqLayer->pDec->pRefIndex[LIST_1][iMBXY], iPartIdx, LIST_1));
735735 if (i) {
736736 pTempMCRefMem.pDstY += (iDstLineLuma << 3);
737737 pTempMCRefMem.pDstU += (iDstLineChroma << 2);
@@ -739,8 +739,8 @@ int32_t GetInterBPred (uint8_t* pPredYCbCr[3], uint8_t* pTempPredYCbCr[3], PWels · 1 unmodified line
739739 }
740740 BaseMC (&pTempMCRefMem, iMBOffsetX, iMBOffsetY + iPartIdx, pMCFunc, 16, 8, iMVs);
741741 if (pCurDqLayer->bUseWeightedBiPredIdc) {
742− iRefIndex1 = pCurDqLayer->pRefIndex[LIST_0][iMBXY][iPartIdx];
743− iRefIndex2 = pCurDqLayer->pRefIndex[LIST_1][iMBXY][iPartIdx];
742+ iRefIndex1 = pCurDqLayer->pDec->pRefIndex[LIST_0][iMBXY][iPartIdx];
743+ iRefIndex2 = pCurDqLayer->pDec->pRefIndex[LIST_1][iMBXY][iPartIdx];
744744 BiWeightPrediction (pCurDqLayer, &pMCRefMem, &pTempMCRefMem, iRefIndex1, iRefIndex2, bWeightedBipredIdcIs1, 16, 8);
745745 } else {
746746 BiPrediction (pCurDqLayer, &pMCRefMem, &pTempMCRefMem, 16, 8);
@@ -750,7 +750,7 @@ int32_t GetInterBPred (uint8_t* pPredYCbCr[3], uint8_t* pTempPredYCbCr[3], PWels · 3 unmodified lines
750750 }
751751 if (listCount == 1) {
752752 if (bWeightedBipredIdcIs1) {
753− int32_t iRefIndex = pCurDqLayer->pRefIndex[lastListIdx][iMBXY][iPartIdx];
753+ int32_t iRefIndex = pCurDqLayer->pDec->pRefIndex[lastListIdx][iMBXY][iPartIdx];
754754 WeightPrediction (pCurDqLayer, &pMCRefMem, lastListIdx, iRefIndex, 16, 8);
755755 }
756756 }
@@ -762,9 +762,9 @@ int32_t GetInterBPred (uint8_t* pPredYCbCr[3], uint8_t* pTempPredYCbCr[3], PWels · 5 unmodified lines
762762 for (int32_t listIdx = LIST_0; listIdx < LIST_A; ++listIdx) {
763763 if (IS_DIR (iMBType, i, listIdx)) {
764764 lastListIdx = listIdx;
765− iMVs[0] = pCurDqLayer->pMv[listIdx][iMBXY][i << 1][0];
766− iMVs[1] = pCurDqLayer->pMv[listIdx][iMBXY][i << 1][1];
767− WELS_B_MB_REC_VERIFY (GetRefPic (&pMCRefMem, pCtx, pCurDqLayer->pRefIndex[listIdx][iMBXY], i << 1, listIdx));
765+ iMVs[0] = pCurDqLayer->pDec->pMv[listIdx][iMBXY][i << 1][0];
766+ iMVs[1] = pCurDqLayer->pDec->pMv[listIdx][iMBXY][i << 1][1];
767+ WELS_B_MB_REC_VERIFY (GetRefPic (&pMCRefMem, pCtx, pCurDqLayer->pDec->pRefIndex[listIdx][iMBXY], i << 1, listIdx));
768768 if (i) {
769769 pMCRefMem.pDstY += 8;
770770 pMCRefMem.pDstU += 4;
@@ -772,9 +772,9 @@ int32_t GetInterBPred (uint8_t* pPredYCbCr[3], uint8_t* pTempPredYCbCr[3], PWels · 1 unmodified line
772772 }
773773 BaseMC (&pMCRefMem, iMBOffsetX + (i ? 8 : 0), iMBOffsetY, pMCFunc, 8, 16, iMVs);
774774 if (++listCount == 2) {
775− iMVs[0] = pCurDqLayer->pMv[LIST_1][iMBXY][i << 1][0];
776− iMVs[1] = pCurDqLayer->pMv[LIST_1][iMBXY][i << 1][1];
777− WELS_B_MB_REC_VERIFY (GetRefPic (&pTempMCRefMem, pCtx, pCurDqLayer->pRefIndex[LIST_1][iMBXY], i << 1, LIST_1));
775+ iMVs[0] = pCurDqLayer->pDec->pMv[LIST_1][iMBXY][i << 1][0];
776+ iMVs[1] = pCurDqLayer->pDec->pMv[LIST_1][iMBXY][i << 1][1];
777+ WELS_B_MB_REC_VERIFY (GetRefPic (&pTempMCRefMem, pCtx, pCurDqLayer->pDec->pRefIndex[LIST_1][iMBXY], i << 1, LIST_1));
778778 if (i) {
779779 pTempMCRefMem.pDstY += 8;
780780 pTempMCRefMem.pDstU += 4;
@@ -782,8 +782,8 @@ int32_t GetInterBPred (uint8_t* pPredYCbCr[3], uint8_t* pTempPredYCbCr[3], PWels · 1 unmodified line
782782 }
783783 BaseMC (&pTempMCRefMem, iMBOffsetX + (i ? 8 : 0), iMBOffsetY, pMCFunc, 8, 16, iMVs);
784784 if (pCurDqLayer->bUseWeightedBiPredIdc) {
785− iRefIndex1 = pCurDqLayer->pRefIndex[LIST_0][iMBXY][i << 1];
786− iRefIndex2 = pCurDqLayer->pRefIndex[LIST_1][iMBXY][i << 1];
785+ iRefIndex1 = pCurDqLayer->pDec->pRefIndex[LIST_0][iMBXY][i << 1];
786+ iRefIndex2 = pCurDqLayer->pDec->pRefIndex[LIST_1][iMBXY][i << 1];
787787 BiWeightPrediction (pCurDqLayer, &pMCRefMem, &pTempMCRefMem, iRefIndex1, iRefIndex2, bWeightedBipredIdcIs1, 8, 16);
788788 } else {
789789 BiPrediction (pCurDqLayer, &pMCRefMem, &pTempMCRefMem, 8, 16);
@@ -793,7 +793,7 @@ int32_t GetInterBPred (uint8_t* pPredYCbCr[3], uint8_t* pTempPredYCbCr[3], PWels · 3 unmodified lines
793793 }
794794 if (listCount == 1) {
795795 if (bWeightedBipredIdcIs1) {
796− int32_t iRefIndex = pCurDqLayer->pRefIndex[lastListIdx][iMBXY][i << 1];
796+ int32_t iRefIndex = pCurDqLayer->pDec->pRefIndex[lastListIdx][iMBXY][i << 1];
797797 WeightPrediction (pCurDqLayer, &pMCRefMem, lastListIdx, iRefIndex, 8, 16);
798798 }
799799 }
@@ -830,25 +830,25 @@ int32_t GetInterBPred (uint8_t* pPredYCbCr[3], uint8_t* pTempPredYCbCr[3], PWels · 30 unmodified lines
830830 pTempMCRefMem.pDstV = pDstV2;
831831
832832 if ((IS_TYPE_L0 (iSubMBType) && IS_TYPE_L1 (iSubMBType))) {
833− iRefIndex1 = pCurDqLayer->pRefIndex[LIST_0][iMBXY][iIIdx];
834− WELS_B_MB_REC_VERIFY (GetRefPic (&pMCRefMem, pCtx, pCurDqLayer->pRefIndex[LIST_0][iMBXY], iIIdx, LIST_0));
833+ iRefIndex1 = pCurDqLayer->pDec->pRefIndex[LIST_0][iMBXY][iIIdx];
834+ WELS_B_MB_REC_VERIFY (GetRefPic (&pMCRefMem, pCtx, pCurDqLayer->pDec->pRefIndex[LIST_0][iMBXY], iIIdx, LIST_0));
835835
836− iRefIndex2 = pCurDqLayer->pRefIndex[LIST_1][iMBXY][iIIdx];
837− WELS_B_MB_REC_VERIFY (GetRefPic (&pTempMCRefMem, pCtx, pCurDqLayer->pRefIndex[LIST_1][iMBXY], iIIdx, LIST_1));
836+ iRefIndex2 = pCurDqLayer->pDec->pRefIndex[LIST_1][iMBXY][iIIdx];
837+ WELS_B_MB_REC_VERIFY (GetRefPic (&pTempMCRefMem, pCtx, pCurDqLayer->pDec->pRefIndex[LIST_1][iMBXY], iIIdx, LIST_1));
838838 } else {
839839 int32_t listIdx = IS_TYPE_L0 (iSubMBType) ? LIST_0 : LIST_1;
840− iRefIndex1 = pCurDqLayer->pRefIndex[listIdx][iMBXY][iIIdx];
841− WELS_B_MB_REC_VERIFY (GetRefPic (&pMCRefMem, pCtx, pCurDqLayer->pRefIndex[listIdx][iMBXY], iIIdx, listIdx));
840+ iRefIndex1 = pCurDqLayer->pDec->pRefIndex[listIdx][iMBXY][iIIdx];
841+ WELS_B_MB_REC_VERIFY (GetRefPic (&pMCRefMem, pCtx, pCurDqLayer->pDec->pRefIndex[listIdx][iMBXY], iIIdx, listIdx));
842842 }
843843
844844 if (IS_SUB_8x8 (iSubMBType)) {
845845 if (IS_TYPE_L0 (iSubMBType) && IS_TYPE_L1 (iSubMBType)) {
846− iMVs[0] = pCurDqLayer->pMv[LIST_0][iMBXY][iIIdx][0];
847− iMVs[1] = pCurDqLayer->pMv[LIST_0][iMBXY][iIIdx][1];
846+ iMVs[0] = pCurDqLayer->pDec->pMv[LIST_0][iMBXY][iIIdx][0];
847+ iMVs[1] = pCurDqLayer->pDec->pMv[LIST_0][iMBXY][iIIdx][1];
848848 BaseMC (&pMCRefMem, iXOffset, iYOffset, pMCFunc, 8, 8, iMVs);
849849
850− iMVs[0] = pCurDqLayer->pMv[LIST_1][iMBXY][iIIdx][0];
851− iMVs[1] = pCurDqLayer->pMv[LIST_1][iMBXY][iIIdx][1];
850+ iMVs[0] = pCurDqLayer->pDec->pMv[LIST_1][iMBXY][iIIdx][0];
851+ iMVs[1] = pCurDqLayer->pDec->pMv[LIST_1][iMBXY][iIIdx][1];
852852 BaseMC (&pTempMCRefMem, iXOffset, iYOffset, pMCFunc, 8, 8, iMVs);
853853
854854 if (pCurDqLayer->bUseWeightedBiPredIdc) {
@@ -858,21 +858,21 @@ int32_t GetInterBPred (uint8_t* pPredYCbCr[3], uint8_t* pTempPredYCbCr[3], PWels · 3 unmodified lines
858858 }
859859 } else {
860860 int32_t listIdx = IS_TYPE_L0 (iSubMBType) ? LIST_0 : LIST_1;
861− iMVs[0] = pCurDqLayer->pMv[listIdx][iMBXY][iIIdx][0];
862− iMVs[1] = pCurDqLayer->pMv[listIdx][iMBXY][iIIdx][1];
861+ iMVs[0] = pCurDqLayer->pDec->pMv[listIdx][iMBXY][iIIdx][0];
862+ iMVs[1] = pCurDqLayer->pDec->pMv[listIdx][iMBXY][iIIdx][1];
863863 BaseMC (&pMCRefMem, iXOffset, iYOffset, pMCFunc, 8, 8, iMVs);
864864 if (bWeightedBipredIdcIs1) {
865− int32_t iRefIndex = pCurDqLayer->pRefIndex[listIdx][iMBXY][iIIdx];
865+ int32_t iRefIndex = pCurDqLayer->pDec->pRefIndex[listIdx][iMBXY][iIIdx];
866866 WeightPrediction (pCurDqLayer, &pMCRefMem, listIdx, iRefIndex, 8, 8);
867867 }
868868 }
869869 } else if (IS_SUB_8x4 (iSubMBType)) {
870870 if (IS_TYPE_L0 (iSubMBType) && IS_TYPE_L1 (iSubMBType)) { //B_Bi_8x4
871− iMVs[0] = pCurDqLayer->pMv[LIST_0][iMBXY][iIIdx][0];
872− iMVs[1] = pCurDqLayer->pMv[LIST_0][iMBXY][iIIdx][1];
871+ iMVs[0] = pCurDqLayer->pDec->pMv[LIST_0][iMBXY][iIIdx][0];
872+ iMVs[1] = pCurDqLayer->pDec->pMv[LIST_0][iMBXY][iIIdx][1];
873873 BaseMC (&pMCRefMem, iXOffset, iYOffset, pMCFunc, 8, 4, iMVs);
874− iMVs[0] = pCurDqLayer->pMv[LIST_1][iMBXY][iIIdx][0];
875− iMVs[1] = pCurDqLayer->pMv[LIST_1][iMBXY][iIIdx][1];
874+ iMVs[0] = pCurDqLayer->pDec->pMv[LIST_1][iMBXY][iIIdx][0];
875+ iMVs[1] = pCurDqLayer->pDec->pMv[LIST_1][iMBXY][iIIdx][1];
876876 BaseMC (&pTempMCRefMem, iXOffset, iYOffset, pMCFunc, 8, 4, iMVs);
877877
878878 if (pCurDqLayer->bUseWeightedBiPredIdc) {
@@ -884,15 +884,15 @@ int32_t GetInterBPred (uint8_t* pPredYCbCr[3], uint8_t* pTempPredYCbCr[3], PWels · 5 unmodified lines
884884 pMCRefMem.pDstY += (iDstLineLuma << 2);
885885 pMCRefMem.pDstU += (iDstLineChroma << 1);
886886 pMCRefMem.pDstV += (iDstLineChroma << 1);
887− iMVs[0] = pCurDqLayer->pMv[LIST_0][iMBXY][iIIdx + 4][0];
888− iMVs[1] = pCurDqLayer->pMv[LIST_0][iMBXY][iIIdx + 4][1];
887+ iMVs[0] = pCurDqLayer->pDec->pMv[LIST_0][iMBXY][iIIdx + 4][0];
888+ iMVs[1] = pCurDqLayer->pDec->pMv[LIST_0][iMBXY][iIIdx + 4][1];
889889 BaseMC (&pMCRefMem, iXOffset, iYOffset + 4, pMCFunc, 8, 4, iMVs);
890890
891891 pTempMCRefMem.pDstY += (iDstLineLuma << 2);
892892 pTempMCRefMem.pDstU += (iDstLineChroma << 1);
893893 pTempMCRefMem.pDstV += (iDstLineChroma << 1);
894− iMVs[0] = pCurDqLayer->pMv[LIST_1][iMBXY][iIIdx + 4][0];
895− iMVs[1] = pCurDqLayer->pMv[LIST_1][iMBXY][iIIdx + 4][1];
894+ iMVs[0] = pCurDqLayer->pDec->pMv[LIST_1][iMBXY][iIIdx + 4][0];
895+ iMVs[1] = pCurDqLayer->pDec->pMv[LIST_1][iMBXY][iIIdx + 4][1];
896896 BaseMC (&pTempMCRefMem, iXOffset, iYOffset + 4, pMCFunc, 8, 4, iMVs);
897897
898898 if (pCurDqLayer->bUseWeightedBiPredIdc) {
@@ -902,27 +902,27 @@ int32_t GetInterBPred (uint8_t* pPredYCbCr[3], uint8_t* pTempPredYCbCr[3], PWels · 3 unmodified lines
902902 }
903903 } else { //B_L0_8x4 B_L1_8x4
904904 int32_t listIdx = IS_TYPE_L0 (iSubMBType) ? LIST_0 : LIST_1;
905− iMVs[0] = pCurDqLayer->pMv[listIdx][iMBXY][iIIdx][0];
906− iMVs[1] = pCurDqLayer->pMv[listIdx][iMBXY][iIIdx][1];
905+ iMVs[0] = pCurDqLayer->pDec->pMv[listIdx][iMBXY][iIIdx][0];
906+ iMVs[1] = pCurDqLayer->pDec->pMv[listIdx][iMBXY][iIIdx][1];
907907 BaseMC (&pMCRefMem, iXOffset, iYOffset, pMCFunc, 8, 4, iMVs);
908908 pMCRefMem.pDstY += (iDstLineLuma << 2);
909909 pMCRefMem.pDstU += (iDstLineChroma << 1);
910910 pMCRefMem.pDstV += (iDstLineChroma << 1);
911− iMVs[0] = pCurDqLayer->pMv[listIdx][iMBXY][iIIdx + 4][0];
912− iMVs[1] = pCurDqLayer->pMv[listIdx][iMBXY][iIIdx + 4][1];
911+ iMVs[0] = pCurDqLayer->pDec->pMv[listIdx][iMBXY][iIIdx + 4][0];
912+ iMVs[1] = pCurDqLayer->pDec->pMv[listIdx][iMBXY][iIIdx + 4][1];
913913 BaseMC (&pMCRefMem, iXOffset, iYOffset + 4, pMCFunc, 8, 4, iMVs);
914914 if (bWeightedBipredIdcIs1) {
915− int32_t iRefIndex = pCurDqLayer->pRefIndex[listIdx][iMBXY][iIIdx];
915+ int32_t iRefIndex = pCurDqLayer->pDec->pRefIndex[listIdx][iMBXY][iIIdx];
916916 WeightPrediction (pCurDqLayer, &pMCRefMem, listIdx, iRefIndex, 8, 4);
917917 }
918918 }
919919 } else if (IS_SUB_4x8 (iSubMBType)) {
920920 if (IS_TYPE_L0 (iSubMBType) && IS_TYPE_L1 (iSubMBType)) { //B_Bi_4x8
921− iMVs[0] = pCurDqLayer->pMv[LIST_0][iMBXY][iIIdx][0];
922− iMVs[1] = pCurDqLayer->pMv[LIST_0][iMBXY][iIIdx][1];
921+ iMVs[0] = pCurDqLayer->pDec->pMv[LIST_0][iMBXY][iIIdx][0];
922+ iMVs[1] = pCurDqLayer->pDec->pMv[LIST_0][iMBXY][iIIdx][1];
923923 BaseMC (&pMCRefMem, iXOffset, iYOffset, pMCFunc, 4, 8, iMVs);
924− iMVs[0] = pCurDqLayer->pMv[LIST_1][iMBXY][iIIdx][0];
925− iMVs[1] = pCurDqLayer->pMv[LIST_1][iMBXY][iIIdx][1];
924+ iMVs[0] = pCurDqLayer->pDec->pMv[LIST_1][iMBXY][iIIdx][0];
925+ iMVs[1] = pCurDqLayer->pDec->pMv[LIST_1][iMBXY][iIIdx][1];
926926 BaseMC (&pTempMCRefMem, iXOffset, iYOffset, pMCFunc, 4, 8, iMVs);
927927
928928 if (pCurDqLayer->bUseWeightedBiPredIdc) {
@@ -934,15 +934,15 @@ int32_t GetInterBPred (uint8_t* pPredYCbCr[3], uint8_t* pTempPredYCbCr[3], PWels · 5 unmodified lines
934934 pMCRefMem.pDstY += 4;
935935 pMCRefMem.pDstU += 2;
936936 pMCRefMem.pDstV += 2;
937− iMVs[0] = pCurDqLayer->pMv[LIST_0][iMBXY][iIIdx + 1][0];
938− iMVs[1] = pCurDqLayer->pMv[LIST_0][iMBXY][iIIdx + 1][1];
937+ iMVs[0] = pCurDqLayer->pDec->pMv[LIST_0][iMBXY][iIIdx + 1][0];
938+ iMVs[1] = pCurDqLayer->pDec->pMv[LIST_0][iMBXY][iIIdx + 1][1];
939939 BaseMC (&pMCRefMem, iXOffset + 4, iYOffset, pMCFunc, 4, 8, iMVs);
940940
941941 pTempMCRefMem.pDstY += 4;
942942 pTempMCRefMem.pDstU += 2;
943943 pTempMCRefMem.pDstV += 2;
944− iMVs[0] = pCurDqLayer->pMv[LIST_1][iMBXY][iIIdx + 1][0];
945− iMVs[1] = pCurDqLayer->pMv[LIST_1][iMBXY][iIIdx + 1][1];
944+ iMVs[0] = pCurDqLayer->pDec->pMv[LIST_1][iMBXY][iIIdx + 1][0];
945+ iMVs[1] = pCurDqLayer->pDec->pMv[LIST_1][iMBXY][iIIdx + 1][1];
946946 BaseMC (&pTempMCRefMem, iXOffset + 4, iYOffset, pMCFunc, 4, 8, iMVs);
947947
948948 if (pCurDqLayer->bUseWeightedBiPredIdc) {
@@ -952,17 +952,17 @@ int32_t GetInterBPred (uint8_t* pPredYCbCr[3], uint8_t* pTempPredYCbCr[3], PWels · 3 unmodified lines
952952 }
953953 } else { //B_L0_4x8 B_L1_4x8
954954 int32_t listIdx = IS_TYPE_L0 (iSubMBType) ? LIST_0 : LIST_1;
955− iMVs[0] = pCurDqLayer->pMv[listIdx][iMBXY][iIIdx][0];
956− iMVs[1] = pCurDqLayer->pMv[listIdx][iMBXY][iIIdx][1];
955+ iMVs[0] = pCurDqLayer->pDec->pMv[listIdx][iMBXY][iIIdx][0];
956+ iMVs[1] = pCurDqLayer->pDec->pMv[listIdx][iMBXY][iIIdx][1];
957957 BaseMC (&pMCRefMem, iXOffset, iYOffset, pMCFunc, 4, 8, iMVs);
958958 pMCRefMem.pDstY += 4;
959959 pMCRefMem.pDstU += 2;
960960 pMCRefMem.pDstV += 2;
961− iMVs[0] = pCurDqLayer->pMv[listIdx][iMBXY][iIIdx + 1][0];
962− iMVs[1] = pCurDqLayer->pMv[listIdx][iMBXY][iIIdx + 1][1];
961+ iMVs[0] = pCurDqLayer->pDec->pMv[listIdx][iMBXY][iIIdx + 1][0];
962+ iMVs[1] = pCurDqLayer->pDec->pMv[listIdx][iMBXY][iIIdx + 1][1];
963963 BaseMC (&pMCRefMem, iXOffset + 4, iYOffset, pMCFunc, 4, 8, iMVs);
964964 if (bWeightedBipredIdcIs1) {
965− int32_t iRefIndex = pCurDqLayer->pRefIndex[listIdx][iMBXY][iIIdx];
965+ int32_t iRefIndex = pCurDqLayer->pDec->pRefIndex[listIdx][iMBXY][iIIdx];
966966 WeightPrediction (pCurDqLayer, &pMCRefMem, listIdx, iRefIndex, 4, 8);
967967 }
968968 }
@@ -980,16 +980,16 @@ int32_t GetInterBPred (uint8_t* pPredYCbCr[3], uint8_t* pTempPredYCbCr[3], PWels · 11 unmodified lines
980980 pMCRefMem.pDstU = pDstU + iUVLineStride;
981981 pMCRefMem.pDstV = pDstV + iUVLineStride;
982982
983− iMVs[0] = pCurDqLayer->pMv[LIST_0][iMBXY][iIIdx + iJIdx][0];
984− iMVs[1] = pCurDqLayer->pMv[LIST_0][iMBXY][iIIdx + iJIdx][1];
983+ iMVs[0] = pCurDqLayer->pDec->pMv[LIST_0][iMBXY][iIIdx + iJIdx][0];
984+ iMVs[1] = pCurDqLayer->pDec->pMv[LIST_0][iMBXY][iIIdx + iJIdx][1];
985985 BaseMC (&pMCRefMem, iXOffset + iBlk4X, iYOffset + iBlk4Y, pMCFunc, 4, 4, iMVs);
986986
987987 pTempMCRefMem.pDstY = pDstY2 + iBlk8X + iBlk8Y * iDstLineLuma;
988988 pTempMCRefMem.pDstU = pDstU2 + iUVLineStride;
989989 pTempMCRefMem.pDstV = pDstV2 + iUVLineStride;;
990990
991− iMVs[0] = pCurDqLayer->pMv[LIST_1][iMBXY][iIIdx + iJIdx][0];
992− iMVs[1] = pCurDqLayer->pMv[LIST_1][iMBXY][iIIdx + iJIdx][1];
991+ iMVs[0] = pCurDqLayer->pDec->pMv[LIST_1][iMBXY][iIIdx + iJIdx][0];
992+ iMVs[1] = pCurDqLayer->pDec->pMv[LIST_1][iMBXY][iIIdx + iJIdx][1];
993993 BaseMC (&pTempMCRefMem, iXOffset + iBlk4X, iYOffset + iBlk4Y, pMCFunc, 4, 4, iMVs);
994994
995995 if (pCurDqLayer->bUseWeightedBiPredIdc) {
@@ -1000,7 +1000,7 @@ int32_t GetInterBPred (uint8_t* pPredYCbCr[3], uint8_t* pTempPredYCbCr[3], PWels · 4 unmodified lines
10001000 }
10011001 } else {
10021002 int32_t listIdx = IS_TYPE_L0 (iSubMBType) ? LIST_0 : LIST_1;
1003− int32_t iRefIndex = pCurDqLayer->pRefIndex[listIdx][iMBXY][iIIdx];
1003+ int32_t iRefIndex = pCurDqLayer->pDec->pRefIndex[listIdx][iMBXY][iIIdx];
10041004 for (int32_t j = 0; j < 4; j++) {
10051005 int32_t iUVLineStride;
10061006 iJIdx = ((j >> 1) << 2) + (j & 1);
@@ -1013,8 +1013,8 @@ int32_t GetInterBPred (uint8_t* pPredYCbCr[3], uint8_t* pTempPredYCbCr[3], PWels · 6 unmodified lines
10131013 pMCRefMem.pDstU = pDstU + iUVLineStride;
10141014 pMCRefMem.pDstV = pDstV + iUVLineStride;
10151015
1016− iMVs[0] = pCurDqLayer->pMv[listIdx][iMBXY][iIIdx + iJIdx][0];
1017− iMVs[1] = pCurDqLayer->pMv[listIdx][iMBXY][iIIdx + iJIdx][1];
1016+ iMVs[0] = pCurDqLayer->pDec->pMv[listIdx][iMBXY][iIIdx + iJIdx][0];
1017+ iMVs[1] = pCurDqLayer->pDec->pMv[listIdx][iMBXY][iIIdx + iJIdx][1];
10181018 BaseMC (&pMCRefMem, iXOffset + iBlk4X, iYOffset + iBlk4Y, pMCFunc, 4, 4, iMVs);
10191019 if (bWeightedBipredIdcIs1) {
10201020 WeightPrediction (pCurDqLayer, &pMCRefMem, listIdx, iRefIndex, 4, 4);

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