Changeset 1084 in 3DVCSoftware for trunk/source/Lib/TLibCommon

Timestamp:

24 Oct 2014, 11:44:58 (10 years ago)

Author:

tech

Message:

Merged branches/HTM-12.1-dev0@1083.

Location:

trunk/source/Lib/TLibCommon

Files:

• CommonDef.h (modified) (1 diff)
• ContextTables.h (modified) (3 diffs)
• SEI.h (modified) (1 diff)
• TComDataCU.cpp (modified) (27 diffs)
• TComDataCU.h (modified) (7 diffs)
• TComMotionInfo.h (modified) (1 diff)
• TComPicSym.cpp (modified) (7 diffs)
• TComPicSym.h (modified) (4 diffs)
• TComPrediction.cpp (modified) (33 diffs)
• TComPrediction.h (modified) (2 diffs)
• TComRom.cpp (modified) (5 diffs)
• TComRom.h (modified) (2 diffs)
• TComSlice.cpp (modified) (57 diffs)
• TComSlice.h (modified) (55 diffs)
• TComWedgelet.cpp (modified) (5 diffs)
• TComWedgelet.h (modified) (5 diffs)
• TComYuv.cpp (modified) (6 diffs)
• TypeDef.h (modified) (18 diffs)

trunk/source/Lib/TLibCommon/CommonDef.h

@@ -61 +61 @@
 #if H_MV
 #define NV_VERSION        "12.1"                ///< Current software version
-#define HM_VERSION        "14.0"                ///< 
+#define HM_VERSION        "15.0"                ///< 
 #else
 #define NV_VERSION        "14.0"                 ///< Current software version

trunk/source/Lib/TLibCommon/ContextTables.h

@@ -51 +51 @@
 #define NUM_SPLIT_FLAG_CTX            3       ///< number of context models for split flag
 #define NUM_SKIP_FLAG_CTX             3       ///< number of context models for skip flag
-#if MTK_SINGLE_DEPTH_MODE_I0095
+#if H_3D_SINGLE_DEPTH
 #define NUM_SINGLEDEPTH_FLAG_CTX                     1
 #define NUM_SINGLE_DEPTH_VALUE_DATA_CTX              1       
@@ -153 +153 @@
   { CNU,  CNU,  CNU, }, 
 };
-#if MTK_SINGLE_DEPTH_MODE_I0095
+#if H_3D_SINGLE_DEPTH
 static const UChar 
 INIT_SINGLEDEPTH_FLAG[3][NUM_SINGLEDEPTH_FLAG_CTX] =  
@@ -450 +450 @@
 static const UChar INIT_DBBP_FLAG[3][DBBP_NUM_FLAG_CTX] =
 {
-#if SEC_DBBP_EXPLICIT_SIG_I0077
-  { CNU },
-  { CNU },
-  { CNU },
-#else
-  { 161 },
-  { 161 },
-  { 161 },
-#endif
-};
-#endif
-
-#endif
+  { CNU },
+  { CNU },
+  { CNU },
+};
+#endif
+
+#endif

trunk/source/Lib/TLibCommon/SEI.h

@@ -161 +161 @@
   UInt m_bpSeqParameterSetId;
   Bool m_rapCpbParamsPresentFlag;
-  Bool m_cpbDelayOffset;
-  Bool m_dpbDelayOffset;
+  UInt m_cpbDelayOffset;
+  UInt m_dpbDelayOffset;
   UInt m_initialCpbRemovalDelay         [MAX_CPB_CNT][2];
   UInt m_initialCpbRemovalDelayOffset   [MAX_CPB_CNT][2];

trunk/source/Lib/TLibCommon/TComDataCU.cpp

@@ -60 +60 @@
   
   m_skipFlag           = NULL;
-#if MTK_SINGLE_DEPTH_MODE_I0095
+#if H_3D_SINGLE_DEPTH
   m_singleDepthFlag     = NULL;
   m_apSingleDepthValue  = NULL;
@@ -185 +185 @@
 
     m_skipFlag           = new Bool[ uiNumPartition ];
-#if MTK_SINGLE_DEPTH_MODE_I0095
+#if H_3D_SINGLE_DEPTH
     m_singleDepthFlag     = new Bool[ uiNumPartition ];
     m_apSingleDepthValue  = (Pel*)xMalloc(Pel, uiNumPartition);
@@ -335 +335 @@
 
     if ( m_skipFlag           ) { delete[] m_skipFlag;          m_skipFlag          = NULL; }
-#if MTK_SINGLE_DEPTH_MODE_I0095
+#if H_3D_SINGLE_DEPTH
     if ( m_singleDepthFlag    ) { delete[] m_singleDepthFlag;   m_singleDepthFlag     = NULL; }
     if ( m_apSingleDepthValue ) { xFree(m_apSingleDepthValue);  m_apSingleDepthValue  = NULL; }
@@ -503 +503 @@
     TComDataCU * pcFrom = pcPic->getCU(getAddr());
     m_skipFlag[ui]   = pcFrom->getSkipFlag(ui);
-#if MTK_SINGLE_DEPTH_MODE_I0095
+#if H_3D_SINGLE_DEPTH
     m_singleDepthFlag[ui]    = pcFrom->getSingleDepthFlag(ui);
     m_apSingleDepthValue[ui] = pcFrom->getSingleDepthValue(ui);
