Changeset 1282 in 3DVCSoftware for branches/HTM-14.1-update-dev1/source/Lib/TLibEncoder/TEncCu.cpp
- Timestamp:
- 18 Jul 2015, 09:07:20 (9 years ago)
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
branches/HTM-14.1-update-dev1/source/Lib/TLibEncoder/TEncCu.cpp
r1279 r1282 716 716 if( rpcTempCU->getSlice()->getDepthBasedBlkPartFlag() && rpcTempCU->getSlice()->getDefaultRefViewIdxAvailableFlag() ) 717 717 { 718 xCheckRDCostInterDBBP( rpcBestCU, rpcTempCU , false );718 xCheckRDCostInterDBBP( rpcBestCU, rpcTempCU DEBUG_STRING_PASS_INTO(sDebug), false ); 719 719 rpcTempCU->initEstData( uiDepth, iQP, bIsLosslessMode ); 720 720 #if NH_3D_VSP || NH_3D_DBBP … … 1916 1916 for( Int nARPW=nARPWMax; nARPW >= 0 ; nARPW-- ) 1917 1917 { 1918 #if NH_3D 1919 #if DEBUG_STRING 1920 bestStr.clear(); 1921 #endif 1922 #endif 1918 1923 #if NH_3D_IV_MERGE 1919 1924 memset( mergeCandBuffer, 0, MRG_MAX_NUM_CANDS_MEM*sizeof(Int) ); … … 2510 2515 2511 2516 #if NH_3D_DBBP 2512 Void TEncCu::xCheckRDCostInterDBBP( TComDataCU*& rpcBestCU, TComDataCU*& rpcTempCU , Bool bUseMRG )2517 Void TEncCu::xCheckRDCostInterDBBP( TComDataCU*& rpcBestCU, TComDataCU*& rpcTempCU DEBUG_STRING_FN_DECLARE(sDebug), Bool bUseMRG ) 2513 2518 { 2519 DEBUG_STRING_NEW(sTest) 2514 2520 AOF( !rpcTempCU->getSlice()->getIsDepth() ); 2515 2521 … … 2582 2588 rpcTempCU->getDBBPTmpData()->eVirtualPartSize = eVirtualPartSize; 2583 2589 rpcTempCU->getDBBPTmpData()->uiVirtualPartIndex = uiSegment; 2584 m_pcPredSearch->predInterSearch( rpcTempCU, m_ppcOrigYuvDBBP[uhDepth], apPredYuv[uiSegment], m_ppcResiYuvTemp[uhDepth], m_ppcResiYuvTemp[uhDepth] , false, bUseMRG );2590 m_pcPredSearch->predInterSearch( rpcTempCU, m_ppcOrigYuvDBBP[uhDepth], apPredYuv[uiSegment], m_ppcResiYuvTemp[uhDepth], m_ppcResiYuvTemp[uhDepth] DEBUG_STRING_PASS_INTO(sTest), false, bUseMRG ); 2585 2591 m_pcRdCost->setUseMask(false); 2586 2592 … … 2641 2647 Int bitDepthY = rpcTempCU->getSlice()->getSPS()->getBitDepth(CHANNEL_TYPE_LUMA); 2642 2648 m_pcPredSearch->combineSegmentsWithMask(apPredYuv, m_ppcPredYuvTemp[uhDepth], pMask, uiWidth, uiHeight, 0, eVirtualPartSize, bitDepthY); 2643 m_pcPredSearch->encodeResAndCalcRdInterCU( rpcTempCU, m_ppcOrigYuv[uhDepth], m_ppcPredYuvTemp[uhDepth], m_ppcResiYuvTemp[uhDepth], m_ppcResiYuvBest[uhDepth], m_ppcRecoYuvTemp[uhDepth], false );2649 m_pcPredSearch->encodeResAndCalcRdInterCU( rpcTempCU, m_ppcOrigYuv[uhDepth], m_ppcPredYuvTemp[uhDepth], m_ppcResiYuvTemp[uhDepth], m_ppcResiYuvBest[uhDepth], m_ppcRecoYuvTemp[uhDepth], false DEBUG_STRING_PASS_INTO(sTest) ); 2644 2650 2645 2651 xCheckDQP( rpcTempCU ); 2646 xCheckBestMode(rpcBestCU, rpcTempCU, uhDepth );2652 xCheckBestMode(rpcBestCU, rpcTempCU, uhDepth DEBUG_STRING_PASS_INTO(sDebug) DEBUG_STRING_PASS_INTO(sTest) ); 2647 2653 } 2648 2654 #endif … … 2715 2721 2716 2722 xCheckDQP( rpcTempCU ); 2717 xCheckBestMode(rpcBestCU, rpcTempCU, uiDepth );2723 xCheckBestMode(rpcBestCU, rpcTempCU, uiDepth DEBUG_STRING_PASS_INTO(sDebug) DEBUG_STRING_PASS_INTO(sTest) ); 2718 2724 } 2719 2725 #endif
Note: See TracChangeset for help on using the changeset viewer.