Changeset 195 in 3DVCSoftware for branches/HTM-5.0-Qualcomm


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

Changed macro switch names to match conventions.

Location:
branches/HTM-5.0-Qualcomm/source
Files:
52 edited

Legend:

Unmodified
Added
Removed
  • branches/HTM-5.0-Qualcomm/source/App/TAppDecoder/TAppDecTop.cpp

    r194 r195  
    8282Void TAppDecTop::decode()
    8383{
    84 #if VIDYO_VPS_INTEGRATION|MVHEVC
     84#if VIDYO_VPS_INTEGRATION|QC_MVHEVC_B0046
    8585  increaseNumberOfViews( 0, 0, 0 );
    8686#else
     
    145145    {
    146146      read(nalu, nalUnit);
    147 #if MVHEVC
     147#if QC_MVHEVC_B0046
    148148    viewDepthId = nalu.m_layerId;
    149149    Int depth = 0;
     
    171171      if( viewDepthId >= m_tDecTop.size() )     
    172172      {
    173 #if VIDYO_VPS_INTEGRATION|MVHEVC
     173#if VIDYO_VPS_INTEGRATION|QC_MVHEVC_B0046
    174174        increaseNumberOfViews( viewDepthId, viewId, depth );
    175175#else
     
    200200      if( !(m_iMaxTemporalLayer >= 0 && nalu.m_temporalId > m_iMaxTemporalLayer) )
    201201      {
    202 #if MVHEVC
     202#if QC_MVHEVC_B0046
    203203        if(viewDepthId && m_tDecTop[viewDepthId]->m_bFirstNal== false)
    204204        {
     
    233233    if( pcListPic[viewDepthId] )
    234234    {
    235 #if QC_REM_IDV
     235#if QC_REM_IDV_B0046
    236236      Int iviewId = m_tDecTop[viewDepthId]->getViewId();
    237237      if( newPicture[viewDepthId] && (nalu.m_nalUnitType == NAL_UNIT_CODED_SLICE_IDR || ((nalu.m_nalUnitType == NAL_UNIT_CODED_SLICE_IDR && iviewId) && m_tDecTop[viewDepthId]->getNalUnitTypeBaseView() == NAL_UNIT_CODED_SLICE_IDR)) )
     
    295295        m_tDecTop[viewDepthIdx]->destroy() ;
    296296      }
    297 #if MVHEVC
     297#if QC_MVHEVC_B0046
    298298      if(viewDepthIdx)
    299299      {
     
    445445  m_pocLastDisplay[viewDepthId] = -MAX_INT;
    446446}
    447 #if VIDYO_VPS_INTEGRATION|MVHEVC
     447#if VIDYO_VPS_INTEGRATION|QC_MVHEVC_B0046
    448448Void  TAppDecTop::increaseNumberOfViews  ( UInt layerId, UInt viewId, UInt isDepth )
    449449#else
     
    451451#endif
    452452{
    453 #if VIDYO_VPS_INTEGRATION|MVHEVC
     453#if VIDYO_VPS_INTEGRATION|QC_MVHEVC_B0046
    454454  Int newNumberOfViewDepth = layerId + 1;
    455455#endif
     
    458458    m_outputBitDepth = g_uiBitDepth + g_uiBitIncrement;
    459459  }
    460 #if !VIDYO_VPS_INTEGRATION&!MVHEVC
     460#if !VIDYO_VPS_INTEGRATION&!QC_MVHEVC_B0046
    461461  Int viewId = (newNumberOfViewDepth-1)>>1;   // coding order T0D0T1D1T2D2
    462462  Bool isDepth = ((newNumberOfViewDepth % 2) == 0);  // coding order T0D0T1D1T2D2
     
    471471      m_tVideoIOYuvReconFile.push_back(new TVideoIOYuv);
    472472      Char buffer[4];
    473 #if VIDYO_VPS_INTEGRATION|MVHEVC
     473#if VIDYO_VPS_INTEGRATION|QC_MVHEVC_B0046
    474474      sprintf(buffer,"_%i", viewId );
    475475#else
     
    477477#endif
    478478      Char* nextFilename = NULL;
    479 #if VIDYO_VPS_INTEGRATION|MVHEVC
     479#if VIDYO_VPS_INTEGRATION|QC_MVHEVC_B0046
    480480      if( isDepth)
    481481#else
     
    492492        xAppendToFileNameEnd( m_pchReconFile, buffer, nextFilename);
    493493      }
    494 #if !VIDYO_VPS_INTEGRATION&!MVHEVC
     494#if !VIDYO_VPS_INTEGRATION&!QC_MVHEVC_B0046
    495495      if( isDepth || ( !isDepth && (m_tVideoIOYuvReconFile.size() % 2) == 1 ) )
    496496#endif
     
    509509  {
    510510    m_tDecTop.push_back(new TDecTop);
    511 #if !VIDYO_VPS_INTEGRATION&!MVHEVC
     511#if !VIDYO_VPS_INTEGRATION&!QC_MVHEVC_B0046
    512512    if( isDepth || ( !isDepth && (m_tVideoIOYuvReconFile.size() % 2) == 1 ) )
    513513    {
     
    519519      m_tDecTop.back()->setPictureDigestEnabled(m_pictureDigestEnabled);
    520520      m_tDecTop.back()->setCamParsCollector( &m_cCamParsCollector );
    521 #if !VIDYO_VPS_INTEGRATION&!MVHEVC
     521#if !VIDYO_VPS_INTEGRATION&!QC_MVHEVC_B0046
    522522    }
    523523#endif
  • branches/HTM-5.0-Qualcomm/source/App/TAppDecoder/TAppDecTop.h

    r194 r195  
    7474  CamParsCollector                m_cCamParsCollector;
    7575#if DEPTH_MAP_GENERATION
    76 #if VIDYO_VPS_INTEGRATION|MVHEVC
     76#if VIDYO_VPS_INTEGRATION|QC_MVHEVC_B0046
    7777  TComVPSAccess                   m_cVPSAccess;
    7878#endif
     
    8888  Void  destroy           (); ///< destroy internal members
    8989  Void  decode            (); ///< main decoding function
    90 #if VIDYO_VPS_INTEGRATION|MVHEVC
     90#if VIDYO_VPS_INTEGRATION|QC_MVHEVC_B0046
    9191  Void  increaseNumberOfViews  (UInt layerId, UInt viewId, UInt isDepth);
    9292#else
  • branches/HTM-5.0-Qualcomm/source/App/TAppEncoder/TAppEncCfg.cpp

    r194 r195  
    329329  /* Camera Paremetes */
    330330  ("CameraParameterFile,cpf", m_pchCameraParameterFile,    (Char *) 0, "Camera Parameter File Name")
    331 #if MVHEVC
     331#if QC_MVHEVC_B0046
    332332  ("BaseViewCameraNumbers" ,  m_aiVId,     std::vector<Int>(1, MAX_VIEW_NUM), "Numbers of base views")
    333333#endif
     
    789789}
    790790#else
    791 #if !MVHEVC
     791#if !QC_MVHEVC_B0046
    792792  m_cCameraData     .init     ( (UInt)m_iNumberOfViews,
    793793    m_uiInputBitDepth,
     
    806806  // check validity of input parameters
    807807  xCheckParameter();
    808 #if !MVHEVC
     808#if !QC_MVHEVC_B0046
    809809  m_cCameraData.check( false, true );
    810810#endif
  • branches/HTM-5.0-Qualcomm/source/App/TAppEncoder/TAppEncCfg.h

    r194 r195  
    109109  std::vector<Double>  m_adQP;                                ///< QP value of key-picture (floating point) [0] video, [1] depth
    110110  std::vector<Int>     m_aiQP;                                ///< QP value of key-picture (integer) [0] video, [1] depth
    111 #if MVHEVC
     111#if QC_MVHEVC_B0046
    112112  std::vector<Int>     m_aiVId;                                ///< view id
    113113#endif
     
    288288  Char*     m_pchCameraParameterFile;                         ///< camera parameter file
    289289  Char*     m_pchBaseViewCameraNumbers;
    290 #if !MVHEVC
     290#if !QC_MVHEVC_B0046
    291291  TAppComCamPara m_cCameraData;
    292292#endif
  • branches/HTM-5.0-Qualcomm/source/App/TAppEncoder/TAppEncTop.cpp

    r194 r195  
    6767Void TAppEncTop::xInitLibCfg()
    6868{
    69 #if VIDYO_VPS_INTEGRATION|MVHEVC
    70 #if !MVHEVC
     69#if VIDYO_VPS_INTEGRATION|QC_MVHEVC_B0046
     70#if !QC_MVHEVC_B0046
    7171  UInt layerId = 0;
    7272#endif
    7373  // TODO: fix the assumption here that the temporal structures are all equal across all layers???
    7474  m_cVPS.setMaxTLayers( m_maxTempLayer[0] );
    75 #if MVHEVC
     75#if QC_MVHEVC_B0046
    7676  m_cVPS.setMaxLayers( m_iNumberOfViews );
    7777#else
     
    107107    m_acTEncTopList[iViewIdx]->setViewId                       ( iViewIdx );
    108108    m_acTEncTopList[iViewIdx]->setIsDepth                      ( false );
    109 #if MVHEVC
     109#if QC_MVHEVC_B0046
    110110    m_acTEncTopList[iViewIdx]->setLayerId                      ( iViewIdx );
    111111    m_cVPS.setViewId                                           ( m_aiVId[ iViewIdx ], iViewIdx );
     
    417417      m_acTEncDepthTopList[iViewIdx]->setViewId                       ( iViewIdx );
    418418      m_acTEncDepthTopList[iViewIdx]->setIsDepth                      ( true );
    419 #if MVHEVC
     419#if QC_MVHEVC_B0046
    420420      m_acTEncDepthTopList[iViewIdx]->setLayerId                      ( iViewIdx );
    421421#else
     
    836836  {
    837837    m_acTEncTopList[iViewIdx]->init( this );
    838 #if MVHEVC
     838#if QC_MVHEVC_B0046
    839839  //set setNumDirectRefLayer
    840840  Int iNumDirectRef = m_acTEncTopList[iViewIdx]->getSPS()->getNumberOfUsableInterViewRefs();
     
    887887  TComPicYuv*       pcPicYuvOrg = new TComPicYuv;
    888888  TComPicYuv*       pcDepthPicYuvOrg = new TComPicYuv;
    889 #if !MVHEVC
     889#if !QC_MVHEVC_B0046
    890890  TComPicYuv*       pcPdmDepthOrg    = new TComPicYuv;
    891891#endif
     
    990990    {
    991991      Int  iNumEncoded = 0;
    992 #if !MVHEVC
     992#if !QC_MVHEVC_B0046
    993993      UInt iNextPoc = m_acTEncTopList[0] -> getFrameId( gopId );
    994994      if ( iNextPoc < m_iFrameToBeEncoded )
     
    10521052  pcDepthPicYuvOrg = NULL;
    10531053
    1054 #if !MVHEVC
    1055 #if BUG_FIX_HTM
     1054#if !QC_MVHEVC_B0046
     1055#if FIX_DEL_NULLPTR
    10561056  if ( pcPdmDepthOrg != NULL && m_uiMultiviewMvRegMode )
    10571057#else
     
    12671267    case NAL_UNIT_CODED_SLICE:
    12681268#if H0566_TLA
    1269 #if !QC_REM_IDV
     1269#if !QC_REM_IDV_B0046
    12701270    case NAL_UNIT_CODED_SLICE_IDV:
    12711271#endif
  • branches/HTM-5.0-Qualcomm/source/App/TAppEncoder/TAppEncTop.h

    r194 r195  
    8787#endif
    8888
    89 #if VIDYO_VPS_INTEGRATION|MVHEVC
     89#if VIDYO_VPS_INTEGRATION|QC_MVHEVC_B0046
    9090  TComVPS                     m_cVPS;
    9191#endif
     
    139139#endif
    140140 
    141 #if MVHEVC
     141#if QC_MVHEVC_B0046
    142142  TComVPS*          getVPS()  { return &m_cVPS; }
    143143#endif
  • branches/HTM-5.0-Qualcomm/source/App/TAppRenderer/RendererMain.cpp

    r194 r195  
    4343int main(int argc, char* argv[])
    4444  {
    45 #if !MVHEVC
     45#if !QC_MVHEVC_B0046
    4646  TAppRendererTop  cTAppRendererTop;
    4747
  • branches/HTM-5.0-Qualcomm/source/App/TAppRenderer/TAppRendererCfg.cpp

    r194 r195  
    5959// Constructor / destructor / initialization / destroy
    6060// ====================================================================================================================
    61 #if !MVHEVC
     61#if !QC_MVHEVC_B0046
    6262TAppRendererCfg::TAppRendererCfg()
    6363{
  • branches/HTM-5.0-Qualcomm/source/App/TAppRenderer/TAppRendererCfg.h

    r194 r195  
    5050#include <string>
    5151#include <vector>
    52 #if !MVHEVC
     52#if !QC_MVHEVC_B0046
    5353// ====================================================================================================================
    5454// Class definition
  • branches/HTM-5.0-Qualcomm/source/App/TAppRenderer/TAppRendererTop.cpp

    r194 r195  
    4545// Constructor / destructor / initialization / destroy
    4646// ====================================================================================================================
    47 #if !MVHEVC
     47#if !QC_MVHEVC_B0046
    4848TAppRendererTop::TAppRendererTop()
    4949{
  • branches/HTM-5.0-Qualcomm/source/App/TAppRenderer/TAppRendererTop.h

    r194 r195  
    5050#include "../../Lib/TLibRenderer/TRenModel.h"
    5151
    52 #if !MVHEVC
     52#if !QC_MVHEVC_B0046
    5353// ====================================================================================================================
    5454// Class definition
  • 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
  • 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
  • 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
  • branches/HTM-5.0-Qualcomm/source/Lib/TLibExtractor/TExtrTop.cpp

    r194 r195  
    5555Bool TExtrTop::extract( InputNALUnit& nalu, std::set<UInt>& rsuiExtractLayerIds )
    5656{
    57 #if VIDYO_VPS_INTEGRATION|MVHEVC
     57#if VIDYO_VPS_INTEGRATION|QC_MVHEVC_B0046
    5858  //extraction now has to be done using layer_id
    5959  UInt uiLayerId = nalu.m_layerId;
     
    6565  m_cEntropyDecoder.setBitstream     ( nalu.m_Bitstream );
    6666 
    67 #if VIDYO_VPS_INTEGRATION|MVHEVC
     67#if VIDYO_VPS_INTEGRATION|QC_MVHEVC_B0046
    6868  if ( nalu.m_nalUnitType == NAL_UNIT_VPS )
    6969  {
  • branches/HTM-5.0-Qualcomm/source/Lib/TLibExtractor/TExtrTop.h

    r194 r195  
    5454{
    5555private:
    56 #if VIDYO_VPS_INTEGRATION|MVHEVC
     56#if VIDYO_VPS_INTEGRATION|QC_MVHEVC_B0046
    5757  TComVPS                 m_cVPS;
    5858#endif
  • branches/HTM-5.0-Qualcomm/source/Lib/TLibRenderer/TRenModSetupStrParser.cpp

    r194 r195  
    3636#include "TRenFilter.h"
    3737#include "TRenModSetupStrParser.h"
    38 #if !MVHEVC
     38#if !QC_MVHEVC_B0046
    3939Int
    4040TRenModSetupStrParser::getNumOfModels()
  • branches/HTM-5.0-Qualcomm/source/Lib/TLibRenderer/TRenModSetupStrParser.h

    r194 r195  
    3131 * THE POSSIBILITY OF SUCH DAMAGE.
    3232 */
    33 #if !MVHEVC
     33#if !QC_MVHEVC_B0046
    3434#ifndef __TRENMODSETUPSTRPARSER__
    3535#define __TRENMODSETUPSTRPARSER__
  • branches/HTM-5.0-Qualcomm/source/Lib/TLibRenderer/TRenModel.cpp

    r194 r195  
    3535#include "TRenFilter.h"
    3636#include "TRenModel.h"
    37 #if !MVHEVC
     37#if !QC_MVHEVC_B0046
    3838///////////  TRENMODEL //////////////////////
    3939TRenModel::TRenModel()
  • branches/HTM-5.0-Qualcomm/source/Lib/TLibRenderer/TRenModel.h

    r194 r195  
    3232 */
    3333
    34 #if !MVHEVC
     34#if !QC_MVHEVC_B0046
    3535#ifndef __TRENMODEL__
    3636#define __TRENMODEL__
  • branches/HTM-5.0-Qualcomm/source/Lib/TLibRenderer/TRenSingleModel.cpp

    r194 r195  
    3636#include "TRenSingleModel.h"
    3737
    38 #if !MVHEVC
     38#if !QC_MVHEVC_B0046
    3939////////////// TRENSINGLE MODEL ///////////////
    4040template <BlenMod iBM, Bool bBitInc>
  • branches/HTM-5.0-Qualcomm/source/Lib/TLibRenderer/TRenSingleModel.h

    r194 r195  
    3232 */
    3333
    34 #if !MVHEVC
     34#if !QC_MVHEVC_B0046
    3535#ifndef __TRENSINGLEMODEL__
    3636#define __TRENSINGLEMODEL__
Note: See TracChangeset for help on using the changeset viewer.