Changeset 1373 in 3DVCSoftware for branches/HTM-15.2-dev/source/Lib/TLibEncoder/TEncCu.cpp
- Timestamp:
- 6 Nov 2015, 16:18:36 (8 years ago)
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
branches/HTM-15.2-dev/source/Lib/TLibEncoder/TEncCu.cpp
r1360 r1373 420 420 const UInt fastDeltaQPCuMaxSize = Clip3(sps.getMaxCUHeight()>>sps.getLog2DiffMaxMinCodingBlockSize(), sps.getMaxCUHeight(), 32u); 421 421 422 422 #if NH_3D_QTL 423 423 #if NH_3D_QTLPC 424 424 Bool bLimQtPredFalg = pcPic->getSlice(0)->getQtPredFlag(); 425 #else 426 Bool bLimQtPredFalg = false; 427 #endif 425 428 TComPic *pcTexture = rpcBestCU->getSlice()->getTexturePic(); 426 429 … … 437 440 m_ppcOrigYuv[uiDepth]->copyFromPicYuv( pcPic->getPicYuvOrg(), rpcBestCU->getCtuRsAddr(), rpcBestCU->getZorderIdxInCtu() ); 438 441 439 #if NH_3D_QTL PC442 #if NH_3D_QTL 440 443 Bool bTrySplit = true; 441 444 Bool bTrySplitDQP = true; … … 534 537 } 535 538 536 #if NH_3D_QTL PC539 #if NH_3D_QTL 537 540 bTrySplit = true; 538 541 #endif … … 552 555 553 556 rpcTempCU->initEstData( uiDepth, iQP, bIsLosslessMode ); 554 #if NH_3D_QTL PC557 #if NH_3D_QTL 555 558 //logic for setting bTrySplit using the partition information that is stored of the texture colocated CU 556 559 #if H_3D_FCO … … 734 737 #endif 735 738 } 736 #if NH_3D_QTL PC739 #if NH_3D_QTL 737 740 if(depthMapDetect && !bIntraSliceDetect && !rapPic && ( m_pcEncCfg->getUseQTL() || bLimQtPredFalg )) 738 741 { … … 789 792 { 790 793 if( uiDepth == sps.getLog2DiffMaxMinCodingBlockSize() && doNotBlockPu 791 #if NH_3D_QTL PC794 #if NH_3D_QTL 792 795 && bTrySplit 793 796 #endif … … 809 812 810 813 if(doNotBlockPu 811 #if NH_3D_QTL PC814 #if NH_3D_QTL 812 815 && bTryNx2N 813 816 #endif … … 830 833 } 831 834 if(doNotBlockPu 832 #if NH_3D_QTL PC835 #if NH_3D_QTL 833 836 && bTry2NxN 834 837 #endif … … 871 874 { 872 875 if(doNotBlockPu 873 #if NH_3D_QTL PC876 #if NH_3D_QTL 874 877 && bTry2NxN 875 878 #endif … … 891 894 } 892 895 if(doNotBlockPu 893 #if NH_3D_QTL PC896 #if NH_3D_QTL 894 897 && bTry2NxN 895 898 #endif … … 917 920 { 918 921 if(doNotBlockPu 919 #if NH_3D_QTL PC922 #if NH_3D_QTL 920 923 && bTry2NxN 921 924 #endif … … 939 942 } 940 943 if(doNotBlockPu 941 #if NH_3D_QTL PC944 #if NH_3D_QTL 942 945 && bTry2NxN 943 946 #endif … … 966 969 { 967 970 if(doNotBlockPu 968 #if NH_3D_QTL PC971 #if NH_3D_QTL 969 972 && bTryNx2N 970 973 #endif … … 987 990 } 988 991 if(doNotBlockPu 989 #if NH_3D_QTL PC992 #if NH_3D_QTL 990 993 && bTryNx2N 991 994 #endif … … 1007 1010 { 1008 1011 if(doNotBlockPu 1009 #if NH_3D_QTL PC1012 #if NH_3D_QTL 1010 1013 && bTryNx2N 1011 1014 #endif … … 1027 1030 } 1028 1031 if(doNotBlockPu 1029 #if NH_3D_QTL PC1032 #if NH_3D_QTL 1030 1033 && bTryNx2N 1031 1034 #endif … … 1048 1051 1049 1052 #else 1050 #if NH_3D_QTL PC1053 #if NH_3D_QTL 1051 1054 if (bTry2NxN) 1052 1055 { … … 1063 1066 rpcTempCU->setDvInfoSubParts(DvInfo, 0, uiDepth); 1064 1067 #endif 1065 #if NH_3D_QTL PC1068 #if NH_3D_QTL 1066 1069 } 1067 1070 if (bTryNx2N) … … 1078 1081 rpcTempCU->setDvInfoSubParts(DvInfo, 0, uiDepth); 1079 1082 #endif 1080 #if NH_3D_QTL PC1083 #if NH_3D_QTL 1081 1084 } 1082 1085 #endif … … 1134 1137 if( uiDepth == sps.getLog2DiffMaxMinCodingBlockSize() ) 1135 1138 { 1136 #if NH_3D_QTL PC//Try IntraNxN1139 #if NH_3D_QTL //Try IntraNxN 1137 1140 if(bTrySplit) 1138 1141 { … … 1150 1153 rpcTempCU->initEstData( uiDepth, iQP, bIsLosslessMode ); 1151 1154 } 1152 #if NH_3D_QTL PC1155 #if NH_3D_QTL 1153 1156 } 1154 1157 #endif … … 1252 1255 const Bool bSubBranch = bBoundary || !( m_pcEncCfg->getUseEarlyCU() && rpcBestCU->getTotalCost()!=MAX_DOUBLE && rpcBestCU->isSkipped(0) ); 1253 1256 #endif 1254 #if NH_3D_QTL PC1257 #if NH_3D_QTL 1255 1258 if( bSubBranch && uiDepth < sps.getLog2DiffMaxMinCodingBlockSize() && (!getFastDeltaQp() || uiWidth > fastDeltaQPCuMaxSize || bBoundary) && bTrySplitDQP ) 1256 1259 #else
Note: See TracChangeset for help on using the changeset viewer.