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/TLibCommon
Files:
10 edited

Legend:

Unmodified
Added
Removed

  • branches/HTM-5.0-Qualcomm/source/Lib/TLibCommon/CommonDef.h

    r194 r195  
    185185// VPS constants
    186186// ====================================================================================================================
    187 #if MVHEVC
     187#if QC_MVHEVC_B0046
    188188#define MAX_LAYER_NUM                     MAX_VIEW_NUM
    189189#endif
    … …  
    483483  NAL_UNIT_CODED_SLICE,
    484484#if H0566_TLA
    485 #if QC_REM_IDV
     485#if QC_REM_IDV_B0046
    486486  NAL_UNIT_RESERVED,
    487487#else
    … …  
    515515  NAL_UNIT_RESERVED_23,
    516516  NAL_UNIT_UNSPECIFIED_24,
    517 #if VIDYO_VPS_INTEGRATION|MVHEVC
     517#if VIDYO_VPS_INTEGRATION|QC_MVHEVC_B0046
    518518  NAL_UNIT_VPS,
    519519#else

  • branches/HTM-5.0-Qualcomm/source/Lib/TLibCommon/NAL.h

    r194 r195  
    5151  NalRefIdc   m_nalRefIDC;   ///< nal_ref_idc
    5252#endif
    53 #if VIDYO_VPS_INTEGRATION|MVHEVC
     53#if VIDYO_VPS_INTEGRATION|QC_MVHEVC_B0046
    5454  unsigned    m_layerId;
    5555  unsigned    m_temporalId;  ///< temporal_id
    … …  
    6969    NalUnitType nalUnitType,
    7070    Bool        nalRefFlag,
    71 #if !VIDYO_VPS_INTEGRATION & !MVHEVC   
     71#if !VIDYO_VPS_INTEGRATION & !QC_MVHEVC_B0046   
    7272    Int         viewId,
    7373    Bool        isDepth,
    … …  
    7878    :m_nalUnitType (nalUnitType)
    7979    ,m_nalRefFlag  (nalRefFlag)
    80 #if !VIDYO_VPS_INTEGRATION & !MVHEVC
     80#if !VIDYO_VPS_INTEGRATION & !QC_MVHEVC_B0046
    8181    ,m_viewId      (viewId)
    8282    ,m_isDepth     (isDepth)
    … …  
    139139    return m_nalUnitType == NAL_UNIT_CODED_SLICE_IDR
    140140#if H0566_TLA
    141 #if !QC_REM_IDV   
     141#if !QC_REM_IDV_B0046   
    142142        || m_nalUnitType == NAL_UNIT_CODED_SLICE_IDV
    143143#endif

  • branches/HTM-5.0-Qualcomm/source/Lib/TLibCommon/TComDataCU.cpp

    r194 r195  
    43074307  {
    43084308    // col [2]
    4309 #if !TMVP_INDEX_MODIFY
     4309#if !QC_TMVP_IDX_MOD_B0046
    43104310    Int iRefIdxSkip[2] = {-1, -1};
    43114311    for (Int i=0; i<2; i++)
    … …  
    43394339
    43404340    TComMv cColMv;
    4341 #if TMVP_INDEX_MODIFY
     4341#if QC_TMVP_IDX_MOD_B0046
    43424342    Int iRefIdx = 0;
    43434343#else
    … …  
    43764376      }
    43774377    }
    4378 #if !TMVP_INDEX_MODIFY
     4378#if !QC_TMVP_IDX_MOD_B0046
    43794379    iRefIdx = iRefIdxSkip[0];
    43804380#else
    … …  
    43984398      if ( getSlice()->isInterB() )
    43994399      {       
    4400 #if !TMVP_INDEX_MODIFY
     4400#if !QC_TMVP_IDX_MOD_B0046
    44014401        iRefIdx = iRefIdxSkip[1];
    44024402#else
    … …  
    64126412  if( pcTmpCU->getCUMvField(eRefPicList2nd)->getRefIdx(uiIdx) >= 0 )
    64136413  {
    6414 #if IV_AS_LT
     6414#if QC_IV_AS_LT_B0046
    64156415    Bool bIsCurrRefLongTerm = m_pcSlice->getRefPic( eRefPicList, iRefIdx)->getIsLongTerm();
    64166416    Bool bIsNeibRefLongTerm = m_pcSlice->getRefPic( eRefPicList2nd, pcTmpCU->getCUMvField(eRefPicList2nd)->getRefIdx(uiIdx))->getIsLongTerm();
    … …  
    65616561  Int iNeibRefPOC;
    65626562
    6563 #if IV_AS_LT
     6563#if QC_IV_AS_LT_B0046
    65646564  Bool bIsCurrRefLongTerm = m_pcSlice->getRefPic( eRefPicList, iRefIdx)->getIsLongTerm();
    65656565  Bool bIsNeibRefLongTerm = false;
    … …  
    65686568  {
    65696569    iNeibRefPOC = pcTmpCU->getSlice()->getRefPOC( eRefPicList2nd, pcTmpCU->getCUMvField(eRefPicList2nd)->getRefIdx(uiIdx) );
    6570 #if IV_AS_LT
     6570#if QC_IV_AS_LT_B0046
    65716571    bIsNeibRefLongTerm = m_pcSlice->getRefPic( eRefPicList2nd, pcTmpCU->getCUMvField(eRefPicList2nd)->getRefIdx(uiIdx))->getIsLongTerm() ;
    65726572    if ( (bIsCurrRefLongTerm == bIsNeibRefLongTerm) && (iNeibRefPOC == iCurrRefPOC) )
    … …  
    65936593    TComMv cMvPred = pcTmpCU->getCUMvField(eRefPicList)->getMv(uiIdx);
    65946594    TComMv rcMv;
    6595 #if IV_AS_LT
     6595#if QC_IV_AS_LT_B0046
    65966596    bIsNeibRefLongTerm = m_pcSlice->getRefPic( eRefPicList, pcTmpCU->getCUMvField(eRefPicList)->getRefIdx(uiIdx))->getIsLongTerm();
    65976597    if ( bIsCurrRefLongTerm == bIsNeibRefLongTerm )
    … …  
    66176617    pInfo->m_acMvCand[ pInfo->iN++] = rcMv;
    66186618    return true;
    6619 #if IV_AS_LT
     6619#if QC_IV_AS_LT_B0046
    66206620    }
    66216621#endif
    … …  
    66276627    TComMv cMvPred = pcTmpCU->getCUMvField(eRefPicList2nd)->getMv(uiIdx);
    66286628    TComMv rcMv;
    6629 #if IV_AS_LT
     6629#if QC_IV_AS_LT_B0046
    66306630    bIsNeibRefLongTerm = m_pcSlice->getRefPic( eRefPicList2nd, pcTmpCU->getCUMvField(eRefPicList2nd)->getRefIdx(uiIdx))->getIsLongTerm(); ;
    66316631    if ( bIsCurrRefLongTerm == bIsNeibRefLongTerm )
    … …  
    66516651    pInfo->m_acMvCand[ pInfo->iN++] = rcMv;
    66526652    return true;
    6653 #if IV_AS_LT
     6653#if QC_IV_AS_LT_B0046
    66546654  }
    66556655#endif
    … …  
    67646764  Int iColPOC, iColRefPOC, iCurrPOC, iCurrRefPOC, iScale;
    67656765#if SONY_COLPIC_AVAILABILITY
    6766 #if IV_AS_LT
     6766#if QC_IV_AS_LT_B0046
    67676767  Int iColViewOrderIdx, iCurrViewOrderIdx, iCurrRefViewOrderIdx;
    67686768#else
    … …  
    67996799  }
    68006800
    6801 #if !SONY_COLPIC_AVAILABILITY&!IV_AS_LT
     6801#if !SONY_COLPIC_AVAILABILITY&!QC_IV_AS_LT_B0046
    68026802  if( m_pcSlice->getRefPic(eRefPicList, riRefIdx)->getViewId() != m_pcSlice->getViewId() )
    68036803    return false;
    … …  
    68276827  iColRefPOC = pColCU->getSlice()->getRefPOC(eColRefPicList, iColRefIdx);
    68286828
    6829 #if !IV_AS_LT
     6829#if !QC_IV_AS_LT_B0046
    68306830#if SONY_COLPIC_AVAILABILITY
    68316831  iColRefViewOrderIdx = pColCU->getSlice()->getRefPic( eColRefPicList, pColCU->getCUMvField(eColRefPicList)->getRefIdx(uiAbsPartAddr))->getViewOrderIdx();
    … …  
    68486848
    68496849  iCurrRefPOC = m_pcSlice->getRefPic(eRefPicList, riRefIdx)->getPOC();
    6850 #if IV_AS_LT
     6850#if QC_IV_AS_LT_B0046
    68516851  {
    68526852    assert( ((iColPOC != iColRefPOC)&&(iCurrPOC != iCurrRefPOC))||((iColPOC == iColRefPOC)&&(iCurrPOC == iCurrRefPOC)));

  • branches/HTM-5.0-Qualcomm/source/Lib/TLibCommon/TComDepthMapGenerator.h

    r194 r195  
    239239  Bool              m_bDecoder;
    240240  TComPrediction*   m_pcPrediction;
    241 #if VIDYO_VPS_INTEGRATION|MVHEVC
     241#if VIDYO_VPS_INTEGRATION|QC_MVHEVC_B0046
    242242  TComVPSAccess*    m_pcVPSAccess;
    243243#endif

  • branches/HTM-5.0-Qualcomm/source/Lib/TLibCommon/TComPic.cpp

    r194 r195  
    519519      UInt uiTempLayer = currSlice->getRefPic(eRefPicList, lpRef)->getCurrSlice()->getTLayer();
    520520      Int iTempDiff = (iTempPoc > iPOCCurr) ? (iTempPoc - iPOCCurr): (iPOCCurr - iTempPoc);
    521 #if QC_REM_IDV
     521#if QC_REM_IDV_B0046
    522522      TComSlice* refSlice = currSlice->getRefPic(eRefPicList, lpRef)->getCurrSlice();
    523523      bRAP = (refSlice->getSPS()->getViewId() && (refSlice->getNalUnitType() == NAL_UNIT_CODED_SLICE_IDR || refSlice->getNalUnitType() == NAL_UNIT_CODED_SLICE_CRA))? 1: 0;     

  • branches/HTM-5.0-Qualcomm/source/Lib/TLibCommon/TComPic.h

    r194 r195  
    140140  TComSlice*    getSlice(Int i)       { return  m_apcPicSym->getSlice(i);  }
    141141  TComSlice*    getCurrSlice()        { return  m_apcPicSym->getSlice(m_uiCurrSliceIdx);  }
    142 #if VIDYO_VPS_INTEGRATION|MVHEVC
     142#if VIDYO_VPS_INTEGRATION|QC_MVHEVC_B0046
    143143  TComVPS*      getVPS()              { return  m_apcPicSym->getSlice(m_uiCurrSliceIdx)->getVPS();  }
    144144#endif

  • branches/HTM-5.0-Qualcomm/source/Lib/TLibCommon/TComPrediction.cpp

    r194 r195  
    924924}
    925925#endif
    926 #if !MVHEVC
     926#if !QC_MVHEVC_B0046
    927927  Int     ixFrac      = iHor & 0x3;
    928928  Int     iyFrac      = iVer & 0x3;

  • branches/HTM-5.0-Qualcomm/source/Lib/TLibCommon/TComSlice.cpp

    r194 r195  
    4444
    4545TComSlice::TComSlice()
    46 #if MVHEVC
     46#if QC_MVHEVC_B0046
    4747: m_iPPSId                        ( 0  )
    4848#else
    … …  
    146146  resetWpScalingLC(m_weightPredTableLC);
    147147  initWpAcDcParam();
    148 #if IV_AS_LT
     148#if QC_IV_AS_LT_B0046
    149149  for(Int iNumCount = 0; iNumCount < MAX_NUM_REF+1; iNumCount++)
    150150  {
    … …  
    483483  {
    484484    pcRefPic = xGetInterViewRefPic( rapcInterViewRefPics, getViewId() + m_pcSPS->getUsableInterViewRef(i) );
    485 #if IV_AS_LT
     485#if QC_IV_AS_LT_B0046
    486486    pcRefPic->setIsLongTerm( 1 );
    487487#else
    … …  
    528528  {
    529529    m_apcRefPicList[0][cIdx] = m_RefPicListModification.getRefPicListModificationFlagL0() ? refPicListTemp0[ m_RefPicListModification.getRefPicSetIdxL0(cIdx) ] : refPicListTemp0[cIdx];
    530 #if IV_AS_LT
     530#if QC_IV_AS_LT_B0046
    531531    setWasLongTerm(m_apcRefPicList[0][cIdx]->getIsLongTerm(), REF_PIC_LIST_0, cIdx);
    532532#endif
    … …  
    542542    {
    543543      m_apcRefPicList[1][cIdx] = m_RefPicListModification.getRefPicListModificationFlagL1() ? refPicListTemp1[ m_RefPicListModification.getRefPicSetIdxL1(cIdx) ] : refPicListTemp1[cIdx];
    544 #if IV_AS_LT
     544#if QC_IV_AS_LT_B0046
    545545      setWasLongTerm(m_apcRefPicList[1][cIdx]->getIsLongTerm(), REF_PIC_LIST_1, cIdx);
    546546#endif
    … …  
    897897    for(i=0;i<pReferencePictureSet->getNumberOfPositivePictures()+pReferencePictureSet->getNumberOfNegativePictures();i++)
    898898    {
    899 #if IV_AS_LT
     899#if QC_IV_AS_LT_B0046
    900900       if( rpcPic->getPicSym()->getSlice(0)->getPOC() == this->getPOC() + pReferencePictureSet->getDeltaPOC(i))
    901901#else
    … …  
    911911    for(;i<pReferencePictureSet->getNumberOfPictures();i++)
    912912    {
    913 #if IV_AS_LT
     913#if QC_IV_AS_LT_B0046
    914914     if( (rpcPic->getPicSym()->getSlice(0)->getPOC()%(1<<rpcPic->getPicSym()->getSlice(0)->getSPS()->getBitsForPOC())) == pReferencePictureSet->getPOC(i)%(1<<rpcPic->getPicSym()->getSlice(0)->getSPS()->getBitsForPOC()))
    915915#else
    … …  
    14191419// Video parameter set (VPS)
    14201420// ------------------------------------------------------------------------------------------------
    1421 #if MVHEVC
     1421#if QC_MVHEVC_B0046
    14221422TComVPS::TComVPS()
    14231423: m_VPSId                     (  0)
    … …  
    14961496
    14971497TComSPS::TComSPS()
    1498 #if VIDYO_VPS_INTEGRATION|MVHEVC
     1498#if VIDYO_VPS_INTEGRATION|QC_MVHEVC_B0046
    14991499: m_VPSId                     (  0)
    15001500, m_SPSId                     (  0)
    … …  
    15481548, m_bLCMod                    (false)
    15491549#if H0412_REF_PIC_LIST_RESTRICTION
    1550 #if MVHEVC
     1550#if QC_MVHEVC_B0046
    15511551, m_restrictedRefPicListsFlag   (  0)
    15521552#else
    … …  
    18051805TComSPS::initMultiviewSPS( UInt uiViewId, Int iViewOrderIdx, UInt uiCamParPrecision, Bool bCamParSlice, Int** aaiScale, Int** aaiOffset )
    18061806{
    1807 #if !MVHEVC
     1807#if !QC_MVHEVC_B0046
    18081808  AOT( uiViewId == 0 && iViewOrderIdx != 0 );
    18091809  AOT( uiViewId != 0 && iViewOrderIdx == 0 );
    … …  
    18171817  ::memset( m_aaiCodedScale,  0x00, sizeof( m_aaiCodedScale  ) );
    18181818  ::memset( m_aaiCodedOffset, 0x00, sizeof( m_aaiCodedOffset ) );
    1819 #if !MVHEVC
     1819#if !QC_MVHEVC_B0046
    18201820  if( !m_bCamParInSliceHeader )
    18211821  {
    … …  
    24482448, m_ppsMap(MAX_NUM_PPS)
    24492449, m_apsMap(MAX_NUM_APS)
    2450 #if VIDYO_VPS_INTEGRATION|MVHEVC
     2450#if VIDYO_VPS_INTEGRATION|QC_MVHEVC_B0046
    24512451, m_vpsMap(MAX_NUM_VPS)
    24522452#endif

  • branches/HTM-5.0-Qualcomm/source/Lib/TLibCommon/TComSlice.h

    r194 r195  
    144144#endif
    145145
    146 #if VIDYO_VPS_INTEGRATION|MVHEVC
     146#if VIDYO_VPS_INTEGRATION|QC_MVHEVC_B0046
    147147/// VPS class
    148148
    … …  
    156156
    157157  UInt        m_uiExtensionType;
    158 #if !MVHEVC 
     158#if !QC_MVHEVC_B0046 
    159159  Bool        m_bDependentFlag[MAX_LAYER_NUM];
    160160#else
    … …  
    168168#endif
    169169  UInt        m_uiViewId[MAX_LAYER_NUM];
    170 #if !MVHEVC 
     170#if !QC_MVHEVC_B0046 
    171171  Bool        m_bDepthFlag[MAX_LAYER_NUM];
    172172#endif
    173173  Int         m_iViewOrderIdx[MAX_LAYER_NUM];
    174 #if !MVHEVC 
     174#if !QC_MVHEVC_B0046 
    175175  UInt        m_uiDependentLayer[MAX_LAYER_NUM];
    176176#endif
    … …  
    195195  Bool    getTemporalNestingFlag   ()         { return m_uiMaxLayers;   }
    196196  Void    setTemporalNestingFlag   (UInt t)   { m_bTemporalIdNestingFlag = t; }
    197 #if !MVHEVC
     197#if !QC_MVHEVC_B0046
    198198  Void    setExtensionType(UInt v)                     { m_uiExtensionType = v;    }
    199199  UInt    getExtensionType()                             { return m_uiExtensionType; }
    … …  
    204204  Void    setViewId(UInt v, UInt layer)                     { m_uiViewId[layer] = v;    }
    205205  UInt    getViewId(UInt layer)                             { return m_uiViewId[layer]; }
    206 #if !MVHEVC
     206#if !QC_MVHEVC_B0046
    207207  Void    setDepthFlag(Bool d, UInt layer)                  { m_bDepthFlag[layer] = d;    }
    208208  Bool    getDepthFlag(UInt layer)                          { return m_bDepthFlag[layer]; }
    … …  
    210210  Void    setViewOrderIdx(Int v, UInt layer)                { m_iViewOrderIdx[layer] = v;    }
    211211  Int     getViewOrderIdx(UInt layer)                       { return m_iViewOrderIdx[layer]; }
    212 #if !MVHEVC   
     212#if !QC_MVHEVC_B0046   
    213213  Void    setDependentLayer(UInt v, UInt layer)                     { m_uiDependentLayer[layer] = v;    }
    214214  UInt    getDependentLayer(UInt layer)                             { return m_uiDependentLayer[layer]; }
    … …  
    222222  Void    setMaxLatencyIncrease(UInt v, UInt tLayer)                { m_uiMaxLatencyIncrease[tLayer] = v;    }
    223223  UInt    getMaxLatencyIncrease(UInt tLayer)                        { return m_uiMaxLatencyIncrease[tLayer]; }
    224 #if MVHEVC
     224#if QC_MVHEVC_B0046
    225225  Void    setNumHRDParameters(UInt n)                                { m_uiNumHRDParameter = n;    }
    226226  UInt    getNumHRDParameters()                                      { return m_uiNumHRDParameter; }
    … …  
    249249{
    250250private:
    251 #if VIDYO_VPS_INTEGRATION|MVHEVC
     251#if VIDYO_VPS_INTEGRATION|QC_MVHEVC_B0046
    252252  Int          m_VPSId;
    253253#endif
    … …  
    422422  TComSPS();
    423423  virtual ~TComSPS();
    424 #if VIDYO_VPS_INTEGRATION|MVHEVC
     424#if VIDYO_VPS_INTEGRATION|QC_MVHEVC_B0046
    425425  Int  getVPSId       ()         { return m_VPSId;          }
    426426  Void setVPSId       (Int i)    { m_VPSId = i;             }
    … …  
    12521252 
    12531253  // access channel
    1254 #if VIDYO_VPS_INTEGRATION|MVHEVC
     1254#if VIDYO_VPS_INTEGRATION|QC_MVHEVC_B0046
    12551255  TComVPS*    m_pcVPS;
    12561256#endif
    1257 #if IV_AS_LT
     1257#if QC_IV_AS_LT_B0046
    12581258  Bool                  m_bWasLongTerm[2][MAX_NUM_REF+1]; //was long-term picture
    12591259#endif
    … …  
    13311331  Int        m_aaiCodedOffset[2][MAX_VIEW_NUM];
    13321332
    1333 #if SONY_COLPIC_AVAILABILITY|MVHEVC
     1333#if SONY_COLPIC_AVAILABILITY|QC_MVHEVC_B0046
    13341334  Int         m_iViewOrderIdx;
    13351335#endif
    … …  
    13451345  Void      initTiles();
    13461346
    1347 #if VIDYO_VPS_INTEGRATION|MVHEVC
     1347#if VIDYO_VPS_INTEGRATION|QC_MVHEVC_B0046
    13481348  Void      setVPS          ( TComVPS* pcVPS ) { m_pcVPS = pcVPS; }
    13491349  TComVPS*  getVPS          () { return m_pcVPS; }
    13501350#endif
    1351 #if IV_AS_LT
     1351#if QC_IV_AS_LT_B0046
    13521352  Void          setWasLongTerm( Bool lt,  RefPicList e, Int iRefIdx ) { m_bWasLongTerm[e][iRefIdx] = lt; }
    13531353  Bool          getWasLongTerm( RefPicList e, Int iRefIdx           ) { return m_bWasLongTerm[e][iRefIdx] ; }
    … …  
    16261626  Void setViewId( Int viewId )       { m_viewId = viewId;   }
    16271627  Int  getViewId()                   { return m_viewId;     }
    1628 #if MVHEVC
     1628#if QC_MVHEVC_B0046
    16291629  Void    setViewOrderIdx(Int v, UInt layer)                { m_iViewOrderIdx = v;    }
    16301630  Int     getViewOrderIdx()                                 { return m_iViewOrderIdx; }
    … …  
    16981698  }
    16991699
    1700 #if MVHEVC
     1700#if QC_MVHEVC_B0046
    17011701  Void clearPSList()
    17021702  {
    … …  
    17141714  ParameterSetManager();
    17151715  virtual ~ParameterSetManager();
    1716 #if VIDYO_VPS_INTEGRATION|MVHEVC
     1716#if VIDYO_VPS_INTEGRATION|QC_MVHEVC_B0046
    17171717  //! store video parameter set and take ownership of it
    17181718  Void storeVPS(TComVPS *vps) { m_vpsMap.storePS( vps->getVPSId(), vps); };
    … …  
    17201720  TComVPS* getVPS(Int vpsId)  { return m_vpsMap.getPS(vpsId); };
    17211721  TComVPS* getFirstVPS()      { return m_vpsMap.getFirstPS(); };
    1722 #if MVHEVC
     1722#if QC_MVHEVC_B0046
    17231723  Void     clearVPS()         { m_vpsMap.clearPSList(); };
    17241724  Void     clearSPS()         { m_spsMap.clearPSList(); };
    … …  
    17471747  ParameterSetMap<TComPPS> m_ppsMap;
    17481748  ParameterSetMap<TComAPS> m_apsMap;
    1749 #if VIDYO_VPS_INTEGRATION|MVHEVC
     1749#if VIDYO_VPS_INTEGRATION|QC_MVHEVC_B0046
    17501750  ParameterSetMap<TComVPS> m_vpsMap;
    17511751#endif

  • branches/HTM-5.0-Qualcomm/source/Lib/TLibCommon/TypeDef.h

    r194 r195  
    4141//! \ingroup TLibCommon
    4242//! \{
    43 #define MVHEVC                            0
    44 #define            IV_AS_LT               1   //inter-view reference pictures are treated as long-term pictures       
    45 #define            TMVP_INDEX_MODIFY      1   //the reference index for temporal merging candidate is set to 0, as defined in HEVC
    46 #define            QC_REM_IDV             1   //nal unit type NAL_UNIT_CODED_SLICE_IDV is removed.
    47 #define            BUG_FIX_HTM            1
    48 #if !MVHEVC
     43#define QC_MVHEVC_B0046                   0
     44#define QC_IV_AS_LT_B0046                 1   //JCT3V-B0046: Disable 3DHEVC tools
     45#define QC_TMVP_IDX_MOD_B0046             1   //JCT3V-B0046: inter-view reference pictures are treated as long-term pictures, scaling of motion vectors for DCP based on ViewId/ViewOrderIdx is disabled
     46#define QC_REM_IDV_B0046                  1   //JCT3V-B0046: the reference index for temporal merging candidate is set to 0, as defined in HEVC
     47#define FIX_DEL_NULLPTR                   1
     48#if !QC_MVHEVC_B0046
    4949///// ***** FIXES *********
    5050// A
    … …  
    482482// VPS INTEGRATION
    483483// ====================================================================================================================
    484 #if !MVHEVC
     484#if !QC_MVHEVC_B0046
    485485#if VIDYO_VPS_INTEGRATION
    486486#define MAX_NUM_VPS 10
Note: See TracChangeset for help on using the changeset viewer.