@@ -563 +563 @@
   {
     memset( m_skipFlag          + firstElement, false,                    numElements * sizeof( *m_skipFlag ) );
-#if MTK_SINGLE_DEPTH_MODE_I0095
+#if H_3D_SINGLE_DEPTH
     memset( m_singleDepthFlag     + firstElement, false,                  numElements * sizeof( *m_singleDepthFlag ) );
     memset( m_apSingleDepthValue  + firstElement,     0,                  numElements * sizeof( *m_apSingleDepthValue ) );
@@ -754 +754 @@
       m_puhTransformSkip[2][ui] = 0;
       m_skipFlag[ui]   = false;
-#if MTK_SINGLE_DEPTH_MODE_I0095
+#if H_3D_SINGLE_DEPTH
       m_singleDepthFlag[ui]     = false;
       m_apSingleDepthValue[ui]  = 0;
@@ -933 +933 @@
   {
     m_skipFlag[ui]   = false;
-#if MTK_SINGLE_DEPTH_MODE_I0095
+#if H_3D_SINGLE_DEPTH
     m_singleDepthFlag[ui]   = false;
     m_apSingleDepthValue[ui]= 0;
@@ -958 +958 @@
       m_puhTransformSkip[2][ui] = pcCU->getTransformSkip(uiPartOffset+ui,TEXT_CHROMA_V);
       m_skipFlag[ui]   = pcCU->getSkipFlag(uiPartOffset+ui);
-#if MTK_SINGLE_DEPTH_MODE_I0095
+#if H_3D_SINGLE_DEPTH
       m_singleDepthFlag[ui]    = pcCU->getSingleDepthFlag(uiPartOffset+ui);
       m_apSingleDepthValue[ui] = pcCU->getSingleDepthValue(uiPartOffset+ui);
@@ -1111 +1111 @@
   
   m_skipFlag=pcCU->getSkipFlag()          + uiPart;
-#if MTK_SINGLE_DEPTH_MODE_I0095
+#if H_3D_SINGLE_DEPTH
   m_singleDepthFlag     = pcCU->getSingleDepthFlag()   + uiPart;
   m_apSingleDepthValue  = pcCU->getSingleDepthValue()  + uiPart;
@@ -1252 +1252 @@
   
   m_skipFlag           = pcCU->getSkipFlag ()             + uiAbsPartIdx;
-#if MTK_SINGLE_DEPTH_MODE_I0095
+#if H_3D_SINGLE_DEPTH
   m_singleDepthFlag     = pcCU->getSingleDepthFlag ()             + uiAbsPartIdx;
   m_apSingleDepthValue  = pcCU->getSingleDepthValue ()            + uiAbsPartIdx;
@@ -1331 +1331 @@
   Int sizeInChar  = sizeof( Char ) * uiNumPartition;
   memcpy( m_skipFlag   + uiOffset, pcCU->getSkipFlag(),       sizeof( *m_skipFlag )   * uiNumPartition );
-#if MTK_SINGLE_DEPTH_MODE_I0095
+#if H_3D_SINGLE_DEPTH
   memcpy( m_singleDepthFlag     + uiOffset, pcCU->getSingleDepthFlag(),       sizeof( *m_singleDepthFlag )   * uiNumPartition );
   memcpy( m_apSingleDepthValue  + uiOffset, pcCU->getSingleDepthValue(),      sizeof( *m_apSingleDepthValue ) * uiNumPartition);
@@ -1455 +1455 @@
 
   memcpy( rpcCU->getSkipFlag() + m_uiAbsIdxInLCU, m_skipFlag, sizeof( *m_skipFlag ) * m_uiNumPartition );
-#if MTK_SINGLE_DEPTH_MODE_I0095
+#if H_3D_SINGLE_DEPTH
   memcpy( rpcCU->getSingleDepthFlag()  + m_uiAbsIdxInLCU, m_singleDepthFlag,    sizeof( *m_singleDepthFlag ) * m_uiNumPartition );
   memcpy( rpcCU->getSingleDepthValue() + m_uiAbsIdxInLCU, m_apSingleDepthValue, sizeof( *m_apSingleDepthValue ) * m_uiNumPartition);
@@ -1574 +1574 @@
   Int sizeInChar  = sizeof( Char ) * uiQNumPart;
   memcpy( rpcCU->getSkipFlag()       + uiPartOffset, m_skipFlag,   sizeof( *m_skipFlag )   * uiQNumPart );
-#if MTK_SINGLE_DEPTH_MODE_I0095
+#if H_3D_SINGLE_DEPTH
   memcpy( rpcCU->getSingleDepthFlag()  + uiPartOffset, m_singleDepthFlag,    sizeof( *m_singleDepthFlag )   * uiQNumPart );
   memcpy( rpcCU->getSingleDepthValue() + uiPartOffset, m_apSingleDepthValue, sizeof( *m_apSingleDepthValue ) * uiQNumPart);
@@ -2497 +2497 @@
   memset( m_skipFlag + absPartIdx, skip, m_pcPic->getNumPartInCU() >> ( 2 * depth ) );
 }
-#if MTK_SINGLE_DEPTH_MODE_I0095
+#if H_3D_SINGLE_DEPTH
 Void TComDataCU::setSingleDepthFlagSubParts( Bool singleDepth, UInt absPartIdx, UInt depth )
 {
@@ -2677 +2677 @@
   }
 
-#if HS_DMM_SIGNALLING_I0120
   if( isDimMode( getLumaIntraDir( uiAbsPartIdx ) ) )
-#else
-  if( isDimMode( getLumaIntraDir( uiAbsPartIdx ) ) && !isDimDeltaDC( getLumaIntraDir( uiAbsPartIdx ) ) )
-#endif
   {
     return true;
@@ -2694 +2690 @@
   // check prediction mode
   UInt uiLumaPredMode = getLumaIntraDir( uiAbsPartIdx );  
-#if HS_DMM_SIGNALLING_I0120
   if( uiLumaPredMode == PLANAR_IDX || ( getDimType( uiLumaPredMode ) == DMM1_IDX  ) )
-#else
-  if( uiLumaPredMode == PLANAR_IDX || ( getDimType( uiLumaPredMode ) == DMM1_IDX && !isDimDeltaDC( uiLumaPredMode ) ) )
-#endif
     return true;
   
@@ -3373 +3365 @@
   for(Int iLoop = 0; iLoop < 2; iLoop ++ ) 
   {
-#if !SEC_SIMP_SHIFTED_DV_I0086
-    // IvDcShift (Derived from spatial Iv neighboring blocks)
-    if( iLoop == 1 )
-    {
-      Int iFirDispCand = -1;
-      TComMvField mvIvDcShift[2];
-      UChar dirIvDcShift;
-
-      if (xGetPosFirstAvailDmvCand(MRG_IVSHIFT, iFirDispCand))
-      {
-        TComMv cMv;
-        cMv = m_mergCands[iFirDispCand].m_cMvField[0].getMv();
-        cMv.setHor(cMv.getHor()+4);
-        if(m_pcSlice->getVPS()->getViewSynthesisPredFlag(m_pcSlice->getLayerIdInVps()))
-        {
-          cMv.setVer(0);
-        }
-#if !(NTT_BUG_FIX_TK54)
-        clipMv( cMv );
-#endif
-
-        dirIvDcShift = m_mergCands[iFirDispCand].m_uDir;
-        mvIvDcShift[0].setMvField(cMv, m_mergCands[iFirDispCand].m_cMvField[0].getRefIdx() );
-        mvIvDcShift[1].setMvField(m_mergCands[iFirDispCand].m_cMvField[1].getMv(), m_mergCands[iFirDispCand].m_cMvField[1].getRefIdx() );
-        m_mergCands[MRG_IVSHIFT].setCand(mvIvDcShift, dirIvDcShift, false, false);
-        
-        if( mrgCandIdx == iCount ) 
-        {
-          return true;
-        }
-        iCount++;
-        break;
-      }
-    }
-#endif
-
     /// iLoop = 0 --> IvMCShift
     /// iLoop = 1 --> IvDCShift  (Derived from IvDC)
@@ -3455 +3411 @@
 } 
 
-#if !SEC_SIMP_SHIFTED_DV_I0086
-inline Bool TComDataCU::xGetPosFirstAvailDmvCand(Int iCount, Int& posFirstAvailDmvCand )
-{
-  for ( Int currListPos = 0; currListPos < iCount; currListPos++ )
-  {
-    if ( !m_mergCands[currListPos].m_bAvailable || ( currListPos == MRG_IVMC ) || ( currListPos == MRG_IVDC ) || ( m_mergCands[currListPos].m_iVspFlag != 0 ))
-    {
-      continue;
-    }
-    else if((m_mergCands[currListPos].m_bAvailable) && (m_mergCands[currListPos].m_cMvField[0].getRefIdx() != -1 ) && (getSlice()->getViewIndex() != getSlice()->getRefPic(RefPicList(0), m_mergCands[currListPos].m_cMvField[0].getRefIdx())->getViewIndex()))
-    {
-      posFirstAvailDmvCand = currListPos;
-      return true;
-    }
-  }
-  return false;  
-}
-#endif
-                                      
 #endif
 
@@ -3921 +3858 @@
 Void TComDataCU::getInterMergeCandidates( UInt uiAbsPartIdx, UInt uiPUIdx, TComMvField* pcMvFieldNeighbours, UChar* puhInterDirNeighbours
 #endif
-#if H_3D_VSP && !FIX_TICKET_79
-      , InheritedVSPDisInfo*  inheritedVSPDisInfo
-#endif
 #if H_3D_SPIVMP
       , TComMvField* pcMvFieldSP, UChar* puhInterDirSP
@@ -3951 +3885 @@
   //////////////////////////////////
   DisInfo cDisInfo = getDvInfo(uiAbsPartIdx);
-#if !FIX_TICKET_79
-  for(Int i = 0; i < MRG_MAX_NUM_CANDS_MEM; i++)
-  {
-    inheritedVSPDisInfo[i].m_acDvInfo = cDisInfo;   // To prevent run-time error, this code must be executed always for merging process.
-  }
-#endif
   m_cDefaultDisInfo = cDisInfo;
 
@@ -4177 +4105 @@
     TComPic * pcTexPic = m_pcSlice->getTexturePic();
 #if H_3D_FCO
-#if LGE_FCO_I0116
+#if H_3D_FCO
     if (pcTexPic && pcTexPic->getReconMark())
 #else
@@ -4251 +4179 @@
                 TComMv cMv = cDefaultMvField.getMv() + cMvRounding;
                 cMv >>= 2;
-#if !FIX_TICKET_68
-                clipMv( cMv );
-#endif
                 cMvFieldSaved[eCurrRefPicList].setMvField(cMv, iRefPicList) ;
                 break;
@@ -5325 +5250 @@
 #endif
 
-#if !FIX_TICKET_76
-#if H_3D_VSP
-inline Void TComDataCU::xInheritVSPDisInfo(TComDataCU* pcCURef, UInt uiAbsPartIdx, Int iCount, InheritedVSPDisInfo*  inheritedVSPDisInfo)
-{
-  inheritedVSPDisInfo[iCount].m_acDvInfo.m_acNBDV   = pcCURef->getDvInfo(uiAbsPartIdx).m_acNBDV;
-  inheritedVSPDisInfo[iCount].m_acDvInfo.m_aVIdxCan = pcCURef->getDvInfo(uiAbsPartIdx).m_aVIdxCan;
-}
-#endif
-#endif
 /** Check whether the current PU and a spatial neighboring PU are in a same ME region.
  * \param xN, xN   location of the upper-left corner pixel of a neighboring PU
@@ -5976 +5892 @@
     Int iColRefViewId  = pColCU->getSlice()->getRefPic( eColRefPicList, pColCU->getCUMvField(eColRefPicList)->getRefIdx(uiAbsPartAddr))->getViewIndex(); 
     iScale = xGetDistScaleFactor( iCurrViewId, iCurrRefViewId, iColViewId, iColRefViewId );
-#if SEC_HLS_CLEANUP_I0100
+
     if ( iScale != 4096 && m_pcSlice->getVPS()->getIvMvScalingFlag(getSlice()->getLayerIdInVps()) ) 
-#else
-    if ( iScale != 4096 && m_pcSlice->getVPS()->getIvMvScalingFlag() ) 
-#endif
     {
       rcMv = cColMv.scaleMv( iScale );
@@ -6164 +6077 @@
   TComMv cMv; 
 #if MTK_I0093
-#if H_3D_FIX_64BIT_SHIFT
   Int iDisp     = getSlice()->getDepthToDisparityB( 0 )[ (Int64) (1 << ( getSlice()->getSPS()->getBitDepthY() - 1 )) ];
-#else
-  Int iDisp     = getSlice()->getDepthToDisparityB( 0 )[  1 << ( getSlice()->getSPS()->getBitDepthY() - 1 ) ];
-#endif
 #else
   Int iDisp     = getSlice()->getDepthToDisparityB( 0 )[ 128 ];
@@ -6181 +6090 @@
 #endif
 
-#if MTK_SINGLE_DEPTH_MODE_I0095
+#if H_3D_SINGLE_DEPTH
 Bool TComDataCU::getNeighDepth (UInt uiPartIdx, UInt uiPartAddr, Pel* pNeighDepth, Int index)
 {
@@ -6795 +6704 @@
   if( getSlice()->getIsDepth() )
   {
-#if MTK_I0099_VPS_EX2
     iSubPUSize = 1<<getSlice()->getVPS()->getSubPUMPILog2Size(getSlice()->getLayerId());
-#else
-    iSubPUSize = 1 << getSlice()->getVPS()->getSubPUMPILog2Size();
-#endif
   }
 

trunk/source/Lib/TLibCommon/TComDataCU.h

@@ -110 +110 @@
   // -------------------------------------------------------------------------------------------------------------------
   Bool*         m_skipFlag;           ///< array of skip flags
-#if MTK_SINGLE_DEPTH_MODE_I0095
+#if H_3D_SINGLE_DEPTH
   Bool*         m_singleDepthFlag;           ///< array of single depth flags
   Pel*          m_apSingleDepthValue;
@@ -250 +250 @@
 #if H_3D_IV_MERGE
   Bool          xAddIvMRGCand( Int mrgCandIdx, Int& iCount, Int*   ivCandDir, TComMv* ivCandMv, Int* ivCandRefIdx ); 
-#if! SEC_SIMP_SHIFTED_DV_I0086
-  Bool          xGetPosFirstAvailDmvCand( Int iCount, Int& iFirDispCand );
-#endif
 #endif
 
@@ -353 +350 @@
   Void         setSkipFlag           ( UInt idx, Bool skip)     { m_skipFlag[idx] = skip;   }
   Void         setSkipFlagSubParts   ( Bool skip, UInt absPartIdx, UInt depth );
-#if MTK_SINGLE_DEPTH_MODE_I0095
+#if H_3D_SINGLE_DEPTH
   Bool*        getSingleDepthFlag            ()                        { return m_singleDepthFlag;          }
   Bool         getSingleDepthFlag            (UInt idx)                { return m_singleDepthFlag[idx];     }
@@ -505 +502 @@
   Bool          getDispMvPredCan(UInt uiPartIdx, RefPicList eRefPicList, Int iRefIdx, Int* paiPdmRefIdx, TComMv* pacPdmMv, DisInfo* pDis, Int* iPdm );
 #endif
-#if MTK_SINGLE_DEPTH_MODE_I0095
+#if H_3D_SINGLE_DEPTH
    Bool          getNeighDepth (UInt uiPartIdx, UInt uiPartAddr, Pel* pNeighDepth, Int index);
 #endif
@@ -670 +667 @@
   Void          getInterMergeCandidates ( UInt uiAbsPartIdx, UInt uiPUIdx, TComMvField* pcMFieldNeighbours, UChar* puhInterDirNeighbours
 #endif
-#if H_3D_VSP && !FIX_TICKET_79
-                                            , InheritedVSPDisInfo*  inheritedVSPDisInfo
-#endif
 #if H_3D_SPIVMP
                                             , TComMvField* pcMvFieldSP, UChar* puhInterDirSP
@@ -680 +674 @@
 
 #if H_3D_VSP
-#if !FIX_TICKET_76
-  inline Void   xInheritVSPDisInfo(TComDataCU* pcCURef, UInt uiAbsPartIdx, Int iCount,  InheritedVSPDisInfo*  inheritedVSPDisInfo);
-#endif
-
 #if H_3D_SPIVMP
   Bool*         getSPIVMPFlag        ()                        { return m_pbSPIVMPFlag;          }
@@ -771 +761 @@
 #endif
 
-#if SHARP_DMM1_I0110
+#if H_3D_DIM
   Bool         isDMM1UpscaleMode       ( UInt uiWidth ){ Bool bDMM1UpsampleModeFlag = true; UInt uiBaseWidth = 16; if( uiBaseWidth >= uiWidth ){ bDMM1UpsampleModeFlag = false; } return bDMM1UpsampleModeFlag; };
   UInt         getDMM1BasePatternWidth ( UInt uiWidth ){ UInt uiBaseWidth = 16; if( uiBaseWidth >= uiWidth ){ uiBaseWidth =  uiWidth; } return uiBaseWidth; }

trunk/source/Lib/TLibCommon/TComMotionInfo.h

@@ -79 +79 @@
 } IDVInfo;
 #endif
-#if H_3D_VSP && !FIX_TICKET_79
-typedef struct _InheritedVSPDisCand 
-{
-  DisInfo m_acDvInfo;
-} InheritedVSPDisInfo;
-#endif
+
 // ====================================================================================================================
 // Class definition

trunk/source/Lib/TLibCommon/TComPicSym.cpp

@@ -38 +38 @@
 #include "TComPicSym.h"
 #include "TComSampleAdaptiveOffset.h"
+#include "TComSlice.h"
 
 //! \ingroup TLibCommon
@@ -63 +64 @@
 ,m_iNumColumnsMinus1 (0)
 ,m_iNumRowsMinus1(0)
-,m_apcTComTile(NULL)
 ,m_puiCUOrderMap(0)
 ,m_puiTileIdxMap(NULL)
@@ -101 +101 @@
     delete [] m_apcTComSlice;
   }
-  m_apcTComSlice      = new TComSlice*[m_uiNumCUsInFrame*m_uiNumPartitions];  
+  m_apcTComSlice      = new TComSlice*[m_uiNumCUsInFrame];
   m_apcTComSlice[0]   = new TComSlice;
   m_uiNumAllocatedSlice = 1;
@@ -148 +148 @@
   m_apcTComDataCU = NULL;
 
-  for(Int i = 0; i < (m_iNumColumnsMinus1+1)*(m_iNumRowsMinus1+1); i++ )
-  {
-    delete m_apcTComTile[i];
-  }
-  delete [] m_apcTComTile;
-
-  m_apcTComTile = NULL;
-
   delete [] m_puiCUOrderMap;
   m_puiCUOrderMap = NULL;
@@ -173 +165 @@
 Void TComPicSym::allocateNewSlice()
 {
+  assert ((m_uiNumAllocatedSlice + 1) <= m_uiNumCUsInFrame);
   m_apcTComSlice[m_uiNumAllocatedSlice ++] = new TComSlice;
   if (m_uiNumAllocatedSlice>=2)
@@ -201 +194 @@
 }
 
-Void TComPicSym::xCreateTComTileArray()
-{
-  m_apcTComTile = new TComTile*[(m_iNumColumnsMinus1+1)*(m_iNumRowsMinus1+1)];
-  for( UInt i=0; i<(m_iNumColumnsMinus1+1)*(m_iNumRowsMinus1+1); i++ )
-  {
-    m_apcTComTile[i] = new TComTile;
-  }
-}
-
-Void TComPicSym::xInitTiles()
-{
-  UInt  uiTileIdx;
-  UInt  uiColumnIdx = 0;
-  UInt  uiRowIdx = 0;
-  UInt  uiRightEdgePosInCU;
-  UInt  uiBottomEdgePosInCU;
-  Int   i, j;
+Void TComPicSym::initTiles(TComPPS *pps)
+{
+  //set NumColumnsMinus1 and NumRowsMinus1
+  setNumColumnsMinus1( pps->getNumTileColumnsMinus1() );
+  setNumRowsMinus1( pps->getTileNumRowsMinus1() );
+
+  const Int numCols = pps->getNumTileColumnsMinus1() + 1;
+  const Int numRows = pps->getTileNumRowsMinus1() + 1;
+  const Int numTiles = numRows * numCols;
+
+  // allocate memory for tile parameters
+  m_tileParameters.resize(numTiles);
+
+  if( pps->getTileUniformSpacingFlag() )
+  {
+    //set width and height for each (uniform) tile
+    for(Int row=0; row < numRows; row++)
+    {
+      for(Int col=0; col < numCols; col++)
+      {
+        const Int tileIdx = row * numCols + col;
+        m_tileParameters[tileIdx].setTileWidth( (col+1)*getFrameWidthInCU()/numCols
+                                              - (col*getFrameWidthInCU())/numCols );
+        m_tileParameters[tileIdx].setTileHeight( (row+1)*getFrameHeightInCU()/numRows
+                                               - (row*getFrameHeightInCU())/numRows );
+      }
+    }
+  }
+  else
+  {
+    //set the width for each tile
+    for(Int row=0; row < numRows; row++)
+    {
+      Int cumulativeTileWidth = 0;
+      for(Int col=0; col < getNumColumnsMinus1(); col++)
+  {
+        m_tileParameters[row * numCols + col].setTileWidth( pps->getTileColumnWidth(col) );
+        cumulativeTileWidth += pps->getTileColumnWidth(col);
+  }
+      m_tileParameters[row * numCols + getNumColumnsMinus1()].setTileWidth( getFrameWidthInCU()-cumulativeTileWidth );
+}
+
+    //set the height for each tile
+    for(Int col=0; col < numCols; col++)
+{
+      Int cumulativeTileHeight = 0;
+      for(Int row=0; row < getNumRowsMinus1(); row++)
+      {
+        m_tileParameters[row * numCols + col].setTileHeight( pps->getTileRowHeight(row) );
+        cumulativeTileHeight += pps->getTileRowHeight(row);
+      }
+      m_tileParameters[getNumRowsMinus1() * numCols + col].setTileHeight( getFrameHeightInCU()-cumulativeTileHeight );
+    }
+  }
+
+#if TILE_SIZE_CHECK
+  Int minWidth  = 1;
+  Int minHeight = 1;
+  const Int profileIdc = pps->getSPS()->getPTL()->getGeneralPTL()->getProfileIdc();
+  if (  profileIdc == Profile::MAIN || profileIdc == Profile::MAIN10)
+  {
+    if (pps->getTilesEnabledFlag())
+    {
+      minHeight = 64  / g_uiMaxCUHeight;
+      minWidth  = 256 / g_uiMaxCUWidth;
+    }
+  }
+  for(Int row=0; row < numRows; row++)
+  {
+    for(Int col=0; col < numCols; col++)
+    {
+      const Int tileIdx = row * numCols + col;
+      assert (m_tileParameters[tileIdx].getTileWidth() >= minWidth);
+      assert (m_tileParameters[tileIdx].getTileHeight() >= minHeight);
+    }
+  }
+#endif
 
   //initialize each tile of the current picture
-  for( uiRowIdx=0; uiRowIdx < m_iNumRowsMinus1+1; uiRowIdx++ )
-  {
-    for( uiColumnIdx=0; uiColumnIdx < m_iNumColumnsMinus1+1; uiColumnIdx++ )
-    {
-      uiTileIdx = uiRowIdx * (m_iNumColumnsMinus1+1) + uiColumnIdx;
+  for( Int row=0; row < numRows; row++ )
+  {
+    for( Int col=0; col < numCols; col++ )
+    {
+      const Int tileIdx = row * numCols + col;
 
       //initialize the RightEdgePosInCU for each tile
-      uiRightEdgePosInCU = 0;
-      for( i=0; i <= uiColumnIdx; i++ )
-      {
-        uiRightEdgePosInCU += this->getTComTile(uiRowIdx * (m_iNumColumnsMinus1+1) + i)->getTileWidth();
-      }
-      this->getTComTile(uiTileIdx)->setRightEdgePosInCU(uiRightEdgePosInCU-1);
+      Int rightEdgePosInCTU = 0;
+      for( Int i=0; i <= col; i++ )
+      {
+        rightEdgePosInCTU += m_tileParameters[row * numCols + i].getTileWidth();
+      }
+      m_tileParameters[tileIdx].setRightEdgePosInCU(rightEdgePosInCTU-1);
 
       //initialize the BottomEdgePosInCU for each tile
-      uiBottomEdgePosInCU = 0;
-      for( i=0; i <= uiRowIdx; i++ )
-      {
-        uiBottomEdgePosInCU += this->getTComTile(i * (m_iNumColumnsMinus1+1) + uiColumnIdx)->getTileHeight();
-      }
-      this->getTComTile(uiTileIdx)->setBottomEdgePosInCU(uiBottomEdgePosInCU-1);
+      Int bottomEdgePosInCTU = 0;
+      for( Int i=0; i <= row; i++ )
+      {
+        bottomEdgePosInCTU += m_tileParameters[i * numCols + col].getTileHeight();
+      }
+      m_tileParameters[tileIdx].setBottomEdgePosInCU(bottomEdgePosInCTU-1);
 
       //initialize the FirstCUAddr for each tile
-      this->getTComTile(uiTileIdx)->setFirstCUAddr( (this->getTComTile(uiTileIdx)->getBottomEdgePosInCU() - this->getTComTile(uiTileIdx)->getTileHeight() +1)*m_uiWidthInCU + 
-        this->getTComTile(uiTileIdx)->getRightEdgePosInCU() - this->getTComTile(uiTileIdx)->getTileWidth() + 1);
-    }
-  }
+      m_tileParameters[tileIdx].setFirstCUAddr( (m_tileParameters[tileIdx].getBottomEdgePosInCU() - m_tileParameters[tileIdx].getTileHeight() + 1) * getFrameWidthInCU() + 
+                                                 m_tileParameters[tileIdx].getRightEdgePosInCU() - m_tileParameters[tileIdx].getTileWidth() + 1);
+    }
+  }
+
+  Int  columnIdx = 0;
+  Int  rowIdx = 0;
 
   //initialize the TileIdxMap
-  for( i=0; i<m_uiNumCUsInFrame; i++)
-  {
-    for(j=0; j < m_iNumColumnsMinus1+1; j++)
-    {
-      if(i % m_uiWidthInCU <= this->getTComTile(j)->getRightEdgePosInCU())
-      {
-        uiColumnIdx = j;
-        j = m_iNumColumnsMinus1+1;
-      }
-    }
-    for(j=0; j < m_iNumRowsMinus1+1; j++)
-    {
-      if(i/m_uiWidthInCU <= this->getTComTile(j*(m_iNumColumnsMinus1 + 1))->getBottomEdgePosInCU())
-      {
-        uiRowIdx = j;
-        j = m_iNumRowsMinus1 + 1;
-      }
-    }
-    m_puiTileIdxMap[i] = uiRowIdx * (m_iNumColumnsMinus1 + 1) + uiColumnIdx;
+  for( Int i=0; i<m_uiNumCUsInFrame; i++)
+  {
+    for( Int col=0; col < numCols; col++)
+    {
+      if(i % getFrameWidthInCU() <= m_tileParameters[col].getRightEdgePosInCU())
+      {
+        columnIdx = col;
+        break;
+      }
+    }
+    for(Int row=0; row < numRows; row++)
+    {
+      if(i / getFrameWidthInCU() <= m_tileParameters[row*numCols].getBottomEdgePosInCU())
+      {
+        rowIdx = row;
+        break;
+      }
+    }
+    m_puiTileIdxMap[i] = rowIdx * numCols + columnIdx;
   }
 
@@ -417 +473 @@
 
 TComTile::TComTile()
+: m_uiTileWidth         (0)
+, m_uiTileHeight        (0)
+, m_uiRightEdgePosInCU  (0)
+, m_uiBottomEdgePosInCU (0)
+, m_uiFirstCUAddr       (0)
+
 {
 }

trunk/source/Lib/TLibCommon/TComPicSym.h

@@ -45 +45 @@
 #include "TComDataCU.h"
 class TComSampleAdaptiveOffset;
+class TComPPS;
 
 //! \ingroup TLibCommon
@@ -102 +103 @@
   Int           m_iNumColumnsMinus1; 
   Int           m_iNumRowsMinus1;
-  TComTile**    m_apcTComTile;
+  std::vector<TComTile> m_tileParameters;
   UInt*         m_puiCUOrderMap;       //the map of LCU raster scan address relative to LCU encoding order 
   UInt*         m_puiTileIdxMap;       //the map of the tile index relative to LCU raster scan address 
@@ -133 +134 @@
   Int          getNumRowsMinus1()                                    { return m_iNumRowsMinus1; }
   Int          getNumTiles()                                         { return (m_iNumRowsMinus1+1)*(m_iNumColumnsMinus1+1); }
-  TComTile*    getTComTile  ( UInt tileIdx )                         { return *(m_apcTComTile + tileIdx); }
+  TComTile*    getTComTile  ( UInt tileIdx )                         { return &(m_tileParameters[tileIdx]); }
   Void         setCUOrderMap( Int encCUOrder, Int cuAddr )           { *(m_puiCUOrderMap + encCUOrder) = cuAddr; }
   UInt         getCUOrderMap( Int encCUOrder )                       { return *(m_puiCUOrderMap + (encCUOrder>=m_uiNumCUsInFrame ? m_uiNumCUsInFrame : encCUOrder)); }
@@ -141 +142 @@
   UInt         getPicSCUEncOrder( UInt SCUAddr );
   UInt         getPicSCUAddr( UInt SCUEncOrder );
-  Void         xCreateTComTileArray();
-  Void         xInitTiles();
+  Void         initTiles(TComPPS *pps);
   UInt         xCalculateNxtCUAddr( UInt uiCurrCUAddr );
   SAOBlkParam* getSAOBlkParam() { return m_saoBlkParams;}

trunk/source/Lib/TLibCommon/TComPrediction.cpp

@@ -423 +423 @@
 
   UInt dimType    = getDimType  ( uiIntraMode );
-#if !HS_DMM_SIGNALLING_I0120
-  Bool dimDeltaDC = isDimDeltaDC( uiIntraMode );
-#endif
   Bool isDmmMode  = (dimType <  DMM_NUM_TYPE);
 
@@ -440 +437 @@
     case( DMM1_IDX ): 
       {
-#if SHARP_DMM1_I0110
         dmmSegmentation = pcCU->isDMM1UpscaleMode((UInt)iWidth) ? 
             &(g_dmmWedgeLists[ g_aucConvertToBit[pcCU->getDMM1BasePatternWidth((UInt)iWidth)] ][ pcCU->getDmmWedgeTabIdx( dimType, uiAbsPartIdx ) ]) : 
             &(g_dmmWedgeLists[ g_aucConvertToBit[iWidth] ][ pcCU->getDmmWedgeTabIdx( dimType, uiAbsPartIdx ) ]);
-#else
-        dmmSegmentation = &(g_dmmWedgeLists[ g_aucConvertToBit[iWidth] ][ pcCU->getDmmWedgeTabIdx( dimType, uiAbsPartIdx ) ]);
-#endif
       } break;
     case( DMM4_IDX ): 
@@ -464 +457 @@
     }
     assert( dmmSegmentation );
-#if SHARP_DMM1_I0110
     if( dimType == DMM1_IDX && pcCU->isDMM1UpscaleMode((UInt)iWidth) ) 
     {
@@ -475 +467 @@
         patternStride = dmmSegmentation->getStride ();
     }
-#else
-    biSegPattern  = dmmSegmentation->getPattern();
-    patternStride = dmmSegmentation->getStride ();
-#endif
   }
 #endif
@@ -495 +483 @@
   Pel segDC1 = 0;
   Pel segDC2 = 0;
-#if HS_DMM_SIGNALLING_I0120
   if( !pcCU->getSDCFlag( uiAbsPartIdx ) )
-#else
-  if( dimDeltaDC )
-#endif
   {
     Pel deltaDC1 = pcCU->getDimDeltaDC( dimType, 0, uiAbsPartIdx );
@@ -568 +552 @@
     pcCU->getSPAbsPartIdx(uiPartAddr, iSPWidth, iSPHeight, i, iNumSPInOneLine, uiSPAddr[i]);
   }
-#if SHARP_ARP_CHROMA_I0104
   if( pcCU->getARPW( uiPartAddr ) != 0 )
   {
     return;
   }
-#endif
+
   // horizontal sub-PU merge
   for (Int i=0; i<iNumSP; i++)
@@ -745 +728 @@
   Int uiMinDepth = MAX_INT;
   Int uiMaxDepth = 0;
-#if SEC_DBBP_DMM4_THRESHOLD_I0076
+
   iSumDepth  = pDepthPels[ 0 ];
   iSumDepth += pDepthPels[ uiWidth - 1 ];
@@ -760 +743 @@
   uiMaxDepth = std::max( uiMaxDepth, (Int)pDepthPels[ uiDepthStride * (uiHeight - 1) ]);
   uiMaxDepth = std::max( uiMaxDepth, (Int)pDepthPels[ uiDepthStride * (uiHeight - 1) + uiWidth - 1 ]);
-#else
-  for (Int y=0; y<uiHeight; y++)
-  {
-    for (Int x=0; x<uiWidth; x++)
-    {
-      Int depthPel = pDepthPels[x];
-      iSumDepth += depthPel;
-      
-      if( depthPel > uiMaxDepth )
-      {
-        uiMaxDepth = depthPel;
-      }
-      if( depthPel < uiMinDepth )
-      {
-        uiMinDepth = depthPel;
-      }
-    }
-    
-    // next row
-    pDepthPels += uiDepthStride;
-  }
-#endif
+
   
   // don't generate mask for blocks with small depth range (encoder decision)
@@ -790 +752 @@
   
   AOF(uiWidth==uiHeight);
-#if SEC_DBBP_DMM4_THRESHOLD_I0076
   Int iMean = iSumDepth >> 2;
-#else
-  Int iSizeInBits = g_aucConvertToBit[uiWidth]+2;
-  Int iMean = iSumDepth >> iSizeInBits*2;       // iMean /= (uiWidth*uiHeight);
-#endif
   
   // start again for segmentation
@@ -842 +799 @@
 }
 
-#if SHARP_DBBP_SIMPLE_FLTER_I0109
 Void TComPrediction::combineSegmentsWithMask( TComYuv* pInYuv[2], TComYuv* pOutYuv, Bool* pMask, UInt uiWidth, UInt uiHeight, UInt uiPartAddr, UInt partSize )
-#else
-Void TComPrediction::combineSegmentsWithMask( TComYuv* pInYuv[2], TComYuv* pOutYuv, Bool* pMask, UInt uiWidth, UInt uiHeight, UInt uiPartAddr )
-#endif
 {
   Pel*  piSrc[2]    = {pInYuv[0]->getLumaAddr(uiPartAddr), pInYuv[1]->getLumaAddr(uiPartAddr)};
@@ -854 +807 @@
   
   UInt  uiMaskStride= MAX_CU_SIZE;
-#if !SHARP_DBBP_SIMPLE_FLTER_I0109
-  Pel  filSrc = 0;
-#endif
   Pel* tmpTar = 0;
   tmpTar = (Pel *)xMalloc(Pel, uiWidth*uiHeight);
@@ -880 +830 @@
   }
   
-#if SHARP_DBBP_SIMPLE_FLTER_I0109
   if (partSize == SIZE_Nx2N)
   {
@@ -917 +866 @@
     }
   }
-#else
-  for (Int y=0; y<uiHeight; y++)
-  {
-    for (Int x=0; x<uiWidth; x++)
-    {
-      Bool t = (y==0)?pMaskStart[y*uiMaskStride+x]:pMaskStart[(y-1)*uiMaskStride+x];
-      Bool l = (x==0)?pMaskStart[y*uiMaskStride+x]:pMaskStart[y*uiMaskStride+x-1];
-      Bool b = (y==uiHeight-1)?pMaskStart[y*uiMaskStride+x]:pMaskStart[(y+1)*uiMaskStride+x];
-      Bool r = (x==uiWidth-1)?pMaskStart[y*uiMaskStride+x]:pMaskStart[y*uiMaskStride+x+1];
-      Bool c =pMaskStart[y*uiMaskStride+x];
-
-      Pel left, right, top, bottom;
-      left   = (x==0)          ? tmpTar[y*uiWidth+x] : tmpTar[y*uiWidth+x-1];
-      right  = (x==uiWidth-1)  ? tmpTar[y*uiWidth+x] : tmpTar[y*uiWidth+x+1];
-      top    = (y==0)          ? tmpTar[y*uiWidth+x] : tmpTar[(y-1)*uiWidth+x];
-      bottom = (y==uiHeight-1) ? tmpTar[y*uiWidth+x] : tmpTar[(y+1)*uiWidth+x];
-
-      if(!((l&&r&&c) || (!l&&!r&&!c)))
-      {
-        filSrc = Clip3( Pel( 0 ), Pel( 255 ), Pel(( left + (tmpTar[y*uiWidth+x] << 1) + right ) >> 2 ));
-      }
-      else
-      {
-        filSrc = tmpTar[y*uiWidth+x];
-      }
-
-      if(!((t&&b&&c) || (!t&&!b&&!c)))
-      {
-        filSrc = Clip3( Pel( 0 ), Pel( 255 ), Pel(( top + (filSrc << 1) + bottom ) >> 2 ));
-      }
-      piDst[x] = filSrc;
-    }
-    piDst     += uiDstStride;
-  }
-#endif
 
   if ( tmpTar    ) { xFree(tmpTar);             tmpTar        = NULL; }
@@ -989 +903 @@
   }
 
-#if SHARP_DBBP_SIMPLE_FLTER_I0109
   if (partSize == SIZE_Nx2N)
   {
@@ -1056 +969 @@
     }
   }
-#else
-  for (Int y=0; y<uiHeightC; y++)
-  {
-    for (Int x=0; x<uiWidthC; x++)
-    {
-      Bool t = (y==0)?pMaskStart[y*2*uiMaskStride+x*2]:pMaskStart[(y-1)*2*uiMaskStride+x*2];
-      Bool l = (x==0)?pMaskStart[y*2*uiMaskStride+x*2]:pMaskStart[y*2*uiMaskStride+(x-1)*2];
-      Bool b = (y==uiHeightC-1)?pMaskStart[y*2*uiMaskStride+x*2]:pMaskStart[(y+1)*2*uiMaskStride+x*2];
-      Bool r = (x==uiWidthC-1)?pMaskStart[y*2*uiMaskStride+x*2]:pMaskStart[y*2*uiMaskStride+(x+1)*2];
-      Bool c =pMaskStart[y*2*uiMaskStride+x*2];
-
-      Pel leftU, rightU, topU, bottomU;
-      leftU   = (x==0)           ? tmpTarU[y*uiWidthC+x] : tmpTarU[y*uiWidthC+x-1];
-      rightU  = (x==uiWidthC-1)  ? tmpTarU[y*uiWidthC+x] : tmpTarU[y*uiWidthC+x+1];
-      topU    = (y==0)           ? tmpTarU[y*uiWidthC+x] : tmpTarU[(y-1)*uiWidthC+x];
-      bottomU = (y==uiHeightC-1) ? tmpTarU[y*uiWidthC+x] : tmpTarU[(y+1)*uiWidthC+x];
-
-      Pel leftV, rightV, topV, bottomV;
-      leftV   = (x==0)           ? tmpTarV[y*uiWidthC+x] : tmpTarV[y*uiWidthC+x-1];
-      rightV  = (x==uiWidthC-1)  ? tmpTarV[y*uiWidthC+x] : tmpTarV[y*uiWidthC+x+1];
-      topV    = (y==0)           ? tmpTarV[y*uiWidthC+x] : tmpTarV[(y-1)*uiWidthC+x];
-      bottomV = (y==uiHeightC-1) ? tmpTarV[y*uiWidthC+x] : tmpTarV[(y+1)*uiWidthC+x];
-
-      if(!((l&&r&&c) || (!l&&!r&&!c)))
-      {
-        filSrcU = Clip3( Pel( 0 ), Pel( 255 ), Pel(( leftU + (tmpTarU[y*uiWidthC+x] << 1) + rightU ) >> 2 ));
-        filSrcV = Clip3( Pel( 0 ), Pel( 255 ), Pel(( leftV + (tmpTarV[y*uiWidthC+x] << 1) + rightV ) >> 2 ));
-      }
-      else
-      {
-        filSrcU = tmpTarU[y*uiWidthC+x];
-        filSrcV = tmpTarV[y*uiWidthC+x];
-      }
-
-      if(!((t&&b&&c) || (!t&&!b&&!c)))
-      {
-        filSrcU = Clip3( Pel( 0 ), Pel( 255 ), Pel(( topU + (filSrcU << 1) + bottomU ) >> 2 ));
-        filSrcV = Clip3( Pel( 0 ), Pel( 255 ), Pel(( topV + (filSrcV << 1) + bottomV ) >> 2 ));
-      }
-
-      piDstU[x] = filSrcU;
-      piDstV[x] = filSrcV;
-    }
-    piDstU      += uiDstStrideC;
-    piDstV      += uiDstStrideC;
-  }
-#endif
+
   if ( tmpTarU    ) { xFree(tmpTarU);             tmpTarU        = NULL; }
   if ( tmpTarV    ) { xFree(tmpTarV);             tmpTarV        = NULL; }
@@ -1475 +1342 @@
   pcCU->clipMv(cMv);
   TComPicYuv* pcPicYuvRef = pcCU->getSlice()->getRefPic( eRefPicList, iRefIdx )->getPicYuvRec();
-#if QC_I0129_ARP_FIX
   xPredInterLumaBlk  ( pcCU, pcPicYuvRef, uiPartAddr, &cMv, iWidth, iHeight, rpcYuvPred, bi || ( dW > 0 ), true );
   xPredInterChromaBlk( pcCU, pcPicYuvRef, uiPartAddr, &cMv, iWidth, iHeight, rpcYuvPred, bi || ( dW > 0 ), true );
-#else
-  xPredInterLumaBlk  ( pcCU, pcPicYuvRef, uiPartAddr, &cMv, iWidth, iHeight, rpcYuvPred, bi, true );
-  xPredInterChromaBlk( pcCU, pcPicYuvRef, uiPartAddr, &cMv, iWidth, iHeight, rpcYuvPred, bi, true );
-#endif
+
   if( dW > 0 )
   {
@@ -1489 +1352 @@
     TComMv cMVwithDisparity = cMv + cDistparity.m_acNBDV;
     pcCU->clipMv(cMVwithDisparity);
-#if SHARP_ARP_CHROMA_I0104
     if (iWidth <= 8)
     {
       pYuvB0->clear(); pYuvB1->clear();
     }
-#endif
 
     assert ( cDistparity.bDV );
     
-#if NTT_BUG_FIX_TK54
     TComMv cNBDV = cDistparity.m_acNBDV;
     pcCU->clipMv( cNBDV );
     
     pcPicYuvRef = pcPicYuvBaseCol->getPicYuvRec();
-#if QC_I0129_ARP_FIX
     xPredInterLumaBlk  ( pcCU, pcPicYuvRef, uiPartAddr, &cNBDV, iWidth, iHeight, pYuvB0, true, true );
-#if SHARP_ARP_CHROMA_I0104
     if (iWidth > 8)
-#endif
-    xPredInterChromaBlk( pcCU, pcPicYuvRef, uiPartAddr, &cNBDV, iWidth, iHeight, pYuvB0, true, true );
-#else
-    xPredInterLumaBlk  ( pcCU, pcPicYuvRef, uiPartAddr, &cNBDV, iWidth, iHeight, pYuvB0, bi, true );
-    xPredInterChromaBlk( pcCU, pcPicYuvRef, uiPartAddr, &cNBDV, iWidth, iHeight, pYuvB0, bi, true );
-#endif
-#else
-    pcPicYuvRef = pcPicYuvBaseCol->getPicYuvRec();
-    xPredInterLumaBlk  ( pcCU, pcPicYuvRef, uiPartAddr, &cDistparity.m_acNBDV, iWidth, iHeight, pYuvB0, bi, true );
-    xPredInterChromaBlk( pcCU, pcPicYuvRef, uiPartAddr, &cDistparity.m_acNBDV, iWidth, iHeight, pYuvB0, bi, true );
-#endif
+      xPredInterChromaBlk( pcCU, pcPicYuvRef, uiPartAddr, &cNBDV, iWidth, iHeight, pYuvB0, true, true );
     
     pcPicYuvRef = pcPicYuvBaseRef->getPicYuvRec();
-#if QC_I0129_ARP_FIX
     xPredInterLumaBlk  ( pcCU, pcPicYuvRef, uiPartAddr, &cMVwithDisparity, iWidth, iHeight, pYuvB1, true, true );
-#if SHARP_ARP_CHROMA_I0104
+  
     if (iWidth > 8)
-#endif
-    xPredInterChromaBlk( pcCU, pcPicYuvRef, uiPartAddr, &cMVwithDisparity, iWidth, iHeight, pYuvB1, true, true );
-#else
-    xPredInterLumaBlk  ( pcCU, pcPicYuvRef, uiPartAddr, &cMVwithDisparity, iWidth, iHeight, pYuvB1, bi, true );
-    xPredInterChromaBlk( pcCU, pcPicYuvRef, uiPartAddr, &cMVwithDisparity, iWidth, iHeight, pYuvB1, bi, true );
-#endif
+      xPredInterChromaBlk( pcCU, pcPicYuvRef, uiPartAddr, &cMVwithDisparity, iWidth, iHeight, pYuvB1, true, true );
+    
     pYuvB0->subtractARP( pYuvB0 , pYuvB1 , uiPartAddr , iWidth , iHeight );
 
@@ -1540 +1383 @@
 }
 
-#if QC_I0051_ARP_SIMP
 Bool TComPrediction::xCheckBiInterviewARP( TComDataCU* pcCU, UInt uiPartAddr, Int iWidth, Int iHeight, RefPicList eBaseRefPicList, TComPic*& pcPicYuvCurrTRef, TComMv& cBaseTMV, Int& iCurrTRefPoc )
 {
@@ -1572 +1414 @@
         Int  iCurrRefPOC = pcPicYuvBaseTRef->getPOC();
         Int  iCurrRef    = pcCU->getSlice()->getFirstTRefIdx(eRefPicListCurr);
-#if MTK_I0072_IVARP_SCALING_FIX
+
         if( iCurrRef >= 0 && iCurrPOC != iCurrRefPOC)
-#else
-        if( iCurrRef >= 0)
-#endif
         {
           pcPicYuvCurrTRef =  pcCU->getSlice()->getRefPic(eRefPicListCurr,iCurrRef);  
@@ -1608 +1447 @@
   return false;
 }
-#endif
 
 Void TComPrediction::xPredInterUniARPviewRef( TComDataCU* pcCU, UInt uiPartAddr, Int iWidth, Int iHeight, RefPicList eRefPicList, TComYuv*& rpcYuvPred, Bool bi, TComMvField * pNewMvFiled )
@@ -1643 +1481 @@
   pcYuvBaseCol->getCUAddrAndPartIdx( irefPUX, irefPUY, uiLCUAddr, uiAbsPartAddr);
   TComDataCU *pColCU = pcPicYuvBaseCol->getCU( uiLCUAddr );
-#if QC_I0051_ARP_SIMP
   if( pcCU->getSlice()->isInterB() && !pcCU->getSlice()->getIsDepth() )
   {
@@ -1708 +1545 @@
 
   if( !pColCU->isIntra( uiAbsPartAddr ) && !bTMVAvai )
-#else
-  if(!pColCU->isIntra(uiAbsPartAddr))
-#endif
   {
     TComMvField puMVField;
@@ -1723 +1557 @@
         Int  iCurrRefPOC = pcPicYuvBaseTRef->getPOC();
         Int  iCurrRef    = pcCU->getSlice()->getFirstTRefIdx(eRefPicListCurr);
-#if MTK_I0072_IVARP_SCALING_FIX
         if (iCurrRef >= 0 && iCurrRefPOC != iCurrPOC)
-#else
-        if( iCurrRef >= 0)
-#endif
         {
           pcPicYuvCurrTRef =  pcCU->getSlice()->getRefPic(eRefPicListCurr,iCurrRef);  
@@ -1754 +1584 @@
     pcPicYuvCurrTRef =  pcCU->getSlice()->getRefPic  (eRefPicList,  pcCU->getSlice()->getFirstTRefIdx(eRefPicList));      
   }
-#if QC_I0129_ARP_FIX
+
   xPredInterLumaBlk  ( pcCU, pcYuvBaseCol, uiPartAddr, &cTempDMv, iWidth, iHeight, rpcYuvPred, bi || ( dW > 0 && bTMVAvai ),        bTMVAvai);
   xPredInterChromaBlk( pcCU, pcYuvBaseCol, uiPartAddr, &cTempDMv, iWidth, iHeight, rpcYuvPred, bi || ( dW > 0 && bTMVAvai ),        bTMVAvai);
-#else
-  xPredInterLumaBlk  ( pcCU, pcYuvBaseCol, uiPartAddr, &cTempDMv, iWidth, iHeight, rpcYuvPred, bi,        bTMVAvai);
-  xPredInterChromaBlk( pcCU, pcYuvBaseCol, uiPartAddr, &cTempDMv, iWidth, iHeight, rpcYuvPred, bi,        bTMVAvai);
-#endif
+
   if( dW > 0 && bTMVAvai ) 
   {
@@ -1771 +1598 @@
     pcCU->clipMv(cBaseTMV);
     pcCU->clipMv(cTempMv);
-#if SHARP_ARP_CHROMA_I0104
+
     if (iWidth <= 8)
     {
       pYuvCurrTRef->clear(); pYuvBaseTRef->clear();
     }
-#endif
-#if QC_I0129_ARP_FIX
     xPredInterLumaBlk  ( pcCU, pcYuvCurrTref, uiPartAddr, &cBaseTMV, iWidth, iHeight, pYuvCurrTRef, true,   true);
-#if SHARP_ARP_CHROMA_I0104
+
     if (iWidth > 8)
-#endif
-    xPredInterChromaBlk( pcCU, pcYuvCurrTref, uiPartAddr, &cBaseTMV, iWidth, iHeight, pYuvCurrTRef, true,   true);
+      xPredInterChromaBlk( pcCU, pcYuvCurrTref, uiPartAddr, &cBaseTMV, iWidth, iHeight, pYuvCurrTRef, true,   true);
+
     xPredInterLumaBlk  ( pcCU, pcYuvBaseTref, uiPartAddr, &cTempMv,  iWidth, iHeight, pYuvBaseTRef, true,   true); 
-#if SHARP_ARP_CHROMA_I0104
+
     if (iWidth > 8)
-#endif
-    xPredInterChromaBlk( pcCU, pcYuvBaseTref, uiPartAddr, &cTempMv,  iWidth, iHeight, pYuvBaseTRef, true,   true); 
-#else
-    xPredInterLumaBlk  ( pcCU, pcYuvCurrTref, uiPartAddr, &cBaseTMV, iWidth, iHeight, pYuvCurrTRef, bi,   true);
-    xPredInterChromaBlk( pcCU, pcYuvCurrTref, uiPartAddr, &cBaseTMV, iWidth, iHeight, pYuvCurrTRef, bi,   true);
-    xPredInterLumaBlk  ( pcCU, pcYuvBaseTref, uiPartAddr, &cTempMv,  iWidth, iHeight, pYuvBaseTRef, bi,   true); 
-    xPredInterChromaBlk( pcCU, pcYuvBaseTref, uiPartAddr, &cTempMv,  iWidth, iHeight, pYuvBaseTRef, bi,   true); 
-
-#endif
+      xPredInterChromaBlk( pcCU, pcYuvBaseTref, uiPartAddr, &cTempMv,  iWidth, iHeight, pYuvBaseTRef, true,   true); 
+
     pYuvCurrTRef->subtractARP( pYuvCurrTRef , pYuvBaseTRef , uiPartAddr , iWidth , iHeight );  
     if(dW == 2)
@@ -1803 +1621 @@
   }
 }
-
 #endif
 
@@ -2328 +2145 @@
   Int iRecStride = ( eType == TEXT_LUMA ) ? pRecPic->getStride() : pRecPic->getCStride();
   Int iRefStride = ( eType == TEXT_LUMA ) ? pRefPic->getStride() : pRefPic->getCStride();
-#if SEC_IC_NEIGHBOR_CLIP_I0080
   Int iRefOffset, iHor, iVer;
-#else
-  Int iCUPelX, iCUPelY, iRefX, iRefY, iRefOffset, iHor, iVer;
-
-  iCUPelX = pcCU->getCUPelX() + g_auiRasterToPelX[g_auiZscanToRaster[pcCU->getZorderIdxInCU()]];
-  iCUPelY = pcCU->getCUPelY() + g_auiRasterToPelY[g_auiZscanToRaster[pcCU->getZorderIdxInCU()]];
-#endif
   iHor = pcCU->getSlice()->getIsDepth() ? pMv->getHor() : ( ( pMv->getHor() + 2 ) >> 2 );
   iVer = pcCU->getSlice()->getIsDepth() ? pMv->getVer() : ( ( pMv->getVer() + 2 ) >> 2 );
-#if !SEC_IC_NEIGHBOR_CLIP_I0080
-  iRefX   = iCUPelX + iHor;
-  iRefY   = iCUPelY + iVer;
-#endif
   if( eType != TEXT_LUMA )
   {
@@ -2357 +2163 @@
   Int precShift = std::max(0, (( eType == TEXT_LUMA ) ? g_bitDepthY : g_bitDepthC) - 12);
 
-#if SEC_IC_NEIGHBOR_CLIP_I0080
   if( pcCU->getPUAbove( uiTmpPartIdx, pcCU->getZorderIdxInCU() ) )
-#else
-  if( pcCU->getPUAbove( uiTmpPartIdx, pcCU->getZorderIdxInCU() ) && iCUPelY > 0 && iRefY > 0 )
-#endif
   {
     iRefOffset = iHor + iVer * iRefStride - iRefStride;
@@ -2391 +2193 @@
   }
 
-#if SEC_IC_NEIGHBOR_CLIP_I0080
   if( pcCU->getPULeft( uiTmpPartIdx, pcCU->getZorderIdxInCU() ) )
-#else
-  if( pcCU->getPULeft( uiTmpPartIdx, pcCU->getZorderIdxInCU() ) && iCUPelX > 0 && iRefX > 0 )
-#endif
   {
     iRefOffset = iHor + iVer * iRefStride - 1;
@@ -2429 +2227 @@
   }
 
-#if FIX_TICKET_71
   if( iCountShift == 0 )
   {
@@ -2436 +2233 @@
     return;
   }
-#endif
 
   xy += xx >> IC_REG_COST_SHIFT;
@@ -2553 +2349 @@
   // find contour for texture luma block
   UInt iDC = 0;
-#if SEC_DBBP_DMM4_THRESHOLD_I0076
+
   iDC  = piRefBlkY[ 0 ];
   iDC += piRefBlkY[ uiWidth - 1 ];
@@ -2559 +2355 @@
   iDC += piRefBlkY[ uiWidth * (uiHeight - 1) + uiWidth - 1 ];
   iDC = iDC >> 2;
-#else
-  for( UInt k = 0; k < (uiWidth*uiHeight); k++ ) 
-  { 
-    iDC += piRefBlkY[k]; 
-  }
-
-  Int cuMaxLog2Size = g_aucConvertToBit[g_uiMaxCUWidth]+2;   // 
-  iDC = iDC >> (cuMaxLog2Size - pcCU->getDepth(0))*2;        //  iDC /= (uiWidth*uiHeight);
-#endif
 
   piRefBlkY = cTempYuv.getLumaAddr();

trunk/source/Lib/TLibCommon/TComPrediction.h

@@ -90 +90 @@
 #if H_3D_ARP
   Void xPredInterUniARP         ( TComDataCU* pcCU,                          UInt uiPartAddr,               Int iWidth, Int iHeight, RefPicList eRefPicList, TComYuv*& rpcYuvPred, Bool bi=false, TComMvField * pNewMvFiled = NULL );
-#if QC_I0051_ARP_SIMP
   Bool xCheckBiInterviewARP     ( TComDataCU* pcCU, UInt uiPartAddr, Int iWidth, Int iHeight, RefPicList eBaseRefPicList, TComPic*& pcPicYuvCurrTRef, TComMv& cBaseTMV, Int& iCurrTRefPoc );
-#endif
   Void xPredInterUniARPviewRef( TComDataCU* pcCU, UInt uiPartAddr, Int iWidth, Int iHeight, RefPicList eRefPicList, TComYuv*& rpcYuvPred, Bool bi, TComMvField * pNewMvFiled = NULL );
 #endif
@@ -179 +177 @@
   PartSize      getPartitionSizeFromDepth(Pel* pDepthPels, UInt uiDepthStride, UInt uiSize);
   Bool          getSegmentMaskFromDepth( Pel* pDepthPels, UInt uiDepthStride, UInt uiWidth, UInt uiHeight, Bool* pMask );
-#if SHARP_DBBP_SIMPLE_FLTER_I0109
   Void          combineSegmentsWithMask( TComYuv* pInYuv[2], TComYuv* pOutYuv, Bool* pMask, UInt uiWidth, UInt uiHeight, UInt uiPartAddr, UInt partSize );
-#else
-  Void          combineSegmentsWithMask( TComYuv* pInYuv[2], TComYuv* pOutYuv, Bool* pMask, UInt uiWidth, UInt uiHeight, UInt uiPartAddr = 0 );
-#endif
 #endif
 

trunk/source/Lib/TLibCommon/TComRom.cpp

@@ -355 +355 @@
   HALF_PEL,    //   8x8
   FULL_PEL,    //  16x16
-#if SHARP_DMM1_I0110
   FULL_PEL,    //  32x32
   FULL_PEL,    //  64x64
   FULL_PEL     // 128x128
-#else
-  DOUBLE_PEL,  //  32x32
-  DOUBLE_PEL,  //  64x64
-  DOUBLE_PEL   // 128x128
-#endif
 };
 
@@ -374 +368 @@
      0,    4,    7,    8,    8,    0 };
 
-#if SHARP_DMM1_I0110
 Bool g_wedgePattern[32*32];
-#endif
 
 extern std::vector< std::vector<TComWedgelet> >   g_dmmWedgeLists;
@@ -388 +380 @@
 
 Char  g_aucConvertToBit  [ MAX_CU_SIZE+1 ];
-#if !MTK_LOW_LATENCY_IC_ENCODING_H0086_FIX
-#if H_3D_IC
-UInt g_aICEnableCANDIDATE[10] = { 0, };
-UInt g_aICEnableNUM[ 10 ] = { 0, };
-Int g_lastlayer=0;
-#endif
-#endif
 #if ENC_DEC_TRACE
 FILE*  g_hTrace = NULL;
@@ -676 +661 @@
   if( !g_dmmWedgeLists.empty() ) return;
 
-#if SHARP_DMM1_I0110
   for( UInt ui = g_aucConvertToBit[DIM_MIN_SIZE]; ui < (g_aucConvertToBit[DIM_MAX_SIZE]); ui++ )
-#else
-  for( UInt ui = g_aucConvertToBit[DIM_MIN_SIZE]; ui < (g_aucConvertToBit[DIM_MAX_SIZE]+1); ui++ )
-#endif
   {
     UInt uiWedgeBlockSize = ((UInt)DIM_MIN_SIZE)<<ui;
@@ -764 +745 @@
   switch( eWedgeRes )
   {
-#if !SHARP_DMM1_I0110
-  case( DOUBLE_PEL ): { uiBlockSize = (uiWidth>>1); break; }
-#endif
   case(   FULL_PEL ): { uiBlockSize =  uiWidth;     break; }
   case(   HALF_PEL ): { uiBlockSize = (uiWidth<<1); break; }

trunk/source/Lib/TLibCommon/TComRom.h

@@ -166 +166 @@
 extern const UChar                                           g_dmm3IntraTabIdxBits[6];
 
-#if SHARP_DMM1_I0110
 extern Bool                                                  g_wedgePattern[32*32];
-#endif 
 
 extern       std::vector< std::vector<TComWedgelet> >        g_dmmWedgeLists;
@@ -230 +228 @@
 
 extern       Char   g_aucConvertToBit  [ MAX_CU_SIZE+1 ];   // from width to log2(width)-2
-#if !MTK_LOW_LATENCY_IC_ENCODING_H0086_FIX
-#if H_3D_IC
-extern UInt g_aICEnableCANDIDATE[10];
-extern UInt g_aICEnableNUM[ 10 ]; //10 layers
-extern Int  g_lastlayer;
-#endif
-#endif
 
 #ifndef ENC_DEC_TRACE

trunk/source/Lib/TLibCommon/TComSlice.cpp

@@ -103 +103 @@
 , m_temporalLayerNonReferenceFlag ( false )
 , m_enableTMVPFlag                ( true )
-#if I0044_SLICE_TMVP
+#if H_MV
 , m_availableForTMVPRefFlag       ( true )
-#endif
-#if H_MV
 , m_refPicSetInterLayer0           ( NULL )
 , m_refPicSetInterLayer1           ( NULL )
@@ -142 +140 @@
 , m_depthToDisparityF             ( NULL )
 #endif
-#if MTK_SINGLE_DEPTH_MODE_I0095
+#if H_3D_SINGLE_DEPTH
 , m_bApplySingleDepthMode         (false)
 #endif
@@ -650 +648 @@
   
   TComPic**             refPicSetStCurr    [2] = { RefPicSetStCurr0, RefPicSetStCurr1 };
-#if FIX_WARNING
   Int numPocStCurr[2] = { (Int)NumPocStCurr0, (Int)NumPocStCurr1 }; 
-#else
-  Int numPocStCurr[2] = { NumPocStCurr0, NumPocStCurr1 }; 
-#endif
 
   for (Int li = 0; li < ((m_eSliceType==B_SLICE) ? 2 : 1); li++)
@@ -728 +722 @@
 
         assert( rpsCurrList[li][ orgIdx ] != NULL ); 
-#if DISCARDABLE_PIC_RPS
         assert( rpsCurrList[li][ orgIdx ]->getSlice(0)->getDiscardableFlag() == 0 );    // Inter-layer RPS shall not contain picture with discardable_flag = 1.
-#endif
         m_apcRefPicList    [li][rIdx] = rpsCurrList    [li][ orgIdx ];
         m_bIsUsedAsLongTerm[li][rIdx] = usedAsLongTerm [li][ orgIdx ] ; 
@@ -1105 +1097 @@
   }
 #endif
-#if MTK_SINGLE_DEPTH_MODE_I0095
+#if H_3D_SINGLE_DEPTH
   m_bApplySingleDepthMode = pSrc->m_bApplySingleDepthMode;
 #endif
@@ -1881 +1873 @@
 #if H_MV
   m_vpsBaseLayerInternalFlag = true; 
-#if H_MV_HLS10_GEN_VSP_BASE_LAYER_AVAIL
   m_vpsBaseLayerAvailableFlag = true; 
-#endif
 #endif
 
@@ -1909 +1899 @@
   {
     m_layerSetIdxForOlsMinus1[i]  = -1; 
-#if !H_MV_HLS10_PTL
-    m_profileLevelTierIdx[i]      = 0; 
-#endif
     for ( Int j = 0; j < MAX_VPS_NUH_LAYER_ID_PLUS1; j++)
     {
-#if H_MV_HLS10_PTL
-#if H_MV_HLS10_PTL_FIX
       m_profileTierLevelIdx[i][j] = -1; 
-#else
-      m_profileTierLevelIdx[i][j] = false; 
-#endif
-#endif
       m_outputLayerFlag[i][j] = false; 
     }
@@ -1970 +1951 @@
     m_viewIndex         [i] = -1; 
     m_vpsDepthModesFlag [i] = false;
-#if SEC_HLS_CLEANUP_I0100
     m_ivMvScalingFlag[i] = true; 
-#else
-    m_ivMvScalingFlag = true; 
-#endif
-#if SEPARATE_FLAG_I0085
     m_bIVPFlag [i]      = false;
-#endif
 #endif
 
@@ -1984 +1959 @@
       m_directDependencyFlag[i][j] = false;
       m_directDependencyType[i][j] = -1; 
-#if H_MV_HLS10_REF_PRED_LAYERS
       m_dependencyFlag  [i][j]    = false; 
       m_idDirectRefLayer[i][j]    = -1; 
       m_idPredictedLayer[i][j]    = -1; 
       m_idRefLayer      [i][j]    = -1; 
-#else
-      m_refLayerId[i][j]           = -1; 
-#endif
       m_maxTidIlRefPicsPlus1[i][j]  = 7;
     }
@@ -2016 +1987 @@
 #endif
 #endif
-#if MTK_I0099_VPS_EX2
+#if H_3D_QTLPC
     m_bLimQtPredFlag       [ i ] = false;
 #endif
@@ -2028 +1999 @@
     m_bInterSDCFlag        [ i ] = false;
 #endif
-#if SEPARATE_FLAG_I0085
+#if H_3D
     m_bIVPFlag             [ i ] = false;
 #endif
@@ -2075 +2046 @@
   assert( getVpsNumRepFormatsMinus1() <= 255 ); 
 
-#if H_MV_HLS10_ADD_LAYERSETS
   // The value of num_add_layer_sets shall be in the range of 0 to 1023, inclusive. 
   assert( getNumAddLayerSets() >= 0 && getNumAddLayerSets() <= 1023 ); 
-#endif
   return true; 
 }
@@ -2111 +2080 @@
 {
 
-#if H_MV_HLS10_REF_PRED_LAYERS
   for( Int i = 0; i  <=  getMaxLayersMinus1(); i++ )
   {
@@ -2181 +2149 @@
   }
   m_numIndependentLayers = k;
-#else // H_MV_HLS10_GEN
-
-  for( Int i = 0; i  <= getMaxLayersMinus1(); i++ )
-  {
-    Int iNuhLId = getLayerIdInNuh( i ); 
-    m_numDirectRefLayers[ iNuhLId ] = 0; 
-    for( Int j = 0; j < i; j++ )
-    {
-      if( getDirectDependencyFlag(i , j) )
-      {
-        m_refLayerId[ iNuhLId ][m_numDirectRefLayers[ iNuhLId ]++ ] = getLayerIdInNuh( j );
-      }
-    }
-  }
-
-  for (Int i = 0 ; i < MAX_NUM_LAYER_IDS; i++ )
-  {
-    m_numRefLayers[i] = 0; 
-  }
-
-  for (Int currLayerId = 0; currLayerId <= 62; currLayerId++ ) 
-  {
-    for (Int i = 0 ; i < MAX_NUM_LAYER_IDS; i++ )
-    {
-      m_recursiveRefLayerFlag[currLayerId][i] = 0; 
-    }
-  }
-
-  for( Int i = 0; i  <=  getMaxLayersMinus1(); i++ )
-  {
-    Int iNuhLId = getLayerIdInNuh( i );
-    xSetRefLayerFlags( iNuhLId );
-    for( Int j = 0; j < 63; j++ )
-    {
-      m_numRefLayers[ iNuhLId ]  +=  m_recursiveRefLayerFlag[ iNuhLId ][ j ];
-    }
-  }
-  
-  for( Int i = 0; i <= getMaxLayersMinus1(); i++ )  // Bug in spec "<" instead of "<=" 
-  {
-    Int iNuhLId = getLayerIdInNuh( i );
-    Int predIdx = 0;
-    for( Int j = iNuhLId + 1; j < 63; j++ )
-    {
-      if( m_recursiveRefLayerFlag[ j ][ iNuhLId ] )
-      {
-        m_predictedLayerId[ iNuhLId ][ predIdx++ ] = j;
-      }
-    }
-    m_numPredictedLayers[ iNuhLId ] = predIdx;
-  }
-  
-  Bool countedLayerIdxFlag[ MAX_NUM_LAYERS ]; 
-  for( Int i = 0; i  <=  getMaxLayersMinus1(); i++ )
-  {
-    countedLayerIdxFlag[ i ] = 0;
-  }
-  for( Int i = 0, k = 0; i  <=  getMaxLayersMinus1(); i++ )
-  {
-    Int iNuhLId = getLayerIdInNuh( i );
-    if( m_numDirectRefLayers[ iNuhLId ]  ==  0 )
-    {
-      m_treePartitionLayerIdList[ k ][ 0 ] = iNuhLId;
-      m_numLayersInTreePartition[ k ]      = 1;
-
-      for( Int j = 0; j < m_numPredictedLayers[ iNuhLId ]; j++ )  
-      {
-        if( !countedLayerIdxFlag[ getLayerIdInVps( m_predictedLayerId[ iNuhLId ][ j ] ) ] )    
-        {
-          m_treePartitionLayerIdList[ k ][ m_numLayersInTreePartition[ k ] ] = m_predictedLayerId[ iNuhLId ][ j ];
-          m_numLayersInTreePartition[ k ]++;
-          countedLayerIdxFlag[ getLayerIdInVps( m_predictedLayerId[ iNuhLId ][ j ] ) ] = 1;
-        }
-      }
-      k++;
-
-      m_numIndependentLayers = k;
-    }
-  }
-#endif // H_MV_HLS10_GEN
-}
-
-#if !H_MV_HLS10_REF_PRED_LAYERS
-Int TComVPS::getRefLayerId( Int layerIdInNuh, Int idx )
-{
-  assert( idx >= 0 && idx < m_numDirectRefLayers[layerIdInNuh] );     
-  Int refLayerIdInNuh = m_refLayerId[ layerIdInNuh ][ idx ];    
-  assert ( refLayerIdInNuh >= 0 ); 
-  return refLayerIdInNuh;
-}
-#endif
+}
+
 
 Int TComVPS::getScalabilityId( Int layerIdInVps, ScalabilityType scalType )
@@ -2309 +2188 @@
   for ( i = 0; i < iNumViews ; i++ )
   {
-#if H_3D_FIX_UNINIT
     m_bCamParPresent[i] = false; 
-#endif
     m_bCamParInSliceHeader[i] = false; 
     m_aaaiCodedScale[i] = new Int*[ 2 ];
@@ -2424 +2301 @@
 {
   assert( lsIdx >= 0 ); 
-#if H_MV_HLS10_ADD_LAYERSETS
   assert( lsIdx <= getNumLayerSets() ); 
-#else
-  assert( lsIdx <= getVpsNumLayerSetsMinus1() ); 
-#endif
   return (Int) m_layerSetLayerIdList[ lsIdx ].size(); 
 }
@@ -2452 +2325 @@
 }
 
-#if !H_MV_HLS10_REF_PRED_LAYERS
-Bool TComVPS::getInDirectDependencyFlag( Int depLayeridInVps, Int refLayeridInVps, Int depth /*= 0 */ )
-{
-#if H_MV_HLS10_REF_PRED_LAYERS
-  // TBD: Remove getInDirectDependencyFlag entirely.
-  return getDependencyFlag( depLayeridInVps, refLayeridInVps );
-#else
-  assert( depth < 65 ); 
-  Bool dependentFlag = getDirectDependencyFlag( depLayeridInVps, refLayeridInVps ); 
-
-  for( Int i = 0; i < depLayeridInVps && !dependentFlag; i++ )
-  {
-    if ( getDirectDependencyFlag( depLayeridInVps, i ) )
-    {
-      dependentFlag = getInDirectDependencyFlag( i, refLayeridInVps, depth++ ); 
-    }
-  }
-  return dependentFlag;
-#endif
-}
-#endif
 
 Void TComVPS::deriveLayerSetLayerIdList()
@@ -2501 +2353 @@
   for( Int j = 0; j < getNumLayersInIdList( lsIdx ); j++ )
   {
-#if H_MV_HLS10_NESSECARY_LAYER
     if ( getNecessaryLayerFlag( i , j ))
     {
-#endif
       m_targetDecLayerIdLists[i].push_back( m_layerSetLayerIdList[ lsIdx ][ j ] ); 
-#if H_MV_HLS10_NESSECARY_LAYER
-    }
-#endif
+    }
 
     if( getOutputLayerFlag( i, j  ))
@@ -2557 +2405 @@
 }
 
-#if !H_MV_HLS10_ADD_LAYERSETS
-Void TComVPS::inferDbpSizeLayerSetZero( TComSPS* sps, Bool encoder )
-{
-  for( Int j = 0; j <= getMaxSubLayersInLayerSetMinus1( 0 ); j++ )
-  {
-    Int maxDecPicBufferingMinus1 = sps->getMaxDecPicBuffering( j ) - 1; 
-    Int numReorderPics           = sps->getNumReorderPics    ( j ); 
-    Int maxLatencyIncreasePlus1  = sps->getMaxLatencyIncrease( j ); 
-
-    if ( encoder )
-    {
-      assert( getDpbSize()->getMaxVpsDecPicBufferingMinus1(0, 0, j ) == maxDecPicBufferingMinus1 );
-      assert( getDpbSize()->getMaxVpsNumReorderPics       (0,    j ) == numReorderPics           );
-      assert( getDpbSize()->getMaxVpsLatencyIncreasePlus1 (0,    j ) == maxLatencyIncreasePlus1  );
-    }
-    else
-    {
-      getDpbSize()->setMaxVpsDecPicBufferingMinus1(0, 0, j, maxDecPicBufferingMinus1 );
-      getDpbSize()->setMaxVpsNumReorderPics       (0,    j, numReorderPics           );
-      getDpbSize()->setMaxVpsLatencyIncreasePlus1 (0,    j, maxLatencyIncreasePlus1  );        
-    }     
-  }
-}
-#endif
 Bool TComVPS::getAltOutputLayerFlagVar( Int i )
 {
@@ -2594 +2418 @@
 }
 
-#if !H_MV_HLS10_MAXNUMPICS
-Int TComVPS::getMaxNumPics( Int layerId )
-{
-  Int maxNumPics = MAX_INT; 
-  for( Int olsIdx = 0; olsIdx < getNumOutputLayerSets(); olsIdx++)
-  {
-    Int lsIdx = olsIdxToLsIdx( olsIdx ); 
-    for( Int j = 0; j < getNumLayersInIdList( lsIdx ); j++ )
-    {
-      if( getLayerSetLayerIdList(lsIdx, j ) ==  layerId )
-      {
-        Int maxSL = getMaxSubLayersInLayerSetMinus1( lsIdx ); 
-        maxNumPics = std::min( maxNumPics, getDpbSize()->getMaxVpsDecPicBufferingMinus1( olsIdx , j,  maxSL ) );
-      }
-    }
-  }
-  assert( maxNumPics != MAX_INT ); 
-  return maxNumPics;
-}
-#endif
-
-#if !H_MV_HLS10_REF_PRED_LAYERS
-Void TComVPS::xSetRefLayerFlags( Int currLayerId )
-{
-  for( Int j = 0; j < getNumDirectRefLayers( currLayerId ); j++ )
-  {
-    Int refLayerId = m_refLayerId[ currLayerId ][ j ];
-    m_recursiveRefLayerFlag[ currLayerId ][ refLayerId ] = 1;
-    for( Int k = 0; k < MAX_NUM_LAYER_IDS; k++ )
-    {
-      m_recursiveRefLayerFlag[ currLayerId ][ k ] = m_recursiveRefLayerFlag[ currLayerId ][ k ]  ||  m_recursiveRefLayerFlag[ refLayerId ][ k ];
-    }
-  }
-}
-
-#endif
-
-#if H_MV_HLS10_PTL_FIX
+
+
 Int TComVPS::inferProfileTierLevelIdx(Int i, Int j)
 {
@@ -2651 +2439 @@
   return ptlIdx;
 }
-#endif
-
-#if H_MV_HLS10_ADD_LAYERSETS
+
 Void TComVPS::deriveAddLayerSetLayerIdList(Int i)
 {
@@ -2676 +2462 @@
 }
 
-#endif
-
-#if H_MV_HLS10_NESSECARY_LAYER
+
 Void TComVPS::deriveNecessaryLayerFlags(Int olsIdx)
 {
@@ -2709 +2493 @@
   }
 }
