Changeset 292 in 3DVCSoftware for branches/HTM-5.1-dev0/source/Lib/TLibDecoder


Ignore:
Timestamp:
19 Feb 2013, 17:50:51 (12 years ago)
Author:
tech
Message:

Removed macros related to IV motion parameter prediction.

Location:
branches/HTM-5.1-dev0/source/Lib/TLibDecoder
Files:
7 edited

Legend:

Unmodified
Added
Removed

  • branches/HTM-5.1-dev0/source/Lib/TLibDecoder/TDecCAVLC.cpp

    r287 r292  
    18441844#if DEPTH_MAP_GENERATION
    18451845        UInt uiPredDepthMapGeneration = 0, uiPdmPrecision = 0;
    1846 #if HHI_INTER_VIEW_MOTION_PRED
     1846#if H3D_IVMP
    18471847        UInt uiMultiviewMvPredMode = 0;
    18481848#endif
    … …  
    18591859            READ_SVLC( iCode, "Pdm_offset" );   m_aaiTempPdmOffset       [ uiViewId ][ uiBaseId ] = iCode;
    18601860          }
    1861 #if HHI_INTER_VIEW_MOTION_PRED
     1861#if H3D_IVMP
    18621862          READ_UVLC( uiMultiviewMvPredMode, "multi_view_mv_pred_mode" );
    18631863#endif
    … …  
    18661866#endif
    18671867        }
    1868 #if HHI_INTER_VIEW_MOTION_PRED
     1868#if H3D_IVMP
    18691869        pcSPS->setPredDepthMapGeneration( uiViewId, false, uiPredDepthMapGeneration, uiMultiviewMvPredMode, uiPdmPrecision, m_aaiTempPdmScaleNomDelta, m_aaiTempPdmOffset );
    18701870#else
    … …  
    25012501  }
    25022502
    2503 #if ( HHI_MPI || HHI_INTER_VIEW_MOTION_PRED )
    2504   #if ( HHI_MPI && HHI_INTER_VIEW_MOTION_PRED )
     2503#if ( HHI_MPI || H3D_IVMP )
     2504  #if ( HHI_MPI && H3D_IVMP )
    25052505  const int iExtraMergeCandidates = ( sps->getUseMVI() || sps->getMultiviewMvPredMode() ) ? 1 : 0;
    25062506  #elif HHI_MPI
    … …  
    27802780#endif
    27812781
    2782 #if HHI_INTER_VIEW_MOTION_PRED
     2782#if H3D_IVMP
    27832783Void TDecCavlc::parseMVPIdx( Int& riMVPIdx, Int iAMVPCands )
    27842784#else

  • branches/HTM-5.1-dev0/source/Lib/TLibDecoder/TDecCAVLC.h

    r280 r292  
    141141  Void  parseTerminatingBit ( UInt& ruiBit );
    142142 
    143 #if HHI_INTER_VIEW_MOTION_PRED
     143#if H3D_IVMP
    144144  Void  parseMVPIdx         ( Int& riMVPIdx, Int iAMVPCands );
    145145#else

  • branches/HTM-5.1-dev0/source/Lib/TLibDecoder/TDecCu.cpp

    r287 r292  
    339339    m_ppcCU[uiDepth]->copyInterPredInfoFrom( pcCU, uiAbsPartIdx, REF_PIC_LIST_0 );
    340340    m_ppcCU[uiDepth]->copyInterPredInfoFrom( pcCU, uiAbsPartIdx, REF_PIC_LIST_1 );
    341 #if HHI_INTER_VIEW_MOTION_PRED
     341#if H3D_IVMP
    342342    TComMvField cMvFieldNeighbours[MRG_MAX_NUM_CANDS_MEM << 1]; // double length for mv of both lists
    343343    UChar uhInterDirNeighbours[MRG_MAX_NUM_CANDS_MEM];

  • branches/HTM-5.1-dev0/source/Lib/TLibDecoder/TDecEntropy.cpp

    r290 r292  
    276276
    277277#if CU_BASED_MRG_CAND_LIST
    278 #if HHI_INTER_VIEW_MOTION_PRED
     278#if H3D_IVMP
    279279  TComMvField cMvFieldNeighbours[MRG_MAX_NUM_CANDS_MEM << 1]; // double length for mv of both lists
    280280  UChar uhInterDirNeighbours[MRG_MAX_NUM_CANDS_MEM];
    … …  
    297297  {
    298298#if !CU_BASED_MRG_CAND_LIST
    299 #if HHI_INTER_VIEW_MOTION_PRED
     299#if H3D_IVMP
    300300    TComMvField cMvFieldNeighbours[MRG_MAX_NUM_CANDS_MEM << 1]; // double length for mv of both lists
    301301    UChar uhInterDirNeighbours[MRG_MAX_NUM_CANDS_MEM];
    … …  
    523523  if ( (pcSubCU->getInterDir(uiPartAddr) & ( 1 << eRefList )) && (pcSubCU->getAMVPMode(uiPartAddr) == AM_EXPL) )
    524524  {
    525 #if HHI_INTER_VIEW_MOTION_PRED
     525#if H3D_IVMP
    526526    const Int iNumAMVPCands = AMVP_MAX_NUM_CANDS + ( pcSubCU->getSlice()->getSPS()->getMultiviewMvPredMode() ? 1 : 0 );
    527527    m_pcEntropyDecoderIf->parseMVPIdx( iMVPIdx, iNumAMVPCands );
    … …  
    530530#endif
    531531  }
    532 #if SHARP_INTERVIEW_DECOUPLE_B0111
     532#if H3D_IVMP
    533533  pcSubCU->fillMvpCand(uiPartIdx, uiPartAddr, eRefList, iRefIdx, pAMVPInfo, iMVPIdx);
    534534#else

  • branches/HTM-5.1-dev0/source/Lib/TLibDecoder/TDecEntropy.h

    r280 r292  
    9999  virtual Void  parseTerminatingBit       ( UInt& ruilsLast )                                     = 0;
    100100 
    101 #if HHI_INTER_VIEW_MOTION_PRED
     101#if H3D_IVMP
    102102  virtual Void parseMVPIdx        ( Int& riMVPIdx, Int iNumAMVPCands ) = 0;
    103103#else

  • branches/HTM-5.1-dev0/source/Lib/TLibDecoder/TDecSbac.cpp

    r287 r292  
    728728#endif
    729729
    730 #if HHI_INTER_VIEW_MOTION_PRED
     730#if H3D_IVMP
    731731Void TDecSbac::parseMVPIdx      ( Int& riMVPIdx, Int iNumAMVPCands )
    732732{

  • branches/HTM-5.1-dev0/source/Lib/TLibDecoder/TDecSbac.h

    r287 r292  
    114114
    115115  Void  parseTerminatingBit       ( UInt& ruiBit );
    116 #if HHI_INTER_VIEW_MOTION_PRED
     116#if H3D_IVMP
    117117  Void  parseMVPIdx               ( Int& riMVPIdx, Int iNumAMVPCands );
    118118#else
Note: See TracChangeset for help on using the changeset viewer.