Changeset 188 in 3DVCSoftware for branches/HTM-4.1-dev0/source/Lib/TLibEncoder
- Timestamp:
- 15 Nov 2012, 21:36:12 (12 years ago)
- Location:
- branches/HTM-4.1-dev0/source/Lib/TLibEncoder
- Files:
-
- 8 edited
Legend:
- Unmodified
- Added
- Removed
-
branches/HTM-4.1-dev0/source/Lib/TLibEncoder/TEncCfg.h
r181 r188 279 279 Int m_iColumnRowInfoPresent; 280 280 Int m_iUniformSpacingIdr; 281 #if FIX_REMOVE_TILE_DEPENDENCE282 #else283 Int m_iTileBoundaryIndependenceIdr;284 #endif285 281 Int m_iNumColumnsMinus1; 286 282 UInt* m_puiColumnWidth; -
branches/HTM-4.1-dev0/source/Lib/TLibEncoder/TEncCu.cpp
r187 r188 1348 1348 1349 1349 #if HHI_VSO 1350 #if HHI_VSO_SET_OPTIM1351 #else1352 if( m_pcRdCost->getUseRenModel() ) // necessary ??1353 {1354 UInt uiWidth = m_ppcRecoYuvBest[uhNextDepth]->getWidth ( );1355 UInt uiHeight = m_ppcRecoYuvBest[uhNextDepth]->getHeight ( );1356 Pel* piSrc = m_ppcRecoYuvBest[uhNextDepth]->getLumaAddr( 0 );1357 UInt uiSrcStride = m_ppcRecoYuvBest[uhNextDepth]->getStride ( );1358 m_pcRdCost->setRenModelData( pcSubBestPartCU, 0, piSrc, uiSrcStride, uiWidth, uiHeight );1359 }1360 #endif1361 1350 #endif 1362 1351 } -
branches/HTM-4.1-dev0/source/Lib/TLibEncoder/TEncGOP.cpp
r187 r188 449 449 #endif 450 450 451 #if HHI_VSO_SPEEDUP_A0033452 #else453 if ( iVSOMode == 4 )454 {455 m_pcEncTop->getEncTop()->setupRenModel( pcSlice->getPOC(), pcSlice->getViewId(), m_pcEncTop->isDepthCoder() ? 1 : 0 );456 }457 else458 {459 AOT(true);460 }461 #endif462 451 463 452 #if SAIT_VSO_EST_A0033 -
branches/HTM-4.1-dev0/source/Lib/TLibEncoder/TEncGOP.h
r101 r188 137 137 138 138 Void preLoopFilterPicAll ( TComPic* pcPic, UInt64& ruiDist, UInt64& ruiBits ); 139 #if HHI_VSO_SPEEDUP_A0033140 139 TEncTop* getEncTop() { return m_pcEncTop; } 141 #endif142 140 143 141 TEncSlice* getSliceEncoder() { return m_pcSliceEncoder; } -
branches/HTM-4.1-dev0/source/Lib/TLibEncoder/TEncSbac.cpp
r187 r188 307 307 } 308 308 309 #if CABAC_INIT_FLAG && POZNAN_CABAC_INIT_FLAG_FIX309 #if CABAC_INIT_FLAG && FIX_POZNAN_CABAC_INIT_FLAG 310 310 m_pcSlice->getPPS()->setEncPrevPOC( m_pcSlice->getPOC() ); 311 311 #endif -
branches/HTM-4.1-dev0/source/Lib/TLibEncoder/TEncSearch.cpp
r187 r188 6513 6513 6514 6514 Dist uiActDist = RDO_DIST_MAX; 6515 #if FIX_RDO_MACRO6516 6515 #if SAIT_VSO_EST_A0033 6517 6516 if ( m_pcRdCost->getUseEstimatedVSD() ) … … 6544 6543 #endif // LGE_WVSO_A0119 6545 6544 } 6546 #else // FIX_RDO_MACRO6547 #if SAIT_VSO_EST_A00336548 if ( m_pcRdCost->getUseEstimatedVSD() )6549 {6550 TComPicYuv* pcVirRec = m_pcRdCost->getVideoRecPicYuv();6551 TComPicYuv* pcVirOrg = m_pcRdCost->getDepthPicYuv();6552 uiActDist = m_pcRdCost->getDistPart( piPredic, uiStride, piOrig, uiStride, pcVirRec->getLumaAddr(pcCU->getAddr(),pcCU->getZorderIdxInCU()), pcVirOrg->getLumaAddr(pcCU->getAddr(),pcCU->getZorderIdxInCU()), pcVirRec->getStride(), uiWidth, uiHeight );6553 #if LGE_WVSO_A01196554 if ( m_pcRdCost->getUseWVSO() )6555 {6556 Int iDWeight = m_pcRdCost->getDWeight() * m_pcRdCost->getDWeight();6557 Int iVSDWeight = m_pcRdCost->getVSDWeight() * m_pcRdCost->getVSDWeight();6558 Dist iD = (Dist) m_pcRdCost->getDistPart( piPredic, uiStride, piOrig, uiStride, uiWidth, uiHeight, false, DF_SAD );6559 uiActDist = (iDWeight * iD + iVSDWeight * (Dist) uiActDist) / ( iDWeight + iVSDWeight);6560 }6561 #endif // LGE_WVSO_A01196562 }6563 else6564 #else // SAIT_VSO_EST_A0033 <-- wrong #else statement should be #endif6565 {6566 uiActDist = m_pcRdCost->getDistVS( pcCU, 0, piPredic, uiStride, piOrig, uiStride, uiWidth, uiHeight, false, 0 );6567 #if LGE_WVSO_A01196568 if ( m_pcRdCost->getUseWVSO() )6569 {6570 Int iDWeight = m_pcRdCost->getDWeight() * m_pcRdCost->getDWeight();6571 Int iVSOWeight = m_pcRdCost->getVSOWeight() * m_pcRdCost->getVSOWeight();6572 Dist iD = (Dist) m_pcRdCost->getDistPart( piPredic, uiStride, piOrig, uiStride, uiWidth, uiHeight, false, DF_SAD );6573 uiActDist = (iDWeight * iD + iVSOWeight * (Dist) uiActDist) / ( iDWeight + iVSOWeight);6574 }6575 #endif // LGE_WVSO_A01196576 }6577 #endif // SAIT_VSO_EST_A0033 <-- wrong #endif should be removed6578 #endif // FIX_RDO_MACRO6579 6545 6580 6546 if( uiActDist < uiBestDist || uiBestDist == RDO_DIST_MAX ) -
branches/HTM-4.1-dev0/source/Lib/TLibEncoder/TEncSlice.cpp
r187 r188 38 38 #include "TEncTop.h" 39 39 #include "TEncSlice.h" 40 #if HHI_VSO_SPEEDUP_A003341 40 #include "../../App/TAppEncoder/TAppEncTop.h" 42 #endif43 41 #include <math.h> 44 42 … … 659 657 m_uiPicDist = 0; 660 658 661 #if CABAC_INIT_FLAG && POZNAN_CABAC_INIT_FLAG_FIX659 #if CABAC_INIT_FLAG && FIX_POZNAN_CABAC_INIT_FLAG 662 660 Bool bReset =(pcSlice->getPOC() == 0) || 663 661 (pcSlice->getPOC() % m_pcCfg->getIntraPeriod() == 0) || … … 823 821 UInt uiTileLCUX = 0; 824 822 825 #if HHI_VSO_SPEEDUP_A0033826 823 Int iLastPosY = -1; 827 #endif828 824 829 825 // for every CU in slice … … 838 834 pcCU->initCU( rpcPic, uiCUAddr ); 839 835 840 #if HHI_VSO_SPEEDUP_A0033841 836 if ( m_pcRdCost->getUseRenModel() ) 842 837 { … … 852 847 } 853 848 } 854 #endif855 849 856 850 // inherit from TR if necessary, select substream to use. -
branches/HTM-4.1-dev0/source/Lib/TLibEncoder/TEncTop.cpp
r181 r188 91 91 { 92 92 // initialize global variables 93 #if FIX_INIT_ROM94 93 if( m_viewId == 0 && m_isDepth == false ) 95 94 { 96 #endif97 95 initROM(); 98 #if FIX_INIT_ROM 99 } 100 #endif 96 } 101 97 102 98 … … 605 601 // mark it should be extended 606 602 rpcPic->getPicYuvRec()->setBorderExtension(false); 607 #if FIXES608 603 rpcPic->getPicYuvOrg()->setBorderExtension(false); 609 #endif610 604 } 611 605 … … 1106 1100 1107 1101 // # substreams is "per tile" when tiles are independent. 1108 #if FIX_REMOVE_TILE_DEPENDENCE1109 1102 if ( m_iWaveFrontSynchro ) 1110 #else1111 if (m_iTileBoundaryIndependenceIdr && m_iWaveFrontSynchro)1112 #endif1113 1103 { 1114 1104 m_cPPS.setNumSubstreams(m_iWaveFrontSubstreams * (m_iNumColumnsMinus1+1)*(m_iNumRowsMinus1+1));
Note: See TracChangeset for help on using the changeset viewer.