Ignore:
Timestamp:
26 Nov 2012, 22:32:00 (12 years ago)
Author:
tech
Message:

Changed macro switch names to match conventions.

Location:
branches/HTM-5.0-Qualcomm/source/Lib/TLibDecoder
Files:
9 edited

Legend:

Unmodified
Added
Removed

  • branches/HTM-5.0-Qualcomm/source/Lib/TLibDecoder/NALread.cpp

    r194 r195  
    132132#endif
    133133
    134 #if MVHEVC
     134#if QC_MVHEVC_B0046
    135135  //nalu.m_layerId    = bs.read(6);
    136136  nalu.m_layerId    = bs.read(5);
    … …  
    150150  if ( nalu.m_temporalId )
    151151  {
    152 #if QC_REM_IDV
     152#if QC_REM_IDV_B0046
    153153    assert( nalu.m_nalUnitType != NAL_UNIT_CODED_SLICE_CRA && nalu.m_nalUnitType != NAL_UNIT_CODED_SLICE_IDR);
    154154#else
    … …  
    163163  case NAL_UNIT_CODED_SLICE_IDR:
    164164#if H0566_TLA
    165 #if !QC_REM_IDV
     165#if !QC_REM_IDV_B0046
    166166  case NAL_UNIT_CODED_SLICE_IDV:
    167167#endif
    … …  
    186186      if (nalu.m_temporalId == 0)
    187187      {
    188 #if QC_REM_IDV
     188#if QC_REM_IDV_B0046
    189189        assert(nalu.m_nalUnitType == NAL_UNIT_CODED_SLICE || nalu.m_nalUnitType == NAL_UNIT_CODED_SLICE_CRA || nalu.m_nalUnitType == NAL_UNIT_CODED_SLICE_IDR);
    190190#else

  • branches/HTM-5.0-Qualcomm/source/Lib/TLibDecoder/TDecCAVLC.cpp

    r194 r195  
    13381338  }
    13391339}
    1340 #if MVHEVC
     1340#if QC_MVHEVC_B0046
    13411341Void TDecCavlc::parseVPS(TComVPS* pcVPS)
    13421342{
    … …  
    14791479 
    14801480  UInt  uiCode;
    1481 #if !MVHEVC
     1481#if !QC_MVHEVC_B0046
    14821482  Int   iCode;
    14831483#endif
    … …  
    17241724#endif
    17251725  READ_FLAG( uiCode, "sps_extension_flag");
    1726 #if !MVHEVC
     1726#if !QC_MVHEVC_B0046
    17271727  if(uiCode)
    17281728  {
    … …  
    19881988    }
    19891989#endif
    1990 #if QC_REM_IDV
    1991 #if !MVHEVC
     1990#if QC_REM_IDV_B0046
     1991#if !QC_MVHEVC_B0046
    19921992  if(rpcSlice->getNalUnitType()==NAL_UNIT_CODED_SLICE_IDR && rpcSlice->getSPS()->getViewId() == 0)
    19931993#else
    … …  
    20302030      }
    20312031      rpcSlice->setPOC( iPOCmsb+iPOClsb );
    2032 #if QC_REM_IDV
    2033 #if !MVHEVC
     2032#if QC_REM_IDV_B0046
     2033#if !QC_MVHEVC_B0046
    20342034      if( rpcSlice->getNalUnitType() == NAL_UNIT_CODED_SLICE_IDR &&  rpcSlice->getSPS()->getViewId() && rpcSlice->getPOC() == 0 )
    20352035#else
    … …  
    21782178    {
    21792179#if H0412_REF_PIC_LIST_RESTRICTION
    2180 #if MVHEVC
     2180#if QC_MVHEVC_B0046
    21812181    if( !rpcSlice->getViewId() || !rpcSlice->getSPS()->getListsModificationPresentFlag() )
    21822182#else
    … …  
    22532253    {
    22542254#if H0412_REF_PIC_LIST_RESTRICTION
    2255 #if MVHEVC
     2255#if QC_MVHEVC_B0046
    22562256    if( !rpcSlice->getViewId() || !rpcSlice->getSPS()->getListsModificationPresentFlag() )
    22572257#else
    … …  
    23412341     
    23422342#if H0412_REF_PIC_LIST_RESTRICTION
    2343 #if MVHEVC
     2343#if QC_MVHEVC_B0046
    23442344    if( rpcSlice->getViewId() && rpcSlice->getSPS()->getListsModificationPresentFlag() )
    23452345#else
    … …  
    30523052}
    30533053
    3054 #if MVHEVC
     3054#if QC_MVHEVC_B0046
    30553055/** Parse VPS alignment one bits.
    30563056 * \returns Void

  • branches/HTM-5.0-Qualcomm/source/Lib/TLibDecoder/TDecCAVLC.h

    r194 r195  
    7575  Void  xReadFlagTr           (              UInt& rValue, const Char *pSymbolName);
    7676#endif
    77 #if MVHEVC
     77#if QC_MVHEVC_B0046
    7878  Void  xReadVPSAlignOne      ();
    7979#endif
    … …  
    115115  Void  parseQtRootCbf      ( TComDataCU* pcCU, UInt uiAbsPartIdx, UInt uiDepth, UInt& uiQtRootCbf );
    116116
    117 #if VIDYO_VPS_INTEGRATION|MVHEVC
     117#if VIDYO_VPS_INTEGRATION|QC_MVHEVC_B0046
    118118  Void  parseVPS            ( TComVPS* pcVPS );
    119119#endif

  • branches/HTM-5.0-Qualcomm/source/Lib/TLibDecoder/TDecEntropy.h

    r194 r195  
    7171#endif
    7272
    73 #if VIDYO_VPS_INTEGRATION|MVHEVC
     73#if VIDYO_VPS_INTEGRATION|QC_MVHEVC_B0046
    7474  virtual Void  parseVPS                  ( TComVPS* pcVPS )                       = 0;
    7575#endif
    … …  
    175175  Void    resetEntropy                ( TComSlice* p)           { m_pcEntropyDecoderIf->resetEntropy(p);                    }
    176176
    177 #if VIDYO_VPS_INTEGRATION|MVHEVC
     177#if VIDYO_VPS_INTEGRATION|QC_MVHEVC_B0046
    178178  Void    decodeVPS                   ( TComVPS* pcVPS ) { m_pcEntropyDecoderIf->parseVPS(pcVPS); }
    179179#endif

  • branches/HTM-5.0-Qualcomm/source/Lib/TLibDecoder/TDecSbac.h

    r194 r195  
    8787  Void  setBitstream              ( TComInputBitstream* p  ) { m_pcBitstream = p; m_pcTDecBinIf->init( p ); }
    8888 
    89 #if VIDYO_VPS_INTEGRATION|MVHEVC
     89#if VIDYO_VPS_INTEGRATION|QC_MVHEVC_B0046
    9090  Void  parseVPS                  ( TComVPS* pcVPS )  {}
    9191#endif

  • branches/HTM-5.0-Qualcomm/source/Lib/TLibDecoder/TDecSlice.cpp

    r194 r195  
    446446, m_ppsBuffer(16)
    447447, m_apsBuffer(64)
    448 #if VIDYO_VPS_INTEGRATION|MVHEVC
     448#if VIDYO_VPS_INTEGRATION|QC_MVHEVC_B0046
    449449, m_vpsBuffer(16)
    450450#endif
    … …  
    458458}
    459459
    460 #if VIDYO_VPS_INTEGRATION|MVHEVC
     460#if VIDYO_VPS_INTEGRATION|QC_MVHEVC_B0046
    461461TComVPS* ParameterSetManagerDecoder::getPrefetchedVPS  (Int vpsId)
    462462{
    … …  
    513513  m_ppsMap.mergePSList(m_ppsBuffer);
    514514  m_spsMap.mergePSList(m_spsBuffer);
    515 #if VIDYO_VPS_INTEGRATION|MVHEVC
     515#if VIDYO_VPS_INTEGRATION|QC_MVHEVC_B0046
    516516  m_vpsMap.mergePSList(m_vpsBuffer);
    517517#endif

  • branches/HTM-5.0-Qualcomm/source/Lib/TLibDecoder/TDecSlice.h

    r194 r195  
    9696  Void     storePrefetchedAPS(TComAPS *aps)  { m_apsBuffer.storePS( aps->getAPSID(), aps); };
    9797  TComAPS* getPrefetchedAPS  (Int apsId);
    98 #if VIDYO_VPS_INTEGRATION|MVHEVC
     98#if VIDYO_VPS_INTEGRATION|QC_MVHEVC_B0046
    9999  Void     storePrefetchedVPS(TComVPS *vps)  { m_vpsBuffer.storePS( vps->getVPSId(), vps); };
    100100  TComVPS* getPrefetchedVPS  (Int vpsId);
    … …  
    106106  ParameterSetMap<TComPPS> m_ppsBuffer;
    107107  ParameterSetMap<TComAPS> m_apsBuffer;
    108 #if VIDYO_VPS_INTEGRATION|MVHEVC
     108#if VIDYO_VPS_INTEGRATION|QC_MVHEVC_B0046
    109109  ParameterSetMap<TComVPS> m_vpsBuffer;
    110110#endif

  • branches/HTM-5.0-Qualcomm/source/Lib/TLibDecoder/TDecTop.cpp

    r194 r195  
    5050  m_aaiCodedScale          = new Int* [ MAX_VIEW_NUM ];
    5151  m_aiViewOrderIndex       = new Int  [ MAX_VIEW_NUM ];
    52 #if MVHEVC
     52#if QC_MVHEVC_B0046
    5353  m_aiViewId               = new Int  [ MAX_VIEW_NUM ];
    5454#endif
    … …  
    269269  m_bFirstSliceInSequence   = true;
    270270  m_pcCamParsCollector = 0;
    271 #if MVHEVC
     271#if QC_MVHEVC_B0046
    272272  m_bFirstNal                  = false;
    273273#endif
    … …  
    584584  TComVPS *vps = m_parameterSetManagerDecoder.getVPS(sps->getVPSId());
    585585  assert (vps != 0);
    586 #if !QC_REM_IDV
     586#if !QC_REM_IDV_B0046
    587587  if( m_apcSlicePilot->getNalUnitType() == NAL_UNIT_CODED_SLICE_IDR || m_apcSlicePilot->getNalUnitType() == NAL_UNIT_CODED_SLICE_CRA )
    588588#else
    … …  
    594594  m_apcSlicePilot->setPPS(pps);
    595595  m_apcSlicePilot->setSPS(sps);
    596 #if MVHEVC
     596#if QC_MVHEVC_B0046
    597597  TComVPS *vps = m_parameterSetManagerDecoder.getVPS(sps->getVPSId());
    598598#endif
    599 #if VIDYO_VPS_INTEGRATION|MVHEVC
     599#if VIDYO_VPS_INTEGRATION|QC_MVHEVC_B0046
    600600  m_apcSlicePilot->setVPS(vps);
    601601#endif
    … …  
    639639  m_apcSlicePilot->setPPS(m_parameterSetManagerDecoder.getPrefetchedPPS(0));
    640640  m_apcSlicePilot->setSPS(m_parameterSetManagerDecoder.getPrefetchedSPS(0));
    641 #if VIDYO_VPS_INTEGRATION|MVHEVC
    642 #if MVHEVC
     641#if VIDYO_VPS_INTEGRATION|QC_MVHEVC_B0046
     642#if QC_MVHEVC_B0046
    643643  m_apcSlicePilot->setIsDepth(false);
    644644#endif
    … …  
    646646#endif
    647647  m_apcSlicePilot->initTiles();
    648 #if MVHEVC
     648#if QC_MVHEVC_B0046
    649649  m_apcSlicePilot->setViewId( nalu.m_layerId );
    650650  m_apcSlicePilot->setViewId( nalu.m_layerId );
    … …  
    672672  if( m_bFirstSliceInPicture )
    673673  {
    674 #if MVHEVC
     674#if QC_MVHEVC_B0046
    675675    if( nalu.m_layerId == 0 ) { m_nalUnitTypeBaseView = nalu.m_nalUnitType; }
    676676    else                     { m_nalUnitTypeBaseView = m_tAppDecTop->getTDecTop( 0, 0 )->getNalUnitTypeBaseView(); }
    … …  
    982982
    983983    // Set reference list
    984 #if !MVHEVC
     984#if !QC_MVHEVC_B0046
    985985#if VIDYO_VPS_INTEGRATION
    986986    pcSlice->setViewId( pcSlice->getVPS()->getViewId(nalu.m_layerId) );
    … …  
    11041104  m_cGopDecoder.decompressGop(nalu.m_Bitstream, pcPic, false);
    11051105
    1106 #if IV_AS_LT
     1106#if QC_IV_AS_LT_B0046
    11071107  std::vector<TComPic*> apcInterViewRefPics = m_tAppDecTop->getInterViewRefPics( m_viewId, pcSlice->getPOC(), m_isDepth, pcSlice->getSPS() );
    11081108  for( Int k = 0; k < apcInterViewRefPics.size(); k++ )
    … …  
    11231123}
    11241124
    1125 #if VIDYO_VPS_INTEGRATION|MVHEVC
     1125#if VIDYO_VPS_INTEGRATION|QC_MVHEVC_B0046
    11261126Void TDecTop::xDecodeVPS()
    11271127{
    … …  
    11301130  m_cEntropyDecoder.decodeVPS( vps );
    11311131  m_parameterSetManagerDecoder.storePrefetchedVPS(vps); 
    1132 #if !MVHEVC
     1132#if !QC_MVHEVC_B0046
    11331133  getTAppDecTop()->getVPSAccess()->addVPS( vps );
    11341134#endif
    … …  
    11981198  switch (nalu.m_nalUnitType)
    11991199  {
    1200 #if VIDYO_VPS_INTEGRATION|MVHEVC
     1200#if VIDYO_VPS_INTEGRATION|QC_MVHEVC_B0046
    12011201    case NAL_UNIT_VPS:
    12021202      xDecodeVPS();
    … …  
    12211221    case NAL_UNIT_CODED_SLICE_IDR:
    12221222#if H0566_TLA
    1223 #if !QC_REM_IDV
     1223#if !QC_REM_IDV_B0046
    12241224    case NAL_UNIT_CODED_SLICE_IDV:
    12251225#endif
    … …  
    12381238}
    12391239
    1240 #if MVHEVC
     1240#if QC_MVHEVC_B0046
    12411241Void TDecTop::xCopyVPS( TComVPS* pVPSV0 )
    12421242{

  • branches/HTM-5.0-Qualcomm/source/Lib/TLibDecoder/TDecTop.h

    r194 r195  
    8888  Int**   m_aaiCodedScale;
    8989  Int*    m_aiViewOrderIndex;
    90 #if MVHEVC
     90#if QC_MVHEVC_B0046
    9191  Int*    m_aiViewId;
    9292#endif
    … …  
    171171 
    172172  Void  deletePicBuffer();
    173 #if MVHEVC
     173#if QC_MVHEVC_B0046
    174174  Void      xCopySPS( TComSPS* pSPSV0);
    175175  Void      xCopyPPS( TComPPS* pPPSV0);
    … …  
    202202  TAppDecTop*         getTAppDecTop()                           { return  m_tAppDecTop; }
    203203  NalUnitType         getNalUnitTypeBaseView()                  { return m_nalUnitTypeBaseView; }
    204 #if MVHEVC
     204#if QC_MVHEVC_B0046
    205205  bool                m_bFirstNal; //used to copy SPS, PPS, VPS
    206206  ParameterSetManagerDecoder* xGetParaSetDec ()        {return  &m_parameterSetManagerDecoder;}
    … …  
    218218  Bool      xDecodeSlice(InputNALUnit &nalu, Int iSkipFrame, Int iPOCLastDisplay);
    219219#endif
    220 #if VIDYO_VPS_INTEGRATION|MVHEVC
     220#if VIDYO_VPS_INTEGRATION|QC_MVHEVC_B0046
    221221  Void      xDecodeVPS();
    222222#endif
Note: See TracChangeset for help on using the changeset viewer.