Changeset 332 in 3DVCSoftware for trunk/source/Lib/TLibDecoder/TDecCu.cpp


Ignore:
Timestamp:
21 Apr 2013, 19:13:11 (11 years ago)
Author:
tech
Message:

Merged branch 6.1-Cleanup@329.

File:
1 edited

Legend:

Unmodified
Added
Removed
  • trunk/source/Lib/TLibDecoder/TDecCu.cpp

    r296 r332  
    409409    }
    410410#endif
    411 #if H3D_IVRP && !MTK_MDIVRP_C0138
    412     m_pcEntropyDecoder->decodeResPredFlag( pcCU, uiAbsPartIdx, uiDepth, m_ppcCU[uiDepth], 0 );
    413 #endif
    414411    xFinishDecodeCU( pcCU, uiAbsPartIdx, uiDepth, ruiIsLast );
    415412    return;
     
    460457#endif
    461458
    462 #if H3D_IVRP && !MTK_MDIVRP_C0138
    463   if( !pcCU->isIntra( uiAbsPartIdx ) )
    464   {
    465     m_pcEntropyDecoder->decodeResPredFlag    ( pcCU, uiAbsPartIdx, uiDepth, m_ppcCU[uiDepth], 0 );
    466   }
    467 #endif
    468459#if LGE_ILLUCOMP_DEPTH_C0046 && HHI_MPI
    469460  }
     
    679670  m_pcPrediction->motionCompensation( pcCU, m_ppcYuvReco[uiDepth] );
    680671#endif
    681 #if MTK_MDIVRP_C0138
     672#if H3D_IVRP
    682673  if (pcCU->getMergeFlag(0) && pcCU->getMergeIndex(0)==0 && pcCU->getResPredAvail(0))
    683674  {
     
    691682#endif
    692683
    693 #if H3D_IVRP && !MTK_MDIVRP_C0138
    694   if( pcCU->getResPredFlag( 0 ) )
    695   {
    696     AOF( pcCU->getResPredAvail( 0 ) );
    697     Bool bOK = pcCU->getResidualSamples( 0,
    698 #if QC_SIMPLIFIEDIVRP_M24938
    699       true,
    700 #endif
    701       m_ppcYuvResPred[uiDepth] );
    702     AOF( bOK );
    703 #if LG_RESTRICTEDRESPRED_M24766
    704     Int iPUResiPredShift[4];
    705     pcCU->getPUResiPredShift(iPUResiPredShift, 0);
    706     m_ppcYuvReco[uiDepth]->add(iPUResiPredShift, pcCU->getPartitionSize(0), m_ppcYuvResPred[uiDepth], pcCU->getWidth( 0 ), pcCU->getHeight( 0 ) );
    707 #else
    708     m_ppcYuvReco[uiDepth]->add( m_ppcYuvResPred[uiDepth], pcCU->getWidth( 0 ), pcCU->getHeight( 0 ) );
    709 #endif
    710   }
    711 #endif
    712 
    713684  // inter recon
    714685  xDecodeInterTexture( pcCU, 0, uiDepth );
     
    722693  {
    723694#if H3D_IVRP
    724 #if MTK_MDIVRP_C0138
    725695    if (pcCU->getMergeFlag(0) && pcCU->getMergeIndex(0)==0 && pcCU->getResPredAvail(0))
    726 #else
    727     if( pcCU->getResPredFlag( 0 ) )
    728 #endif
    729696    {
    730697      m_ppcYuvReco[uiDepth]->clip( pcCU->getWidth( 0 ), pcCU->getHeight( 0 ) );
Note: See TracChangeset for help on using the changeset viewer.