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/TLibEncoder
Files:
14 edited

Legend:

Unmodified
Added
Removed

  • branches/HTM-5.0-Qualcomm/source/Lib/TLibEncoder/NALwrite.cpp

    r194 r195  
    6464#endif
    6565
    66 #if MVHEVC
     66#if QC_MVHEVC_B0046
    6767  bsNALUHeader.write(nalu.m_layerId,        5); // when nal_ref_flag is signalled, 5 bits here. otherwise, 6 bits
    6868  bsNALUHeader.write(nalu.m_temporalId + 1, 3); // temporal_id
    … …  
    8383  case NAL_UNIT_CODED_SLICE_IDR:
    8484#if H0566_TLA
    85 #if !QC_REM_IDV
     85#if !QC_REM_IDV_B0046
    8686  case NAL_UNIT_CODED_SLICE_IDV:
    8787#endif
    … …  
    202202}
    203203
    204 #if !MVHEVC
     204#if !QC_MVHEVC_B0046
    205205/**
    206206 * Copy NALU from naluSrc to naluDest

  • branches/HTM-5.0-Qualcomm/source/Lib/TLibEncoder/NALwrite.h

    r194 r195  
    6262    NalRefIdc nalRefIDC,
    6363#endif
    64 #if VIDYO_VPS_INTEGRATION|MVHEVC
     64#if VIDYO_VPS_INTEGRATION|QC_MVHEVC_B0046
    6565    unsigned layerId,
    6666#else
    … …  
    7070    unsigned temporalID = 0)
    7171#if NAL_REF_FLAG
    72 #if VIDYO_VPS_INTEGRATION|MVHEVC
     72#if VIDYO_VPS_INTEGRATION|QC_MVHEVC_B0046
    7373  : NALUnit(nalUnitType, nalRefFlag, layerId, temporalID)
    7474#else

  • branches/HTM-5.0-Qualcomm/source/Lib/TLibEncoder/TEncCavlc.cpp

    r194 r195  
    375375}
    376376
    377 #if MVHEVC
     377#if QC_MVHEVC_B0046
    378378Void TEncCavlc::codeVPS( TComVPS* pcVPS )
    379379{
    … …  
    708708#endif
    709709  WRITE_FLAG( 1, "sps_extension_flag" );
    710 #if !MVHEVC
     710#if !QC_MVHEVC_B0046
    711711  WRITE_FLAG( (pcSPS->getNumberOfUsableInterViewRefs() > 0) ? 1 : 0, "interview_refs_present_flag" );
    712712  if( pcSPS->getNumberOfUsableInterViewRefs() > 0 )
    … …  
    884884  if (!bEntropySlice)
    885885  {
    886 #if MVHEVC
     886#if QC_MVHEVC_B0046
    887887    WRITE_UVLC( 0, "pic_parameter_set_id" );
    888888#else
    … …  
    895895    }
    896896#endif
    897 #if QC_REM_IDV
     897#if QC_REM_IDV_B0046
    898898    if(pcSlice->getNalUnitType()==NAL_UNIT_CODED_SLICE_IDR && pcSlice->getViewId() == 0)
    899899#else
    … …  
    907907    {
    908908      WRITE_CODE( (pcSlice->getPOC()-pcSlice->getLastIDR()+(1<<pcSlice->getSPS()->getBitsForPOC()))%(1<<pcSlice->getSPS()->getBitsForPOC()), pcSlice->getSPS()->getBitsForPOC(), "pic_order_cnt_lsb");
    909 #if QC_REM_IDV
     909#if QC_REM_IDV_B0046
    910910      if( pcSlice->getPOC() == 0 && !(pcSlice->getSPS()->getViewId() && (pcSlice->getNalUnitType() == NAL_UNIT_CODED_SLICE_IDR || pcSlice->getNalUnitType() == NAL_UNIT_CODED_SLICE_CRA)))
    911911#else

  • branches/HTM-5.0-Qualcomm/source/Lib/TLibEncoder/TEncCavlc.h

    r194 r195  
    114114  UInt  getCoeffCost          ()                { return  m_uiCoeffCost;  }
    115115 
    116 #if VIDYO_VPS_INTEGRATION|MVHEVC
     116#if VIDYO_VPS_INTEGRATION|QC_MVHEVC_B0046
    117117  Void  codeVPS                 ( TComVPS* pcVPS );
    118118#endif

  • branches/HTM-5.0-Qualcomm/source/Lib/TLibEncoder/TEncCfg.h

    r194 r195  
    307307#endif
    308308
    309 #if VIDYO_VPS_INTEGRATION|MVHEVC
     309#if VIDYO_VPS_INTEGRATION|QC_MVHEVC_B0046
    310310  UInt     m_layerId;
    311311#endif
    … …  
    820820  Int       getTSIG()                            { return m_signHidingThreshold; }
    821821#endif
    822 #if VIDYO_VPS_INTEGRATION |MVHEVC
     822#if VIDYO_VPS_INTEGRATION |QC_MVHEVC_B0046
    823823  Void      setLayerId             ( UInt layerId )   { m_layerId = layerId; }
    824824  UInt      getLayerId             ()               { return m_layerId; }

  • branches/HTM-5.0-Qualcomm/source/Lib/TLibEncoder/TEncEntropy.cpp

    r194 r195  
    121121}
    122122
    123 #if VIDYO_VPS_INTEGRATION|MVHEVC
     123#if VIDYO_VPS_INTEGRATION|QC_MVHEVC_B0046
    124124Void TEncEntropy::encodeVPS( TComVPS* pcVPS )
    125125{
    … …  
    129129#endif
    130130
    131 #if VIDYO_VPS_INTEGRATION|MVHEVC
     131#if VIDYO_VPS_INTEGRATION|QC_MVHEVC_B0046
    132132Void  codeVPS                 ( TComVPS* pcVPS );
    133133#endif

  • branches/HTM-5.0-Qualcomm/source/Lib/TLibEncoder/TEncEntropy.h

    r194 r195  
    7676  virtual UInt  getCoeffCost          ()                = 0;
    7777
    78 #if VIDYO_VPS_INTEGRATION|MVHEVC
     78#if VIDYO_VPS_INTEGRATION|QC_MVHEVC_B0046
    7979  virtual Void  codeVPS                 ( TComVPS* pcVPS )                                      = 0;
    8080#endif
    … …  
    242242 
    243243public:
    244 #if VIDYO_VPS_INTEGRATION|MVHEVC
     244#if VIDYO_VPS_INTEGRATION|QC_MVHEVC_B0046
    245245  Void encodeVPS               ( TComVPS* pcVPS);
    246246#endif

  • branches/HTM-5.0-Qualcomm/source/Lib/TLibEncoder/TEncGOP.cpp

    r194 r195  
    246246
    247247      std::vector<TComAPS>& vAPS = m_pcEncTop->getAPS();
    248 #if VIDYO_VPS_INTEGRATION|MVHEVC
     248#if VIDYO_VPS_INTEGRATION|QC_MVHEVC_B0046
    249249    m_pcSliceEncoder->initEncSlice ( pcPic, iPOCLast, uiPOCCurr, iNumPicRcvd, iGOPid, pcSlice, m_pcEncTop->getEncTop()->getVPS(), m_pcEncTop->getSPS(), m_pcEncTop->getPPS() );
    250250#else
    … …  
    298298      if( pcSlice->getSliceType() == B_SLICE )
    299299      {
    300 #if QC_REM_IDV
     300#if QC_REM_IDV_B0046
    301301      if( m_pcCfg->getGOPEntry(pcSlice->getSPS()->getViewId() && ((getNalUnitType(uiPOCCurr) == NAL_UNIT_CODED_SLICE_IDR) || (getNalUnitType(uiPOCCurr) == NAL_UNIT_CODED_SLICE_CRA))? MAX_GOP : iGOPid ).m_sliceType == 'P' ) { pcSlice->setSliceType( P_SLICE ); }
    302302#else
    … …  
    336336#endif
    337337
    338 #if !QC_REM_IDV
     338#if !QC_REM_IDV_B0046
    339339      pcSlice->setNumRefIdx( REF_PIC_LIST_0, min( m_pcCfg->getGOPEntry( (getNalUnitType(uiPOCCurr) == NAL_UNIT_CODED_SLICE_IDV) ? MAX_GOP : iGOPid ).m_numRefPicsActive, (pcSlice->getRPS()->getNumberOfPictures() + pcSlice->getSPS()->getNumberOfUsableInterViewRefs()) ) );
    340340      pcSlice->setNumRefIdx( REF_PIC_LIST_1, min( m_pcCfg->getGOPEntry( (getNalUnitType(uiPOCCurr) == NAL_UNIT_CODED_SLICE_IDV) ? MAX_GOP : iGOPid ).m_numRefPicsActive, (pcSlice->getRPS()->getNumberOfPictures() + pcSlice->getSPS()->getNumberOfUsableInterViewRefs()) ) );
    … …  
    373373      if( pcSlice->getSliceType() == B_SLICE )
    374374      {
    375 #if !QC_REM_IDV
     375#if !QC_REM_IDV_B0046
    376376        if( m_pcCfg->getGOPEntry( (getNalUnitType(uiPOCCurr) == NAL_UNIT_CODED_SLICE_IDV) ? MAX_GOP : iGOPid ).m_sliceType == 'P' ) { pcSlice->setSliceType( P_SLICE ); }
    377377#else
    … …  
    845845      if ( m_bSeqFirst )
    846846      {
    847 #if MVHEVC
     847#if QC_MVHEVC_B0046
    848848      if(!m_pcEncTop->getLayerId())
    849849      {
    850850#endif
    851 #if VIDYO_VPS_INTEGRATION|MVHEVC
     851#if VIDYO_VPS_INTEGRATION|QC_MVHEVC_B0046
    852852        {
    853853          OutputNALUnit nalu(NAL_UNIT_VPS, true, m_pcEncTop->getLayerId());
    … …  
    859859#endif
    860860#if NAL_REF_FLAG
    861 #if VIDYO_VPS_INTEGRATION|MVHEVC
     861#if VIDYO_VPS_INTEGRATION|QC_MVHEVC_B0046
    862862        OutputNALUnit nalu(NAL_UNIT_SPS, true, m_pcEncTop->getLayerId());
    863863#else
    … …  
    880880
    881881#if NAL_REF_FLAG
    882 #if VIDYO_VPS_INTEGRATION|MVHEVC
    883 #if MVHEVC
     882#if VIDYO_VPS_INTEGRATION|QC_MVHEVC_B0046
     883#if QC_MVHEVC_B0046
    884884        nalu = NALUnit(NAL_UNIT_PPS, true, m_pcEncTop->getLayerId());
    885885#else
    … …  
    896896        writeRBSPTrailingBits(nalu.m_Bitstream);
    897897        accessUnit.push_back(new NALUnitEBSP(nalu));
    898 #if MVHEVC
     898#if QC_MVHEVC_B0046
    899899      }
    900900#endif
    … …  
    10181018#if NAL_REF_FLAG
    10191019        OutputNALUnit nalu( pcSlice->getNalUnitType(), pcSlice->isReferenced(),
    1020 #if !VIDYO_VPS_INTEGRATION &!MVHEVC
     1020#if !VIDYO_VPS_INTEGRATION &!QC_MVHEVC_B0046
    10211021                           m_pcEncTop->getViewId(), m_pcEncTop->getIsDepth(), pcSlice->getTLayer() );
    10221022#else
    … …  
    14941494          {
    14951495#if NAL_REF_FLAG
    1496 #if VIDYO_VPS_INTEGRATION | MVHEVC
     1496#if VIDYO_VPS_INTEGRATION | QC_MVHEVC_B0046
    14971497            OutputNALUnit nalu(NAL_UNIT_APS, true, m_pcEncTop->getLayerId());
    14981498#else
    … …  
    15601560
    15611561#if NAL_REF_FLAG
    1562 #if VIDYO_VPS_INTEGRATION | MVHEVC
     1562#if VIDYO_VPS_INTEGRATION | QC_MVHEVC_B0046
    15631563        OutputNALUnit nalu(NAL_UNIT_SEI, false, m_pcEncTop->getLayerId());
    15641564#else
    … …  
    19981998  case NAL_UNIT_CODED_SLICE: return "SLICE";
    19991999#if H0566_TLA
    2000 #if !QC_REM_IDV
     2000#if !QC_REM_IDV_B0046
    20012001  case NAL_UNIT_CODED_SLICE_IDV: return "IDV";
    20022002#endif
    … …  
    22152215    if( bInterViewOnlySlice )
    22162216    {
    2217 #if !QC_REM_IDV
     2217#if !QC_REM_IDV_B0046
    22182218      return NAL_UNIT_CODED_SLICE_IDV;
    22192219#else
    … …  
    22322232      if( bInterViewOnlySlice )
    22332233      {
    2234 #if !QC_REM_IDV
     2234#if !QC_REM_IDV_B0046
    22352235        return NAL_UNIT_CODED_SLICE_IDV;
    22362236#else
    … …  
    22512251      if( bInterViewOnlySlice )
    22522252      {
    2253 #if !QC_REM_IDV
     2253#if !QC_REM_IDV_B0046
    22542254        return NAL_UNIT_CODED_SLICE_IDV;
    22552255#else
    … …  
    24932493
    24942494  // analyze inter-view modifications
    2495 #if !QC_REM_IDV
     2495#if !QC_REM_IDV_B0046
    24962496  GOPEntryMvc gem = m_pcCfg->getGOPEntry( (getNalUnitType(uiPOCCurr) == NAL_UNIT_CODED_SLICE_IDV) ? MAX_GOP : iGOPid );
    24972497#else

  • branches/HTM-5.0-Qualcomm/source/Lib/TLibEncoder/TEncSbac.cpp

    r194 r195  
    396396}
    397397
    398 #if VIDYO_VPS_INTEGRATION|MVHEVC
     398#if VIDYO_VPS_INTEGRATION|QC_MVHEVC_B0046
    399399Void TEncSbac::codeVPS( TComVPS* pcVPS )
    400400{

  • branches/HTM-5.0-Qualcomm/source/Lib/TLibEncoder/TEncSbac.h

    r194 r195  
    9898  //--SBAC RD
    9999
    100 #if VIDYO_VPS_INTEGRATION|MVHEVC
     100#if VIDYO_VPS_INTEGRATION|QC_MVHEVC_B0046
    101101  Void  codeVPS                 ( TComVPS* pcVPS );
    102102#endif

  • branches/HTM-5.0-Qualcomm/source/Lib/TLibEncoder/TEncSearch.cpp

    r194 r195  
    42844284  }
    42854285#endif
    4286 #if MVHEVC
     4286#if QC_MVHEVC_B0046
    42874287  m_pcRdCost->setMultiviewReg( 0 );
    42884288#endif

  • branches/HTM-5.0-Qualcomm/source/Lib/TLibEncoder/TEncSlice.cpp

    r194 r195  
    162162 \param pPPS          PPS associated with the slice
    163163 */
    164 #if VIDYO_VPS_INTEGRATION|MVHEVC
     164#if VIDYO_VPS_INTEGRATION|QC_MVHEVC_B0046
    165165Void TEncSlice::initEncSlice( TComPic* pcPic, Int iPOCLast, UInt uiPOCCurr, Int iNumPicRcvd, Int iGOPid, TComSlice*& rpcSlice, TComVPS * pVPS, TComSPS* pSPS, TComPPS *pPPS )
    166166#else
    … …  
    172172 
    173173  rpcSlice = pcPic->getSlice(0);
    174 #if VIDYO_VPS_INTEGRATION|MVHEVC
     174#if VIDYO_VPS_INTEGRATION|QC_MVHEVC_B0046
    175175  rpcSlice->setVPS( pVPS );
    176176#endif
    … …  
    820820  UInt uiTileStartLCU = 0;
    821821  UInt uiTileLCUX     = 0;
    822 #if !MVHEVC
     822#if !QC_MVHEVC_B0046
    823823  Int iLastPosY = -1;
    824824#endif
    … …  
    833833    TComDataCU*& pcCU = rpcPic->getCU( uiCUAddr );
    834834    pcCU->initCU( rpcPic, uiCUAddr );
    835 #if !MVHEVC
     835#if !QC_MVHEVC_B0046
    836836    if ( m_pcRdCost->getUseRenModel() )
    837837    {

  • branches/HTM-5.0-Qualcomm/source/Lib/TLibEncoder/TEncSlice.h

    r194 r195  
    110110 
    111111  /// preparation of slice encoding (reference marking, QP and lambda)
    112 #if VIDYO_VPS_INTEGRATION|MVHEVC
     112#if VIDYO_VPS_INTEGRATION|QC_MVHEVC_B0046
    113113  Void    initEncSlice        ( TComPic*  pcPic, Int iPOCLast, UInt uiPOCCurr, Int iNumPicRcvd, Int iGOPid, TComSlice*& rpcSlice, TComVPS* pVPS, TComSPS* pSPS, TComPPS *pPPS );
    114114#else

  • branches/HTM-5.0-Qualcomm/source/Lib/TLibEncoder/TEncTop.cpp

    r194 r195  
    785785  else
    786786  {
    787 #if MVHEVC
     787#if QC_MVHEVC_B0046
    788788    m_cSPS.initMultiviewSPS   ( m_viewId);
    789789#else
    … …  
    997997Void TEncTop::selectReferencePictureSet(TComSlice* slice, Int POCCurr, Int GOPid,TComList<TComPic*>& listPic )
    998998{
    999 #if QC_REM_IDV
     999#if QC_REM_IDV_B0046
    10001000  if( (slice->getNalUnitType() == NAL_UNIT_CODED_SLICE_IDR ||slice->getNalUnitType() == NAL_UNIT_CODED_SLICE_CRA) && slice->getSPS()->getViewId() && POCCurr == 0 )
    10011001#else
Note: See TracChangeset for help on using the changeset viewer.