Changeset 785 in 3DVCSoftware for branches/HTM-9.3-dev2-Samsung
- Timestamp:
- 21 Jan 2014, 01:02:51 (11 years ago)
- Location:
- branches/HTM-9.3-dev2-Samsung
- Files:
-
- 2 added
- 6 edited
Legend:
- Unmodified
- Added
- Removed
-
branches/HTM-9.3-dev2-Samsung/source/Lib/TLibCommon/TypeDef.h
r773 r785 225 225 #define H_3D_ARP_WFNR 3 226 226 #endif 227 #define SEC_IC_ARP_SIG_G0072 1 // Disabling IC when ARP is enabled, option 1 in JCT3V-G0072, part 2 in JCT3V-G0121 227 228 228 229 ///// ***** DEPTH INTRA MODES ********* -
branches/HTM-9.3-dev2-Samsung/source/Lib/TLibDecoder/TDecCu.cpp
r773 r785 390 390 UInt uiMergeIndex = pcCU->getMergeIndex(uiAbsPartIdx); 391 391 392 #if !SEC_IC_ARP_SIG_G0072 392 393 #if H_3D_IC 393 394 m_pcEntropyDecoder->decodeICFlag( pcCU, uiAbsPartIdx, uiDepth ); 394 395 #endif 396 #endif 395 397 #if H_3D_ARP 396 398 m_pcEntropyDecoder->decodeARPW( pcCU , uiAbsPartIdx , uiDepth ); 399 #endif 400 #if SEC_IC_ARP_SIG_G0072 401 #if H_3D_IC 402 m_pcEntropyDecoder->decodeICFlag( pcCU, uiAbsPartIdx, uiDepth ); 403 #endif 397 404 #endif 398 405 -
branches/HTM-9.3-dev2-Samsung/source/Lib/TLibDecoder/TDecEntropy.cpp
r773 r785 111 111 pcCU->setICFlagSubParts( false , uiAbsPartIdx, 0, uiDepth ); 112 112 113 #if SEC_IC_ARP_SIG_G0072 114 if ( pcCU->isIntra( uiAbsPartIdx ) || ( pcCU->getSlice()->getViewIndex() == 0 ) || pcCU->getSlice()->getIsDepth() || pcCU->getARPW( uiAbsPartIdx ) > 0 ) 115 #else 113 116 if ( pcCU->isIntra( uiAbsPartIdx ) || ( pcCU->getSlice()->getViewIndex() == 0 ) || pcCU->getSlice()->getIsDepth() ) 117 #endif 114 118 { 115 119 return; … … 241 245 decodeMergeIndex( pcCU, uiPartIdx, uiSubPartIdx, uiDepth ); 242 246 UInt uiMergeIndex = pcCU->getMergeIndex(uiSubPartIdx); 247 #if !SEC_IC_ARP_SIG_G0072 243 248 #if H_3D_IC 244 249 decodeICFlag( pcCU, uiAbsPartIdx, uiDepth ); 245 250 #endif 251 #endif 246 252 #if H_3D_ARP 247 253 decodeARPW ( pcCU, uiAbsPartIdx, uiDepth ); 254 #endif 255 #if SEC_IC_ARP_SIG_G0072 256 #if H_3D_IC 257 decodeICFlag( pcCU, uiAbsPartIdx, uiDepth ); 258 #endif 248 259 #endif 249 260 if ( pcCU->getSlice()->getPPS()->getLog2ParallelMergeLevelMinus2() && ePartSize != SIZE_2Nx2N && pcSubCU->getWidth( 0 ) <= 8 ) … … 367 378 } 368 379 } 380 #if !SEC_IC_ARP_SIG_G0072 369 381 #if H_3D_IC 370 382 decodeICFlag( pcCU, uiAbsPartIdx, uiDepth ); 371 383 #endif 384 #endif 372 385 #if H_3D_ARP 373 386 decodeARPW ( pcCU, uiAbsPartIdx, uiDepth ); 387 #endif 388 #if SEC_IC_ARP_SIG_G0072 389 #if H_3D_IC 390 decodeICFlag( pcCU, uiAbsPartIdx, uiDepth ); 391 #endif 374 392 #endif 375 393 } -
branches/HTM-9.3-dev2-Samsung/source/Lib/TLibEncoder/TEncCu.cpp
r773 r785 1576 1576 #endif 1577 1577 m_pcEntropyCoder->encodeMergeIndex( pcCU, uiAbsPartIdx ); 1578 #if !SEC_IC_ARP_SIG_G0072 1578 1579 #if H_3D_IC 1579 1580 m_pcEntropyCoder->encodeICFlag ( pcCU, uiAbsPartIdx ); 1580 1581 #endif 1582 #endif 1581 1583 #if H_3D_ARP 1582 1584 m_pcEntropyCoder->encodeARPW( pcCU , uiAbsPartIdx ); 1585 #endif 1586 #if SEC_IC_ARP_SIG_G0072 1587 #if H_3D_IC 1588 m_pcEntropyCoder->encodeICFlag ( pcCU, uiAbsPartIdx ); 1589 #endif 1583 1590 #endif 1584 1591 finishCU(pcCU,uiAbsPartIdx,uiDepth); … … 1603 1610 // prediction Info ( Intra : direction mode, Inter : Mv, reference idx ) 1604 1611 m_pcEntropyCoder->encodePredInfo( pcCU, uiAbsPartIdx ); 1612 #if !SEC_IC_ARP_SIG_G0072 1605 1613 #if H_3D_IC 1606 1614 m_pcEntropyCoder->encodeICFlag ( pcCU, uiAbsPartIdx ); 1607 1615 #endif 1616 #endif 1608 1617 #if H_3D_ARP 1609 1618 m_pcEntropyCoder->encodeARPW( pcCU , uiAbsPartIdx ); 1619 #endif 1620 #if SEC_IC_ARP_SIG_G0072 1621 #if H_3D_IC 1622 m_pcEntropyCoder->encodeICFlag ( pcCU, uiAbsPartIdx ); 1623 #endif 1610 1624 #endif 1611 1625 #if H_3D_INTER_SDC … … 1837 1851 #if H_3D_ARP 1838 1852 Int nARPWMax = rpcTempCU->getSlice()->getARPStepNum() - 1; 1853 #if SEC_IC_ARP_SIG_G0072 1854 if( nARPWMax < 0 || !rpcTempCU->getDvInfo(0).bDV || bICFlag ) 1855 #else 1839 1856 if( nARPWMax < 0 || !rpcTempCU->getDvInfo(0).bDV ) 1857 #endif 1840 1858 { 1841 1859 nARPWMax = 0; … … 2087 2105 Int nARPWMax = rpcTempCU->getSlice()->getARPStepNum() - 1; 2088 2106 2107 #if SEC_IC_ARP_SIG_G0072 2108 if( nARPWMax < 0 || ePartSize != SIZE_2Nx2N || !rpcTempCU->getDvInfo(0).bDV || rpcTempCU->getICFlag(0) ) 2109 #else 2089 2110 if( nARPWMax < 0 || ePartSize != SIZE_2Nx2N || !rpcTempCU->getDvInfo(0).bDV ) 2111 #endif 2090 2112 { 2091 2113 nARPWMax = 0; -
branches/HTM-9.3-dev2-Samsung/source/Lib/TLibEncoder/TEncEntropy.cpp
r773 r785 160 160 Void TEncEntropy::encodeICFlag( TComDataCU* pcCU, UInt uiAbsPartIdx, Bool bRD ) 161 161 { 162 #if SEC_IC_ARP_SIG_G0072 163 if ( pcCU->isIntra( uiAbsPartIdx ) || ( pcCU->getSlice()->getViewIndex() == 0 ) || pcCU->getSlice()->getIsDepth() || pcCU->getARPW( uiAbsPartIdx ) > 0 ) 164 #else 162 165 if ( pcCU->isIntra( uiAbsPartIdx ) || ( pcCU->getSlice()->getViewIndex() == 0 ) || pcCU->getSlice()->getIsDepth() ) 166 #endif 163 167 { 164 168 return; -
branches/HTM-9.3-dev2-Samsung/source/Lib/TLibEncoder/TEncSearch.cpp
r773 r785 5253 5253 m_pcEntropyCoder->encodeSkipFlag(pcCU, 0, true); 5254 5254 m_pcEntropyCoder->encodeMergeIndex( pcCU, 0, true ); 5255 #if !SEC_IC_ARP_SIG_G0072 5255 5256 #if H_3D_IC 5256 5257 m_pcEntropyCoder->encodeICFlag( pcCU, 0, true ); 5257 5258 #endif 5259 #endif 5258 5260 #if H_3D_ARP 5259 5261 m_pcEntropyCoder->encodeARPW( pcCU, 0 ); 5262 #endif 5263 #if SEC_IC_ARP_SIG_G0072 5264 #if H_3D_IC 5265 m_pcEntropyCoder->encodeICFlag( pcCU, 0, true ); 5266 #endif 5260 5267 #endif 5261 5268 uiBits = m_pcEntropyCoder->getNumberOfWrittenBits(); … … 6833 6840 m_pcEntropyCoder->encodeSkipFlag(pcCU, 0, true); 6834 6841 m_pcEntropyCoder->encodeMergeIndex(pcCU, 0, true); 6842 #if !SEC_IC_ARP_SIG_G0072 6835 6843 #if H_3D_IC 6836 6844 m_pcEntropyCoder->encodeICFlag( pcCU, 0, true ); 6837 6845 #endif 6846 #endif 6838 6847 #if H_3D_ARP 6839 6848 m_pcEntropyCoder->encodeARPW( pcCU, 0 ); 6849 #endif 6850 #if SEC_IC_ARP_SIG_G0072 6851 #if H_3D_IC 6852 m_pcEntropyCoder->encodeICFlag( pcCU, 0, true ); 6853 #endif 6840 6854 #endif 6841 6855 ruiBits += m_pcEntropyCoder->getNumberOfWrittenBits(); … … 6852 6866 m_pcEntropyCoder->encodePartSize( pcCU, 0, pcCU->getDepth(0), true ); 6853 6867 m_pcEntropyCoder->encodePredInfo( pcCU, 0, true ); 6868 #if !SEC_IC_ARP_SIG_G0072 6854 6869 #if H_3D_IC 6855 6870 m_pcEntropyCoder->encodeICFlag( pcCU, 0, true ); 6856 6871 #endif 6872 #endif 6857 6873 #if H_3D_ARP 6858 6874 m_pcEntropyCoder->encodeARPW( pcCU , 0 ); 6875 #endif 6876 #if SEC_IC_ARP_SIG_G0072 6877 #if H_3D_IC 6878 m_pcEntropyCoder->encodeICFlag( pcCU, 0, true ); 6879 #endif 6859 6880 #endif 6860 6881 #if H_3D_INTER_SDC
Note: See TracChangeset for help on using the changeset viewer.