Changeset 1209 in 3DVCSoftware for branches/HTM-14.1-update-dev1-HHI/source/Lib/TLibEncoder/TEncEntropy.cpp
- Timestamp:
- 13 May 2015, 15:16:14 (10 years ago)
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
TabularUnified branches/HTM-14.1-update-dev1-HHI/source/Lib/TLibEncoder/TEncEntropy.cpp ¶
r1200 r1209 722 722 assert( pcCU->getCbf(uiAbsPartIdx, TEXT_CHROMA_V) == 1 ); 723 723 } 724 725 724 #endif 725 #if H_3D_INTER_SDC 726 726 if( pcCU->getSDCFlag( uiAbsPartIdx ) && !pcCU->isIntra( uiAbsPartIdx ) ) 727 727 { … … 730 730 assert( pcCU->getSlice()->getIsDepth() ); 731 731 } 732 733 if( pcCU->getSlice()->getIsDepth() && ( pcCU->getSDCFlag( uiAbsPartIdx ) || pcCU->isIntra( uiAbsPartIdx ) ) ) 732 #endif 733 #if NH_3D 734 if( pcCU->getSlice()->getIsDepth() ) 735 { 736 #if H_3D_DIM_SDC || H_3D_INTER_SDC 737 if( pcCU->getSDCFlag( uiAbsPartIdx ) ) 738 { 739 m_pcEntropyCoderIf->codeDeltaDC( pcCU, uiAbsPartIdx ); 740 return; 741 } 742 #endif 743 #if NH_3D_DMM 744 if( pcCU->isIntra(uiAbsPartIdx) ) 734 745 { 735 746 Int iPartNum = ( pcCU->isIntra( uiAbsPartIdx ) && pcCU->getPartitionSize( uiAbsPartIdx ) == SIZE_NxN ) ? 4 : 1; 736 UInt uiPartOffset = ( pcCU->getPic()->getNumPartInCU() >> ( pcCU->getDepth( uiAbsPartIdx ) << 1 ) ) >> 2; 737 738 if( !pcCU->getSDCFlag( uiAbsPartIdx ) ) 739 { 747 UInt uiPartOffset = ( pcCU->getPic()->getNumPartitionsInCtu() >> ( pcCU->getDepth( uiAbsPartIdx ) << 1 ) ) >> 2; 740 748 for( Int iPart = 0; iPart < iPartNum; iPart++ ) 741 749 { 742 if( getDimType( pcCU->getLumaIntraDir( uiAbsPartIdx + uiPartOffset*iPart ) ) < DIM_NUM_TYPE)750 if( isDmmMode( pcCU->getIntraDir( CHANNEL_TYPE_LUMA, uiAbsPartIdx + uiPartOffset*iPart ) ) ) 743 751 { 744 752 m_pcEntropyCoderIf->codeDeltaDC( pcCU, uiAbsPartIdx + uiPartOffset*iPart ); … … 746 754 } 747 755 } 748 else 749 { 750 m_pcEntropyCoderIf->codeDeltaDC( pcCU, uiAbsPartIdx ); 751 return; 752 } 753 } 754 #endif 755 756 #endif 757 } 758 #endif 756 759 757 760 if( pcCU->isIntra(uiAbsPartIdx) ) … … 840 843 } 841 844 845 #if NH_3D_DMM || H_3D_DIM_SDC || H_3D_INTER_SDC 846 Void TEncEntropy::encodeDeltaDC ( TComDataCU* pcCU, UInt absPartIdx ) 847 { 848 m_pcEntropyCoderIf->codeDeltaDC( pcCU, absPartIdx ); 849 } 850 #endif 842 851 #if H_3D_INTER_SDC 843 Void TEncEntropy::encodeDeltaDC ( TComDataCU* pcCU, UInt absPartIdx )844 {845 m_pcEntropyCoderIf->codeDeltaDC( pcCU, absPartIdx );846 }847 848 852 Void TEncEntropy::encodeSDCFlag( TComDataCU* pcCU, UInt uiAbsPartIdx, Bool bRD ) 849 853 {
Note: See TracChangeset for help on using the changeset viewer.