Changeset 460 in 3DVCSoftware for branches/HTM-DEV-0.3-dev1
- Timestamp:
- 6 Jun 2013, 12:10:16 (11 years ago)
- Location:
- branches/HTM-DEV-0.3-dev1/source/Lib
- Files:
-
- 4 edited
Legend:
- Unmodified
- Added
- Removed
-
branches/HTM-DEV-0.3-dev1/source/Lib/TLibCommon/TypeDef.h
r459 r460 105 105 ///// ***** DEPTH INTRA MODES ********* 106 106 #if H_3D_DIM 107 #define H_3D_DIM_DMM 1 // Depth Modeling Modes 108 #define H_3D_DIM_RBC 1 // Region Boundary Chain mode 109 #define H_3D_DIM_SDC 0 // Simplified Depth Coding method 110 #define H_3D_DIM_DLT 0 // Depth Lookup Table 107 #define H_3D_DIM_DMM 1 // Depth Modeling Modes 108 #define H_3D_DIM_RBC 1 // Region Boundary Chain mode 109 #define H_3D_DIM_SDC 0 // Simplified Depth Coding method 110 #define H_3D_DIM_DLT 0 // Depth Lookup Table 111 #define H_3D_DIM_ENC 1 // Depth Intra encoder optimizations, includes: 112 // HHI_DEPTH_INTRA_SEARCH_RAU_C0160 113 // LG_ZEROINTRADEPTHRESI_A0087 111 114 #endif 112 115 -
branches/HTM-DEV-0.3-dev1/source/Lib/TLibEncoder/TEncCu.cpp
r446 r460 517 517 m_LCUPredictionSAD += m_temporalSAD; 518 518 m_addSADDepth = uiDepth; 519 } 520 #endif 521 522 #if H_3D_DIM_ENC 523 if( rpcBestCU->getSlice()->getIsDepth() && rpcBestCU->getSlice()->isIRAP() ) 524 { 525 earlyDetectionSkipMode = false; 519 526 } 520 527 #endif … … 682 689 683 690 // do normal intra modes 691 #if H_3D_DIM_ENC 692 if ( !bEarlySkip || ( rpcBestCU->getSlice()->getIsDepth() && rpcBestCU->getSlice()->isIRAP() ) ) 693 #else 684 694 if ( !bEarlySkip ) 695 #endif 685 696 { 686 697 // speedup for inter frames … … 688 699 rpcBestCU->getCbf( 0, TEXT_LUMA ) != 0 || 689 700 rpcBestCU->getCbf( 0, TEXT_CHROMA_U ) != 0 || 690 rpcBestCU->getCbf( 0, TEXT_CHROMA_V ) != 0 ) // avoid very complex intra if it is unlikely 701 rpcBestCU->getCbf( 0, TEXT_CHROMA_V ) != 0 702 #if H_3D_DIM_ENC 703 || ( rpcBestCU->getSlice()->getIsDepth() && rpcBestCU->getSlice()->isIRAP() ) 704 #endif 705 ) // avoid very complex intra if it is unlikely 691 706 { 692 707 xCheckRDCostIntra( rpcBestCU, rpcTempCU, SIZE_2Nx2N ); -
branches/HTM-DEV-0.3-dev1/source/Lib/TLibEncoder/TEncSearch.cpp
r459 r460 1013 1013 UInt& ruiDist, 1014 1014 #endif 1015 Int default0Save1Load2 ) 1015 Int default0Save1Load2 1016 #if H_3D_DIM_ENC 1017 , Bool zeroResi 1018 #endif 1019 ) 1016 1020 { 1017 1021 UInt uiLumaPredMode = pcCU ->getLumaIntraDir ( uiAbsPartIdx ); … … 1099 1103 for( UInt uiY = 0; uiY < uiHeight; uiY++ ) 1100 1104 { 1105 #if H_3D_DIM_ENC 1106 if( zeroResi ) 1107 { 1108 memset( pResi, 0, sizeof( Pel ) * uiWidth ); 1109 pResi += uiStride; 1110 } 1111 else 1112 { 1113 #endif 1101 1114 for( UInt uiX = 0; uiX < uiWidth; uiX++ ) 1102 1115 { … … 1106 1119 pResi += uiStride; 1107 1120 pPred += uiStride; 1121 #if H_3D_DIM_ENC 1122 } 1123 #endif 1108 1124 } 1109 1125 } … … 1404 1420 Bool bCheckFirst, 1405 1421 #endif 1406 Double& dRDCost ) 1422 Double& dRDCost 1423 #if H_3D_DIM_ENC 1424 , Bool zeroResi 1425 #endif 1426 ) 1407 1427 { 1408 1428 UInt uiFullDepth = pcCU->getDepth( 0 ) + uiTrDepth; … … 1514 1534 } 1515 1535 //----- code luma block with given intra prediction mode and store Cbf----- 1536 #if H_3D_DIM_ENC 1537 xIntraCodingLumaBlk( pcCU, uiTrDepth, uiAbsPartIdx, pcOrgYuv, pcPredYuv, pcResiYuv, singleDistYTmp, default0Save1Load2, zeroResi ); 1538 #else 1516 1539 xIntraCodingLumaBlk( pcCU, uiTrDepth, uiAbsPartIdx, pcOrgYuv, pcPredYuv, pcResiYuv, singleDistYTmp,default0Save1Load2); 1540 #endif 1517 1541 singleCbfYTmp = pcCU->getCbf( uiAbsPartIdx, TEXT_LUMA, uiTrDepth ); 1518 1542 //----- code chroma blocks with given intra prediction mode and store Cbf----- … … 2744 2768 for( UInt uiMode = 0; uiMode < numModesForFullRD; uiMode++ ) 2745 2769 { 2770 #if H_3D_DIM_ENC 2771 for( UInt testZeroResi = 0; testZeroResi <= ((pcCU->getSlice()->getIsDepth() && pcCU->getSlice()->isIRAP()) ? 1 : 0 ); testZeroResi++ ) 2772 { 2773 #endif 2746 2774 // set luma prediction mode 2747 2775 UInt uiOrgMode = uiRdModeList[uiMode]; … … 2770 2798 #endif 2771 2799 #if HHI_RQT_INTRA_SPEEDUP 2800 #if H_3D_DIM_ENC 2801 xRecurIntraCodingQT( pcCU, uiInitTrDepth, uiPartOffset, bLumaOnly, pcOrgYuv, pcPredYuv, pcResiYuv, uiPUDistY, uiPUDistC, true, dPUCost, (testZeroResi != 0) ); 2802 #else 2772 2803 xRecurIntraCodingQT( pcCU, uiInitTrDepth, uiPartOffset, bLumaOnly, pcOrgYuv, pcPredYuv, pcResiYuv, uiPUDistY, uiPUDistC, true, dPUCost ); 2804 #endif 2805 #else 2806 #if H_3D_DIM_ENC 2807 xRecurIntraCodingQT( pcCU, uiInitTrDepth, uiPartOffset, bLumaOnly, pcOrgYuv, pcPredYuv, pcResiYuv, uiPUDistY, uiPUDistC, dPUCost, (testZeroResi != 0) ); 2773 2808 #else 2774 2809 xRecurIntraCodingQT( pcCU, uiInitTrDepth, uiPartOffset, bLumaOnly, pcOrgYuv, pcPredYuv, pcResiYuv, uiPUDistY, uiPUDistC, dPUCost ); 2810 #endif 2775 2811 #endif 2776 2812 … … 2803 2839 uiSecondBestMode = uiOrgMode; 2804 2840 dSecondBestPUCost = dPUCost; 2841 } 2842 #endif 2843 #if H_3D_DIM_ENC 2805 2844 } 2806 2845 #endif … … 6761 6800 if( m_pcRdCost->getUseVSO() ) 6762 6801 { 6763 if( m_pcRdCost->getUseEstimatedVSD() ) 6802 if( m_pcRdCost->getUseEstimatedVSD() ) //PM: use VSO instead of VSD here? 6764 6803 { 6765 6804 uiActDist = m_pcRdCost->getDistPartVSD( pcCU, uiAbsPtIdx, piPred, uiPredStride, piRef, uiRefStride, uiWidth, uiHeight, false ); -
branches/HTM-DEV-0.3-dev1/source/Lib/TLibEncoder/TEncSearch.h
r459 r460 261 261 UInt& ruiDist, 262 262 #endif 263 Int default0Save1Load2 = 0); 263 Int default0Save1Load2 = 0 264 #if H_3D_DIM_ENC 265 , Bool zeroResi = false 266 #endif 267 ); 264 268 Void xIntraCodingChromaBlk ( TComDataCU* pcCU, 265 269 UInt uiTrDepth, … … 288 292 Bool bCheckFirst, 289 293 #endif 290 Double& dRDCost ); 294 Double& dRDCost 295 #if H_3D_DIM_ENC 296 , Bool zeroResi = false 297 #endif 298 ); 291 299 292 300 Void xSetIntraResultQT ( TComDataCU* pcCU,
Note: See TracChangeset for help on using the changeset viewer.