Changeset 156 in 3DVCSoftware for branches/HTM-4.1-dev2-LG/source/Lib/TLibEncoder/TEncCu.cpp
- Timestamp:
- 29 Oct 2012, 02:20:31 (12 years ago)
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
branches/HTM-4.1-dev2-LG/source/Lib/TLibEncoder/TEncCu.cpp
r153 r156 735 735 Bool bResPredFlag = ( uiResPrdId > 0 ); 736 736 #if LGE_ILLUCOMP_B0045 737 for(UInt uiICId = 0; uiICId < (bICEnabled ? 2 : 1); uiICId++)738 {739 Bool bICFlag = (uiICId ? true : false);740 rpcTempCU->setICFlagSubParts(bICFlag, 0, 0, uiDepth);737 for(UInt uiICId = 0; uiICId < (bICEnabled ? 2 : 1); uiICId++) 738 { 739 Bool bICFlag = (uiICId ? true : false); 740 rpcTempCU->setICFlagSubParts(bICFlag, 0, 0, uiDepth); 741 741 #endif 742 742 #endif … … 763 763 } 764 764 #if LGE_ILLUCOMP_B0045_ENCSIMP 765 if(bICFlag && rpcBestCU->getMergeFlag(0) && !rpcBestCU->getICFlag(0))766 {767 bICEnabled = false;768 break;769 }765 if(bICFlag && rpcBestCU->getMergeFlag(0) && !rpcBestCU->getICFlag(0)) 766 { 767 bICEnabled = false; 768 break; 769 } 770 770 #endif 771 771 // 2Nx2N, NxN … … 788 788 } 789 789 #if LGE_ILLUCOMP_B0045 790 }790 } 791 791 #endif 792 792 #if HHI_INTER_VIEW_RESIDUAL_PRED … … 877 877 Bool bResPredFlag = ( uiResPrdId > 0 ); 878 878 #if LGE_ILLUCOMP_B0045 879 for(UInt uiICId = 0; uiICId < (bICEnabled ? 2 : 1); uiICId++)880 {881 Bool bICFlag = (uiICId ? true : false);882 rpcTempCU->setICFlagSubParts(bICFlag, 0, 0, uiDepth);879 for(UInt uiICId = 0; uiICId < (bICEnabled ? 2 : 1); uiICId++) 880 { 881 Bool bICFlag = (uiICId ? true : false); 882 rpcTempCU->setICFlagSubParts(bICFlag, 0, 0, uiDepth); 883 883 #endif 884 884 #endif … … 1418 1418 #endif 1419 1419 #if LGE_ILLUCOMP_B0045 1420 }1420 } 1421 1421 #endif 1422 1422 #if HHI_INTER_VIEW_RESIDUAL_PRED … … 1446 1446 { 1447 1447 #if LGE_ILLUCOMP_B0045 1448 rpcTempCU->setICFlagSubParts(false, 0, 0, uiDepth);1448 rpcTempCU->setICFlagSubParts(false, 0, 0, uiDepth); 1449 1449 #endif 1450 1450 xCheckRDCostIntra( rpcBestCU, rpcTempCU, SIZE_2Nx2N ); … … 1466 1466 { 1467 1467 #if LGE_ILLUCOMP_B0045 1468 rpcTempCU->setICFlagSubParts(false, 0, 0, uiDepth);1468 rpcTempCU->setICFlagSubParts(false, 0, 0, uiDepth); 1469 1469 #endif 1470 1470 xCheckRDCostIntra( rpcBestCU, rpcTempCU, SIZE_NxN ); … … 1502 1502 { 1503 1503 #if LGE_ILLUCOMP_B0045 1504 rpcTempCU->setICFlagSubParts(false, 0, 0, uiDepth);1504 rpcTempCU->setICFlagSubParts(false, 0, 0, uiDepth); 1505 1505 #endif 1506 1506 xCheckIntraPCM (rpcBestCU, rpcTempCU); … … 2148 2148 m_pcEntropyCoder->encodeMergeIndex( pcCU, uiAbsPartIdx, 0 ); 2149 2149 #if LGE_ILLUCOMP_B0045 2150 m_pcEntropyCoder->encodeICFlag ( pcCU, uiAbsPartIdx );2150 m_pcEntropyCoder->encodeICFlag ( pcCU, uiAbsPartIdx ); 2151 2151 #endif 2152 2152 #if HHI_INTER_VIEW_RESIDUAL_PRED … … 2179 2179 m_pcEntropyCoder->encodePredInfo( pcCU, uiAbsPartIdx ); 2180 2180 #if LGE_ILLUCOMP_B0045 2181 m_pcEntropyCoder->encodeICFlag ( pcCU, uiAbsPartIdx );2181 m_pcEntropyCoder->encodeICFlag ( pcCU, uiAbsPartIdx ); 2182 2182 #endif 2183 2183 #if HHI_INTER_VIEW_RESIDUAL_PRED … … 2303 2303 #endif 2304 2304 #if LGE_ILLUCOMP_B0045 2305 rpcTempCU->setICFlagSubParts(bICFlag, 0, 0, uhDepth);2305 rpcTempCU->setICFlagSubParts(bICFlag, 0, 0, uhDepth); 2306 2306 #endif 2307 2307 … … 3218 3218 m_pcEntropyCoder->encodeMergeIndex( pcCU, 0, 0, true ); 3219 3219 #if LGE_ILLUCOMP_B0045 3220 m_pcEntropyCoder->encodeICFlag( pcCU, 0, true );3220 m_pcEntropyCoder->encodeICFlag( pcCU, 0, true ); 3221 3221 #endif 3222 3222 } … … 3228 3228 m_pcEntropyCoder->encodePredInfo( pcCU, 0, true ); 3229 3229 #if LGE_ILLUCOMP_B0045 3230 m_pcEntropyCoder->encodeICFlag( pcCU, 0, true );3230 m_pcEntropyCoder->encodeICFlag( pcCU, 0, true ); 3231 3231 #endif 3232 3232 }
Note: See TracChangeset for help on using the changeset viewer.