-#endif
-
-#if H_MV_HLS10_ADD_LAYERSETS
+
 Void TComVPS::printPTL()
 {
@@ -2757 +2539 @@
 #endif
 
-#if H_MV_HLS10_AUX
   vector<Int> viewOrderIndex;
   vector<Int> auxId;
   vector<Int> dependencyId; 
   vector<Int> viewId; 
-#endif
   for (Int i = 0; i <= getMaxLayersMinus1(); i++ )
   {
     fullArray.push_back( getMaxLayersMinus1() + 1 ); 
     range.push_back( i ); 
-#if H_MV_HLS10_AUX      
     viewOrderIndex.push_back( getViewIndex   ( i ) );
     dependencyId  .push_back( getDependencyId( i ) );
@@ -2774 +2553 @@
 #if H_3D  
     depthId.push_back( getDepthId( i ) );
-#endif
 #endif
   }
@@ -2787 +2565 @@
 }
 
-#if H_MV_HLS10_AUX
 Void TComVPS::printScalabilityId()
 {
@@ -2825 +2602 @@
   std::cout << std::endl;
 }
-#endif
 
 Void TComVPS::printLayerSets()
@@ -2880 +2656 @@
 }
 
-#endif
 
 #endif // H_MV
@@ -2910 +2685 @@
 , m_pcmLog2MaxSize            (  5)
 , m_uiPCMLog2MinSize          (  7)
