Changeset 1270 in 3DVCSoftware for branches/HTM-14.1-update-dev3/source/Lib/TLibEncoder/TEncSearch.cpp
- Timestamp:
- 13 Jul 2015, 15:22:02 (9 years ago)
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
branches/HTM-14.1-update-dev3/source/Lib/TLibEncoder/TEncSearch.cpp
r1267 r1270 3884 3884 UInt uiDepth = pcCU->getDepth( uiAbsPartIdx ); 3885 3885 3886 #if H_3D_DBBP3886 #if NH_3D_DBBP 3887 3887 DbbpTmpData* pDBBPTmpData = pcCU->getDBBPTmpData(); 3888 3888 if( pcCU->getDBBPFlag(0) ) … … 3891 3891 AOF( iPUIdx == 0 ); 3892 3892 AOF( pcCU->getPartitionSize(0) == SIZE_2Nx2N ); 3893 AOF( pDBBPTmpData->eVirtualPartSize != SIZE_NONE);3893 AOF( pDBBPTmpData->eVirtualPartSize != NUMBER_OF_PART_SIZES ); 3894 3894 3895 3895 // temporary change of partition size for candidate derivation … … 3916 3916 3917 3917 PartSize partSize = pcCU->getPartitionSize( 0 ); 3918 #if H_3D_DBBP3918 #if NH_3D_DBBP 3919 3919 if ( pcCU->getSlice()->getPPS()->getLog2ParallelMergeLevelMinus2() && partSize != SIZE_2Nx2N && pcCU->getWidth( 0 ) <= 8 && pcCU->getDBBPFlag(0) == false ) 3920 3920 #else … … 3978 3978 xRestrictBipredMergeCand( pcCU, iPUIdx, cMvFieldNeighbours, uhInterDirNeighbours, numValidMergeCand ); 3979 3979 3980 #if H_3D_DBBP3980 #if NH_3D_DBBP 3981 3981 if( pcCU->getDBBPFlag(0) ) 3982 3982 { … … 4025 4025 #endif 4026 4026 #if NH_3D_VSP 4027 #if H_3D_DBBP4027 #if NH_3D_DBBP 4028 4028 if ( vspFlag[uiMergeCand] && !pcCU->getDBBPFlag(0) ) 4029 4029 #else … … 4550 4550 } // end if bTestNormalMC 4551 4551 #endif 4552 #if H_3D_DBBP4552 #if NH_3D_DBBP 4553 4553 // test merge mode for DBBP (2Nx2N) 4554 4554 if ( pcCU->getPartitionSize( uiPartAddr ) != SIZE_2Nx2N || pcCU->getDBBPFlag(0) ) … … 4648 4648 #endif 4649 4649 #if NH_3D_VSP 4650 #if H_3D_DBBP4650 #if NH_3D_DBBP 4651 4651 if ( vspFlag[uiMRGIndex] && !pcCU->getDBBPFlag(uiPartAddr) ) 4652 4652 #else … … 4749 4749 { 4750 4750 4751 #if H_3D_DBBP4751 #if NH_3D_DBBP 4752 4752 DbbpTmpData* pDBBPTmpData = pcCU->getDBBPTmpData(); 4753 4753 if( pcCU->getDBBPFlag(0) ) … … 4756 4756 AOF( uiPartIdx == 0 ); 4757 4757 AOF( pcCU->getPartitionSize(0) == SIZE_2Nx2N ); 4758 AOF( pDBBPTmpData->eVirtualPartSize != SIZE_NONE);4758 AOF( pDBBPTmpData->eVirtualPartSize != NUMBER_OF_PART_SIZES ); 4759 4759 AOF( iRoiWidth == iRoiHeight ); 4760 4760 … … 4781 4781 4782 4782 pcCU->fillMvpCand( uiPartIdx, uiPartAddr, eRefPicList, iRefIdx, pcAMVPInfo ); 4783 #if H_3D_DBBP4783 #if NH_3D_DBBP 4784 4784 if( pcCU->getDBBPFlag(0) ) 4785 4785 { … … 5009 5009 if ( pcCU->getSlice()->testWeightPred() && pcCU->getSlice()->getSliceType()==P_SLICE ) 5010 5010 { 5011 xPredInterBlk( COMPONENT_Y, pcCU, pcPicYuvRef, uiPartAddr, &cMvCand, iSizeX, iSizeY, pcTemplateCand, true, pcCU->getSlice()->getSPS()->getBitDepth(CHANNEL_TYPE_LUMA) ); 5011 xPredInterBlk( COMPONENT_Y, pcCU, pcPicYuvRef, uiPartAddr, &cMvCand, iSizeX, iSizeY, pcTemplateCand, true, pcCU->getSlice()->getSPS()->getBitDepth(CHANNEL_TYPE_LUMA) 5012 #if NH_3D_ARP 5013 , false //add this for IC, otherwise, it could be removed 5014 #endif 5015 ); 5012 5016 } 5013 5017 else 5014 5018 { 5015 5019 xPredInterBlk( COMPONENT_Y, pcCU, pcPicYuvRef, uiPartAddr, &cMvCand, iSizeX, iSizeY, pcTemplateCand, false, pcCU->getSlice()->getSPS()->getBitDepth(CHANNEL_TYPE_LUMA) 5016 #if H_3D_ARP5020 #if NH_3D_ARP 5017 5021 , false 5018 5022 #endif … … 5783 5787 m_pcEntropyCoder->encodeSkipFlag(pcCU, 0, true); 5784 5788 m_pcEntropyCoder->encodeMergeIndex( pcCU, 0, true ); 5785 #if H_3D_ARP5789 #if NH_3D_ARP 5786 5790 m_pcEntropyCoder->encodeARPW( pcCU, 0 ); 5787 5791 #endif … … 7099 7103 m_pcEntropyCoder->encodeSkipFlag(pcCU, 0, true); 7100 7104 m_pcEntropyCoder->encodeMergeIndex(pcCU, 0, true); 7101 #if H_3D_ARP7105 #if NH_3D_ARP 7102 7106 m_pcEntropyCoder->encodeARPW( pcCU, 0 ); 7103 7107 #endif … … 7126 7130 m_pcEntropyCoder->encodeSDCFlag( pcCU, 0, true ); 7127 7131 #endif 7128 #if H_3D_ARP7132 #if NH_3D_ARP 7129 7133 m_pcEntropyCoder->encodeARPW( pcCU , 0 ); 7130 7134 #endif … … 7132 7136 m_pcEntropyCoder->encodeICFlag( pcCU, 0, true ); 7133 7137 #endif 7134 #if H_3D7138 #if NH_3D_DBBP 7135 7139 m_pcEntropyCoder->encodeDBBPFlag( pcCU, 0, true ); 7136 7140 #endif
Note: See TracChangeset for help on using the changeset viewer.