Changeset 253 in 3DVCSoftware for branches/HTM-5.1-dev1-LG/source/Lib/TLibEncoder/TEncCu.cpp
- Timestamp:
- 4 Feb 2013, 02:57:15 (12 years ago)
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
branches/HTM-5.1-dev1-LG/source/Lib/TLibEncoder/TEncCu.cpp
r229 r253 498 498 499 499 #if LGE_ILLUCOMP_B0045 500 Bool bICEnabled = (!rpcTempCU->getSlice()->getIsDepth() && rpcTempCU->getSlice()->getViewId()); 500 Bool bICEnabled = ( 501 #if !LGE_ILLUCOMP_DEPTH_C0046 502 !rpcTempCU->getSlice()->getIsDepth() && 503 #endif 504 rpcTempCU->getSlice()->getViewId()); 501 505 502 506 bICEnabled = bICEnabled && rpcTempCU->getSlice()->getApplyIC(); … … 703 707 rpcTempCU->setResPredIndicator( bResPredAvailable, bResPredFlag ); 704 708 #endif 709 #if FIX_LGE_ILLUCOMP_B0045 710 rpcTempCU->setICFlagSubParts(bICFlag, 0, 0, uiDepth); 711 #endif 705 712 #if HHI_INTERVIEW_SKIP 706 713 xCheckRDCostInter( rpcBestCU, rpcTempCU, SIZE_2Nx2N, bFullyRenderedSec ); … … 840 847 rpcTempCU->setResPredIndicator( bResPredAvailable, bResPredFlag ); 841 848 #endif 849 #if FIX_LGE_ILLUCOMP_B0045 850 rpcTempCU->setICFlagSubParts(bICFlag, 0, 0, uiDepth); 851 #endif 842 852 #if HHI_INTERVIEW_SKIP 843 853 xCheckRDCostInter( rpcBestCU, rpcTempCU, SIZE_Nx2N, bFullyRenderedSec ); … … 864 874 rpcTempCU->setResPredIndicator( bResPredAvailable, bResPredFlag ); 865 875 #endif 876 #if FIX_LGE_ILLUCOMP_B0045 877 rpcTempCU->setICFlagSubParts(bICFlag, 0, 0, uiDepth); 878 #endif 866 879 #if HHI_INTERVIEW_SKIP 867 880 xCheckRDCostInter( rpcBestCU, rpcTempCU, SIZE_2NxN, bFullyRenderedSec ); … … 907 920 rpcTempCU->setResPredIndicator( bResPredAvailable, bResPredFlag ); 908 921 #endif 922 #if FIX_LGE_ILLUCOMP_B0045 923 rpcTempCU->setICFlagSubParts(bICFlag, 0, 0, uiDepth); 924 #endif 909 925 #if HHI_INTERVIEW_SKIP 910 926 xCheckRDCostInter( rpcBestCU, rpcTempCU, SIZE_2NxnU, bFullyRenderedSec ); … … 923 939 rpcTempCU->setResPredIndicator( bResPredAvailable, bResPredFlag ); 924 940 #endif 941 #if FIX_LGE_ILLUCOMP_B0045 942 rpcTempCU->setICFlagSubParts(bICFlag, 0, 0, uiDepth); 943 #endif 925 944 #if HHI_INTERVIEW_SKIP 926 945 xCheckRDCostInter( rpcBestCU, rpcTempCU, SIZE_2NxnD, bFullyRenderedSec ); … … 950 969 rpcTempCU->setResPredIndicator( bResPredAvailable, bResPredFlag ); 951 970 #endif 971 #if FIX_LGE_ILLUCOMP_B0045 972 rpcTempCU->setICFlagSubParts(bICFlag, 0, 0, uiDepth); 973 #endif 952 974 #if HHI_INTERVIEW_SKIP 953 975 xCheckRDCostInter( rpcBestCU, rpcTempCU, SIZE_2NxnU, bFullyRenderedSec, true ); … … 966 988 rpcTempCU->setResPredIndicator( bResPredAvailable, bResPredFlag ); 967 989 #endif 990 #if FIX_LGE_ILLUCOMP_B0045 991 rpcTempCU->setICFlagSubParts(bICFlag, 0, 0, uiDepth); 992 #endif 968 993 #if HHI_INTERVIEW_SKIP 969 994 xCheckRDCostInter( rpcBestCU, rpcTempCU, SIZE_2NxnD, bFullyRenderedSec, true ); … … 995 1020 rpcTempCU->setResPredIndicator( bResPredAvailable, bResPredFlag ); 996 1021 #endif 1022 #if FIX_LGE_ILLUCOMP_B0045 1023 rpcTempCU->setICFlagSubParts(bICFlag, 0, 0, uiDepth); 1024 #endif 997 1025 #if HHI_INTERVIEW_SKIP 998 1026 xCheckRDCostInter( rpcBestCU, rpcTempCU, SIZE_nLx2N, bFullyRenderedSec ); … … 1011 1039 rpcTempCU->setResPredIndicator( bResPredAvailable, bResPredFlag ); 1012 1040 #endif 1041 #if FIX_LGE_ILLUCOMP_B0045 1042 rpcTempCU->setICFlagSubParts(bICFlag, 0, 0, uiDepth); 1043 #endif 1013 1044 #if HHI_INTERVIEW_SKIP 1014 1045 xCheckRDCostInter( rpcBestCU, rpcTempCU, SIZE_nRx2N, bFullyRenderedSec ); … … 1033 1064 #if HHI_INTER_VIEW_RESIDUAL_PRED 1034 1065 rpcTempCU->setResPredIndicator( bResPredAvailable, bResPredFlag ); 1066 #endif 1067 #if FIX_LGE_ILLUCOMP_B0045 1068 rpcTempCU->setICFlagSubParts(bICFlag, 0, 0, uiDepth); 1035 1069 #endif 1036 1070 #if HHI_INTERVIEW_SKIP … … 1049 1083 #if HHI_INTER_VIEW_RESIDUAL_PRED 1050 1084 rpcTempCU->setResPredIndicator( bResPredAvailable, bResPredFlag ); 1085 #endif 1086 #if FIX_LGE_ILLUCOMP_B0045 1087 rpcTempCU->setICFlagSubParts(bICFlag, 0, 0, uiDepth); 1051 1088 #endif 1052 1089 #if HHI_INTERVIEW_SKIP … … 1194 1231 if( rpcBestCU->getSlice()->getSPS()->getUseMVI() && rpcBestCU->getSlice()->getSliceType() != I_SLICE ) 1195 1232 { 1233 #if LGE_ILLUCOMP_DEPTH_C0046 1234 for(UInt uiICId = 0; uiICId < (bICEnabled ? 2 : 1); uiICId++) 1235 { 1236 Bool bICFlag = (uiICId ? true : false); 1237 rpcTempCU->setICFlagSubParts(bICFlag, 0, 0, uiDepth); 1238 #endif 1196 1239 xCheckRDCostMvInheritance( rpcBestCU, rpcTempCU, uiDepth, false, false ); 1197 1240 rpcTempCU->initEstData( uiDepth, iQP ); 1198 1241 xCheckRDCostMvInheritance( rpcBestCU, rpcTempCU, uiDepth, true, false ); 1199 1242 rpcTempCU->initEstData( uiDepth, iQP ); 1243 #if LGE_ILLUCOMP_DEPTH_C0046 1244 } 1245 #endif 1200 1246 } 1201 1247 #endif … … 1754 1800 { 1755 1801 m_pcEntropyCoder->encodeMergeIndex( pcCU, uiAbsPartIdx, 0 ); 1802 #if LGE_ILLUCOMP_DEPTH_C0046 1803 m_pcEntropyCoder->encodeICFlag ( pcCU, uiAbsPartIdx, false, uiDepth ); 1804 #endif 1756 1805 finishCU(pcCU,uiAbsPartIdx,uiDepth); 1757 1806 xRestoreDepthWidthHeight( pcCU ); … … 1765 1814 // prediction Info ( Intra : direction mode, Inter : Mv, reference idx ) 1766 1815 m_pcEntropyCoder->encodePredInfo( pcCU, uiAbsPartIdx ); 1816 #if LGE_ILLUCOMP_DEPTH_C0046 1817 m_pcEntropyCoder->encodeICFlag ( pcCU, uiAbsPartIdx, false, uiDepth ); 1818 #endif 1767 1819 xRestoreDepthWidthHeight( pcCU ); 1768 1820 } … … 1813 1865 m_pcEntropyCoder->encodeMergeIndex( pcCU, uiAbsPartIdx, 0 ); 1814 1866 #if LGE_ILLUCOMP_B0045 1815 m_pcEntropyCoder->encodeICFlag ( pcCU, uiAbsPartIdx ); 1867 m_pcEntropyCoder->encodeICFlag ( pcCU, uiAbsPartIdx 1868 #if LGE_ILLUCOMP_DEPTH_C0046 1869 , false, uiDepth 1870 #endif 1871 ); 1816 1872 #endif 1817 1873 #if HHI_INTER_VIEW_RESIDUAL_PRED … … 1844 1900 m_pcEntropyCoder->encodePredInfo( pcCU, uiAbsPartIdx ); 1845 1901 #if LGE_ILLUCOMP_B0045 1846 m_pcEntropyCoder->encodeICFlag ( pcCU, uiAbsPartIdx ); 1902 m_pcEntropyCoder->encodeICFlag ( pcCU, uiAbsPartIdx 1903 #if LGE_ILLUCOMP_DEPTH_C0046 1904 ,false, uiDepth 1905 #endif 1906 ); 1847 1907 #endif 1848 1908 #if HHI_INTER_VIEW_RESIDUAL_PRED … … 2902 2962 m_pcEntropyCoder->encodeMergeIndex( pcCU, 0, 0, true ); 2903 2963 #if LGE_ILLUCOMP_B0045 2904 m_pcEntropyCoder->encodeICFlag( pcCU, 0, true ); 2964 m_pcEntropyCoder->encodeICFlag( pcCU, 0, true 2965 #if LGE_ILLUCOMP_DEPTH_C0046 2966 , uhDepth 2967 #endif 2968 ); 2905 2969 #endif 2906 2970 } … … 2912 2976 m_pcEntropyCoder->encodePredInfo( pcCU, 0, true ); 2913 2977 #if LGE_ILLUCOMP_B0045 2914 m_pcEntropyCoder->encodeICFlag( pcCU, 0, true ); 2978 m_pcEntropyCoder->encodeICFlag( pcCU, 0, true 2979 #if LGE_ILLUCOMP_DEPTH_C0046 2980 , uhDepth 2981 #endif 2982 ); 2915 2983 #endif 2916 2984 }
Note: See TracChangeset for help on using the changeset viewer.