-#if !MTK_I0099_VPS_EX2
-#if H_3D_QTLPC
-, m_bUseQTL                   (false)
-, m_bUsePC                    (false)
-#endif
-#endif
 , m_bitDepthY                 (  8)
 , m_bitDepthC                 (  8)
@@ -2964 +2733 @@
 #endif
 
-#if !H_MV_HLS10_PPS
-  m_numScaledRefLayerOffsets = 0; 
-
-  for (Int i = 0; i < MAX_NUM_SCALED_REF_LAYERS; i++ )
-  {
-    m_scaledRefLayerId             [i] = -1;
-  }
-
-  for (Int i = 0; i < MAX_NUM_LAYERS; i++ )
-  {
-    m_scaledRefLayerLeftOffset     [i] = 0;
-    m_scaledRefLayerTopOffset      [i] = 0;
-    m_scaledRefLayerRiFghtOffset    [i] = 0;
-    m_scaledRefLayerBottomOffset   [i] = 0;
-  }
-#endif
 #endif
 }
@@ -3120 +2873 @@
 , m_entropyCodingSyncEnabledFlag   (false)
 , m_loopFilterAcrossTilesEnabledFlag  (true)
-, m_uniformSpacingFlag           (0)
-, m_iNumColumnsMinus1            (0)
-, m_puiColumnWidth               (NULL)
-, m_iNumRowsMinus1               (0)
-, m_puiRowHeight                 (NULL)
-, m_iNumSubstreams             (1)
+, m_uniformSpacingFlag           (false)
+, m_numTileColumnsMinus1         (0)
+, m_numTileRowsMinus1            (0)
+, m_numSubstreams               (1)
 , m_signHideFlag(0)
 , m_cabacInitPresentFlag        (false)
@@ -3158 +2909 @@
 TComPPS::~TComPPS()
 {
-  if( m_iNumColumnsMinus1 > 0 && m_uniformSpacingFlag == 0 )
-  {
-    if (m_puiColumnWidth) delete [] m_puiColumnWidth; 
-    m_puiColumnWidth = NULL;
-  }
-  if( m_iNumRowsMinus1 > 0 && m_uniformSpacingFlag == 0 )
-  {
-    if (m_puiRowHeight) delete [] m_puiRowHeight;
-    m_puiRowHeight = NULL;
-  }
   delete m_scalingList;
 }
@@ -3186 +2927 @@
     // allocate some memory and initialize with default mapping
     m_iNumDepthmapValues[i] = ((1 << m_uiDepthViewBitDepth)-1)+1;
