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


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

Removed macros related to DMMs, IVRP and VSP/Texture Merge candidate.

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

Legend:

Unmodified
Added
Removed

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

    r294 r295  
    14921492      pcSPS->setPredDepthMapGeneration( 0, false );
    14931493#endif
    1494 #if HHI_INTER_VIEW_RESIDUAL_PRED
     1494#if H3D_IVRP
    14951495    pcSPS->setMultiviewResPredMode  ( 0 );
    14961496#endif
    … …  
    15071507        pcSPS->setPredDepthMapGeneration( uiCode, true );
    15081508#endif
    1509 #if HHI_INTER_VIEW_RESIDUAL_PRED
     1509#if H3D_IVRP
    15101510      pcSPS->setMultiviewResPredMode  ( 0 );
    15111511#endif
    … …  
    15371537        UInt uiMultiviewMvPredMode = 0;
    15381538#endif
    1539 #if HHI_INTER_VIEW_RESIDUAL_PRED
     1539#if H3D_IVRP
    15401540      UInt uiMultiviewResPredMode = 0;
    15411541#endif
    … …  
    15521552          READ_UVLC( uiMultiviewMvPredMode, "multi_view_mv_pred_mode" );
    15531553#endif
    1554 #if HHI_INTER_VIEW_RESIDUAL_PRED
     1554#if H3D_IVRP
    15551555          READ_FLAG( uiMultiviewResPredMode, "multi_view_residual_pred_mode" );
    15561556#endif
    … …  
    15621562#endif
    15631563#endif
    1564 #if HHI_INTER_VIEW_RESIDUAL_PRED
     1564#if H3D_IVRP
    15651565      pcSPS->setMultiviewResPredMode  ( uiMultiviewResPredMode );
    15661566#endif
    … …  
    23812381}
    23822382
    2383 #if HHI_INTER_VIEW_RESIDUAL_PRED
     2383#if H3D_IVRP
    23842384Void
    23852385TDecCavlc::parseResPredFlag( TComDataCU* pcCU, Bool& rbResPredFlag, UInt uiAbsPartIdx, UInt uiDepth )

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

    r294 r295  
    141141  Void parseMergeFlag       ( TComDataCU* pcCU, UInt uiAbsPartIdx, UInt uiDepth, UInt uiPUIdx );
    142142  Void parseMergeIndex      ( TComDataCU* pcCU, UInt& ruiMergeIndex, UInt uiAbsPartIdx, UInt uiDepth );
    143 #if HHI_INTER_VIEW_RESIDUAL_PRED
     143#if H3D_IVRP
    144144  Void parseResPredFlag     ( TComDataCU* pcCU, Bool& rbResPredFlag, UInt uiAbsPartIdx, UInt uiDepth );
    145145#endif

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

    r294 r295  
    5454  m_ppcYuvResi = NULL;
    5555  m_ppcYuvReco = NULL;
    56 #if HHI_INTER_VIEW_RESIDUAL_PRED
     56#if H3D_IVRP
    5757  m_ppcYuvResPred = NULL;
    5858#endif
    … …  
    8282  m_ppcYuvResi = new TComYuv*[m_uiMaxDepth-1];
    8383  m_ppcYuvReco = new TComYuv*[m_uiMaxDepth-1];
    84 #if HHI_INTER_VIEW_RESIDUAL_PRED
     84#if H3D_IVRP
    8585  m_ppcYuvResPred = new TComYuv*   [m_uiMaxDepth-1];
    8686#endif
    … …  
    9696    m_ppcYuvResi[ui] = new TComYuv;    m_ppcYuvResi[ui]->create( uiWidth, uiHeight );
    9797    m_ppcYuvReco[ui] = new TComYuv;    m_ppcYuvReco[ui]->create( uiWidth, uiHeight );
    98 #if HHI_INTER_VIEW_RESIDUAL_PRED
     98#if H3D_IVRP
    9999    m_ppcYuvResPred[ui] = new TComYuv;    m_ppcYuvResPred[ui]->create( uiWidth, uiHeight );
    100100#endif
    … …  
    120120    m_ppcYuvResi[ui]->destroy(); delete m_ppcYuvResi[ui]; m_ppcYuvResi[ui] = NULL;
    121121    m_ppcYuvReco[ui]->destroy(); delete m_ppcYuvReco[ui]; m_ppcYuvReco[ui] = NULL;
    122 #if HHI_INTER_VIEW_RESIDUAL_PRED
     122#if H3D_IVRP
    123123    m_ppcYuvResPred[ui]->destroy(); delete m_ppcYuvResPred[ui]; m_ppcYuvResPred[ui] = NULL;
    124124#endif
    … …  
    128128  delete [] m_ppcYuvResi; m_ppcYuvResi = NULL;
    129129  delete [] m_ppcYuvReco; m_ppcYuvReco = NULL;
    130 #if HHI_INTER_VIEW_RESIDUAL_PRED
     130#if H3D_IVRP
    131131  delete [] m_ppcYuvResPred; m_ppcYuvResPred = NULL;
    132132#endif
    … …  
    409409    }
    410410#endif
    411 #if HHI_INTER_VIEW_RESIDUAL_PRED && !MTK_MDIVRP_C0138
     411#if H3D_IVRP && !MTK_MDIVRP_C0138
    412412    m_pcEntropyDecoder->decodeResPredFlag( pcCU, uiAbsPartIdx, uiDepth, m_ppcCU[uiDepth], 0 );
    413413#endif
    … …  
    460460#endif
    461461
    462 #if HHI_INTER_VIEW_RESIDUAL_PRED && !MTK_MDIVRP_C0138
     462#if H3D_IVRP && !MTK_MDIVRP_C0138
    463463  if( !pcCU->isIntra( uiAbsPartIdx ) )
    464464  {
    … …  
    691691#endif
    692692
    693 #if HHI_INTER_VIEW_RESIDUAL_PRED && !MTK_MDIVRP_C0138
     693#if H3D_IVRP && !MTK_MDIVRP_C0138
    694694  if( pcCU->getResPredFlag( 0 ) )
    695695  {
    … …  
    721721  else
    722722  {
    723 #if HHI_INTER_VIEW_RESIDUAL_PRED
     723#if H3D_IVRP
    724724#if MTK_MDIVRP_C0138
    725725    if (pcCU->getMergeFlag(0) && pcCU->getMergeIndex(0)==0 && pcCU->getResPredAvail(0))

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

    r231 r295  
    6161  TComYuv**           m_ppcYuvResi;       ///< array of residual buffer
    6262  TComYuv**           m_ppcYuvReco;       ///< array of prediction & reconstruction buffer
    63 #if HHI_INTER_VIEW_RESIDUAL_PRED
     63#if H3D_IVRP
    6464  TComYuv**           m_ppcYuvResPred;    ///< residual prediction buffer
    6565#endif

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

    r294 r295  
    108108}
    109109
    110 #if HHI_INTER_VIEW_RESIDUAL_PRED && !MTK_MDIVRP_C0138
     110#if H3D_IVRP && !MTK_MDIVRP_C0138
    111111Void
    112112TDecEntropy::decodeResPredFlag( TComDataCU* pcCU, UInt uiAbsPartIdx, UInt uiDepth, TComDataCU* pcSubCU, UInt uiPUIdx )

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

    r294 r295  
    103103  virtual Void parseMergeFlag     ( TComDataCU* pcCU, UInt uiAbsPartIdx, UInt uiDepth, UInt uiPUIdx ) = 0;
    104104  virtual Void parseMergeIndex    ( TComDataCU* pcCU, UInt& ruiMergeIndex, UInt uiAbsPartIdx, UInt uiDepth ) = 0;
    105 #if HHI_INTER_VIEW_RESIDUAL_PRED
     105#if H3D_IVRP
    106106  virtual Void parseResPredFlag   ( TComDataCU* pcCU, Bool& rbResPredFlag, UInt uiAbsPartIdx, UInt uiDepth ) = 0;
    107107#endif
    … …  
    198198  Void decodeMergeFlag         ( TComDataCU* pcCU, UInt uiAbsPartIdx, UInt uiDepth, UInt uiPUIdx );
    199199  Void decodeMergeIndex        ( TComDataCU* pcSubCU, UInt uiPartIdx, UInt uiPartAddr, PartSize eCUMode, UChar* puhInterDirNeighbours, TComMvField* pcMvFieldNeighbours, UInt uiDepth );
    200 #if HHI_INTER_VIEW_RESIDUAL_PRED && !MTK_MDIVRP_C0138
     200#if H3D_IVRP && !MTK_MDIVRP_C0138
    201201  Void decodeResPredFlag       ( TComDataCU* pcCU, UInt uiAbsPartIdx, UInt uiDepth, TComDataCU* pcSubCU, UInt uiPUIdx );
    202202#endif

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

    r294 r295  
    9393                   ,TComDepthMapGenerator*  pcDepthMapGenerator
    9494#endif
    95 #if HHI_INTER_VIEW_RESIDUAL_PRED
     95#if H3D_IVRP
    9696                  ,TComResidualGenerator*  pcResidualGenerator
    9797#endif
    … …  
    109109  m_pcDepthMapGenerator   = pcDepthMapGenerator;
    110110#endif
    111 #if HHI_INTER_VIEW_RESIDUAL_PRED
     111#if H3D_IVRP
    112112  m_pcResidualGenerator   = pcResidualGenerator;
    113113#endif
    … …  
    298298      m_pcDepthMapGenerator->predictDepthMap  ( rpcPic );
    299299#endif
    300 #if HHI_INTER_VIEW_RESIDUAL_PRED
     300#if H3D_IVRP
    301301      m_pcResidualGenerator->initViewComponent( rpcPic );
    302302#endif
    … …  
    331331  else
    332332  {
    333 #if HHI_INTER_VIEW_RESIDUAL_PRED
     333#if H3D_IVRP
    334334    // set residual picture
    335335    m_pcResidualGenerator->setRecResidualPic( rpcPic );

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

    r294 r295  
    9090  TComDepthMapGenerator*  m_pcDepthMapGenerator;
    9191#endif
    92 #if HHI_INTER_VIEW_RESIDUAL_PRED
     92#if H3D_IVRP
    9393  TComResidualGenerator*  m_pcResidualGenerator;
    9494#endif
    … …  
    118118                 ,TComDepthMapGenerator*  pcDepthMapGenerator
    119119#endif
    120 #if HHI_INTER_VIEW_RESIDUAL_PRED
     120#if H3D_IVRP
    121121                ,TComResidualGenerator*  pcResidualGenerator
    122122#endif

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

    r294 r295  
    6262, m_cCUMergeFlagExtSCModel    ( 1,             1,               NUM_MERGE_FLAG_EXT_CTX        , m_contextModels + m_numContextModels, m_numContextModels)
    6363, m_cCUMergeIdxExtSCModel     ( 1,             1,               NUM_MERGE_IDX_EXT_CTX         , m_contextModels + m_numContextModels, m_numContextModels)
    64 #if HHI_INTER_VIEW_RESIDUAL_PRED
     64#if H3D_IVRP
    6565, m_cResPredFlagSCModel       ( 1,             1,               NUM_RES_PRED_FLAG_CTX         , m_contextModels + m_numContextModels, m_numContextModels)
    6666#endif
    … …  
    159159  m_cCUMergeFlagExtSCModel.initBuffer    ( sliceType, qp, (UChar*)INIT_MERGE_FLAG_EXT );
    160160  m_cCUMergeIdxExtSCModel.initBuffer     ( sliceType, qp, (UChar*)INIT_MERGE_IDX_EXT );
    161 #if HHI_INTER_VIEW_RESIDUAL_PRED
     161#if H3D_IVRP
    162162  m_cResPredFlagSCModel.initBuffer       ( sliceType, qp, (UChar*)INIT_RES_PRED_FLAG );
    163163#endif
    … …  
    246246  m_cCUMergeFlagExtSCModel.initBuffer    ( eSliceType, iQp, (UChar*)INIT_MERGE_FLAG_EXT );
    247247  m_cCUMergeIdxExtSCModel.initBuffer     ( eSliceType, iQp, (UChar*)INIT_MERGE_IDX_EXT );
    248 #if HHI_INTER_VIEW_RESIDUAL_PRED
     248#if H3D_IVRP
    249249  m_cResPredFlagSCModel.initBuffer       ( eSliceType, iQp, (UChar*)INIT_RES_PRED_FLAG );
    250250#endif
    … …  
    670670}
    671671
    672 #if HHI_INTER_VIEW_RESIDUAL_PRED
     672#if H3D_IVRP
    673673Void
    674674TDecSbac::parseResPredFlag( TComDataCU* pcCU, Bool& rbResPredFlag, UInt uiAbsPartIdx, UInt uiDepth )

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

    r294 r295  
    173173  Void parseMergeFlag     ( TComDataCU* pcCU, UInt uiAbsPartIdx, UInt uiDepth, UInt uiPUIdx );
    174174  Void parseMergeIndex    ( TComDataCU* pcCU, UInt& ruiMergeIndex, UInt uiAbsPartIdx, UInt uiDepth );
    175 #if HHI_INTER_VIEW_RESIDUAL_PRED
     175#if H3D_IVRP
    176176  Void parseResPredFlag   ( TComDataCU* pcCU, Bool& rbResPredFlag, UInt uiAbsPartIdx, UInt uiDepth );
    177177#endif
    … …  
    216216  ContextModel3DBuffer m_cCUMergeFlagExtSCModel;
    217217  ContextModel3DBuffer m_cCUMergeIdxExtSCModel;
    218 #if HHI_INTER_VIEW_RESIDUAL_PRED
     218#if H3D_IVRP
    219219  ContextModel3DBuffer m_cResPredFlagSCModel;
    220220#endif

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

    r294 r295  
    398398  m_cDepthMapGenerator.destroy();
    399399#endif
    400 #if HHI_INTER_VIEW_RESIDUAL_PRED
     400#if H3D_IVRP
    401401  m_cResidualGenerator.destroy();
    402402#endif
    … …  
    415415                    , &m_cDepthMapGenerator
    416416#endif
    417 #if HHI_INTER_VIEW_RESIDUAL_PRED
     417#if H3D_IVRP
    418418                    , &m_cResidualGenerator
    419419#endif
    … …  
    429429#endif
    430430#endif
    431 #if HHI_INTER_VIEW_RESIDUAL_PRED
     431#if H3D_IVRP
    432432  m_cResidualGenerator.init( &m_cTrQuant, &m_cDepthMapGenerator );
    433433#endif
    … …  
    465465}
    466466
    467 #if HHI_INTER_VIEW_RESIDUAL_PRED
     467#if H3D_IVRP
    468468Void
    469469TDecTop::deleteExtraPicBuffers( Int iPoc )
    … …  
    855855    }
    856856#endif
    857 #if HHI_INTER_VIEW_RESIDUAL_PRED
     857#if H3D_IVRP
    858858    m_cResidualGenerator.create( true, m_apcSlicePilot->getSPS()->getPicWidthInLumaSamples(), m_apcSlicePilot->getSPS()->getPicHeightInLumaSamples(), g_uiMaxCUDepth, g_uiMaxCUWidth, g_uiMaxCUHeight, g_uiBitDepth + g_uiBitIncrement );
    859859#endif

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

    r294 r295  
    213213  TComDepthMapGenerator   m_cDepthMapGenerator;
    214214#endif
    215 #if HHI_INTER_VIEW_RESIDUAL_PRED
     215#if H3D_IVRP
    216216  TComResidualGenerator   m_cResidualGenerator;
    217217#endif
    … …  
    249249  Void      xCopyVPS( TComVPS* pVPSV0);
    250250#endif
    251 #if HHI_INTER_VIEW_RESIDUAL_PRED
     251#if H3D_IVRP
    252252  Void      deleteExtraPicBuffers   ( Int iPoc );
    253253#endif
Note: See TracChangeset for help on using the changeset viewer.