Changeset 622 in 3DVCSoftware for trunk/source/Lib/TLibDecoder/TDecEntropy.cpp


Ignore:
Timestamp:
11 Sep 2013, 14:40:25 (11 years ago)
Author:
tech
Message:

Merged 8.0-dev0@621 (MV-HEVC 5 HLS).

File:
1 edited

Legend:

Unmodified
Added
Removed
  • trunk/source/Lib/TLibDecoder/TDecEntropy.cpp

    r608 r622  
    243243          Int vspFlag[MRG_MAX_NUM_CANDS_MEM];
    244244          memset(vspFlag, 0, sizeof(Int)*MRG_MAX_NUM_CANDS_MEM);
    245 #if MTK_VSP_FIX_ALIGN_WD_E0172
    246245          InheritedVSPDisInfo inheritedVSPDisInfo[MRG_MAX_NUM_CANDS_MEM];
    247246          pcSubCU->getInterMergeCandidates( 0, 0, cMvFieldNeighbours, uhInterDirNeighbours, vspFlag, inheritedVSPDisInfo, numValidMergeCand );
    248 #else
    249 #if MTK_VSP_FIX_E0172
    250           Int vspDir[MRG_MAX_NUM_CANDS_MEM];
    251           memset(vspDir, 0, sizeof(Int)*MRG_MAX_NUM_CANDS_MEM);
    252           pcSubCU->getInterMergeCandidates( 0, 0, cMvFieldNeighbours, uhInterDirNeighbours, vspFlag, vspDir, numValidMergeCand );
    253           pcCU->setVSPDirSubParts( vspDir[uiMergeIndex], uiSubPartIdx, uiPartIdx, uiDepth );
    254 #else
    255           pcSubCU->getInterMergeCandidates( 0, 0, cMvFieldNeighbours, uhInterDirNeighbours, vspFlag, numValidMergeCand );
    256 #endif
    257 #endif//end of MTK_VSP_FIX_ALIGN_WD_E0172
    258247          pcCU->setVSPFlagSubParts( vspFlag[uiMergeIndex], uiSubPartIdx, uiPartIdx, uiDepth );
    259 #if MTK_VSP_FIX_ALIGN_WD_E0172
     248
    260249          if(vspFlag[uiMergeIndex])
    261250          {
    262251            pcCU->setDvInfoSubParts(inheritedVSPDisInfo[uiMergeIndex].m_acDvInfo, uiSubPartIdx, uiPartIdx, uiDepth);
    263252          }
    264 #endif
    265253#else
    266254          pcSubCU->getInterMergeCandidates( 0, 0, cMvFieldNeighbours, uhInterDirNeighbours, numValidMergeCand );
     
    272260      else
    273261      {
    274         uiMergeIndex = pcCU->getMergeIndex(uiSubPartIdx); // Redundant line
     262        uiMergeIndex = pcCU->getMergeIndex(uiSubPartIdx);
    275263#if H_3D_VSP
    276264        Int vspFlag[MRG_MAX_NUM_CANDS_MEM];
    277265        memset(vspFlag, 0, sizeof(Int)*MRG_MAX_NUM_CANDS_MEM);
    278 #if MTK_VSP_FIX_ALIGN_WD_E0172
    279266        InheritedVSPDisInfo inheritedVSPDisInfo[MRG_MAX_NUM_CANDS_MEM];
    280267        pcSubCU->getInterMergeCandidates( uiSubPartIdx-uiAbsPartIdx, uiPartIdx, cMvFieldNeighbours, uhInterDirNeighbours, vspFlag, inheritedVSPDisInfo,numValidMergeCand, uiMergeIndex );
    281 #else
    282 #if MTK_VSP_FIX_E0172
    283         Int vspDir[MRG_MAX_NUM_CANDS_MEM];
    284         memset(vspDir, 0, sizeof(Int)*MRG_MAX_NUM_CANDS_MEM);
    285         pcSubCU->getInterMergeCandidates( uiSubPartIdx-uiAbsPartIdx, uiPartIdx, cMvFieldNeighbours, uhInterDirNeighbours, vspFlag, vspDir,numValidMergeCand, uiMergeIndex );
    286         pcCU->setVSPDirSubParts( vspDir[uiMergeIndex], uiSubPartIdx, uiPartIdx, uiDepth );
    287 #else
    288         pcSubCU->getInterMergeCandidates( uiSubPartIdx-uiAbsPartIdx, uiPartIdx, cMvFieldNeighbours, uhInterDirNeighbours, vspFlag, numValidMergeCand, uiMergeIndex );
    289 #endif
    290 #endif//end of MTK_VSP_FIX_ALIGN_WD_E0172
    291268        pcCU->setVSPFlagSubParts( vspFlag[uiMergeIndex], uiSubPartIdx, uiPartIdx, uiDepth );
    292 #if MTK_VSP_FIX_ALIGN_WD_E0172
    293269        if(vspFlag[uiMergeIndex])
    294270        {
    295271          pcCU->setDvInfoSubParts(inheritedVSPDisInfo[uiMergeIndex].m_acDvInfo, uiSubPartIdx, uiPartIdx, uiDepth);
    296272        }
    297 #endif
    298273#else
    299274        pcSubCU->getInterMergeCandidates( uiSubPartIdx-uiAbsPartIdx, uiPartIdx, cMvFieldNeighbours, uhInterDirNeighbours, numValidMergeCand, uiMergeIndex );
     
    327302      }
    328303    }
    329 #if MTK_VSP_FIX_E0172 || MTK_VSP_FIX_ALIGN_WD_E0172
     304#if H_3D_VSP
    330305    if ( (pcCU->getInterDir(uiSubPartIdx) == 3) && pcSubCU->isBipredRestriction(uiPartIdx) && (pcCU->getVSPFlag(uiSubPartIdx) == false))
    331306#else
Note: See TracChangeset for help on using the changeset viewer.