-#if !FIX_TICKET_77
-    m_iBitsPerDepthValue[i] = numBitsForValue(m_iNumDepthmapValues[i]);
-#endif
     m_iDepthValue2Idx[i]    = (Int*) xMalloc(Int, m_iNumDepthmapValues[i]);
     m_iIdx2DepthValue[i]    = (Int*) xMalloc(Int, m_iNumDepthmapValues[i]);
@@ -3277 +3015 @@
   // update DLT variables
   m_iNumDepthmapValues[layerIdInVps] = iNumDepthValues;
-#if !FIX_TICKET_77
-  m_iBitsPerDepthValue[layerIdInVps] = numBitsForValue(m_iNumDepthmapValues[layerIdInVps]);
-#endif
-}
-
-#if H_3D_DELTA_DLT
+}
+
 Void TComDLT::getDeltaDLT( Int layerIdInVps, Int* piDLTInRef, UInt uiDLTInRefNum, Int* piDeltaDLTOut, UInt *puiDeltaDLTOutNum )
 {
@@ -3347 +3081 @@
   setDepthLUTs(layerIdInVps, aiIdx2DepthValue, uiNumDepthValues);
 }
-#endif
 
 #endif
@@ -3354 +3087 @@
 Void TComSPS::inferRepFormat( TComVPS* vps, Int layerIdCurr )
 {
-#if H_MV_HLS10_MULTILAYERSPS
   if ( getMultiLayerExtSpsFlag() )
-#else
-  if ( layerIdCurr > 0 )
-#endif
   { 
     Int            repFormatIdx = getUpdateRepFormatFlag() ?  getSpsRepFormatIdx() : vps->getVpsRepFormatIdx( vps->getLayerIdInVps( layerIdCurr ) ) ;
@@ -3374 +3103 @@
     setBitDepthC             ( repFormat->getBitDepthVpsChromaMinus8() + 8 ); 
     setQpBDOffsetC           ( (Int) (6* ( getBitDepthC() -8 ) ) );
- #if H_MV_HLS10_GEN_VSP_CONF_WIN
     Window &spsConf    = getConformanceWindow();    
 
@@ -3383 +3111 @@
     spsConf.setWindowTopOffset   ( repFormat->getConfWinVpsTopOffset()     );
     spsConf.setWindowBottomOffset( repFormat->getConfWinVpsBottomOffset()  );    
-#endif
-
-#if H_MV_HLS10_MULTILAYERSPS
+
    if ( getMultiLayerExtSpsFlag() && getUpdateRepFormatFlag() )
-#else 
-   if ( getLayerId() > 0 && getUpdateRepFormatFlag() )
-#endif
     {
       assert( getChromaFormatIdc()      <=  repFormat->getChromaFormatVpsIdc()         ); 
@@ -3423 +3146 @@
   const std::vector<Int>& targetDecLayerIdList = vps->getTargetDecLayerIdList( vps->olsIdxToLsIdx( targetOptLayerSetIdx )); 
 
-#if H_MV_HLS10_MULTILAYERSPS
   if ( getMultiLayerExtSpsFlag() )
-#else
-  if (getLayerId() > 0 )
-#endif
   {
     Int layerIdx = 0;         
@@ -3445 +3164 @@
       Int maxDecPicBufferingMinus1 = vps->getDpbSize()->getMaxVpsDecPicBufferingMinus1( targetOptLayerSetIdx, layerIdx, i ) ; 
 
-#if H_MV_HLS10_MULTILAYERSPS
       // This preliminary fix needs to be checked.
       Int maxNumReorderPics       = vps->getDpbSize()->getMaxVpsNumReorderPics( targetOptLayerSetIdx, i ); 
       Int maxLatencyIncreasePlus1 = vps->getDpbSize()->getMaxVpsLatencyIncreasePlus1( targetOptLayerSetIdx, i ); 
-#endif
       if ( encoder )      
       {
         assert( getMaxDecPicBuffering( i ) - 1 == maxDecPicBufferingMinus1 ); 
-#if H_MV_HLS10_MULTILAYERSPS
         // This preliminary fix needs to be checked.
         assert( getNumReorderPics( i )     == maxNumReorderPics       ); 
         assert( getMaxLatencyIncrease( i ) == maxLatencyIncreasePlus1 ); 
-#endif    
 
       }
       else
       {
-#if !H_MV_HLS10_MULTILAYERSPS
-        setMaxDecPicBuffering(i, maxDecPicBufferingMinus1 + 1 ); 
-#else
         // This preliminary fix needs to be checked.
         setMaxDecPicBuffering( maxDecPicBufferingMinus1 + 1 , i); 
         setNumReorderPics    ( maxNumReorderPics, i );
         setMaxLatencyIncrease( maxLatencyIncreasePlus1 - 1 , i); 
-#endif
       }
     }    
@@ -3477 +3188 @@
 Void TComSPS::checkRpsMaxNumPics( TComVPS* vps, Int currLayerId )
 {
-#if !H_MV_HLS10_MAXNUMPICS
-  // In spec, when rps is in SPS, nuh_layer_id of SPS is used instead 
-  // of nuh_layer_id of slice (currLayerId), this seems to be a bug.
-#endif
   for (Int i = 0; i < getRPSList()->getNumberOfReferencePictureSets(); i++ )
   {
@@ -3486 +3193 @@
     if ( !rps->getInterRPSPrediction() )
     {
-#if H_MV_HLS10_MAXNUMPICS
       rps->checkMaxNumPics( vps->getVpsExtensionFlag(), MAX_INT, getLayerId(), getMaxDecPicBuffering( getSpsMaxSubLayersMinus1() ) - 1 );   // INT_MAX to be replaced by DpbSize
-#else
-      rps->checkMaxNumPics( vps->getVpsExtensionFlag(), vps->getMaxNumPics( currLayerId ), 
-        getLayerId(), getMaxDecPicBuffering( getSpsMaxSubLayersMinus1() ) - 1 );  
-#endif
-    }
-  }
-}
-
-#if H_MV_HLS10_MULTILAYERSPS
+    }
+  }
+}
+
 Void TComSPS::inferSpsMaxSubLayersMinus1(Bool atPsActivation, TComVPS* vps)
 {
@@ -3517 +3218 @@
   }
 }
-#endif
 #endif
 
@@ -3880 +3580 @@
 {
   TComVPS* vps = getVPS(); 
-#if H_MV_HLS10_REF_PRED_LAYERS
   Int refLayerIdx = vps->getLayerIdInVps( vps->getIdDirectRefLayer( getLayerId(), i ) ); 
-#else
-  Int refLayerIdx = vps->getLayerIdInVps( vps->getRefLayerId( getLayerId(), i ) ); 
-#endif
 
   Bool refLayerPicFlag = ( vps->getSubLayersVpsMaxMinus1( refLayerIdx ) >=  getTLayer() )  && ( getTLayer() == 0  ) &&
@@ -3955 +3651 @@
 Int TComSlice::getRefPicLayerId( Int i )
 {
-#if H_MV_HLS10_REF_PRED_LAYERS
   return getVPS()->getIdDirectRefLayer( getLayerId(), getInterLayerPredLayerIdc( i ) );
-#else
-  return getVPS()->getRefLayerId( getLayerId(), getInterLayerPredLayerIdc( i ) );
-#endif
 }
 
@@ -4065 +3757 @@
       m_bApplyIC = true;
       Int refLayer = curLayer-1;
-#if MTK_LOW_LATENCY_IC_ENCODING_H0086_FIX
+
       Int ICEnableCandidate = getICEnableCandidate(refLayer);
       Int ICEnableNum = getICEnableNum(refLayer);
@@ -4083 +3775 @@
       setICEnableCandidate(curLayer, 0);
       setICEnableNum(curLayer, 0);
-#else
-      if( (refLayer>=0) && (g_aICEnableCANDIDATE[refLayer]>0) )
-      {    
-        Double ratio=Double(g_aICEnableNUM[refLayer])/Double(g_aICEnableCANDIDATE[refLayer]);
-
-        if( ratio > IC_LOW_LATENCY_ENCODING_THRESHOLD)
-{
-          m_bApplyIC=true;
-        }
-        else
-        {
-          m_bApplyIC=false;
-        }
-      }
-      g_aICEnableNUM[curLayer]=0;
-      g_aICEnableCANDIDATE[curLayer]=0;
-      g_lastlayer=getDepth();
-#endif
     }
   }
@@ -4210 +3884 @@
 
 #if H_3D_DDD
-#if LGE_FCO_I0116
+#if H_3D_FCO
   if( getIsDepth() && getViewIndex() > 0 && getVPS()->getMPIFlag(layerIdInVPS))
 #else
@@ -4696 +4370 @@
 , m_nonPackedConstraintFlag(false)
 , m_frameOnlyConstraintFlag(false)
-#if H_MV_HLS10_PTL
+#if H_MV
   , m_max12bitConstraintFlag      ( false )
   , m_max10bitConstraintFlag      ( false )
@@ -4712 +4386 @@
 }
 
-#if H_MV_HLS10_PTL_INFER_FIX
+#if H_MV
 Bool ProfileTierLevel::getV2ConstraintsPresentFlag()
 {
@@ -4757 +4431 @@
   copyV2ConstraintFlags      ( ptlRef );
 }
-
 #endif
 
@@ -4767 +4440 @@
 
 #if H_MV
-#if !H_MV_HLS10_PTL_INFER_FIX
-Void TComPTL::copyLevelFrom( TComPTL* source )
-{
-  getGeneralPTL()->setLevelIdc( source->getGeneralPTL()->getLevelIdc() );
-  for( Int subLayer = 0; subLayer < 6; subLayer++ )
-  {
-    setSubLayerLevelPresentFlag( subLayer, source->getSubLayerLevelPresentFlag( subLayer ) );
-    getSubLayerPTL( subLayer )->setLevelIdc( source->getSubLayerPTL( subLayer )->getLevelIdc() );
-  }
-}
-#else
 Void TComPTL::inferGeneralValues(Bool profilePresentFlag, Int k, TComPTL* refPTL)
 {
@@ -4865 +4527 @@
 }
 
-#endif
 #endif
 //! \}
@@ -4908 +4569 @@
 
   m_vpsVuiBspHrdPresentFlag = false; 
-#if H_MV_HLS10_VPS_VUI_BSP
   m_vpsVuiBspHrdParameters  = NULL;
-#else
-  m_vpsVuiBspHrdParameters  = new TComVpsVuiBspHrdParameters();
-#endif
 }
 
@@ -4958 +4615 @@
 }
 
-#if !H_MV_HLS10_VPS_VUI_BSP
-Void TComVpsVuiBspHrdParameters::checkLayerInBspFlag( TComVPS* vps, Int h )
-{
-  // It is a requirement of bitstream conformance that bitstream partition with index j shall not include 
-  // direct or indirect reference layers of any layers in bitstream partition i for any values of i and j 
-  // in the range of 0 to num_bitstream_partitions[ h ] ?1, inclusive, such that i is less than j.
-
-  for ( Int partJ = 0; partJ < getNumBitstreamPartitions( h ); partJ++ )
-  {        
-    for ( Int partI = 0; partI < partJ; partI++ )
-    {
-      for ( Int layerJ = 0; layerJ < vps->getMaxLayersMinus1(); layerJ++ )
-      {
-        if ( m_layerInBspFlag[ h ][partJ][layerJ ] )
-        {
-          for ( Int layerI = 0; layerI < vps->getMaxLayersMinus1(); layerI++ )
-          {
-            if ( m_layerInBspFlag[ h ][partI][layerI] )
-            {
-              assert( !vps->getInDirectDependencyFlag( layerI, layerJ ) ); 
-            }
-          }
-        }
-      }
-    }
-  }
-
-  // ---------------
-  // To be added: 
-  // When vps_base_layer_internal_flag is equal to 0 and layer_in_bsp_flag[ h ][ i ][ 0 ] is equal to 1 for any value of h in the 
-  // range of 1 to vps_num_layer_sets_minus1, inclusive, and any value of i in the range of 0 to num_bitstream_partitions[ h ] - 1, 
-  // inclusive, the value of layer_in_bsp_flag[ h ][ i ][ j ] for at least one value of j in the range of 1 to 
-  // NumLayersInIdList[ h ] - 1, inclusive, shall be equal to 1.
-  // ---------------
-
-
-  // When num_bitstream_partitions[ h ] is equal to 1 for any value of h in the range 1 to vps_num_layer_set_minus1, inclusive, 
-  // the value of layer_in_bsp_flag[ h ][ 0 ][ j ] should be equal to 0 for at least one value of j in the range 0 to 
-  // NumLayersInIdList[ h ] ? 1, inclusive. 
-
-
-  if ( getNumBitstreamPartitions( h ) == 1 )
-  {
-    Bool atLeastOneZero = false; 
-    for ( Int j = 0; j <= vps->getNumLayersInIdList( h ) - 1; j++ )
-    {
-      atLeastOneZero = atLeastOneZero || !getLayerInBspFlag( h, 0, j ); 
-    }    
-    assert( atLeastOneZero ); 
-  }
-
-  
-  // For any value of h in the range 1 to vps_num_layer_set_minus1, inclusive, the value of layer_in_bsp_flag[ h ][ i ][ j ] 
-  // shall be equal to 1 for at most one value of i in the range of 0 to num_bitstream_partitions[ h ] ? 1, inclusive. 
-
-  for ( Int j = 0; j <= vps->getNumLayersInIdList( h ) - 1; j++ )
-  {
-    Int numLayerInBsp = 0; 
-    for ( Int i = 0; i <= getNumBitstreamPartitions( h ) - 1; i++ )
-    {
-      numLayerInBsp += ( getLayerInBspFlag( h, i, j ) ? 1 : 0 );  
-    }    
-    assert( numLayerInBsp <= 1 ); 
-  }
-
-}
-
-Void TComVpsVuiBspHrdParameters::checkBspCombHrdAndShedIdx( TComVPS* vps, Int h, Int i, Int j )
-{
-  // bsp_comb_hrd_idx
-  assert( getBspCombSchedIdx(h, i, j ) >= 0 );
-  assert( getBspCombSchedIdx(h, i, j ) <= getVpsNumBspHrdParametersMinus1() );
-
-  // bsp_comb_sched_idx
-  assert( getBspCombSchedIdx(h, i, j ) >= 0 );
-
-  //* This check needs to activated,  when HighestTid is available here    
-  //  assert(  getBspCombSchedIdx(h, i, j ) <= vps->getHrdParameters( getBspCombHrdIdx( h, i, j ) )->getCpbCntMinus1( highestTid ) );
-}
-#endif
-
-#if H_MV_HLS10_VPS_VUI_BSP
+
 
 TComVpsVuiBspHrdParameters::~TComVpsVuiBspHrdParameters()
@@ -5137 +4713 @@
 }
 
-#endif
 
 Void TComVUI::inferVideoSignalInfo( TComVPS* vps, Int layerIdCurr )
@@ -5173 +4748 @@
       for (Int k = 0; k < MAX_NUM_LAYER_IDS; k++ )
       {
-#if H_MV_HLS10_ADD_LAYERSETS
         m_maxVpsDecPicBufferingMinus1[i][k][j] = MIN_INT; 
-#else
-        m_maxVpsDecPicBufferingMinus1[i][k][j] = 0; 
-#endif
       }
     }

trunk/source/Lib/TLibCommon/TComSlice.h

@@ -45 +45 @@
 #include "TComRom.h"
 #include "TComList.h"
-#if H_MV_HLS10_GEN_FIX
 #if H_MV
 #include <ios>
 #include <iostream>
 #include <iomanip>
-#endif
 #endif
 //! \ingroup TLibCommon
@@ -207 +205 @@
   Bool m_frameOnlyConstraintFlag;
   
-#if H_MV_HLS10_PTL
 #if H_MV
   Bool m_max12bitConstraintFlag;
@@ -220 +217 @@
   Bool m_inbldFlag;
 #endif
-#endif
 public:
   ProfileTierLevel();
@@ -252 +248 @@
 
 #if H_MV
-#if H_MV_HLS10_PTL
   Void setMax12bitConstraintFlag( Bool flag ) { m_max12bitConstraintFlag = flag; } 
   Bool getMax12bitConstraintFlag(  ) { return m_max12bitConstraintFlag; } 
@@ -281 +276 @@
   Void setInbldFlag( Bool flag ) { m_inbldFlag = flag; } 
   Bool getInbldFlag(  ) { return m_inbldFlag; } 
-#endif
-#if H_MV_HLS10_PTL_INFER_FIX
   Bool getV2ConstraintsPresentFlag();  
   Bool getInbldPresentFlag();
   Void copyV2ConstraintFlags( ProfileTierLevel* ptlRef );
   Void copyProfile( ProfileTierLevel* ptlRef );
-#endif
 #endif
 };
@@ -310 +302 @@
   ProfileTierLevel* getSubLayerPTL(Int i)  { return &m_subLayerPTL[i]; }
 #if H_MV
-#if H_MV_HLS10_PTL_INFER_FIX
   Void inferGeneralValues ( Bool profilePresentFlag  , Int k, TComPTL* refPTL );; 
   Void inferSubLayerValues( Int maxNumSubLayersMinus1, Int k, TComPTL* refPTL );; 
-#else
-  Void copyLevelFrom( TComPTL* source );
-#endif
 #endif
 };
@@ -501 +489 @@
 class TComVpsVuiBspHrdParameters
 {
-#if H_MV_HLS10_VPS_VUI_BSP
 
   /* Not yet tested */
@@ -563 +550 @@
   Void setHrdParametermeters( Int k, TComHRD* val  ) {  *(m_hrdParameters + k ) = *val; }; 
   TComHRD* getHrdParametermeters( Int k ) {  return m_hrdParameters + k; }; 
-#else 
-private: 
-  Int  m_vpsNumBspHrdParametersMinus1;
-  Bool m_bspCprmsPresentFlag[MAX_NUM_BSP_HRD_PARAMETERS];
-  Int  m_numBitstreamPartitions[MAX_VPS_OP_SETS_PLUS1];
-  Bool m_layerInBspFlag[MAX_VPS_OP_SETS_PLUS1][MAX_NUM_BSP_HRD_PARAMETERS][MAX_NUM_LAYERS];
-  Int  m_numBspSchedCombinationsMinus1[MAX_VPS_OP_SETS_PLUS1];
-  Int  m_bspCombHrdIdx[MAX_VPS_OP_SETS_PLUS1][MAX_NUM_BSP_HRD_PARAMETERS][MAX_NUM_BSP_SCHED_COMBINATION];
-  Int  m_bspCombSchedIdx[MAX_VPS_OP_SETS_PLUS1][MAX_NUM_BSP_HRD_PARAMETERS][MAX_NUM_BSP_SCHED_COMBINATION];
-  TComHRD* m_hrdParameters[MAX_NUM_BSP_HRD_PARAMETERS]; 
-public: 
-
-  Void setVpsNumBspHrdParametersMinus1( Int  val ) { m_vpsNumBspHrdParametersMinus1 = val; } 
-  Int  getVpsNumBspHrdParametersMinus1(  ) { return m_vpsNumBspHrdParametersMinus1; } 
-
-  Void setBspCprmsPresentFlag( Int i, Bool flag ) { m_bspCprmsPresentFlag[i] = flag; } 
-  Bool getBspCprmsPresentFlag( Int i ) { return m_bspCprmsPresentFlag[i]; } 
-
-  Void setNumBitstreamPartitions( Int h, Int  val ) { m_numBitstreamPartitions[h] = val; } 
-  Int  getNumBitstreamPartitions( Int h ) { return m_numBitstreamPartitions[h]; } 
-
-  Void setLayerInBspFlag( Int h, Int i, Int j, Bool flag ) { m_layerInBspFlag[h][i][j] = flag; } 
-  Bool getLayerInBspFlag( Int h, Int i, Int j ) { return m_layerInBspFlag[h][i][j]; } 
-  Void checkLayerInBspFlag ( TComVPS* vps, Int h );  
-
-  Void setNumBspSchedCombinationsMinus1( Int h, Int  val ) { m_numBspSchedCombinationsMinus1[h] = val; } 
-  Int  getNumBspSchedCombinationsMinus1( Int h ) { return m_numBspSchedCombinationsMinus1[h]; } 
-
-  Void setBspCombHrdIdx( Int h, Int i, Int j, Int  val ) { m_bspCombHrdIdx[h][i][j] = val; } 
-  Int  getBspCombHrdIdx( Int h, Int i, Int j ) { return m_bspCombHrdIdx[h][i][j]; } 
-  Int  getBspCombHrdIdxLen() { return gCeilLog2( getVpsNumBspHrdParametersMinus1() + 1);  }; 
-
-
-  Void setBspCombSchedIdx( Int h, Int i, Int j, Int  val ) { m_bspCombSchedIdx[h][i][j] = val; } 
-  Int  getBspCombSchedIdx( Int h, Int i, Int j ) { return m_bspCombSchedIdx[h][i][j]; } 
-
-  Void checkBspCombHrdAndShedIdx( TComVPS* vps, Int h, Int i, Int j );
-
-  Void setHrdParametermeters( Int k, TComHRD* val  ) {  m_hrdParameters[k] = val; }; 
-  TComHRD* getHrdParametermeters( Int k ) {  return m_hrdParameters[k]; }; 
-#endif
 };
 
@@ -630 +576 @@
   Bool m_wppNotInUseFlag;
   Bool m_wppInUseFlag                [MAX_NUM_LAYERS];
-#if H_MV_HLS10_VPS_VUI
   Bool m_singleLayerForNonIrapFlag;
   Bool m_higherLayerIrapSkipFlag;
