Changeset 471 in 3DVCSoftware for branches/HTM-DEV-0.3-dev1


Ignore:
Timestamp:
17 Jun 2013, 09:07:37 (11 years ago)
Author:
rwth
Message:
  • fixed H_3D_DIM_SDC encoder optimization
File:
1 edited

Legend:

Unmodified
Added
Removed
  • branches/HTM-DEV-0.3-dev1/source/Lib/TLibEncoder/TEncSearch.cpp

    r467 r471  
    19791979  //===== determine distortion =====
    19801980#if H_3D_VSO
    1981   if( m_pcRdCost->getUseVSO() )
    1982   {
    1983     if( m_pcRdCost->getUseEstimatedVSD() )
    1984     {
    1985       ruiDist = m_pcRdCost->getDistPartVSD( pcCU, uiAbsPartIdx, piReco, uiStride, piOrg, uiStride, uiWidth, uiHeight, false );
    1986     }
    1987     else
    1988     {
    1989       ruiDist = m_pcRdCost->getDistPartVSO( pcCU, uiAbsPartIdx, piReco, uiStride, piOrg, uiStride, uiWidth, uiHeight, false );
    1990     }
    1991   }
     1981  if ( m_pcRdCost->getUseVSO() )
     1982    ruiDist = m_pcRdCost->getDistPartVSO  ( pcCU, uiAbsPartIdx, piReco, uiStride, piOrg, uiStride, uiWidth, uiHeight, false );
    19921983  else
    19931984#endif
    1994   {
    1995     ruiDist = m_pcRdCost->getDistPart( g_bitDepthY, piReco, uiStride, piOrg, uiStride, uiWidth, uiHeight );
    1996   }
    1997  
    1998   //----- determine rate and r-d cost -----
     1985    ruiDist = m_pcRdCost->getDistPart(g_bitDepthY, piReco, uiStride, piOrg, uiStride, uiWidth, uiHeight );
     1986 
     1987  //===== determine rate and r-d cost =====
    19991988  m_pcEntropyCoder->resetBits();
    20001989 
    20011990  // encode reduced intra header
    2002   m_pcEntropyCoder->encodeSkipFlag( pcCU, 0, true );
    20031991  m_pcEntropyCoder->encodePredMode( pcCU, 0, true );
    20041992 
    2005   // encode pred direction + residual data
     1993  // encode pred direction + DC residual data
    20061994  m_pcEntropyCoder->encodePredInfo( pcCU, 0, true );
    2007   UInt   uiBits = m_pcEntropyCoder->getNumberOfWrittenBits();
    2008  
    2009 #if HHI_VSO
     1995  UInt uiBits = m_pcEntropyCoder->getNumberOfWrittenBits();
     1996 
     1997#if H_3D_VSO
    20101998  if ( m_pcRdCost->getUseLambdaScaleVSO())
    2011   {
    20121999    dRDCost = m_pcRdCost->calcRdCostVSO( uiBits, ruiDist );
    2013   }
    20142000  else
    20152001#endif
    2016   {
    20172002    dRDCost = m_pcRdCost->calcRdCost( uiBits, ruiDist );
    2018   }
    20192003}
    20202004#endif
Note: See TracChangeset for help on using the changeset viewer.