Changeset 841 in 3DVCSoftware


Ignore:
Timestamp:
8 Feb 2014, 18:03:54 (11 years ago)
Author:
tech
Message:

Further fixes.

Location:
branches/HTM-10.0rc1-dev0/source
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • branches/HTM-10.0rc1-dev0/source/App/TAppDecoder/TAppDecTop.cpp

    r840 r841  
    165165  Bool firstSlice        = true;
    166166#endif
    167   Bool loopFiltered = false;
     167  Bool loopFiltered      = false;
    168168
    169169  while (!!bitstreamFile)
     
    297297    if (bNewPicture || !bitstreamFile || nalu.m_nalUnitType == NAL_UNIT_EOS )
    298298    {
    299 #if H_MV
    300       assert( decIdxLastPic != -1 );
    301       // TODO add loop filtered variable here
    302       m_tDecTop[decIdxLastPic]->endPicDecoding(poc, pcListPic, m_targetDecLayerIdSet );
    303 #else
    304299      if (!loopFiltered || bitstreamFile)
    305300      {
     301#if H_MV
     302        assert( decIdxLastPic != -1 );
     303        m_tDecTop[decIdxLastPic]->endPicDecoding(poc, pcListPic, m_targetDecLayerIdSet );
     304#else
    306305        m_cTDecTop.executeLoopFilters(poc, pcListPic);
     306#endif
    307307      }
    308308      loopFiltered = (nalu.m_nalUnitType == NAL_UNIT_EOS);
    309 #endif
    310309    }
    311310#if H_3D
  • branches/HTM-10.0rc1-dev0/source/Lib/TLibEncoder/TEncSlice.cpp

    r838 r841  
    393393  // store lambda
    394394  m_pcRdCost ->setLambda( dLambda );
     395
     396#if H_3D_VSO
     397  m_pcRdCost->setUseLambdaScaleVSO  ( (m_pcCfg->getUseVSO() ||  m_pcCfg->getForceLambdaScaleVSO()) && m_pcCfg->getIsDepth() );
     398  m_pcRdCost->setLambdaVSO          ( dLambda * m_pcCfg->getLambdaScaleVSO() );
     399
     400  // Should be moved to TEncTop
     401 
     402  // SAIT_VSO_EST_A0033
     403  m_pcRdCost->setDisparityCoeff( m_pcCfg->getDispCoeff() );
     404
     405  // LGE_WVSO_A0119
     406  if( m_pcCfg->getUseWVSO() && m_pcCfg->getIsDepth() )
     407  {
     408    m_pcRdCost->setDWeight  ( m_pcCfg->getDWeight()   );
     409    m_pcRdCost->setVSOWeight( m_pcCfg->getVSOWeight() );
     410    m_pcRdCost->setVSDWeight( m_pcCfg->getVSDWeight() );
     411  }
     412
     413#endif
     414
    395415// for RDO
    396416  // in RdCost there is only one lambda because the luma and chroma bits are not separated, instead we weight the distortion of chroma.
Note: See TracChangeset for help on using the changeset viewer.