-#endif
   Bool m_ilpRestrictedRefLayersFlag;
   Int  m_minSpatialSegmentOffsetPlus1[MAX_NUM_LAYERS][MAX_NUM_LAYERS];
@@ -708 +652 @@
   Bool getWppInUseFlag( Int i ) { return m_wppInUseFlag[i]; } 
 
-#if H_MV_HLS10_VPS_VUI
   Void setSingleLayerForNonIrapFlag( Bool flag ) { m_singleLayerForNonIrapFlag = flag; } 
   Bool getSingleLayerForNonIrapFlag(  ) { return m_singleLayerForNonIrapFlag; } 
@@ -714 +657 @@
   Void setHigherLayerIrapSkipFlag( Bool flag ) { m_higherLayerIrapSkipFlag = flag; } 
   Bool getHigherLayerIrapSkipFlag(  ) { return m_higherLayerIrapSkipFlag; } 
-#endif
 
   Void setIlpRestrictedRefLayersFlag( Bool flag ) { m_ilpRestrictedRefLayersFlag = flag; } 
@@ -750 +692 @@
   Int  m_bitDepthVpsLumaMinus8;
   Int  m_bitDepthVpsChromaMinus8;
-#if H_MV_HLS10_GEN_VSP_CONF_WIN
   Bool m_conformanceWindowVpsFlag;
   Int  m_confWinVpsLeftOffset;
@@ -756 +697 @@
   Int  m_confWinVpsTopOffset;
   Int  m_confWinVpsBottomOffset;
-#endif
 
 public: 
 
-#if H_MV_HLS10_GEN_VSP_CONF_WIN
   TComRepFormat()
   { 
@@ -769 +708 @@
   m_confWinVpsBottomOffset   = 0;
   };  
-#else
-  TComRepFormat() { };  
-#endif
 
   Void setChromaAndBitDepthVpsPresentFlag( Bool flag ) { m_chromaAndBitDepthVpsPresentFlag = flag; } 
@@ -796 +732 @@
   Int  getBitDepthVpsChromaMinus8(  ) { return m_bitDepthVpsChromaMinus8; } 
 
-#if H_MV_HLS10_GEN_VSP_CONF_WIN
   Void setConformanceWindowVpsFlag( Bool flag ) { m_conformanceWindowVpsFlag = flag; } 
   Bool getConformanceWindowVpsFlag(  ) { return m_conformanceWindowVpsFlag; } 
@@ -811 +746 @@
   Void setConfWinVpsBottomOffset( Int  val ) { m_confWinVpsBottomOffset = val; } 
   Int  getConfWinVpsBottomOffset(  ) { return m_confWinVpsBottomOffset; } 
-#endif
 };
 
@@ -834 +768 @@
 
   Void setMaxVpsDecPicBufferingMinus1( Int i, Int k, Int j, Int  val ) { m_maxVpsDecPicBufferingMinus1[i][k][j] = val; } 
-  #if H_MV_HLS10_ADD_LAYERSETS
   Int  getMaxVpsDecPicBufferingMinus1( Int i, Int k, Int j ) { assert( m_maxVpsDecPicBufferingMinus1[i][k][j] >= 0 ); return m_maxVpsDecPicBufferingMinus1[i][k][j]; }     
-  #else
-  Int  getMaxVpsDecPicBufferingMinus1( Int i, Int k, Int j ) { return m_maxVpsDecPicBufferingMinus1[i][k][j]; } 
-  #endif
 
   Void setMaxVpsNumReorderPics( Int i, Int j, Int  val ) { m_maxVpsNumReorderPics[i][j] = val; } 
@@ -853 +783 @@
 #if H_MV
   Bool        m_vpsBaseLayerInternalFlag;
-#if H_MV_HLS10_GEN_VSP_BASE_LAYER_AVAIL
   Bool        m_vpsBaseLayerAvailableFlag;
-#endif // H_MV_HLS10_GEN
 #endif
 
@@ -925 +853 @@
   Int         m_layerSetIdxForOlsMinus1  [MAX_VPS_OUTPUTLAYER_SETS];  
   Bool        m_outputLayerFlag          [MAX_VPS_OUTPUTLAYER_SETS][MAX_VPS_NUH_LAYER_ID_PLUS1];
-#if H_MV_HLS10_PTL
   Int         m_profileTierLevelIdx      [MAX_VPS_OUTPUTLAYER_SETS ][MAX_NUM_LAYERS];
-#else  
-  Int         m_profileLevelTierIdx      [MAX_VPS_OUTPUTLAYER_SETS ];
-#endif
   Bool        m_altOutputLayerFlag       [MAX_VPS_OUTPUTLAYER_SETS];
   Bool        m_repFormatIdxPresentFlag;
@@ -958 +882 @@
   // VPS EXTENSION SEMANTICS VARIABLES
   Int         m_layerIdInVps             [MAX_NUM_LAYERS   ];
-#if H_MV_HLS10_REF_PRED_LAYERS
   Int         m_dependencyFlag           [MAX_NUM_LAYERS][MAX_NUM_LAYERS]; 
-#endif
 
   Int         m_numDirectRefLayers       [MAX_NUM_LAYERS];
-#if H_MV_HLS10_REF_PRED_LAYERS
   Int         m_idDirectRefLayer         [MAX_NUM_LAYERS][MAX_NUM_LAYERS];  
-#else
-  Int         m_refLayerId               [MAX_NUM_LAYERS][MAX_NUM_LAYERS];  
-#endif
 
   Int         m_numRefLayers             [MAX_NUM_LAYER_IDS]; 
-#if H_MV_HLS10_REF_PRED_LAYERS
   Int         m_idRefLayer               [MAX_NUM_LAYERS][MAX_NUM_LAYERS];  
-#endif
 
 
   Int         m_numPredictedLayers       [MAX_NUM_LAYERS ]; 
-#if !H_MV_HLS10_REF_PRED_LAYERS
-  Int         m_predictedLayerId         [MAX_NUM_LAYERS][MAX_NUM_LAYER_IDS];
-#else
   Int         m_idPredictedLayer         [MAX_NUM_LAYERS][MAX_NUM_LAYER_IDS];
-#endif
   Int         m_numIndependentLayers; 
   Int         m_numLayersInTreePartition [MAX_NUM_LAYER_IDS];
   Int         m_treePartitionLayerIdList [MAX_NUM_LAYERS][MAX_NUM_LAYER_IDS];
-#if H_MV_HLS10_REF_PRED_LAYERS
   Bool        m_recursiveRefLayerFlag    [MAX_NUM_LAYER_IDS][MAX_NUM_LAYER_IDS]; 
-  #endif
   Int         m_viewIndex                [MAX_NUM_LAYERS   ];
   
@@ -993 +903 @@
   std::vector< std::vector< Int> >       m_layerSetLayerIdList; 
 
-#if H_MV_HLS10_NESSECARY_LAYER
   Int        m_numNecessaryLayers        [MAX_VPS_OUTPUTLAYER_SETS];
   Bool       m_necessaryLayerFlag        [MAX_VPS_OUTPUTLAYER_SETS][MAX_NUM_LAYERS]; 
-#endif
 
   Int         xGetDimBitOffset( Int j );
-#if H_MV_HLS10_REF_PRED_LAYERS
   Void        xSetRefLayerFlags( Int currLayerId );
-#endif
   // VPS EXTENSION 2 SYNTAX ELEMENTS
 #if H_3D_ARP
@@ -1009 +915 @@
 #if H_3D_IV_MERGE
   Bool        m_ivMvPredFlag             [ MAX_NUM_LAYERS ]; 
-#if SEC_HLS_CLEANUP_I0100
   Bool        m_ivMvScalingFlag          [ MAX_NUM_LAYERS ]; 
-#endif
 #if H_3D_SPIVMP
   Int         m_iSubPULog2Size           [MAX_NUM_LAYERS   ];
-#if MTK_I0099_VPS_EX2
   Int         m_iSubPUMPILog2Size        [MAX_NUM_LAYERS   ];
-#else
-  Int         m_iSubPUMPILog2Size;
-#endif
-#endif
-#endif
-#if MTK_I0099_VPS_EX2
+#endif
+#endif
+#if H_3D_QTLPC
   Bool        m_bLimQtPredFlag           [ MAX_NUM_LAYERS ];
 #endif
@@ -1031 +931 @@
 #endif
   Bool        m_vpsDepthModesFlag        [MAX_NUM_LAYERS   ];
-#if SEPARATE_FLAG_I0085
+#if H_3D
   Bool        m_bIVPFlag                 [MAX_NUM_LAYERS   ];
 #endif
-
 #if H_3D
   UInt        m_uiCamParPrecision;
@@ -1041 +940 @@
   Int         ***m_aaaiCodedScale ;
   Int         ***m_aaaiCodedOffset;
-
-#if !SEC_HLS_CLEANUP_I0100
-  Bool        m_ivMvScalingFlag; 
-#endif
-
 #endif
 #if H_3D_INTER_SDC
@@ -1081 +975 @@
   Void    setVpsBaseLayerInternalFlag( Bool flag ) { m_vpsBaseLayerInternalFlag = flag; } 
   Bool    getVpsBaseLayerInternalFlag(  )          { return m_vpsBaseLayerInternalFlag; } 
-#if H_MV_HLS10_GEN_VSP_BASE_LAYER_AVAIL
   Void    setVpsBaseLayerAvailableFlag( Bool flag ) { m_vpsBaseLayerAvailableFlag = flag; } 
   Bool    getVpsBaseLayerAvailableFlag(  )          { return m_vpsBaseLayerAvailableFlag; } 
 #endif
-#endif
 
   UInt    getMaxTLayers  ()                   { return m_uiMaxTLayers;   }
@@ -1092 +984 @@
 #if H_MV    
   UInt    getMaxSubLayersMinus1()             { return m_uiMaxTLayers - 1;  }  // For consistency with draft spec
-#if H_MV_HLS10_GEN_FIX
   Void    setMaxSubLayersMinus1(UInt val)     { m_uiMaxTLayers = (val + 1); };
-#endif
   UInt    getMaxLayersMinus1()                { return m_uiMaxLayersMinus1;  }; 
   Void    setMaxLayersMinus1(UInt l)          { m_uiMaxLayersMinus1 = l; }
@@ -1134 +1024 @@
 
 #if H_MV
-#if H_MV_HLS10_PTL
   TComPTL* getPTL( Int idx = 0 ) { return &m_pcPTL[idx]; }
-#else
-  TComPTL* getPTL( Int layerSet = 0 ) { return &m_pcPTL[layerSet]; }
-#endif
 #else
   TComPTL* getPTL() { return &m_pcPTL; }
@@ -1218 +1104 @@
   Void    setLayerSetIdxForOlsMinus1( Int outLayerSetIdx, Int val )        { m_layerSetIdxForOlsMinus1[ outLayerSetIdx ]  = val; } 
   Int     getLayerSetIdxForOlsMinus1( Int outLayerSetIdx )                 { return m_layerSetIdxForOlsMinus1[ outLayerSetIdx ]; } 
-#if VPS_MISC_UPDATES
   Int     getLayerSetIdxForOlsMinus1Len( Int outLayerSetIdx )              { return gCeilLog2( getNumLayerSets() ); } 
-#endif
 
   Void    setOutputLayerFlag( Int outLayerSetIdx, Int i, Bool flag )       { m_outputLayerFlag[ outLayerSetIdx ][ i ] = flag; } 
@@ -1227 +1111 @@
   Bool    inferOutputLayerFlag( Int i, Int j );
 
-#if H_MV_HLS10_PTL
   Void    setProfileTierLevelIdx( Int i, Int j, Int val )                  { m_profileTierLevelIdx[ i ][ j ] = val; }
   Int     getProfileTierLevelIdx( Int i, Int j )                           { return m_profileTierLevelIdx[ i ][ j ]; } 
-#if H_MV_HLS10_PTL_FIX
   Int     inferProfileTierLevelIdx( Int i, Int j );
-#endif
-#else
-  Void    setProfileLevelTierIdx( Int outLayerSetIdx, Int val )            { m_profileLevelTierIdx[ outLayerSetIdx ] = val; }
-  Int     getProfileLevelTierIdx( Int outLayerSetIdx )                     { return m_profileLevelTierIdx[ outLayerSetIdx ]; } 
-#endif
   
   Void    setAltOutputLayerFlag( Int i, Bool flag )                        { m_altOutputLayerFlag[i] = flag; } 
@@ -1266 +1143 @@
   TComDpbSize* getDpbSize( )                                               { return m_dpbSize;} 
   
-#if !H_MV_HLS10_ADD_LAYERSETS  
-  Void    inferDbpSizeLayerSetZero( TComSPS* sps, Bool encoder );
-#endif
 
   Void    setPocLsbNotPresentFlag( Int i, Bool flag )                      { m_pocLsbNotPresentFlag[i] = flag; } 
@@ -1299 +1173 @@
 
   Int     getViewIndex    ( Int layerIdInNuh )                             { return getScalabilityId( getLayerIdInVps(layerIdInNuh), VIEW_ORDER_INDEX  ); }    
-#if H_MV_HLS10_AUX
   Int     getAuxId        ( Int layerIdInNuh )                             { return getScalabilityId( getLayerIdInVps(layerIdInNuh), AUX_ID  ); }    
   Int     getDependencyId ( Int layerIdInNuh )                             { return getScalabilityId( getLayerIdInVps(layerIdInNuh), DEPENDENCY_ID  ); }    
-#endif
   Int     getNumViews();
 
-#if H_MV_HLS10_REF_PRED_LAYERS
   Bool    getDependencyFlag( Int i, Int j )                                { return m_dependencyFlag[i][j]; }
-#endif
   Int     getNumDirectRefLayers( Int layerIdInNuh )                        { return m_numDirectRefLayers[ layerIdInNuh ];  };                               
-#if !H_MV_HLS10_REF_PRED_LAYERS
-  Int     getRefLayerId        ( Int layerIdInNuh, Int idx );; 
-#endif
   Int     getNumRefLayers            ( Int i )        { return m_numRefLayers[i]; } 
   Int     getNumPredictedLayers      ( Int i )        { return m_numPredictedLayers[i]; } 
 
-#if !H_MV_HLS10_REF_PRED_LAYERS  
-  Int     getPredictedLayerId        ( Int i, Int j ) { return m_predictedLayerId[i][j]; } 
-#else
   Int     getIdRefLayer              ( Int i, Int j ) { assert( j >= 0 && j < getNumRefLayers      ( i )); return m_idRefLayer      [i][j]; } 
   Int     getIdPredictedLayer        ( Int i, Int j ) { assert( j >= 0 && j < getNumPredictedLayers( i )); return m_idPredictedLayer[i][j]; } 
   Int     getIdDirectRefLayer        ( Int i, Int j ) { assert( j >= 0 && j < getNumDirectRefLayers( i )); return m_idDirectRefLayer[i][j]; } 
-#endif
   Int     getNumIndependentLayers    (  )             { return m_numIndependentLayers; } 
   Int     getNumLayersInTreePartition( Int i )        { return m_numLayersInTreePartition[i]; } 
@@ -1328 +1191 @@
   Int     getNumLayerSets( )                                               { return getVpsNumLayerSetsMinus1() + 1 + getNumAddLayerSets();  };  
   
-#if H_MV_HLS10_ADD_LAYERSETS
   Int     getFirstAddLayerSetIdx()                    { return getVpsNumLayerSetsMinus1() + 1; } 
   Int     getLastAddLayerSetIdx()                     { return getFirstAddLayerSetIdx() + getNumAddLayerSets() - 1; }
-#endif
   Bool    checkVPSExtensionSyntax(); 
   Int     scalTypeToScalIdx   ( ScalabilityType scalType );
 
-#if H_MV_HLS10_PTL
   Int     getProfileTierLevelIdxLen()                                      { return gCeilLog2( getVpsNumProfileTierLevelMinus1() + 1 ); };       
-#else
-  Int     getProfileLevelTierIdxLen()                                      { return gCeilLog2( getVpsNumProfileTierLevelMinus1() + 1 ); };       
-#endif
   Int     getVpsRepFormatIdxLen()                                          { return gCeilLog2( getVpsNumRepFormatsMinus1() + 1 ); };       
 
@@ -1350 +1207 @@
   Void    deriveLayerSetLayerIdList();
 
-#if H_MV_HLS10_ADD_LAYERSETS
   Int     olsIdxToLsIdx( Int i )                                           { return ( i < getNumLayerSets() ) ? i  : getLayerSetIdxForOlsMinus1( i ) + 1 ; };
-#else
-  Int     olsIdxToLsIdx( Int i )                                           { return ( i <= getVpsNumLayerSetsMinus1() ) ? i  : getLayerSetIdxForOlsMinus1( i ) + 1 ; };
-#endif
   Void    initTargetLayerIdLists  ( );
   Void    deriveTargetLayerIdList ( Int i );
@@ -1363 +1216 @@
   Int     getOlsHighestOutputLayerId( Int i )                              { return getTargetOptLayerIdList( i ).back(); };  
 
-#if H_MV_HLS10_ADD_LAYERSETS
   Void    deriveAddLayerSetLayerIdList( Int i );
-#endif
-#if H_MV_HLS10_NESSECARY_LAYER
   Void    deriveNecessaryLayerFlags( Int olsIdx );;
   Int     getNecessaryLayerFlag( Int i, Int j )                            { AOF( i >= 0 && i < getNumOutputLayerSets() ); AOF( j >= 0 && j < getNumLayersInIdList( olsIdxToLsIdx( i ) )  );  return m_necessaryLayerFlag[i][j]; };  
-#endif
 
   Int     getMaxSubLayersInLayerSetMinus1( Int i );
@@ -1380 +1229 @@
 
   // helpers
-#if !H_MV_HLS10_REF_PRED_LAYERS
-  Bool    getInDirectDependencyFlag( Int depLayeridInVps, Int refLayeridInVps, Int depth = 0 );
-#endif
-#if !H_MV_HLS10_MAXNUMPICS
-  Int     getMaxNumPics( Int layerId );
-#endif
-#if H_MV_HLS10_ADD_LAYERSETS
   Void    printPTL();
   Void    printLayerDependencies();
-#if H_MV_HLS10_AUX
   Void    printScalabilityId();;
-#endif
   Void    printLayerSets();;
 
@@ -1436 +1276 @@
     xPrintArray( name, 1, idx2, numElemDim2, vec2, printNumber, false );
   }
-#endif
 
 
@@ -1470 +1309 @@
   Int     getSubPULog2Size(Int layerIdInVps)           { return m_iSubPULog2Size[layerIdInVps]; }
   Void    setSubPULog2Size(Int layerIdInVps, Int u)    { m_iSubPULog2Size[layerIdInVps] = u;}
-#if MTK_I0099_VPS_EX2
   Int     getSubPUMPILog2Size(Int layerIdInVps)           { return m_iSubPUMPILog2Size[layerIdInVps]; }
   Void    setSubPUMPILog2Size(Int layerIdInVps, Int u)    { m_iSubPUMPILog2Size[layerIdInVps] = u;}
-#else
-  Int     getSubPUMPILog2Size( )           { return m_iSubPUMPILog2Size; }
-  Void    setSubPUMPILog2Size( Int u )     { m_iSubPUMPILog2Size = u;    }
-#endif
-#endif
-#endif
-#if MTK_I0099_VPS_EX2
+#endif
+#endif
+#if H_3D_QTLPC
   Void    setLimQtPredFlag    ( Int layerIdInVps, Bool val )  { m_bLimQtPredFlag[ layerIdInVps ] = val; }
   Bool    getLimQtPredFlag    ( Int layerIdInVps ) { return m_bLimQtPredFlag[layerIdInVps];}
@@ -1493 +1327 @@
   Void    setVpsDepthModesFlag( Int layerIdInVps, Bool val )               { m_vpsDepthModesFlag[ layerIdInVps ] = val; }
   Bool    getVpsDepthModesFlag( Int layerIdInVps )                         { return m_vpsDepthModesFlag[ layerIdInVps ]; }
-#if SEPARATE_FLAG_I0085
+
   Void    setIVPFlag( Int layerIdInVps, Bool val )                    { m_bIVPFlag[ layerIdInVps ] = val; }
   Bool    getIVPFlag( Int layerIdInVps )                              { return m_bIVPFlag[ layerIdInVps ]; }
-#endif
-
-#if SEC_HLS_CLEANUP_I0100
+
   Bool    getIvMvScalingFlag   ( Int layerIdInVps )                        { return m_ivMvScalingFlag[ layerIdInVps ]; }
   Void    setIvMvScalingFlag   (Int layerIdInVps, Bool b )                 { m_ivMvScalingFlag[ layerIdInVps ] = b;    }  
-#else
-  Bool    getIvMvScalingFlag   (  )                       { return m_ivMvScalingFlag; }
-  Void    setIvMvScalingFlag   ( Bool b )                 { m_ivMvScalingFlag = b;    }  
-#endif
 
 #if H_3D_INTER_SDC
@@ -1530 +1358 @@
   Bool        m_bInterViewDltPredEnableFlag[ MAX_NUM_LAYERS ];
 
-#if !FIX_TICKET_77
-  Int         m_iBitsPerDepthValue       [ MAX_NUM_LAYERS ];
-#endif
   Int         m_iNumDepthmapValues       [ MAX_NUM_LAYERS ];
   Int*        m_iDepthValue2Idx          [ MAX_NUM_LAYERS ];
