Changeset 542 in 3DVCSoftware


Ignore:
Timestamp:
23 Jul 2013, 15:19:06 (11 years ago)
Author:
tech
Message:

Further removal of unused macros.

Location:
branches/HTM-DEV-0.3-dev2/source
Files:
19 edited

Legend:

Unmodified
Added
Removed

  • branches/HTM-DEV-0.3-dev2/source/App/TAppDecoder/TAppDecTop.cpp

    r534 r542  
    9595    m_pchReconFile = NULL;
    9696  }
    97 #if H_3D_FIX
     97#if H_3D
    9898  if (m_pchScaleOffsetFile)
    9999  {

  • branches/HTM-DEV-0.3-dev2/source/App/TAppEncoder/TAppEncCfg.cpp

    r539 r542  
    10961096     0.753550, 0.800000 
    10971097  };
    1098 #if H_3D_CLEANUPS
    10991098  if ( m_bUseVSO && m_bVSOLSTable )
    1100 #else
    1101   if ( m_bVSOLSTable )
    1102 #endif
    11031099  {
    11041100    Int firstDepthLayer = -1;

  • branches/HTM-DEV-0.3-dev2/source/App/TAppEncoder/TAppEncTop.cpp

    r539 r542  
    123123#if H_3D
    124124  vps.initViewIndex();
    125 #if H_3D_GEN
    126125  xSetVPSExtension2        ( vps );
    127 #endif
    128126  m_ivPicLists.setVPS      ( &vps );
    129127#endif
    … …  
    11941192}
    11951193#endif
    1196 #if H_3D_GEN
     1194#if H_3D
    11971195Void TAppEncTop::xSetVPSExtension2( TComVPS& vps )
    11981196{

  • branches/HTM-DEV-0.3-dev2/source/App/TAppEncoder/TAppEncTop.h

    r534 r542  
    123123  Int  xGetMax( std::vector<Int>& vec);
    124124#endif
    125 #if H_3D_GEN
     125#if H_3D
    126126  Void xSetVPSExtension2( TComVPS& vps );
    127127#endif

  • branches/HTM-DEV-0.3-dev2/source/Lib/TAppCommon/TAppComCamPara.cpp

    r499 r542  
    965965  //--- determine (virtual) camera parameter shift between view order index 1 and base view (view order index 0) ---
    966966  Double        dCamPosShift, dPicPosShift;
    967 #if H_3D_PDM_CAM_PARAS
    968   Int           iMinVOI       = (1<<30);
    969 #endif
    970967  Int           iMinAbsVOI    = (1<<30);
    971968  Int           iMinAbsVOIId  = 0;
    … …  
    975972    if( iAbsVOI < iMinAbsVOI )
    976973    {
    977 #if H_3D_PDM_CAM_PARAS
    978       iMinVOI      = m_aiViewOrderIndex[ iBaseId ];
    979 #endif
    980974      iMinAbsVOI   = iAbsVOI;
    981975      iMinAbsVOIId = iBaseId;
    … …  
    984978  AOF( iMinAbsVOIId != 0 && iMinAbsVOI != 0 );
    985979  xGetCameraShifts( 0, iMinAbsVOIId, m_uiFirstFrameId, dCamPosShift, dPicPosShift );
    986 #if H_3D_PDM_CAM_PARAS
    987   Double  dCamPosShiftVOI01     = dCamPosShift / Double( iMinVOI );
    988 #endif
    989980
    990981  //--- determine maximum absolute camera position shift, precision, and base scale ---
    … …  
    999990    }
    1000991  }
    1001 
    1002 #if H_3D_PDM_CAM_PARAS
    1003   Int     iPrecision  = 0;
    1004 #if 0 // enabling this lines might be reasonable, but produces different results for the 2 view and 3 view test cases
    1005   Double  dEpsilon    = 1e-15;
    1006   Double  dAbsCamPosShiftVOI01  = ( dCamPosShiftVOI01 < 0.0 ? -dCamPosShiftVOI01 : dCamPosShiftVOI01 );
    1007   Double  dShiftRatio = dMaxAbsCamPosShift / dAbsCamPosShiftVOI01 - dEpsilon;
    1008   for( ; (Double)( 1 << iPrecision ) < dShiftRatio; iPrecision++ );
    1009 #endif
    1010   Int     iPrecShift  = iPrecision + PDM_INTER_CALC_SHIFT + PDM_VIRT_DEPTH_PRECISION - 2;
    1011   AOF(    iPrecShift  < PDM_INTERNAL_CALC_BIT_DEPTH );
    1012   Int     iScaleVOI01 = 1 << iPrecShift;
    1013   m_iPdmPrecision     = iPrecision;
    1014 
    1015   //--- loop over target views ---
    1016   for( Int iTargetId = 1; iTargetId < m_iNumberOfBaseViews; iTargetId++ )
    1017   {
    1018     // set scale and offset parameters for other views
    1019     for( Int iBaseId = 0; iBaseId < iTargetId; iBaseId++ )
    1020     {
    1021       xGetCameraShifts( (UInt)iBaseId, (UInt)iTargetId, m_uiFirstFrameId, dCamPosShift, dPicPosShift );
    1022       Double  dScale      = Double( iScaleVOI01 ) * dCamPosShiftVOI01 / dCamPosShift;
    1023       Int     iDiv        = m_aiViewOrderIndex[ iTargetId ] - m_aiViewOrderIndex[ iBaseId ];
    1024       Int     iAdd        = ( iDiv > 0 ? iDiv / 2 : -iDiv / 2 );
    1025       Int     iScalePred  = ( iScaleVOI01 + iAdd ) / iDiv;
    1026       Double  dFactor     = dScale / (Double)iScalePred * pow( 2.0, PDM_LOG4_SCALE_DENOMINATOR );
    1027       Int     iNominator  = (Int)floor( dFactor + .5 );
    1028       Int     iNomDelta   = iNominator - ( 1 << PDM_LOG4_SCALE_DENOMINATOR );
    1029       Int     iScale      = Int( ( (Int64)iNominator * (Int64)iScalePred + (Int64)( ( 1 << PDM_LOG4_SCALE_DENOMINATOR ) >> 1 ) ) >> PDM_LOG4_SCALE_DENOMINATOR );
    1030       Double  dOffset     = -dPicPosShift * Double( iScale ) * pow( 2.0, 2 - PDM_OFFSET_SHIFT );
    1031       Int     iOffset     = (Int)floor( dOffset + .5 );
    1032 
    1033       m_aaiPdmScaleNomDelta [ iTargetId ][ iBaseId ]  = iNomDelta;
    1034       m_aaiPdmOffset        [ iTargetId ][ iBaseId ]  = iOffset;
    1035     }
    1036   }
    1037 #endif
    1038992}
    1039993
    … …  
    10591013  m_aaiScaleAndOffsetSet      = 0;
    10601014
    1061 #if H_3D_PDM_CAM_PARAS
    1062   m_iPdmPrecision             = 0;
    1063   m_aaiPdmScaleNomDelta       = 0;
    1064   m_aaiPdmOffset              = 0;
    1065 #endif
    1066 
    10671015  m_adBaseViewShiftParameter  = 0;
    10681016  m_aiBaseViewShiftParameter  = 0;
    … …  
    10981046  xDeleteArray( m_aaiScaleAndOffsetSet,      m_iNumberOfBaseViews );
    10991047
    1100 #if H_3D_PDM_CAM_PARAS
    1101   xDeleteArray( m_aaiPdmScaleNomDelta,       m_iNumberOfBaseViews );
    1102   xDeleteArray( m_aaiPdmOffset,              m_iNumberOfBaseViews );
    1103 #endif
    11041048}
    11051049
    … …  
    13441288  xInit2dArray  ( (UInt)m_iNumberOfBaseViews, (UInt)m_iNumberOfBaseViews,  m_aaiScaleAndOffsetSet, 0 );
    13451289
    1346 #if H_3D_PDM_CAM_PARAS
    1347   xCreate2dArray( (UInt)m_iNumberOfBaseViews, (UInt)m_iNumberOfBaseViews,  m_aaiPdmScaleNomDelta     );
    1348   xCreate2dArray( (UInt)m_iNumberOfBaseViews, (UInt)m_iNumberOfBaseViews,  m_aaiPdmOffset            );
    1349 
    1350   //===== init disparity to virtual depth conversion parameters =====
    1351   xSetPdmConversionParams();
    1352 #endif
    1353 
    13541290  //===== init arrays for first frame =====
    13551291  xSetShiftParametersAndLUT( m_uiFirstFrameId );

  • branches/HTM-DEV-0.3-dev2/source/Lib/TAppCommon/TAppComCamPara.h

    r446 r542  
    8989  Int**               m_aaiScaleAndOffsetSet;                 ///< array indicating whether scale and offset have been set
    9090
    91 #if H_3D_PDM_CAM_PARAS
    92   // parameters for virtual depth map generation
    93   Int                 m_iPdmPrecision;                        ///< additional precision for disparity - virtual depth conversion
    94   Int**               m_aaiPdmScaleNomDelta;                  ///< [TargetView][RefView] delta for nominator of scale factor
    95   Int**               m_aaiPdmOffset;                         ///< [TargetView][RefView] offset parameter
    96 #endif
    97 
    9891  // scale and offset parameters
    9992  Double***           m_adBaseViewShiftParameter;             ///< ShiftParameters between BaseViews e.g. [2][1][0] shift scale from view 2 to view 1; [2][1][1] shift offset from view 2 to view 1
    … …  
    217210  Int**               getCodedScale             ()  { return m_aaiCodedScale;           }
    218211  Int**               getCodedOffset            ()  { return m_aaiCodedOffset;          }
    219 
    220 #if H_3D_PDM_CAM_PARAS
    221   // parameters for virtual depth map generation
    222   Int                 getPdmPrecision           ()  { return m_iPdmPrecision;           }
    223   Int**               getPdmScaleNomDelta       ()  { return m_aaiPdmScaleNomDelta;     }
    224   Int**               getPdmOffset              ()  { return m_aaiPdmOffset;            }
    225 #endif
    226212};
    227213

  • branches/HTM-DEV-0.3-dev2/source/Lib/TLibCommon/CommonDef.h

    r541 r542  
    6060#define HM_VERSION        "11.0"                ///<
    6161#else
    62 #define NV_VERSION        "10.1"                 ///< Current software version
     62#define NV_VERSION        "11.0"                 ///< Current software version
    6363#endif
    6464

  • branches/HTM-DEV-0.3-dev2/source/Lib/TLibCommon/TComDataCU.cpp

    r537 r542  
    30953095#endif
    30963096        //pcMvFieldNeighbours[iCount<<1].setMvField(cMvPred,pcMvFieldNeighbours[iCount<<1].getRefIdx());
    3097 #if H_3D_CLEANUPS //Notes from QC: for BVSP coded blocks, the reference index shall not be equal to -1 due to the adoption of JCT3V-D0191
     3097#if H_3D //Notes from QC: for BVSP coded blocks, the reference index shall not be equal to -1 due to the adoption of JCT3V-D0191
    30983098        pcMvFieldNeighbours[iCount<<1].setMvField(cMvPred,pcMvFieldNeighbours[iCount<<1].getRefIdx());
    3099 #else
    3100         if (pcMvFieldNeighbours[iCount<<1].getRefIdx()<0)
    3101         {
    3102           for (Int i=0; i<getSlice()->getNumRefIdx(REF_PIC_LIST_0); i++)
    3103           {
    3104             if (getSlice()->getRefPOC(REF_PIC_LIST_0, i) == getSlice()->getPOC())
    3105             {
    3106               pcMvFieldNeighbours[iCount<<1].setMvField(cMvPred,i);
    3107               break;
    3108             }
    3109           }
    3110         }
    31113099#endif
    31123100      }
    … …  
    31243112          clipMv(cMvPred);
    31253113#endif
    3126           //pcMvFieldNeighbours[(iCount<<1)+1].setMvField(cMvPred,pcMvFieldNeighbours[(iCount<<1)+1].getRefIdx());
    3127 #if H_3D_CLEANUPS
    31283114          pcMvFieldNeighbours[(iCount<<1)+1].setMvField(cMvPred,pcMvFieldNeighbours[(iCount<<1)+1].getRefIdx());
    3129 #else
    3130           if (pcMvFieldNeighbours[(iCount<<1)+1].getRefIdx()<0)
    3131           {
    3132             for (Int i=0; i<getSlice()->getNumRefIdx(REF_PIC_LIST_1); i++)
    3133             {
    3134               if (getSlice()->getRefPOC(REF_PIC_LIST_1, i) == getSlice()->getPOC())
    3135               {
    3136                 pcMvFieldNeighbours[(iCount<<1)+1].setMvField(cMvPred,i);
    3137                 break;
    3138               }
    3139             }
    3140           }
    3141 #endif
    31423115        }
    31433116      }
    3144 #if !H_3D_CLEANUPS
    3145       if (!((pcMvFieldNeighbours[iCount<<1].getRefIdx()<0 && !getSlice()->isInterB())
    3146         || (pcMvFieldNeighbours[iCount<<1].getRefIdx()<0 && pcMvFieldNeighbours[(iCount<<1)+1].getRefIdx()<0 && getSlice()->isInterB())))
    3147       {
    3148 #endif
    31493117#if H_3D_NBDV
    31503118      pcMvFieldNeighbours[iCount<<1    ].getMv().setIDVFlag (false);
    … …  
    31563124      }
    31573125      iCount ++;
    3158 #if !H_3D_CLEANUPS
    3159       }
    3160       else
    3161       {
    3162         assert(0);
    3163       }
    3164 #endif
    31653126    }
    31663127  }
    … …  
    31743135   
    31753136  Int iPdmInterDir;
    3176 #if H_3D_CLEANUPS
     3137
    31773138  if( iPdmDir[0] )
    3178 #else
    3179   if( iPdmDir[0] && ivMvPredFlag )
    3180 #endif
    31813139  {
    31823140    abCandIsInter        [ iCount ] = true;
    … …  
    31993157    iCount ++;
    32003158  }
    3201 #if H_3D_CLEANUPS
    32023159  // early termination
    32033160  if (iCount == getSlice()->getMaxNumMergeCand())
    … …  
    32063163  }
    32073164#endif
    3208 #endif
    3209 
    3210 #if !H_3D_IV_MERGE
    3211 #if H_3D_NBDV //Notes from QC: DvMCP related variables. 
    3212   //acPdmMv[0].m_bDvMcp = acPdmMv[1].m_bDvMcp = acPdmMv[2].m_bDvMcp = acPdmMv[3].m_bDvMcp = false;
    3213 #endif
    3214 
    3215 #if H_3D_NBDV //Notes from QC: Some examples to show how to use the NBDV and DoNBDV variables. Remove this comment once it is done
    3216   DisInfo cDisInfo;
    3217   cDisInfo.bDV = false;
    3218   //if(!bNoPdmMerge)
    3219   //{
    3220     //cDisInfo.bDV = getDvInfo(uiAbsPartIdx).bDV;
    3221     //cDisInfo.m_aVIdxCan = getDvInfo(uiAbsPartIdx).m_aVIdxCan;
    3222     //cDisInfo.m_acNBDV = getDvInfo(uiAbsPartIdx).m_acNBDV;
    3223 //#if H_3D_NBDV_REF
    3224     //cDisInfo.m_acDoNBDV = getDvInfo(uiAbsPartIdx).m_acDoNBDV;
    3225 //#endif
    3226   //}
    3227 #endif
    3228 #endif
     3165
    32293166  //left
    32303167  UInt uiLeftPartIdx = 0;
    … …  
    34023339
    34033340#if H_3D_IV_MERGE
    3404 #if H_3D_CLEANUPS
    34053341  if( iPdmDir[1] )
    3406 #else
    3407   if(ivMvPredFlag && iPdmDir[1] )
    3408 #endif
    34093342  {
    34103343    assert(iCount < getSlice()->getMaxNumMergeCand());
    … …  
    50875020          clipMv( cDispVec );
    50885021          pDInfo->m_acNBDV = cDispVec;
    5089 #if H_3D_CLEANUPS
    50905022          pDInfo->m_aVIdxCan = cIDVInfo.m_aVIdxCan[iList][ curPos ];
    50915023          assert(pDInfo->m_aVIdxCan == 0); //Notes from QC: only works for CTC
    5092 #else
    5093           pDInfo->m_aVIdxCan = 0;
    5094 #endif
    50955024#if H_3D_NBDV_REF
    5096 #if H_3D_CLEANUPS
    50975025          TComPic* picDepth = getSlice()->getIvPic( true, pDInfo->m_aVIdxCan );
    5098 #else
    5099           TComPic* picDepth = getSlice()->getIvPic( true, 0 );
    5100 #endif
    51015026          assert(picDepth!=NULL);
    51025027
    51035028          if (picDepth && bDepthRefine)
    5104 #if H_3D_CLEANUPS
     5029          {
    51055030            estimateDVFromDM (pDInfo->m_aVIdxCan, uiPartIdx, picDepth, uiPartAddr, &cDispVec);
    5106 #else
    5107             estimateDVFromDM(0, uiPartIdx, picDepth, uiPartAddr, &cDispVec ); // from base view
    5108 #endif
     5031          }
    51095032          pDInfo->m_acDoNBDV = cDispVec;
    51105033#endif
    … …  
    53385261{
    53395262  TComSlice*    pcSlice         = getSlice (); 
    5340 #if H_3D_CLEANUPS //Notes from QC: to be aligned with the spec.
    53415263  Int iViewIndex = pDInfo->m_aVIdxCan;
    5342 #else
    5343   Bool valid     = false;
    5344 
    5345   Int iViewIndex = 0;
    5346 
    5347   for( UInt uiBIndex = 0; uiBIndex < pcSlice->getViewIndex( ) && !valid; uiBIndex++ )
    5348   {
    5349     UInt        uiBaseIndex = uiBIndex;   
    5350     TComPic*    pcBasePic   = pcSlice->getIvPic( false, uiBaseIndex );
    5351     for( Int iRefListId = 0; iRefListId < 2 && !valid; iRefListId++ )
    5352     {
    5353       RefPicList  eRefPicListTest = RefPicList( iRefListId );
    5354       Int         iNumRefPics = pcSlice->getNumRefIdx( eRefPicListTest ) ;
    5355       for( Int iRefIndex = 0; iRefIndex < iNumRefPics; iRefIndex++ )
    5356       {
    5357         if(pcBasePic->getPOC() == pcSlice->getRefPic( eRefPicListTest, iRefIndex )->getPOC()
    5358           && pcBasePic->getViewIndex() == pcSlice->getRefPic( eRefPicListTest, iRefIndex )->getViewIndex())
    5359         {
    5360           valid = true;
    5361           iViewIndex = uiBaseIndex;
    5362           break;
    5363         }
    5364       }
    5365     }
    5366   }
    5367 
    5368   if (!valid)
    5369     return false;
    5370 #endif
    53715264  //--- get base CU/PU and check prediction mode ---
    53725265  TComPic*    pcBasePic   = pcSlice->getIvPic( false, iViewIndex );

  • branches/HTM-DEV-0.3-dev2/source/Lib/TLibCommon/TComSlice.cpp

    r540 r542  
    118118, m_icSkipParseFlag               ( false )
    119119#endif
    120 #if H_3D_GEN
     120#if H_3D
    121121, m_depthToDisparityB             ( NULL )
    122122, m_depthToDisparityF             ( NULL )
    … …  
    158158  delete[] m_puiSubstreamSizes;
    159159  m_puiSubstreamSizes = NULL;
    160 #if H_3D_GEN   
     160#if H_3D
    161161  for( UInt i = 0; i < getViewIndex(); i++ )
    162162  {
    … …  
    15291529#endif
    15301530  }
    1531 #if H_3D_GEN
     1531#if H_3D
    15321532  for( Int i = 0; i < MAX_NUM_LAYERS; i++ )
    15331533  {
    … …  
    26362636}
    26372637#endif
    2638 #if H_3D_GEN
     2638#if H_3D
    26392639Void TComSlice::setIvPicLists( TComPicLists* m_ivPicLists )
    26402640{

  • branches/HTM-DEV-0.3-dev2/source/Lib/TLibCommon/TComSlice.h

    r541 r542  
    15681568  Bool      m_icSkipParseFlag;
    15691569#endif
    1570 #if H_3D_GEN
     1570#if H_3D
    15711571  TComPic*   m_ivPicsCurrPoc [2][MAX_NUM_LAYERS]; 
    15721572  Int**      m_depthToDisparityB;
    … …  
    16301630  TComPic*  getRefPic           ( RefPicList e, Int iRefIdx)    { return  m_apcRefPicList[e][iRefIdx];  }
    16311631  Int       getRefPOC           ( RefPicList e, Int iRefIdx)    { return  m_aiRefPOCList[e][iRefIdx];   }
    1632 #if H_3D_GEN
     1632#if H_3D
    16331633  TComPic*  getIvPic            ( Bool depthFlag, Int viewIndex){ return  m_ivPicsCurrPoc[ depthFlag ? 1 : 0 ][ viewIndex ]; }
    16341634#endif
    … …  
    18491849#endif
    18501850#endif
    1851 #if H_3D_GEN
     1851#if H_3D
    18521852  Void    setIvPicLists( TComPicLists* m_ivPicLists );
    18531853  Void    setDepthToDisparityLUTs();

  • branches/HTM-DEV-0.3-dev2/source/Lib/TLibCommon/TypeDef.h

    r541 r542  
    5555
    5656#ifndef HEVC_EXT
    57 #define HEVC_EXT                    2
     57#define HEVC_EXT                    1
    5858#endif
    5959
    … …  
    7676                                              // HHI_QTLPC_RAU_OFF_C0160     // JCT3V-C0160 change 2: quadtree limitation and predictive coding switched off in random access units
    7777
    78 #define H_3D_PDM_CAM_PARAS                0 ///< PDM related parts of camera parameters, should be removed if not used anymore.
    7978#define H_3D_VSO                          1   // VSO, View synthesis optimization, includes:
    8079                                              // HHI_VSO
    … …  
    110109                                              // LG_D0092: Multiple VSP candidate allowed
    111110
    112 #if H_3D_VSP
    113 #define H_3D_VSP_POSITION                 3   // The only supported position
    114 #define H_3D_VSP_BLOCKSIZE                4   // Supported values: 1, 2, and 4
    115 #if H_3D_VSP_BLOCKSIZE == 1
    116 #define H_3D_VSP_CONSTRAINED              1   // Constrained VSP @ 1x1
    117 #else
    118 #define H_3D_VSP_CONSTRAINED              0
    119 #endif
    120 #endif
    121 
    122111#define H_3D_IV_MERGE                     1   // Inter-view motion merge candidate
    123112                                              // HHI_INTER_VIEW_MOTION_PRED
    … …  
    130119#define H_3D_TMVP                         1   // QC_TMVP_C0047
    131120                                              // Sony_M23639
    132 #define H_3D_GEN                          1   // Some general changes can be removed after merge
    133 #define H_3D_CLEANUPS                     1   // Temporary for minor fixes can be removed after merge
    134 #define H_3D_FIX                          1   // Temporary for minor fixes can be removed after merge
    135 #define H_3D_VSO_FIX_BORDRE_EXTENSION     1   // Temporary for minor fixes can be removed after merge
     121
    136122#define H_3D_DIM                          1   // DIM, Depth intra modes, includes:
    137123                                              // HHI_DMM_WEDGE_INTRA
    … …  
    156142/////////////////////////////////////////////////////////////////////////////////////////
    157143
     144
    158145///// ***** VIEW SYNTHESIS OPTIMIZAION *********
    159146#if H_3D_VSO                                 
    … …  
    169156////   ****** Neighbouring block-based Disparity Vector  *********
    170157#if H_3D_NBDV
    171 #if H_3D_CLEANUPS
    172158#define DVFROM_LEFTBELOW                  0
    173159#define DVFROM_LEFT                       1
    … …  
    176162#define DVFROM_ABOVELEFT                  4
    177163#define IDV_CANDS                         5
    178 #else
    179 #define IDV_CANDS                         6
    180 #define DVFROM_LEFTBELOW                  1
    181 #define DVFROM_LEFT                       2
    182 #define DVFROM_ABOVERIGHT                 3
    183 #define DVFROM_ABOVE                      4
    184 #define DVFROM_ABOVELEFT                  5
    185 #endif
    186164#endif
    187165///// ***** ADVANCED INTERVIEW RESIDUAL PREDICTION *********
    … …  
    198176                                              // HHI_DEPTH_INTRA_SEARCH_RAU_C0160
    199177                                              // LG_ZEROINTRADEPTHRESI_A0087
     178#endif
     179
     180///// ***** VIEW SYNTHESIS PREDICTION *********
     181#if H_3D_VSP
     182#define H_3D_VSP_POSITION                 3   // The only supported position
     183#define H_3D_VSP_BLOCKSIZE                4   // Supported values: 1, 2, and 4
     184#if H_3D_VSP_BLOCKSIZE == 1
     185#define H_3D_VSP_CONSTRAINED              1   // Constrained VSP @ 1x1
     186#else
     187#define H_3D_VSP_CONSTRAINED              0
     188#endif
    200189#endif
    201190

  • branches/HTM-DEV-0.3-dev2/source/Lib/TLibDecoder/TDecGop.cpp

    r486 r542  
    159159  }
    160160#endif
    161 #if H_3D_GEN
     161#if H_3D
    162162  pcSlice->setDepthToDisparityLUTs();
    163163#endif

  • branches/HTM-DEV-0.3-dev2/source/Lib/TLibDecoder/TDecTop.cpp

    r537 r542  
    913913#endif
    914914
    915 #if H_3D_GEN
     915#if H_3D
    916916    pcSlice->setIvPicLists( m_ivPicLists );         
    917917#if H_3D_IV_MERGE   

  • branches/HTM-DEV-0.3-dev2/source/Lib/TLibDecoder/TDecTop.h

    r531 r542  
    8989  Int**   m_aaiCodedScale;
    9090  Int*    m_aiViewId; 
    91 #if !H_3D_FIX 
    92   Int*    m_aiLayerIdx;
    93 #endif
    9491
    9592  Bool*   m_bViewReceived;

  • branches/HTM-DEV-0.3-dev2/source/Lib/TLibEncoder/TEncCavlc.cpp

    r541 r542  
    801801    WRITE_FLAG ( 0,                    "vps_shvc_reserved_zero_flag" );
    802802
    803 #if H_3D_GEN 
     803#if H_3D
    804804  WRITE_FLAG( 1,                                             "vps_extension2_flag" );
    805805  m_pcBitIf->writeAlignOne();     

  • branches/HTM-DEV-0.3-dev2/source/Lib/TLibEncoder/TEncGOP.cpp

    r537 r542  
    471471    pcPic->setCurrSliceIdx(0);
    472472
    473 #if H_3D_GEN
     473#if H_3D
    474474    m_pcSliceEncoder->initEncSlice ( pcPic, iPOCLast, pocCurr, iNumPicRcvd, iGOPid, pcSlice, m_pcEncTop->getVPS(), m_pcEncTop->getSPS(), m_pcEncTop->getPPS(), getLayerId() );     
    475475#else
    … …  
    482482    pcPic  ->setLayerId     ( getLayerId()   );
    483483    pcPic  ->setViewId      ( getViewId()    );   
    484 #if !H_3D_GEN   
     484#if !H_3D
    485485    pcSlice->setLayerId     ( getLayerId() );
    486486    pcSlice->setViewId      ( getViewId()  );   
    487487    pcSlice->setVPS         ( m_pcEncTop->getVPS() );
    488 #endif
    489 #if H_3D
     488#else
    490489    pcPic  ->setViewIndex   ( getViewIndex() );
    491490    pcPic  ->setIsDepth( getIsDepth() );
    492 #if !H_3D_GEN
    493     pcSlice->setViewIndex   ( getViewIndex()  );
    494     pcSlice->setIsDepth( getIsDepth() );   
    495 #endif
    496491    pcSlice->setCamparaSlice( pcPic->getCodedScale(), pcPic->getCodedOffset() );   
    497492#endif
    … …  
    10781073        pcPic->setNumDdvCandPics(pcPic->getDisCandRefPictures(iColPoc));
    10791074      }
    1080 #if H_3D_GEN
     1075#if H_3D
    10811076      pcSlice->setDepthToDisparityLUTs();
    10821077

  • branches/HTM-DEV-0.3-dev2/source/Lib/TLibEncoder/TEncSlice.cpp

    r541 r542  
    176176 \param pPPS          PPS associated with the slice
    177177 */
    178 #if H_3D_GEN
     178#if H_3D
    179179Void TEncSlice::initEncSlice( TComPic* pcPic, Int pocLast, Int pocCurr, Int iNumPicRcvd, Int iGOPid, TComSlice*& rpcSlice, TComVPS* pVPS, TComSPS* pSPS, TComPPS *pPPS, Int layerId )
    180180#else
    … …  
    186186 
    187187  rpcSlice = pcPic->getSlice(0);
    188 #if H_3D_GEN
     188#if H_3D
    189189  // GT: Should also be activated for MV-HEVC at some stage
    190190  rpcSlice->setVPS( pVPS );

  • branches/HTM-DEV-0.3-dev2/source/Lib/TLibEncoder/TEncSlice.h

    r537 r542  
    116116 
    117117  /// preparation of slice encoding (reference marking, QP and lambda)
    118 #if H_3D_GEN
     118#if H_3D
    119119  Void    initEncSlice        ( TComPic* pcPic, Int pocLast, Int pocCurr, Int iNumPicRcvd,
    120120                                Int iGOPid, TComSlice*& rpcSlice, TComVPS* pVPS, TComSPS* pSPS, TComPPS *pPPS, Int layerId );

  • branches/HTM-DEV-0.3-dev2/source/Lib/TLibEncoder/TEncTop.cpp

    r541 r542  
    511511  // mark it should be extended
    512512  rpcPic->getPicYuvRec()->setBorderExtension(false);
    513 #if H_3D_VSO_FIX_BORDRE_EXTENSION
    514513  rpcPic->getPicYuvOrg()->setBorderExtension(false);
    515 #endif
    516514}
    517515
Note: See TracChangeset for help on using the changeset viewer.