@@ -1559 +1384 @@
   UInt    getDepthViewBitDepth()                          { return m_uiDepthViewBitDepth; }
 
-#if !FIX_TICKET_77
-  Int     getBitsPerDepthValue( Int layerIdInVps )        { return getUseDLTFlag(layerIdInVps)?m_iBitsPerDepthValue[layerIdInVps]:g_bitDepthY; }
-#endif
   Int     getNumDepthValues( Int layerIdInVps )           { return getUseDLTFlag(layerIdInVps)?m_iNumDepthmapValues[layerIdInVps]:((1 << g_bitDepthY)-1); }
   Int     depthValue2idx( Int layerIdInVps, Pel value )   { return getUseDLTFlag(layerIdInVps)?m_iDepthValue2Idx[layerIdInVps][value]:value; }
-#if RWTH_DLT_CLIP_I0057
   Pel     idx2DepthValue( Int layerIdInVps, UInt uiIdx )  { return getUseDLTFlag(layerIdInVps)?m_iIdx2DepthValue[layerIdInVps][ClipY(uiIdx)]:uiIdx; }
-#else
-  Pel     idx2DepthValue( Int layerIdInVps, UInt uiIdx )  { return getUseDLTFlag(layerIdInVps)?m_iIdx2DepthValue[layerIdInVps][uiIdx]:uiIdx; }
-#endif
   Void    setDepthLUTs( Int layerIdInVps, Int* idx2DepthValue = NULL, Int iNumDepthValues = 0 );
-#if H_3D_DELTA_DLT
   Int*    idx2DepthValue( Int layerIdInVps )  { return m_iIdx2DepthValue[layerIdInVps]; }
   Void    getDeltaDLT( Int layerIdInVps, Int* piDLTInRef, UInt uiDLTInRefNum, Int* piDeltaDLTOut, UInt *puiDeltaDLTOutNum );
   Void    setDeltaDLT( Int layerIdInVps, Int* piDLTInRef, UInt uiDLTInRefNum, Int* piDeltaDLTIn, UInt uiDeltaDLTInNum );
-#endif
 };
 #endif
@@ -1833 +1649 @@
   Bool        m_useAMP;
 
-#if !MTK_I0099_VPS_EX2
-#if H_3D_QTLPC
-  Bool        m_bUseQTL;
-  Bool        m_bUsePC;
-#endif
-#endif
   // Parameter
   Int         m_bitDepthY;
@@ -1880 +1690 @@
   TComVPS*    m_pcVPS; 
   // SPS 
-#if H_MV_HLS10_MULTILAYERSPS
   Int         m_spsMaxSubLayersMinus1;
   Int         m_spsExtOrMaxSubLayersMinus1;
-#endif
   Bool        m_spsExtensionPresentFlag; 
 
@@ -1901 +1709 @@
   // SPS Extension 
   Bool        m_interViewMvVertConstraintFlag;
-#if !H_MV_HLS10_PPS
-  Int         m_numScaledRefLayerOffsets;
-  Int         m_scaledRefLayerId          [MAX_NUM_SCALED_REF_LAYERS];
-  Int         m_scaledRefLayerLeftOffset  [MAX_NUM_LAYERS];
-  Int         m_scaledRefLayerTopOffset   [MAX_NUM_LAYERS];
-  Int         m_scaledRefLayerRightOffset [MAX_NUM_LAYERS];
-  Int         m_scaledRefLayerBottomOffset[MAX_NUM_LAYERS];
-#endif
 #endif
 #if H_3D
@@ -2012 +1812 @@
 #if H_MV
   UInt      getSpsMaxSubLayersMinus1()                { return ( m_uiMaxTLayers - 1); }
-#if H_MV_HLS10_MULTILAYERSPS
   Void      setSpsMaxSubLayersMinus1( UInt val )       { setMaxTLayers( val + 1 ); }
-#endif
 #endif
 
@@ -2047 +1845 @@
   TComPTL* getPTL()     { return &m_pcPTL; }
 #if H_MV
-#if H_MV_HLS10_MULTILAYERSPS
   Void setSpsExtOrMaxSubLayersMinus1( Int  val ) { m_spsExtOrMaxSubLayersMinus1 = val; } 
   Int  getSpsExtOrMaxSubLayersMinus1(  ) { return m_spsExtOrMaxSubLayersMinus1; } 
@@ -2053 +1850 @@
 
   Bool getMultiLayerExtSpsFlag()            { return ( getLayerId() != 0  &&  getSpsExtOrMaxSubLayersMinus1() == 7 ); }
-#endif
   Void inferSpsMaxDecPicBufferingMinus1( TComVPS* vps, Int targetOptLayerSetIdx, Int currLayerId, Bool encoder );
 
@@ -2092 +1888 @@
   Bool getInterViewMvVertConstraintFlag()         { return m_interViewMvVertConstraintFlag;}
 
-#if !H_MV_HLS10_PPS
-  Void setNumScaledRefLayerOffsets( Int  val )    { m_numScaledRefLayerOffsets = val; } 
-  Int  getNumScaledRefLayerOffsets(  )            { return m_numScaledRefLayerOffsets; } 
-
-  Void setScaledRefLayerId( Int i, Int  val )     { m_scaledRefLayerId[i] = val; } 
-  Int  getScaledRefLayerId( Int i )               { return m_scaledRefLayerId[i]; } 
-
-  Void setScaledRefLayerLeftOffset( Int j, Int  val ) { m_scaledRefLayerLeftOffset[j] = val; } 
-  Int  getScaledRefLayerLeftOffset( Int j )           { return m_scaledRefLayerLeftOffset[j]; } 
-
-  Void setScaledRefLayerTopOffset( Int j, Int  val )  { m_scaledRefLayerTopOffset[j] = val; } 
-  Int  getScaledRefLayerTopOffset( Int j )            { return m_scaledRefLayerTopOffset[j]; } 
-
-  Void setScaledRefLayerRightOffset( Int j, Int  val ) { m_scaledRefLayerRightOffset[j] = val; } 
-  Int  getScaledRefLayerRightOffset( Int j )           { return m_scaledRefLayerRightOffset[j]; } 
-
-  Void setScaledRefLayerBottomOffset( Int j, Int  val ) { m_scaledRefLayerBottomOffset[j] = val; } 
-  Int  getScaledRefLayerBottomOffset( Int j )           { return m_scaledRefLayerBottomOffset[j]; } 
-#endif
   // Inference 
 
@@ -2119 +1896 @@
   Void checkRpsMaxNumPics( TComVPS* vps, Int currLayerId );
 
-#endif
-#if !MTK_I0099_VPS_EX2
-#if H_3D_QTLPC
-  Void setUseQTL( Bool b ) { m_bUseQTL = b;    }
-  Bool getUseQTL()         { return m_bUseQTL; }
-  Void setUsePC ( Bool b ) { m_bUsePC  = b;    }
-  Bool getUsePC ()         { return m_bUsePC;  }
-#endif
 #endif
 #if H_MV
@@ -2201 +1970 @@
   
   Bool     m_loopFilterAcrossTilesEnabledFlag;
-  Int      m_uniformSpacingFlag;
-  Int      m_iNumColumnsMinus1;
-  UInt*    m_puiColumnWidth;
-  Int      m_iNumRowsMinus1;
-  UInt*    m_puiRowHeight;
-
-  Int      m_iNumSubstreams;
+  Bool             m_uniformSpacingFlag;
+  Int              m_numTileColumnsMinus1;
+  Int              m_numTileRowsMinus1;
+  std::vector<Int> m_tileColumnWidth;
+  std::vector<Int> m_tileRowHeight;
+
+  Int      m_numSubstreams;
 
   Int      m_signHideFlag;
@@ -2304 +2073 @@
   Bool    getDependentSliceSegmentsEnabledFlag() const     { return m_dependentSliceSegmentsEnabledFlag; }
   Void    setDependentSliceSegmentsEnabledFlag(Bool val)   { m_dependentSliceSegmentsEnabledFlag = val; }
-  Bool    getTilesEnabledFlag() const                      { return m_tilesEnabledFlag; }
-  Void    setTilesEnabledFlag(Bool val)                    { m_tilesEnabledFlag = val; }
   Bool    getEntropyCodingSyncEnabledFlag() const          { return m_entropyCodingSyncEnabledFlag; }
   Void    setEntropyCodingSyncEnabledFlag(Bool val)        { m_entropyCodingSyncEnabledFlag = val; }
-  Void     setUniformSpacingFlag            ( Bool b )          { m_uniformSpacingFlag = b; }
-  Bool     getUniformSpacingFlag            ()                  { return m_uniformSpacingFlag; }
-  Void     setNumColumnsMinus1              ( Int i )           { m_iNumColumnsMinus1 = i; }
-  Int      getNumColumnsMinus1              ()                  { return m_iNumColumnsMinus1; }
-  Void     setColumnWidth ( UInt* columnWidth )
-  {
-    if( m_uniformSpacingFlag == 0 && m_iNumColumnsMinus1 > 0 )
-    {
-      m_puiColumnWidth = new UInt[ m_iNumColumnsMinus1 ];
-
-      for(Int i=0; i<m_iNumColumnsMinus1; i++)
-      {
-        m_puiColumnWidth[i] = columnWidth[i];
-      }
-    }
-  }
-  UInt     getColumnWidth  (UInt columnIdx) { return *( m_puiColumnWidth + columnIdx ); }
-  Void     setNumRowsMinus1( Int i )        { m_iNumRowsMinus1 = i; }
-  Int      getNumRowsMinus1()               { return m_iNumRowsMinus1; }
-  Void     setRowHeight    ( UInt* rowHeight )
-  {
-    if( m_uniformSpacingFlag == 0 && m_iNumRowsMinus1 > 0 )
-    {
-      m_puiRowHeight = new UInt[ m_iNumRowsMinus1 ];
-
-      for(Int i=0; i<m_iNumRowsMinus1; i++)
-      {
-        m_puiRowHeight[i] = rowHeight[i];
-      }
-    }
-  }
-  UInt     getRowHeight           (UInt rowIdx)    { return *( m_puiRowHeight + rowIdx ); }
-  Void     setNumSubstreams(Int iNumSubstreams)               { m_iNumSubstreams = iNumSubstreams; }
-  Int      getNumSubstreams()                                 { return m_iNumSubstreams; }
+
+  Void     setTilesEnabledFlag       (Bool val)                             { m_tilesEnabledFlag = val; }
+  Bool     getTilesEnabledFlag       () const                               { return m_tilesEnabledFlag; }
+  Void     setTileUniformSpacingFlag (Bool b)                               { m_uniformSpacingFlag = b; }
+  Bool     getTileUniformSpacingFlag () const                               { return m_uniformSpacingFlag; }
+  Void     setNumTileColumnsMinus1   (Int i)                                { m_numTileColumnsMinus1 = i; }
+  Int      getNumTileColumnsMinus1   () const                               { return m_numTileColumnsMinus1; }
+  Void     setTileColumnWidth        (const std::vector<Int>& columnWidth ) { m_tileColumnWidth = columnWidth; }
+  UInt     getTileColumnWidth        (UInt columnIdx) const                 { return  m_tileColumnWidth[columnIdx]; }
+  Void     setNumTileRowsMinus1      (Int i)                                { m_numTileRowsMinus1 = i; }
+  Int      getTileNumRowsMinus1      () const                               { return m_numTileRowsMinus1; }
+  Void     setTileRowHeight          (const std::vector<Int>& rowHeight)    { m_tileRowHeight = rowHeight;  }
+  UInt     getTileRowHeight          (UInt rowIdx) const                    { return m_tileRowHeight[rowIdx]; }
+
+  Void     setNumSubstreams    (Int numSubstreams)                     { m_numSubstreams = numSubstreams; }
+  Int      getNumSubstreams    ()                                      { return m_numSubstreams; }
 
   Void      setSignHideFlag( Int signHideFlag ) { m_signHideFlag = signHideFlag; }
@@ -2537 +2286 @@
 
   Bool       m_enableTMVPFlag;
-#if I0044_SLICE_TMVP
+#if H_MV
   Bool       m_availableForTMVPRefFlag;
 #endif
@@ -2599 +2348 @@
   UInt         m_aiDDDShift    [MAX_NUM_LAYERS];
 #endif
-#if MTK_SINGLE_DEPTH_MODE_I0095
+#if H_3D_SINGLE_DEPTH
   Bool      m_bApplySingleDepthMode;
 #endif
-#if MTK_LOW_LATENCY_IC_ENCODING_H0086_FIX
+#if H_3D_IC
   Int *m_aICEnableCandidate;
   Int *m_aICEnableNum;
@@ -2676 +2425 @@
   TComPic*  getTexturePic       ()                              { return  m_ivPicsCurrPoc[0][ m_viewIndex ]; }
 #endif
-#if MTK_SINGLE_DEPTH_MODE_I0095
+#if H_3D_SINGLE_DEPTH
   Void      setApplySingleDepthMode( Bool b )                                { m_bApplySingleDepthMode = b; }
   Bool      getApplySingleDepthMode()                                        { return m_bApplySingleDepthMode; }
@@ -2877 +2626 @@
   Void      setEnableTMVPFlag     ( Bool   b )    { m_enableTMVPFlag = b; }
   Bool      getEnableTMVPFlag     ()              { return m_enableTMVPFlag;}
-#if I0044_SLICE_TMVP
+#if H_MV
   Void      setAvailableForTMVPRefFlag     ( Bool   b )    { m_availableForTMVPRefFlag = b; }
   Bool      getAvailableForTMVPRefFlag     ()              { return m_availableForTMVPRefFlag;}
@@ -2917 +2666 @@
   Int* getDepthToDisparityF( Int refViewIdx ) { return m_depthToDisparityF[ refViewIdx ]; }; 
   Bool getVpsDepthModesFlag  ()  { return getVPS()->getVpsDepthModesFlag( getVPS()->getLayerIdInVps( m_layerId ) ); }
-#if SEPARATE_FLAG_I0085
   Bool getIVPFlag       ()  { return getVPS()->getIVPFlag( getVPS()->getLayerIdInVps( m_layerId ) ); }
 #endif
-#endif
-#if MTK_LOW_LATENCY_IC_ENCODING_H0086_FIX
+#if H_3D_IC
   Void    setICEnableCandidate( Int* ICEnableCandidate)   { m_aICEnableCandidate = ICEnableCandidate; };
   Void    setICEnableNum( Int* ICEnableNum)   { m_aICEnableNum = ICEnableNum; };

trunk/source/Lib/TLibCommon/TComWedgelet.cpp

@@ -68 +68 @@
                                                             m_uiHeight ( rcWedge.m_uiHeight  ),
                                                             m_pbPattern( (Bool*)xMalloc( Bool, (m_uiWidth * m_uiHeight) ) )
-#if SHARP_DMM1_I0110
                                                             ,m_pbScaledPattern( g_wedgePattern )
-#endif
 {
   ::memcpy( m_pbPattern, rcWedge.m_pbPattern, sizeof(Bool) * (m_uiWidth * m_uiHeight));
@@ -88 +86 @@
 
   m_pbPattern = (Bool*)xMalloc( Bool, (m_uiWidth * m_uiHeight) );
-#if SHARP_DMM1_I0110
   m_pbScaledPattern = g_wedgePattern;
-#endif
 }
 
@@ -187 +183 @@
   switch( m_eWedgeRes )
   {
-#if !SHARP_DMM1_I0110
-  case( DOUBLE_PEL ): { uiTempBlockSize =  m_uiWidth;     uhXs = (m_uhXs<<1); uhYs = (m_uhYs<<1); uhXe = (m_uhXe<<1); uhYe = (m_uhYe<<1); } break;
-#endif
   case(   FULL_PEL ): { uiTempBlockSize =  m_uiWidth;     uhXs =  m_uhXs;     uhYs =  m_uhYs;     uhXe =  m_uhXe;     uhYe =  m_uhYe;     } break;
   case(   HALF_PEL ): { uiTempBlockSize = (m_uiWidth<<1); uhXs =  m_uhXs;     uhYs =  m_uhYs;     uhXe =  m_uhXe;     uhYe =  m_uhYe;     } break;
   }
-
-#if !SHARP_DMM1_I0110
-  if( m_eWedgeRes == DOUBLE_PEL) // adjust line-end for DOUBLE_PEL resolution
-  {
-    if( m_uhOri == 1 ) { uhXs = uiTempBlockSize-1; }
-    if( m_uhOri == 2 ) { uhXe = uiTempBlockSize-1; uhYs = uiTempBlockSize-1; }
-    if( m_uhOri == 3 ) { uhYe = uiTempBlockSize-1; }
-    if( m_uhOri == 4 ) { uhYe = uiTempBlockSize-1; }
-    if( m_uhOri == 5 ) { uhXs = uiTempBlockSize-1; }
-  }
-#endif
 
   Bool* pbTempPattern = new Bool[ (uiTempBlockSize * uiTempBlockSize) ];
@@ -233 +215 @@
   switch( m_eWedgeRes )
   {
-#if !SHARP_DMM1_I0110
-  case( DOUBLE_PEL ): { for( UInt k = 0; k < (m_uiWidth * m_uiHeight); k++ ) { m_pbPattern[k] = pbTempPattern[k]; }; } break;
-#endif
   case(   FULL_PEL ): { for( UInt k = 0; k < (m_uiWidth * m_uiHeight); k++ ) { m_pbPattern[k] = pbTempPattern[k]; }; } break;
   case(   HALF_PEL ): // sub-sampling by factor 2
@@ -327 +306 @@
 }
 
-#if SHARP_DMM1_I0110
 Bool* TComWedgelet::getScaledPattern(UInt uiDstSize)
 {
-    Bool *pbSrcPat = this->getPattern();
-    UInt uiSrcSize = this->getStride();
-
-    Int scale = (g_aucConvertToBit[uiDstSize] - g_aucConvertToBit[uiSrcSize]);
-    assert(scale>=0);
-    for (Int y=0; y<uiDstSize; y++)
-    {
-       for (Int x=0; x<uiDstSize; x++)
-       {
-           Int srcX = x>>scale;
-           Int srcY = y>>scale;
-           m_pbScaledPattern[y*uiDstSize + x] = pbSrcPat[ srcY*uiSrcSize + srcX ];
-       }
-   }
-   return m_pbScaledPattern;
-}
-#endif
+  Bool *pbSrcPat = this->getPattern();
+  UInt uiSrcSize = this->getStride();
+
+  Int scale = (g_aucConvertToBit[uiDstSize] - g_aucConvertToBit[uiSrcSize]);
+  assert(scale>=0);
+  for (Int y=0; y<uiDstSize; y++)
+  {
+    for (Int x=0; x<uiDstSize; x++)
+    {
+      Int srcX = x>>scale;
+      Int srcY = y>>scale;
+      m_pbScaledPattern[y*uiDstSize + x] = pbSrcPat[ srcY*uiSrcSize + srcX ];
+    }
+  }
+  return m_pbScaledPattern;
+}
 
 TComWedgeNode::TComWedgeNode()

trunk/source/Lib/TLibCommon/TComWedgelet.h

@@ -58 +58 @@
 #define DIM_NO_IDX     MAX_UINT
 
-#if HS_DMM_SIGNALLING_I0120
 __inline UInt getDimType  ( Int intraMode ) 
 { 
@@ -64 +63 @@
     return (dimType >= 0 && dimType < DIM_NUM_TYPE) ? (UInt)dimType : DIM_NO_IDX; 
 }
-#else
-__inline UInt getDimType  ( Int intraMode ) { Int dimType = (intraMode-DIM_OFFSET)/2; return (dimType >= 0 && dimType < DIM_NUM_TYPE) ? (UInt)dimType : DIM_NO_IDX; }
-#endif
 __inline Bool isDimMode   ( Int intraMode ) { return (getDimType( intraMode ) < DIM_NUM_TYPE); }
-#if !HS_DMM_SIGNALLING_I0120
-__inline Bool isDimDeltaDC( Int intraMode ) { return (isDimMode( intraMode ) && ((intraMode-DIM_OFFSET)%2) == 1); }
-#endif
 #endif
 
@@ -79 +72 @@
 enum WedgeResolution
 {
-#if !SHARP_DMM1_I0110
-  DOUBLE_PEL,
-#endif
   FULL_PEL,
   HALF_PEL
@@ -106 +96 @@
 
   Bool* m_pbPattern;
-#if SHARP_DMM1_I0110
   Bool* m_pbScaledPattern;
-#endif
 
   Void  xGenerateWedgePattern();
@@ -134 +122 @@
   Bool            getIsCoarse() { return m_bIsCoarse; }
   UInt            getAng     () { return m_uiAng; }
-#if SHARP_DMM1_I0110
   Bool*           getScaledPattern(UInt uiWidth);
-#endif
 
   Void  setWedgelet( UChar uhXs, UChar uhYs, UChar uhXe, UChar uhYe, UChar uhOri, WedgeResolution eWedgeRes, Bool bIsCoarse = false );

trunk/source/Lib/TLibCommon/TComYuv.cpp

@@ -689 +689 @@
   UInt iSrc1Stride = pcYuvSrc1->getStride();
   UInt iDstStride  = getStride();
-#if QC_I0129_ARP_FIX
   Int iIFshift = IF_INTERNAL_PREC - g_bitDepthY;
   Int iOffSet  = ( 1 << ( iIFshift - 1 ) ) + IF_INTERNAL_OFFS;
-#endif
   for ( y = uiHeight-1; y >= 0; y-- )
   {
@@ -700 +698 @@
       if( bClip )
       {
-#if QC_I0129_ARP_FIX
         pDst[x] = ClipY( ( pDst[x] + iOffSet ) >> iIFshift );
-#else
-        pDst[x] = ClipY( pDst[x] );
-#endif
       }
     }
@@ -727 +721 @@
   UInt  iSrc1Stride = pcYuvSrc1->getCStride();
   UInt  iDstStride  = getCStride();
-#if QC_I0129_ARP_FIX
+
   Int iIFshift = IF_INTERNAL_PREC - g_bitDepthC;
   Int iOffSet  = ( 1 << ( iIFshift - 1 ) ) + IF_INTERNAL_OFFS;
-#endif
+
   for ( y = uiHeight-1; y >= 0; y-- )
   {
@@ -739 +733 @@
       if( bClip )
       {
-#if QC_I0129_ARP_FIX
         pDstU[x] = ClipC( ( pDstU[x] + iOffSet ) >> iIFshift );
         pDstV[x] = ClipC( ( pDstV[x] + iOffSet ) >> iIFshift );
-#else
-        pDstU[x] = ClipC( pDstU[x] );
-        pDstV[x] = ClipC( pDstV[x] );
-#endif
       }
     }
@@ -761 +750 @@
 {
   subtractARPLuma  ( pcYuvSrc0, pcYuvSrc1,  uiAbsPartIdx, uiWidth    , uiHeight    );
-#if SHARP_ARP_CHROMA_I0104
+
   if (uiWidth > 8)
-#endif
-  subtractARPChroma( pcYuvSrc0, pcYuvSrc1,  uiAbsPartIdx, uiWidth>>1 , uiHeight>>1 );
+    subtractARPChroma( pcYuvSrc0, pcYuvSrc1,  uiAbsPartIdx, uiWidth>>1 , uiHeight>>1 );
 }
 
@@ -823 +811 @@
 {
   multiplyARPLuma( uiAbsPartIdx , uiWidth , uiHeight , dW );
-#if SHARP_ARP_CHROMA_I0104
+
   if (uiWidth > 8)
-#endif
-  multiplyARPChroma( uiAbsPartIdx , uiWidth >> 1 , uiHeight >> 1 , dW );
+    multiplyARPChroma( uiAbsPartIdx , uiWidth >> 1 , uiHeight >> 1 , dW );
 }
 

trunk/source/Lib/TLibCommon/TypeDef.h

@@ -111 +111 @@
                                               // MTK_ARP_REF_SELECTION_G0053 ARP Reference picture selection in JCT3V-G0053 
                                               // MTK_ALIGN_SW_WD_BI_PRED_ARP_H0085  Align the SW and WD for the bi-prediction ARP PUs by disallowing non-normative fast bi-prediction for ARP PUs, JCT3V-H0085
-
+                                              // QC_I0051_ARP_SIMP          
+                                              // SHARP_ARP_CHROMA_I0104     
+                                              // MTK_I0072_IVARP_SCALING_FIX
 
 #define H_3D_IC                           1   // Illumination Compensation, JCT3V-B0045, JCT3V-C0046, JCT3V-D0060
@@ -123 +125 @@
                                               // SEC_IC_ARP_SIG_G0072, Disabling IC when ARP is enabled, option 1 in JCT3V-G0072, part 2 in JCT3V-G0121
                                               // MTK_LOW_LATENCY_IC_ENCODING_H0086  Low-latency IC encoding in JCT3V-H0086
-
-#define MTK_LOW_LATENCY_IC_ENCODING_H0086_FIX  1  // Remove the global variables used in JCT3V-H0086
-
-
-#define SEC_IC_NEIGHBOR_CLIP_I0080        1   // Clipping of neighboring sample position, JCT3V-I0080
-
+                                              // MTK_LOW_LATENCY_IC_ENCODING_H0086_FIX  1  // Remove the global variables used in JCT3V-H0086
+                                              // SEC_IC_NEIGHBOR_CLIP_I0080    // Clipping of neighboring sample position, JCT3V-I0080
 
 #if H_3D_NBDV
@@ -177 +175 @@
                                               // SHARP_SIMPLE_MERGE_H0062      Restrict 3D-HEVC merge cand in small PUs
                                               // MTK_DIS_SPBIP8X4_H0205        Disable bi-prediction for 8x4 and 4x8 sub PU and remove the SPIVMP 2Nx2N restriction
-                                              // SEC_ADAPT_DISABLE_IVMP        Disalbing IVMP merge candidates when IC is enabled, JCT3V-H0070
-
-#define SEC_SIMP_SHIFTED_DV_I0086         1   // Simplification of Shifted DV candidate, JCT3V-I0086
+                                              // SEC_ADAPT_DISABLE_IVMP        Disabling IVMP merge candidates when IC is enabled, JCT3V-H0070
+                                              // SEC_SIMP_SHIFTED_DV_I0086     Simplification of Shifted DV candidate, JCT3V-I0086
+
+
 
 #define H_3D_TMVP                         1   // QC_TMVP_C0047 
@@ -222 +221 @@
                                               // SEC_NO_RESI_DLT_H0105    
                                               // MTK_DLT_CODING_FIX_H0091 
-
-#define MTK_SINGLE_DEPTH_MODE_I0095       1   // Single depth mode proposed in JCT3V-I0095
-#if MTK_SINGLE_DEPTH_MODE_I0095
-#define MTK_SINGLE_DEPTH_MODE_CANDIDATE_LIST_SIZE            2 // size of the sample candidate list
-#endif
-
-#define H_3D_FIX_UNINIT                   1   // Fix uninitialized flag
+                                              // HS_DMM_SIGNALLING_I0120
+                                              // SHARP_DMM1_I0110 // LUT size reduction for DMM1 proposed in JCT3V-I0110 
+                                              // FAST_SDC_OFFSET_DECISION_I0084
+                                              // SEPARATE_FLAG_I0085
+                                              // H_3D_DELTA_DLT
+                                              // RWTH_DLT_CLIP_I0057               1
+
+
+
+#define H_3D_SINGLE_DEPTH                 1   // Single depth mode proposed in JCT3V-I0095
+
+
 #define H_3D_INTER_SDC                    1   // INTER SDC, Inter simplified depth coding
                                               // LGE_INTER_SDC_E0156 Enable inter SDC for depth coding
@@ -245 +249 @@
                                               // MTK_DBBP_SIGNALING_H0094    
                                               // H_3D_FIX_DBBP_IVMP        Fix . Enable IVMP is always disabled, when DBBP is enabled. The original intention is to disable Sub-PU IVMP when DBBP is enabled, not to disable IVMP itself. 
-
-#define SEC_DBBP_EXPLICIT_SIG_I0077       1   // Remove the partition derivation and signal dbbp_flag only when the partion mode is 2NxN/Nx2N, JCT3V-I0077
-#define SEC_DBBP_DISALLOW_8x8_I0078       1   // Disallow DBBP in 8x8 CU, JCT3V-I0078
-#define SHARP_DBBP_SIMPLE_FLTER_I0109     1   // Simple condition and one dimensional dilter for DBBP
-#define SEC_DBBP_DMM4_THRESHOLD_I0076     1   // Simplification of threshold derivation for DBBP and DMM4, JCT3V-I0076
+                                              // SEC_DBBP_EXPLICIT_SIG_I0077       1   // Remove the partition derivation and signal dbbp_flag only when the partition mode is 2NxN/Nx2N, JCT3V-I0077
+                                              // Disallow DBBP in 8x8 CU, JCT3V-I0078
+                                              // SHARP_DBBP_SIMPLE_FLTER_I0109     1   // Simple condition and one dimensional filter for DBBP
+                                              // SEC_DBBP_DMM4_THRESHOLD_I0076     Simplification of threshold derivation for DBBP and DMM4, JCT3V-I0076
 
 
@@ -256 +259 @@
 #define H_3D_FCO                          0   // Flexible coding order for 3D
 #if H_3D_FCO
-#define LGE_FCO_I0116                     1
-#endif
-
-#define SCU_HS_FAST_INTRA_SDC_I0123       1
+#define H_3D_FCO                     1
+#endif
+
+#define H_3D_FAST_INTRA_SDC               1   // I0123
 
 // OTHERS
@@ -271 +274 @@
 #endif
 
-#define MTK_I0099_VPS_EX2                 1  ///< JCT3V-I0099, sub-PU size signaling and lim_qt_pred_flag in VPS extension 2
-#define MTK_I0099_FIX                     1  ///< Fix the problem of removing encoder only QTL 
-
 // Rate Control
 #define KWU_FIX_URQ                       1
 #define KWU_RC_VIEWRC_E0227               0  ///< JCT3V-E0227, view-wise target bitrate allocation
 #define KWU_RC_MADPRED_E0227              0  ///< JCT3V-E0227, inter-view MAD prediction
-
-#define SEC_VPS_CLEANUP_I0090             1
-#define SEC_HLS_CLEANUP_I0100             1
-
-#define H_3D_FIX_64BIT_SHIFT              1
 #endif // H_3D
 
@@ -292 +287 @@
 
 // Fixes
-#define FIX_TICKET_79                     1    // Unused VSP code
-#define FIX_TICKET_75                     1    // Bi-pred restriction bug in VSP
-#define FIX_TICKET_68                     1    // MV clipping bug in the sub-PU MPI default MV generation
-#define FIX_TICKET_71                     1    // IC parameters is meaningless in HTM when no training samples are available
-#define FIX_TICKET_77                     1    // Unused variable m_iBitsPerDepthValue
-#define FIX_TICKET_76                     1    // unused functions
-#define FIX_TICKET_62                     1    // buffer overflow for print
-#define FIX_TICKET_61                     1    // layerIdsInSets size check
+
+///// ***** SINGLE DEPTH MODE *********
+#if H_3D_SINGLE_DEPTH
+#define SINGLE_DEPTH_MODE_CAND_LIST_SIZE            2 // size of the sample candidate list
+#endif
 
 ///// ***** VIEW SYNTHESIS OPTIMIZAION *********
@@ -308 +300 @@
 #define H_3D_VSO_RM_ASSERTIONS            0   // Output VSO assertions
 #define H_3D_VSO_SYNTH_DIST_OUT           0   // Output of synthesized view distortion instead of depth distortion in encoder output
-#define H_3D_VSO_FIX                      1   // This fix should be enabled after verification 
 #endif
 
@@ -321 +312 @@
 #if H_3D_ARP
 #define H_3D_ARP_WFNR                     3
-#define QC_I0129_ARP_FIX                  1
-#define QC_I0051_ARP_SIMP                 1
-#define SHARP_ARP_CHROMA_I0104            1
-#define MTK_I0072_IVARP_SCALING_FIX       1
 #endif
 
 ///// ***** DEPTH INTRA MODES *********
 #if H_3D_DIM
+                                              // HHI_DMM4_ENC_I0066
 #define H_3D_DIM_DMM                      1   // Depth Modeling Modes
 #define H_3D_DIM_SDC                      1   // Simplified Depth Coding method
 #define H_3D_DIM_DLT                      1   // Depth Lookup Table
-#define HS_DMM_SIGNALLING_I0120  1   
-#define SHARP_DMM1_I0110                  1   // LUT size reduction for DMM1 proposed in JCT3V-I0110 
-#define FIX_WARNING                       1   // fix narrowing conversion of NumPocStCurr0,NumPocStCurr1 at TComSlice.cpp
-#define FAST_SDC_OFFSET_DECISION_I0084    1
-#define SEPARATE_FLAG_I0085               1
-
-#if H_3D_DIM_DLT
-#define H_3D_DELTA_DLT                    1
-#define RWTH_DLT_CLIP_I0057               1
-#endif
+
 #define H_3D_DIM_ENC                      1   // Depth Intra encoder optimizations, includes:
                                               // HHI_DEPTH_INTRA_SEARCH_RAU_C0160
                                               // LG_ZEROINTRADEPTHRESI_A0087
-#define HHI_DMM4_ENC_I0066                1
 #endif
 ///// ***** VIEW SYNTHESIS PREDICTION *********
@@ -370 +348 @@
 #if H_3D_DBBP
 #define DBBP_INVALID_SHORT                (-4)
-#define RWTH_DBBP_PACK_MODE               SIZE_2NxN
+#define DBBP_PACK_MODE               SIZE_2NxN
 #endif
 
@@ -389 +367 @@
 /////////////////////////////////////////////////////////////////////////////////
 // TBD: Check if integration is necessary. 
-
-
-
-//Added by Qualcomm for HLS
-#define DISCARDABLE_PIC_RPS              1      ///< JCT3V-G0131: Inter-layer RPS and temporal RPS should not contain picture with discardable_flag equal to 1
-#define VPS_MISC_UPDATES                 1      ///< Misc updates:JCT3V-0240, 
-#define NON_REF_NAL_TYPE_DISCARDABLE     1      ///< JCT3V-G0031: If discardable picture is a non-IRAP, it must be a non-referenced sub-layer picture
-#define INFERENCE_POC_MSB_VAL_PRESENT    1      ///< JCT3V-H0042: poc_msb_val_present_flag shall be equal to 0 when slice_header_extension_length is (inferred to be ) equal to 0
-#define INFERENCE_POC_RESET_INFO_PRESENT 1      ///< JCT3V-H0042: Infer the value of poc_reset_info_present_flag to be equal to 0 when no pps extension / pps extension for multilayer.
-#define I0044_SLICE_TMVP                 1      ///< JCT3V-I0044: Regarding slice_temporal_mvp_enabled_flag
-#define I0045_BR_PR_ADD_LAYER_SET        1      ///< JCT3V-I0045: Signalling of bit-rate and picture rate for additional layer set
-#define I0045_VPS_VUI_VST_PARAMS         1      ///< JCT3V-I0045: Related to signalling of VST parameters of the base layer.
-
-
-#define H_MV_HLS10_GEN                       0  // General changes (not tested)
-
-#define H_MV_HLS10_AUX                       1 // Auxiliary pictures
-#define H_MV_HLS10_GEN_FIX                   1
-#define H_MV_FIX_LOOP_GOPSIZE                1
-#define H_MV_FIX_SUB_LAYERS_MAX_MINUS1       1
-
-#define H_MV_HLS10_GEN_VSP_CONF_WIN          1  // VPS conformance window
-#define H_MV_HLS10_GEN_VSP_BASE_LAYER_AVAIL  1  // vps_base_layer_available
-#define H_MV_HLS10_REF_PRED_LAYERS           1  // reference and predicted layer derivation
-#define H_MV_HLS10_NESSECARY_LAYER           1  // necessary layers
-#define H_MV_HLS10_ADD_LAYERSETS             1  // additional layer sets
-#define H_MV_HLS10_DBP_SIZE                  1  // dpb size syntax structure
-#define H_MV_HLS10_MAXNUMPICS                1  // constraint on number of pictures in rps  
-#define H_MV_HLS10_PTL                       1  // profile tier level
-#define H_MV_HLS10_PTL_FIX                   1  // profile tier level fix
-#define H_MV_HLS10_PTL_INBL_FIX              1  // profile tier level fix 
-#define H_MV_HLS10_PTL_INFER_FIX             1  // fix inference ptl
-#define H_MV_HLS10_MULTILAYERSPS             1  // multilayer SPS extension 
-#define H_MV_HLS10_VPS_VUI                   1  // vsp vui
-#define H_MV_HLS10_VPS_VUI_BSP               1  // vsp vui bsp
-#define H_MV_HLS10_PPS                       1  // PPS modifications
-
-#define H_MV_HLS10_VPS_VUI_BSP_STORE         0  // Currently bsp vui bsp hrd parameters are not stored, some dynamic memory allocation with upper bounds is required. 
-
-
+#define H_MV_HLS_PTL_LIMITS                  0
 #define H_MV_HLS7_GEN                        0  // General changes (not tested)
-
+#define H_MV_ALIGN_HM_15                     1  
 
 // POC
@@ -452 +391 @@
 //#define H_MV_HLS_7_SEI_P0123_25  0 // (SEI/P0123/Alpha channel info) #25 Add alpha channel information SEI message Decision: Adopt. Constrain the bit depth indicated to be equal to the coded bit depth of the aux picture. 
 
-// Auxiliary picture related
-//#define H_MV_HLS_8_AUX_NODOC_40  0 // #40 (AUX    /NODOC/primary pic) Clarify that an auxiliary picture can be associated with more than one primary picture. Consider if the language associating an alpha auxiliary picture with a primary picture in the semantics of dimension_id[ ][ ] near the AuxId derivation could be moved to the alpha SEI message.
-//#define H_MV_HLS_8_AUX_Q0081_2   0 // #2  (AUX    /Q0081/primary) Decision: Remove the constraint that an alpha picture must be accompanied by a primary picture.
-//#define H_MV_HLS_8_AUX_Q0078_44  0 // #44 (AUX    /Q0078/concepts Auxiliary picture concepts:
-//#define H_MV_HLS_8_AUX_Q0078_39  0 // #39 (AUX    /Q0078/conformance): mechanism for signaling a profile/tier/level conformance point for auxiliary pictures
-
-// Profiles
-//#define H_MV_HLS_8_PRO_NODOC_50  0 // #50 (PROF   /NODOC/Monochrome) Add Monochrome 8-bit profile
-//#define H_MV_HLS_8_PRO_NODOC_31  0 // #31 (PROF   /NODOC/Profile constraint) Add a profile constraint to the Scalable Main, Scalable Main 10, and Stereo Main profiles against allowing layers with duplicate values of DependencyId (or ViewOrderIdx) when AuxId equal to 0.
-//#define H_MV_HLS_8_PRO_H0126_45  0 // #45 (PROF   /H0126/Stereo main) Phrasing used in specifying the Stereo Main profile. 
-//#define H_MV_HLS_8_PRO_Q0160_33  0 // #33 (PROF   /Q0160/alt_output_flag) v2: Add constraint to stereo main profile that it must contain exactly two texture views, and add a note to state that the constraint implies a restriction that alt_output_flag equal to 0. 
-
 // DPB
 //#define H_MV_HLS_8_HRD_Q0102_09  0 // #9  (HRD    /Q0102/NoOutputOfPriorPicsFlag) It was suggested that also the separate_colour_plane_flag should affect inference of NoOutputOfPriorPicsFlag. Decision (Ed.): Agreed (affects RExt text).
@@ -491 +418 @@
 #define SAO_SGN_FUNC 1
 
+#define TILE_SIZE_CHECK 1
+
 #define FIX1172 1 ///< fix ticket #1172
 
@@ -506 +435 @@
 #define MAX_NESTING_NUM_LAYER       64
 
-#if H_MV_HLS10_VPS_VUI_BSP
+#if H_MV
 #define MAX_VPS_NUM_HRD_PARAMETERS                1024
+#else
+#define MAX_VPS_NUM_HRD_PARAMETERS                1
+#endif
+#if H_MV
 #define MAX_NUM_SUB_LAYERS                        7
 #define MAX_NUM_SIGNALLED_PARTITIONING_SCHEMES    16
-#else
-#define MAX_VPS_NUM_HRD_PARAMETERS                1
-#endif
-
+#endif
 #define MAX_VPS_OP_SETS_PLUS1                     1024
 #if H_MV
-#if H_MV_HLS10_ADD_LAYERSETS
 #define MAX_VPS_NUM_ADD_LAYER_SETS                1024
-#endif
 #define MAX_VPS_NUH_LAYER_ID_PLUS1  63
 #define MAX_NUM_SCALABILITY_TYPES   16
@@ -533 +461 @@
 #define MAX_VPS_PROFILE_TIER_LEVEL      64
 #define MAX_VPS_ADD_OUTPUT_LAYER_SETS   1024
-#if H_MV_HLS10_ADD_LAYERSETS
 #define MAX_VPS_OUTPUTLAYER_SETS        ( MAX_VPS_ADD_OUTPUT_LAYER_SETS + MAX_VPS_OP_SETS_PLUS1 + MAX_VPS_OP_SETS_PLUS1 )
-#else
-#define MAX_VPS_OUTPUTLAYER_SETS        ( MAX_VPS_ADD_OUTPUT_LAYER_SETS + MAX_VPS_OP_SETS_PLUS1 )
-#endif
 #define  MAX_NUM_VIDEO_SIGNAL_INFO      16
 #define MAX_NUM_SCALED_REF_LAYERS       MAX_NUM_LAYERS-1
-#if !H_MV_HLS10_VPS_VUI_BSP
-#define MAX_NUM_BSP_HRD_PARAMETERS      100 ///< Maximum value is actually not specified
-#define MAX_NUM_BITSTREAM_PARTITIONS    100 ///< Maximum value is actually not specified 
-#define MAX_NUM_BSP_SCHED_COMBINATION   100 ///< Maximum value is actually not specified 
-#define MAX_SUB_STREAMS                 1024
-#endif
 #else
 #define MAX_NUM_LAYER_IDS                64
@@ -1016 +934 @@
     MAINSTILLPICTURE = 3,
 #if H_MV
-#if H_MV_HLS10_PTL
     MULTIVIEWMAIN = 6,
 #if H_3D
     MAIN3D = 8, 
-#endif
-#else
-    MAINSTEREO = 4,
-    MAINMULTIVIEW = 5,
-#if H_3D
-    MAIN3D = 6, 
-#endif
 #endif
 #endif
@@ -1069 +979 @@
 #endif    
     VIEW_ORDER_INDEX  = 1,
-#if H_MV_HLS10_AUX
     DEPENDENCY_ID = 2,
     AUX_ID = 3,
-#endif    
   };
 #endif