Changeset 1185 in 3DVCSoftware for branches

Timestamp:

7 Apr 2015, 21:52:03 (10 years ago)

Author:

tech

Message:

Clean up. Part I.

Location:

branches/HTM-14.0-dev0/source

Files:

• App/TAppDecoder/TAppDecTop.cpp (modified) (2 diffs)
• App/TAppEncoder/TAppEncCfg.cpp (modified) (8 diffs)
• App/TAppEncoder/TAppEncCfg.h (modified) (2 diffs)
• App/TAppEncoder/TAppEncTop.cpp (modified) (21 diffs)
• App/TAppEncoder/TAppEncTop.h (modified) (1 diff)
• Lib/TAppCommon/TAppComCamPara.cpp (modified) (3 diffs)
• Lib/TAppCommon/TAppComCamPara.h (modified) (3 diffs)
• Lib/TLibCommon/ContextTables.h (modified) (3 diffs)
• Lib/TLibCommon/TComDataCU.cpp (modified) (46 diffs)
• Lib/TLibCommon/TComDataCU.h (modified) (6 diffs)
• Lib/TLibCommon/TComMotionInfo.h (modified) (1 diff)
• Lib/TLibCommon/TComPrediction.cpp (modified) (15 diffs)
• Lib/TLibCommon/TComPrediction.h (modified) (1 diff)
• Lib/TLibCommon/TComRdCost.cpp (modified) (4 diffs)
• Lib/TLibCommon/TComRdCost.h (modified) (1 diff)
• Lib/TLibCommon/TComRom.cpp (modified) (4 diffs)
• Lib/TLibCommon/TComSlice.cpp (modified) (34 diffs)
• Lib/TLibCommon/TComSlice.h (modified) (26 diffs)
• Lib/TLibCommon/TComWedgelet.cpp (modified) (5 diffs)
• Lib/TLibCommon/TComWedgelet.h (modified) (1 diff)
• Lib/TLibCommon/TypeDef.h (modified) (12 diffs)
• Lib/TLibDecoder/TDecCAVLC.cpp (modified) (15 diffs)
• Lib/TLibDecoder/TDecCAVLC.h (modified) (5 diffs)
• Lib/TLibDecoder/TDecCu.cpp (modified) (11 diffs)
• Lib/TLibDecoder/TDecCu.h (modified) (1 diff)
• Lib/TLibDecoder/TDecEntropy.cpp (modified) (13 diffs)
• Lib/TLibDecoder/TDecEntropy.h (modified) (3 diffs)
• Lib/TLibDecoder/TDecGop.h (modified) (2 diffs)
• Lib/TLibDecoder/TDecSbac.cpp (modified) (5 diffs)
• Lib/TLibDecoder/TDecSbac.h (modified) (2 diffs)
• Lib/TLibDecoder/TDecTop.cpp (modified) (15 diffs)
• Lib/TLibDecoder/TDecTop.h (modified) (4 diffs)
• Lib/TLibEncoder/TEncCavlc.cpp (modified) (11 diffs)
• Lib/TLibEncoder/TEncCavlc.h (modified) (3 diffs)
• Lib/TLibEncoder/TEncCfg.h (modified) (10 diffs)
• Lib/TLibEncoder/TEncCu.cpp (modified) (28 diffs)
• Lib/TLibEncoder/TEncCu.h (modified) (1 diff)
• Lib/TLibEncoder/TEncEntropy.cpp (modified) (6 diffs)
• Lib/TLibEncoder/TEncEntropy.h (modified) (2 diffs)
• Lib/TLibEncoder/TEncGOP.cpp (modified) (6 diffs)
• Lib/TLibEncoder/TEncSbac.cpp (modified) (6 diffs)
• Lib/TLibEncoder/TEncSbac.h (modified) (2 diffs)
• Lib/TLibEncoder/TEncSearch.cpp (modified) (18 diffs)
• Lib/TLibEncoder/TEncSearch.h (modified) (4 diffs)
• Lib/TLibEncoder/TEncSlice.cpp (modified) (2 diffs)
• Lib/TLibEncoder/TEncTop.cpp (modified) (3 diffs)

branches/HTM-14.0-dev0/source/App/TAppDecoder/TAppDecTop.cpp

@@ -248 +248 @@
             {
               m_tDecTop[decIdx]->setTargetOptLayerSetIdx( m_targetOptLayerSetIdx ); 
-#if H_3D_ANNEX_SELECTION_FIX
+#if H_3D
               m_tDecTop[decIdx]->setProfileIdc( ); 
 #endif
@@ -1053 +1053 @@
     m_tDecTop[ decIdx ]->setLayerInitilizedFlags( m_layerInitilizedFlags );
     m_tDecTop[ decIdx ]->setTargetOptLayerSetIdx( m_targetOptLayerSetIdx );    
-#if H_3D_ANNEX_SELECTION_FIX
+#if H_3D
     m_tDecTop[ decIdx ]->setProfileIdc           ( );    
 #endif

branches/HTM-14.0-dev0/source/App/TAppEncoder/TAppEncCfg.cpp

@@ -225 +225 @@
   }
 #endif
-#if HHI_INTER_COMP_PRED_K0052
 #if H_3D
   in>>entry.m_interCompPredFlag;
-#endif
 #endif
   return in;
@@ -482 +480 @@
   ("FastSearch",              m_iFastSearch,                1, "0:Full search  1:Diamond  2:PMVFAST")
   ("SearchRange,-sr",         m_iSearchRange,              96, "Motion search range")
-#if SONY_MV_V_CONST_C0078
+#if H_MV
   ("DispSearchRangeRestriction",  m_bUseDisparitySearchRangeRestriction, false, "restrict disparity search range")
   ("VerticalDispSearchRange",     m_iVerticalDisparitySearchRange, 56, "vertical disparity search range")
@@ -794 +792 @@
   ("QtPredFlag"            , m_qtPredFlag            , true                                           , "Quad tree prediction from texture to depth")
   ("InterSdcFlag"          , m_interSdcFlag          , true                                           , "Inter depth DCs"                           )
-#if SEC_DEPTH_INTRA_SKIP_MODE_K0033
   ("DepthIntraSkip"        , m_depthIntraSkipFlag    , true                                           , "Depth intra skip mode"                     )
-#else
-  ("IntraSingleFlag"       , m_intraSingleFlag       , true                                           , "Intra single mode"                         )
-#endif
 #endif //H_3D
   ;
@@ -1559 +1553 @@
     {
       xConfirmPara( m_directRefLayers[i][j] < 0 || m_directRefLayers[i][j] >= i , "Reference layer id shall be greater than or equal to 0 and less than dependent layer id"); 
-#if H_3D_DIRECT_DEP_TYPE
       xConfirmPara( m_dependencyTypes[i][j] < 0 || m_dependencyTypes[i][j] >  6 , "Dependency type shall be greater than or equal to 0 and less than 7");
-#else
-      xConfirmPara( m_dependencyTypes[i][j] < 0 || m_dependencyTypes[i][j] >  2 , "Dependency type shall be greater than or equal to 0 and less than 3");
-#endif 
     }        
   }  
@@ -1599 +1589 @@
   xConfirmPara( m_iSearchRange < 0 ,                                                        "Search Range must be more than 0" );
   xConfirmPara( m_bipredSearchRange < 0 ,                                                   "Search Range must be more than 0" );
-#if SONY_MV_V_CONST_C0078
+#if H_MV
   xConfirmPara( m_iVerticalDisparitySearchRange <= 0 ,                                      "Vertical Disparity Search Range must be more than 0" );
 #endif
@@ -1716 +1706 @@
   xConfirmPara( m_pchCameraParameterFile    == 0                ,   "CameraParameterFile must be given");
   xConfirmPara( m_pchBaseViewCameraNumbers  == 0                ,   "BaseViewCameraNumbers must be given" );
-#if BUG_FIX_TK65
-#if HHI_CAM_PARA_K0052
   xConfirmPara( m_iNumberOfViews != m_cCameraData.getBaseViewNumbers().size() ,   "Number of Views in BaseViewCameraNumbers must be equal to NumberOfViews" );
-#else
-  xConfirmPara( ( ((UInt) m_numberOfLayers >> 1 ) != m_cCameraData.getBaseViewNumbers().size() ) && ( m_numberOfLayers != m_cCameraData.getBaseViewNumbers().size() ),   "Number of Views in BaseViewCameraNumbers must be equal to NumberOfViews" );
-#endif
-#else
-  xConfirmPara( ((UInt) m_numberOfLayers >> 1 ) != m_cCameraData.getBaseViewNumbers().size(),   "Number of Views in BaseViewCameraNumbers must be equal to NumberOfViews" );
-#endif
   xConfirmPara    ( m_iCodedCamParPrecision < 0 || m_iCodedCamParPrecision > 5,       "CodedCamParsPrecision must be in range of 0..5" );
 #if H_3D_VSO
@@ -2477 +2459 @@
   printf("Min PCM size                 : %d\n", 1 << m_uiPCMLog2MinSize);
   printf("Motion search range          : %d\n", m_iSearchRange );
-#if SONY_MV_V_CONST_C0078
+#if H_MV
   printf("Disp search range restriction: %d\n", m_bUseDisparitySearchRangeRestriction );
   printf("Vertical disp search range   : %d\n", m_iVerticalDisparitySearchRange );
@@ -2632 +2614 @@
   printf( "QtPred:%d "                 , m_qtPredFlag             ? 1 : 0 );
   printf( "InterSdc:%d "               , m_interSdcFlag           ? 1 : 0 );
-#if SEC_DEPTH_INTRA_SKIP_MODE_K0033
   printf( "DepthIntraSkip:%d "         , m_depthIntraSkipFlag     ? 1 : 0 );
-#else
-  printf( "IntraSingle:%d "            , m_intraSingleFlag        ? 1 : 0 );
-#endif
 #endif
 

branches/HTM-14.0-dev0/source/App/TAppEncoder/TAppEncCfg.h

@@ -289 +289 @@
   Int       m_iSearchRange;                                   ///< ME search range
   Int       m_bipredSearchRange;                              ///< ME search range for bipred refinement
-#if SONY_MV_V_CONST_C0078
+#if H_MV
   Bool      m_bUseDisparitySearchRangeRestriction;            ///< restrict vertical search range for inter-view prediction
   Int       m_iVerticalDisparitySearchRange;                  ///< ME vertical search range for inter-view prediction
@@ -488 +488 @@
   Bool                   m_qtPredFlag;
   Bool                   m_interSdcFlag;
-#if SEC_DEPTH_INTRA_SKIP_MODE_K0033
   Bool                   m_depthIntraSkipFlag; 
-#else
-  Bool                   m_intraSingleFlag;
-#endif
 #endif
   // internal member functions

branches/HTM-14.0-dev0/source/App/TAppEncoder/TAppEncTop.cpp

@@ -140 +140 @@
   xSetVPSVUI               ( vps ); 
 #if H_3D
-#if HHI_CAM_PARA_K0052
   xSetCamPara              ( vps ); 
-#endif
-#endif
-#if H_3D
   m_ivPicLists.setVPS      ( &vps );
   xDeriveDltArray          ( vps, dlt );
@@ -201 +197 @@
       m_sps3dExtension.setQtPredFlag            ( d, m_qtPredFlag            );
       m_sps3dExtension.setInterSdcFlag          ( d, m_interSdcFlag          );
-#if SEC_DEPTH_INTRA_SKIP_MODE_K0033
       m_sps3dExtension.setDepthIntraSkipFlag    ( d, m_depthIntraSkipFlag    );  
-#else
-      m_sps3dExtension.setIntraSingleFlag       ( d, m_intraSingleFlag       );  
-#endif
     }
   }
@@ -229 +221 @@
     //====== Camera Parameters =========
     m_cTEncTop.setCameraParameters             ( &m_cCameraData );     
-#if !HHI_CAM_PARA_K0052
-    m_cTEncTop.setCamParPrecision              ( m_cCameraData.getCamParsCodedPrecision  () );
-    m_cTEncTop.setCamParInSliceHeader          ( m_cCameraData.getVaryingCameraParameters() );
-
-    m_cTEncTop.setCodedScale                   ( m_cCameraData.getCodedScale             () );
-    m_cTEncTop.setCodedOffset                  ( m_cCameraData.getCodedOffset            () );
-#endif
 #if H_3D_VSO
     //====== VSO =========
@@ -359 +344 @@
   m_cTEncTop.setBipredSearchRange            ( m_bipredSearchRange );
 
-#if SONY_MV_V_CONST_C0078
+#if H_MV
   m_cTEncTop.setUseDisparitySearchRangeRestriction ( m_bUseDisparitySearchRangeRestriction );
   m_cTEncTop.setVerticalDisparitySearchRange ( m_iVerticalDisparitySearchRange );
@@ -651 +636 @@
   }
 #endif
-#if H_3D_ANNEX_SELECTION_FIX
 #if H_3D
  /// SET Profiles
@@ -692 +676 @@
   }
 #endif
-#endif
 #if H_3D_VSO
   if ( m_bUseVSO )
@@ -799 +782 @@
 {
 #if H_3D
-#if !HHI_CAM_PARA_K0052
-  for ( Int viewIndex = 0; viewIndex < m_vps->getNumViews(); viewIndex++ )
-  {
-    m_vps->initCamParaVPS( viewIndex, true, m_cCameraData.getCamParsCodedPrecision(), 
-      m_cCameraData.getVaryingCameraParameters(), m_cCameraData.getCodedScale(), m_cCameraData.getCodedOffset() );
-  }
-#endif
 #endif
 
@@ -1143 +1119 @@
       if (m_pchReconFileList[layerId])
       {
-#if H_MV_ALIGN_HM_15
         m_acTVideoIOYuvReconFileList[layerId]->write( pcPicYuvRecTop, pcPicYuvRecBottom, m_confWinLeft, m_confWinRight, m_confWinTop, m_confWinBottom, m_isTopFieldFirst );
-#else
-        m_acTVideoIOYuvReconFileList[layerId]->write( pcPicYuvRecTop, pcPicYuvRecBottom, m_confLeft, m_confRight, m_confTop, m_confBottom, m_isTopFieldFirst );
-#endif
       }
     }
@@ -1200 +1172 @@
       if (m_pchReconFileList[layerId])
       {
-#if H_MV_ALIGN_HM_15
         m_acTVideoIOYuvReconFileList[layerId]->write( pcPicYuvRec, m_confWinLeft, m_confWinRight, m_confWinTop, m_confWinBottom );
-#else
-        m_acTVideoIOYuvReconFileList[layerId]->write( pcPicYuvRec, m_confLeft, m_confRight, m_confTop, m_confBottom );
-#endif
       }    
     }
@@ -1390 +1358 @@
 
 
-#if HHI_INTER_COMP_PRED_K0052
 #if H_3D
   vps.initViewCompLayer( ); 
 #endif
-#endif
 }
 
@@ -1412 +1378 @@
   Bool defaultDirectDependencyFlag = false; 
 
-#if H_3D_DIRECT_DEP_TYPE
   Int directDepTypeLenMinus2 = 0;  
-#endif
   for( Int depLayer = 1; depLayer < m_numberOfLayers; depLayer++ )
   {
@@ -1424 +1388 @@
       vps.setDirectDependencyFlag( depLayer, refLayer, true); 
       Int curDirectDependencyType = m_dependencyTypes[depLayer][i]; 
-#if H_3D_DIRECT_DEP_TYPE        
       directDepTypeLenMinus2 = std::max( directDepTypeLenMinus2, gCeilLog2( curDirectDependencyType + 1  ) - 2 );  
-#endif
       if ( defaultDirectDependencyType != -1 )    
       {
@@ -1444 +1406 @@
   vps.setDefaultDirectDependencyType( defaultDirectDependencyFlag ? defaultDirectDependencyType : -1 );       
 
-#if H_3D_DIRECT_DEP_TYPE        
   assert( directDepTypeLenMinus2 <= 1 ); 
   vps.setDirectDepTypeLenMinus2( directDepTypeLenMinus2 ); 
-#endif
 
 
@@ -1495 +1455 @@
 #endif
               {
-#if !HHI_INTER_COMP_PRED_K0052                
-                Bool refAlwaysIntra = ( i == getGOPSize() ) && ( m_iIntraPeriod[ curLayerIdInVps ] % m_iIntraPeriod[ refLayerIdInVps ] == 0 );
-#endif
                 Bool refLayerZero   = ( i == getGOPSize() ) && ( refLayerIdInVps == 0 );
-#if HHI_INTER_COMP_PRED_K0052
-                // refAlwaysIntra actually not needed, since TemporalIds need to be aligned within an AU. 
-                // Thus, reference pictures of IRAP pictures have TemporalId equal to 0.
                 maxTid = std::max( maxTid, refLayerZero ? 0 : geRef.m_temporalId ); 
-#else
-                maxTid = std::max( maxTid, ( refAlwaysIntra || refLayerZero ) ? 0 : geRef.m_temporalId ); 
-#endif
               }
             }
@@ -1513 +1464 @@
         else
         {        
-#if HHI_INTER_COMP_PRED_K0052
           if( m_depthFlag[ curLayerIdInVps ] && ( m_mpiFlag|| m_qtPredFlag || m_intraContourFlag ) ) 
           {          
@@ -1552 +1502 @@
             }
           }        
-#else
-          if( m_depthFlag[ curLayerIdInVps ] && ( m_mpiFlag|| m_qtPredFlag || m_intraContourFlag ) ) 
-          {          
-            Int nuhLayerIdTex = vps.getLayerIdInNuh( vps.getViewIndex( curLayerIdInNuh ), false ); 
-            if ( nuhLayerIdTex == refLayerIdInNuh )
-            {
-              maxTid = std::max( maxTid, vps.getSubLayersVpsMaxMinus1( refLayerIdInVps) + 1 );
-            }
-          }
-          if( !m_depthFlag[ curLayerIdInVps ] && vps.getNumRefListLayers( curLayerIdInNuh) > 0  && ( m_depthRefinementFlag || m_viewSynthesisPredFlag || m_depthBasedBlkPartFlag ) ) 
-          {  
-            Int maxPresentTid =-1; 
-            Bool allPresent = true; 
-            for (Int i = 0; i < vps.getNumRefListLayers( curLayerIdInNuh); i++ )
-            {
-              Int nuhLayerIdDep = vps.getLayerIdInNuh( vps.getViewIndex( vps.getIdRefListLayer(curLayerIdInNuh, i ) ), true ); 
-              if ( nuhLayerIdDep== refLayerIdInNuh )
-              {
-                maxPresentTid= std::max( maxTid, vps.getSubLayersVpsMaxMinus1( refLayerIdInVps) + 1 );              
-              }
-              else
-              {
-                allPresent = false; 
-              }
-            }
-
-            if ( allPresent )
-            {
-              maxTid= std::max( maxTid, maxPresentTid );              
-            }
-          }        
-#endif
         }
       } // if ( vps.getDirectDependencyFlag( curLayerIdInVps, refLayerIdInVps ) ) 
@@ -1823 +1741 @@
     // ToDo not supported yet. 
     //repFormat->setSeparateColourPlaneVpsFlag( );
-#if H_MV_FIX_CONF_WINDOW
     Bool conformanceWindowVpsFlag = ( m_confWinBottom != 0 ) || ( m_confWinRight != 0 ) || ( m_confWinTop != 0 ) || ( m_confWinBottom != 0 ); 
     repFormat->setConformanceWindowVpsFlag( conformanceWindowVpsFlag );
@@ -1833 +1750 @@
       repFormat->setConfWinVpsBottomOffset  ( m_confWinBottom / TComSPS::getWinUnitY( repFormat->getChromaFormatVpsIdc() ) ); 
     }
-#else
-    repFormat->setConformanceWindowVpsFlag( true );
-    repFormat->setConfWinVpsLeftOffset    ( m_confWinLeft   / TComSPS::getWinUnitX( repFormat->getChromaFormatVpsIdc() ) );
-    repFormat->setConfWinVpsRightOffset   ( m_confWinRight  / TComSPS::getWinUnitX( repFormat->getChromaFormatVpsIdc() )  );
-    repFormat->setConfWinVpsTopOffset     ( m_confWinTop    / TComSPS::getWinUnitY( repFormat->getChromaFormatVpsIdc() )  );
-    repFormat->setConfWinVpsBottomOffset  ( m_confWinBottom / TComSPS::getWinUnitY( repFormat->getChromaFormatVpsIdc() ) ); 
-#endif
     assert( vps.getRepFormat( j ) == NULL ); 
     vps.setRepFormat( j , repFormat );
@@ -1861 +1771 @@
 
   repFormat->setConformanceWindowVpsFlag( true );
-#if H_MV_ALIGN_HM_15
   repFormat->setConfWinVpsLeftOffset    ( m_confWinLeft   / TComSPS::getWinUnitX( repFormat->getChromaFormatVpsIdc() ) );
   repFormat->setConfWinVpsRightOffset   ( m_confWinRight  / TComSPS::getWinUnitX( repFormat->getChromaFormatVpsIdc() )  );
   repFormat->setConfWinVpsTopOffset     ( m_confWinTop    / TComSPS::getWinUnitY( repFormat->getChromaFormatVpsIdc() )  );
   repFormat->setConfWinVpsBottomOffset  ( m_confWinBottom / TComSPS::getWinUnitY( repFormat->getChromaFormatVpsIdc() ) ); 
-#else
-  repFormat->setConfWinVpsLeftOffset    ( m_confLeft   / TComSPS::getWinUnitX( repFormat->getChromaFormatVpsIdc() ) );
-  repFormat->setConfWinVpsRightOffset   ( m_confRight  / TComSPS::getWinUnitX( repFormat->getChromaFormatVpsIdc() )  );
-  repFormat->setConfWinVpsTopOffset     ( m_confTop    / TComSPS::getWinUnitY( repFormat->getChromaFormatVpsIdc() )  );
-  repFormat->setConfWinVpsBottomOffset  ( m_confBottom / TComSPS::getWinUnitY( repFormat->getChromaFormatVpsIdc() ) ); 
-#endif
   assert( vps.getRepFormat( 0 ) == NULL ); 
   vps.setRepFormat( 0 , repFormat );
@@ -2250 +2153 @@
 }
 
-#if HHI_CAM_PARA_K0052
 #if H_3D
 Void TAppEncTop::xSetCamPara                ( TComVPS& vps )
@@ -2285 +2187 @@
 }
 #endif
-#endif
 
 

branches/HTM-14.0-dev0/source/App/TAppEncoder/TAppEncTop.h

@@ -142 +142 @@
   Void xSetDpbSize                ( TComVPS& vps );
   Void xSetVPSVUI                 ( TComVPS& vps );
-#if HHI_CAM_PARA_K0052
 #if H_3D
   Void xSetCamPara                ( TComVPS& vps );
-#endif
 #endif
   GOPEntry* xGetGopEntry( Int layerIdInVps, Int poc );

branches/HTM-14.0-dev0/source/Lib/TAppCommon/TAppComCamPara.cpp

@@ -399 +399 @@
 
 
-#if !HHI_CAM_PARA_K0052
-Void
-TAppComCamPara::xGetViewOrderIndices( const std::vector<Int>& raiId2SortedId, std::vector<Int>& raiVOIdx )
-{
-  AOF( raiId2SortedId.size() );
-  raiVOIdx  =      raiId2SortedId;
-  Int iSize = (Int)raiId2SortedId.size();
-  Int iOffs =      raiId2SortedId[ 0 ];
-  for( Int iIdx = 0; iIdx < iSize; iIdx++ )
-  {
-    raiVOIdx[ iIdx ] -= iOffs;
-  }
-}
-#endif
 
 
@@ -960 +946 @@
 
 
-#if !HHI_CAM_PARA_K0052
-Void
-TAppComCamPara::xSetPdmConversionParams()
-{
-  AOF( m_aiViewOrderIndex[ 0 ] == 0 );
-  if ( m_bSetupFromCoded || m_iNumberOfBaseViews    <  2 )
-  {
-    return;
-  }
-
-  //--- determine (virtual) camera parameter shift between view order index 1 and base view (view order index 0) ---
-  Double        dCamPosShift, dPicPosShift;
-  Int           iMinAbsVOI    = (1<<30);
-  Int           iMinAbsVOIId  = 0;
-  for( Int iBaseId = 1; iBaseId < m_iNumberOfBaseViews; iBaseId++ )
-  {
-    Int iAbsVOI = ( m_aiViewOrderIndex[ iBaseId ] < 0 ? -m_aiViewOrderIndex[ iBaseId ] : m_aiViewOrderIndex[ iBaseId ] );
-    if( iAbsVOI < iMinAbsVOI )
-    {
-      iMinAbsVOI   = iAbsVOI;
-      iMinAbsVOIId = iBaseId;
-    }
-  }
-  AOF( iMinAbsVOIId != 0 && iMinAbsVOI != 0 );
-  xGetCameraShifts( 0, iMinAbsVOIId, m_uiFirstFrameId, dCamPosShift, dPicPosShift );
-
-  //--- determine maximum absolute camera position shift, precision, and base scale ---
-  Double  dMaxAbsCamPosShift = 0.0;
-  for( Int iTargetId = 1; iTargetId < m_iNumberOfBaseViews; iTargetId++ )
-  {
-    for( Int iBaseId = 0; iBaseId < iTargetId; iBaseId++ )
-    {
-      xGetCameraShifts( (UInt)iBaseId, (UInt)iTargetId, m_uiFirstFrameId, dCamPosShift, dPicPosShift );
-      dCamPosShift        = ( dCamPosShift < 0.0                ? -dCamPosShift : dCamPosShift       );
-      dMaxAbsCamPosShift  = ( dCamPosShift > dMaxAbsCamPosShift ?  dCamPosShift : dMaxAbsCamPosShift );
-    }
-  }
-}
-#endif
 
 
@@ -1284 +1231 @@
 
   //===== set derived parameters =====
-#if !HHI_CAM_PARA_K0052
-  xGetViewOrderIndices( m_aiBaseId2SortedId, m_aiViewOrderIndex );
-#endif
   m_bCamParsVaryOverTime = xGetCamParsChangeFlag();
 

branches/HTM-14.0-dev0/source/Lib/TAppCommon/TAppComCamPara.h

@@ -85 +85 @@
 
   // SPS and slice header related variables
-#if !HHI_CAM_PARA_K0052
-  std::vector<Int>    m_aiViewOrderIndex;                     ///< list of view order indices
-#endif
   UInt                m_uiCamParsCodedPrecision;              ///< precision for coding of camera parameters (x: max error in disparity is 2^(-x) luma samples)
   Bool                m_bCamParsVaryOverTime;                 ///< flag specifying whether camera parameters vary for given frame numbers
@@ -147 +144 @@
   // getting conversion parameters for disparity to virtual depth conversion
   Void  xGetCameraShifts          ( UInt uiSourceView, UInt uiTargetView, UInt uiFrame, Double& rdCamPosShift, Double& rdPicPosShift );
-#if !HHI_CAM_PARA_K0052
-  Void  xSetPdmConversionParams   ();
-#endif
 
 public:
@@ -220 +214 @@
   Bool                getVaryingCameraParameters()  { return m_bCamParsVaryOverTime;    }
   UInt                getCamParsCodedPrecision  ()  { return m_uiCamParsCodedPrecision; }
-#if !HHI_CAM_PARA_K0052
-  std::vector<Int>&   getViewOrderIndex         ()  { return m_aiViewOrderIndex;        }
-#endif
   Int**               getCodedScale             ()  { return m_aaiCodedScale;           }
   Int**               getCodedOffset            ()  { return m_aaiCodedOffset;          }

branches/HTM-14.0-dev0/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 SEC_DEPTH_INTRA_SKIP_MODE_K0033
 #define NUM_DIS_FLAG_CTX              1
 #define NUM_DIS_TYPE_CTX              1       
-#else
-#if H_3D_SINGLE_DEPTH
-#define NUM_SINGLEDEPTH_FLAG_CTX                     1
-#define NUM_SINGLE_DEPTH_VALUE_DATA_CTX              1       
-#endif
-#endif
 #define NUM_MERGE_FLAG_EXT_CTX        1       ///< number of context models for merge flag of merge extended
 #define NUM_MERGE_IDX_EXT_CTX         1       ///< number of context models for merge index of merge extended
@@ -158 +151 @@
   { CNU,  CNU,  CNU, }, 
 };
-#if SEC_DEPTH_INTRA_SKIP_MODE_K0033
+#if H_3D
 static const UChar 
 INIT_DIS_FLAG[3][NUM_DIS_FLAG_CTX] =  
@@ -173 +166 @@
     { 137 }, 
 };
-#else
-#if H_3D_SINGLE_DEPTH
-static const UChar 
-INIT_SINGLEDEPTH_FLAG[3][NUM_SINGLEDEPTH_FLAG_CTX] =  
-{
-  { 185 }, 
-  { 185 }, 
-  { 185 }, 
-};
-static const UChar
-INIT_SINGLE_DEPTH_VALUE_DATA[3][NUM_SINGLE_DEPTH_VALUE_DATA_CTX] = 
-{
-  { 137 }, 
-  { 137 }, 
-  { 137 }, 
-};
-#endif
 #endif
 static const UChar

branches/HTM-14.0-dev0/source/Lib/TLibCommon/TComDataCU.cpp

@@ -60 +60 @@
   
   m_skipFlag           = NULL;
-#if SEC_DEPTH_INTRA_SKIP_MODE_K0033
+#if H_3D
   m_bDISFlag           = NULL;
   m_uiDISType          = NULL;
-#else
-#if H_3D_SINGLE_DEPTH
-  m_singleDepthFlag     = NULL;
-  m_apSingleDepthValue  = NULL;
-#endif
 #endif
   m_pePartSize         = NULL;
@@ -186 +181 @@
 
     m_skipFlag           = new Bool[ uiNumPartition ];
-#if SEC_DEPTH_INTRA_SKIP_MODE_K0033
+#if H_3D
     m_bDISFlag           = new Bool[ uiNumPartition ];
     m_uiDISType          = (UInt*)xMalloc(UInt, uiNumPartition);
-#else
-#if H_3D_SINGLE_DEPTH
-    m_singleDepthFlag     = new Bool[ uiNumPartition ];
-    m_apSingleDepthValue  = (Pel*)xMalloc(Pel, uiNumPartition);
-#endif
 #endif
     m_pePartSize         = new Char[ uiNumPartition ];
@@ -337 +327 @@
 
     if ( m_skipFlag           ) { delete[] m_skipFlag;          m_skipFlag          = NULL; }
-#if SEC_DEPTH_INTRA_SKIP_MODE_K0033
+#if H_3D
     if ( m_bDISFlag           ) { delete[] m_bDISFlag;   m_bDISFlag     = NULL; }
     if ( m_uiDISType         ) { xFree(m_uiDISType);  m_uiDISType    = NULL; }
-#else
-#if H_3D_SINGLE_DEPTH
-    if ( m_singleDepthFlag    ) { delete[] m_singleDepthFlag;   m_singleDepthFlag     = NULL; }
-    if ( m_apSingleDepthValue ) { xFree(m_apSingleDepthValue);  m_apSingleDepthValue  = NULL; }
-#endif
 #endif
     if ( m_pePartSize         ) { delete[] m_pePartSize;        m_pePartSize        = NULL; }
@@ -506 +491 @@
     TComDataCU * pcFrom = pcPic->getCU(getAddr());
     m_skipFlag[ui]   = pcFrom->getSkipFlag(ui);
-#if SEC_DEPTH_INTRA_SKIP_MODE_K0033
+#if H_3D
     m_bDISFlag[ui]   = pcFrom->getDISFlag(ui);
     m_uiDISType[ui]  = pcFrom->getDISType(ui);
-#else
-#if H_3D_SINGLE_DEPTH
-    m_singleDepthFlag[ui]    = pcFrom->getSingleDepthFlag(ui);
-    m_apSingleDepthValue[ui] = pcFrom->getSingleDepthValue(ui);
-#endif
 #endif
     m_pePartSize[ui] = pcFrom->getPartitionSize(ui);
@@ -566 +546 @@
   {
     memset( m_skipFlag          + firstElement, false,                    numElements * sizeof( *m_skipFlag ) );
-#if SEC_DEPTH_INTRA_SKIP_MODE_K0033
+#if H_3D
     memset( m_bDISFlag          + firstElement, false,                    numElements * sizeof( *m_bDISFlag ) );
     memset( m_uiDISType         + firstElement,     0,                    numElements * sizeof( *m_uiDISType) );
-#else
-#if H_3D_SINGLE_DEPTH
-    memset( m_singleDepthFlag     + firstElement, false,                  numElements * sizeof( *m_singleDepthFlag ) );
-    memset( m_apSingleDepthValue  + firstElement,     0,                  numElements * sizeof( *m_apSingleDepthValue ) );
-#endif
 #endif
     memset( m_pePartSize        + firstElement, SIZE_NONE,                numElements * sizeof( *m_pePartSize ) );
@@ -758 +733 @@
       m_puhTransformSkip[2][ui] = 0;
       m_skipFlag[ui]   = false;
-#if SEC_DEPTH_INTRA_SKIP_MODE_K0033
+#if H_3D
       m_bDISFlag[ui]   = false;
       m_uiDISType[ui]  = 0;
-#else
-#if H_3D_SINGLE_DEPTH
-      m_singleDepthFlag[ui]     = false;
-      m_apSingleDepthValue[ui]  = 0;
-#endif
 #endif
       m_pePartSize[ui] = SIZE_NONE;
@@ -891 +861 @@
   memset( m_puhCbf[2],          0, iSizeInUchar );
   memset( m_puhDepth,     uiDepth, iSizeInUchar );
-#if H_3D_NBDV && !SEC_ARP_REM_ENC_RESTRICT_K0035
-  m_pDvInfo->bDV = false;
-#endif
 #if H_3D_ARP
   memset( m_puhARPW,            0, iSizeInUchar  );
@@ -934 +901 @@
   {
     m_skipFlag[ui]   = false;
-#if SEC_DEPTH_INTRA_SKIP_MODE_K0033
+#if H_3D
     m_bDISFlag[ui]   = false;
     m_uiDISType[ui]  = 0;
-#else
-#if H_3D_SINGLE_DEPTH
-    m_singleDepthFlag[ui]   = false;
-    m_apSingleDepthValue[ui]= 0;
-#endif
 #endif
     m_pePartSize[ui] = SIZE_NONE;
@@ -964 +926 @@
       m_puhTransformSkip[2][ui] = pcCU->getTransformSkip(uiPartOffset+ui,TEXT_CHROMA_V);
       m_skipFlag[ui]   = pcCU->getSkipFlag(uiPartOffset+ui);
-#if SEC_DEPTH_INTRA_SKIP_MODE_K0033
+#if H_3D
       m_bDISFlag[ui]    = pcCU->getDISFlag(uiPartOffset+ui);
       m_uiDISType[ui]   = pcCU->getDISType(uiPartOffset+ui);
-#else
-#if H_3D_SINGLE_DEPTH
-      m_singleDepthFlag[ui]    = pcCU->getSingleDepthFlag(uiPartOffset+ui);
-      m_apSingleDepthValue[ui] = pcCU->getSingleDepthValue(uiPartOffset+ui);
-#endif
 #endif
       m_pePartSize[ui] = pcCU->getPartitionSize(uiPartOffset+ui);
@@ -1118 +1075 @@
   
   m_skipFlag=pcCU->getSkipFlag()          + uiPart;
-#if SEC_DEPTH_INTRA_SKIP_MODE_K0033
+#if H_3D
   m_bDISFlag     = pcCU->getDISFlag()     + uiPart;
   m_uiDISType    = pcCU->getDISType()     + uiPart;
-#else
-#if H_3D_SINGLE_DEPTH
-  m_singleDepthFlag     = pcCU->getSingleDepthFlag()   + uiPart;
-  m_apSingleDepthValue  = pcCU->getSingleDepthValue()  + uiPart;
-#endif
 #endif
   m_phQP=pcCU->getQP()                    + uiPart;
@@ -1260 +1212 @@
   
   m_skipFlag           = pcCU->getSkipFlag ()             + uiAbsPartIdx;
-#if SEC_DEPTH_INTRA_SKIP_MODE_K0033
+#if H_3D
   m_bDISFlag           = pcCU->getDISFlag ()              + uiAbsPartIdx;
   m_uiDISType          = pcCU->getDISType()               + uiAbsPartIdx;
-#else
-#if H_3D_SINGLE_DEPTH
-  m_singleDepthFlag     = pcCU->getSingleDepthFlag ()             + uiAbsPartIdx;
-  m_apSingleDepthValue  = pcCU->getSingleDepthValue ()            + uiAbsPartIdx;
-#endif
 #endif
   m_pePartSize         = pcCU->getPartitionSize ()        + uiAbsPartIdx;
@@ -1340 +1287 @@
   Int sizeInChar  = sizeof( Char ) * uiNumPartition;
   memcpy( m_skipFlag   + uiOffset, pcCU->getSkipFlag(),       sizeof( *m_skipFlag )   * uiNumPartition );
-#if SEC_DEPTH_INTRA_SKIP_MODE_K0033
+#if H_3D
   memcpy( m_bDISFlag   + uiOffset, pcCU->getDISFlag(),       sizeof( *m_bDISFlag )   * uiNumPartition );
   memcpy( m_uiDISType  + uiOffset, pcCU->getDISType(),       sizeof( *m_uiDISType )  * uiNumPartition);
-#else
-#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);
-#endif
 #endif
   memcpy( m_phQP       + uiOffset, pcCU->getQP(),             sizeInChar                        );
@@ -1465 +1407 @@
 
   memcpy( rpcCU->getSkipFlag() + m_uiAbsIdxInLCU, m_skipFlag, sizeof( *m_skipFlag ) * m_uiNumPartition );
-#if SEC_DEPTH_INTRA_SKIP_MODE_K0033
+#if H_3D
   memcpy( rpcCU->getDISFlag()  + m_uiAbsIdxInLCU, m_bDISFlag,    sizeof( *m_bDISFlag )  * m_uiNumPartition );
   memcpy( rpcCU->getDISType()  + m_uiAbsIdxInLCU, m_uiDISType,   sizeof( *m_uiDISType ) * m_uiNumPartition );
-#else
-#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);
-#endif
 #endif
   memcpy( rpcCU->getQP() + m_uiAbsIdxInLCU, m_phQP, sizeInChar  );
@@ -1585 +1522 @@
   Int sizeInChar  = sizeof( Char ) * uiQNumPart;
   memcpy( rpcCU->getSkipFlag()       + uiPartOffset, m_skipFlag,   sizeof( *m_skipFlag )   * uiQNumPart );
-#if SEC_DEPTH_INTRA_SKIP_MODE_K0033
+#if H_3D
   memcpy( rpcCU->getDISFlag()  + uiPartOffset, m_bDISFlag,    sizeof( *m_bDISFlag )   * uiQNumPart );
   memcpy( rpcCU->getDISType()  + uiPartOffset, m_uiDISType,   sizeof( *m_uiDISType )  * uiQNumPart );
-#else
-#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);
-#endif
 #endif
   memcpy( rpcCU->getQP() + uiPartOffset, m_phQP, sizeInChar );
@@ -2388 +2320 @@
     Int iPictureHeight = depthPicYuv->getHeight();
     
-#if !HS_DBBP_CLEAN_K0048
-    Int iWidth  = uiWidth;
-    Int iHeight = uiHeight;
-#endif
     
     Bool depthRefineFlag = false;
@@ -2404 +2332 @@
     }
     
-#if HS_DBBP_CLEAN_K0048
     Int depthPosX = Clip3(0,   iPictureWidth - 1,  iBlkX + ((cDv.getHor()+2)>>2));
     Int depthPosY = Clip3(0,   iPictureHeight - 1, iBlkY + ((cDv.getVer()+2)>>2));
-#else
-    Int depthPosX = Clip3(0,   iPictureWidth - iWidth,  iBlkX + ((cDv.getHor()+2)>>2));
-    Int depthPosY = Clip3(0,   iPictureHeight- iHeight, iBlkY + ((cDv.getVer()+2)>>2));
-#endif
     
     pDepthPels = depthPicYuv->getLumaAddr() + depthPosX + depthPosY * uiDepthStride;
@@ -2500 +2423 @@
   memset( m_skipFlag + absPartIdx, skip, m_pcPic->getNumPartInCU() >> ( 2 * depth ) );
 }
-
-#if SEC_DEPTH_INTRA_SKIP_MODE_K0033
+#if H_3D
 Void TComDataCU::setDISFlagSubParts( Bool bDIS, UInt absPartIdx, UInt depth )
 {
@@ -2512 +2434 @@
     setSubPartT( uiDISType, m_uiDISType, uiAbsPartIdx, uiDepth, uiPUIdx );
 }
-#else
-#if H_3D_SINGLE_DEPTH
-Void TComDataCU::setSingleDepthFlagSubParts( Bool singleDepth, UInt absPartIdx, UInt depth )
-{
-  assert( sizeof( *m_singleDepthFlag) == 1 );
-  memset( m_singleDepthFlag + absPartIdx, singleDepth, m_pcPic->getNumPartInCU() >> ( 2 * depth ) );
-}
-
-Void TComDataCU::setSingleDepthValueSubParts(Pel singleDepthValue, UInt uiAbsPartIdx, UInt uiPUIdx, UInt uiDepth )
-{
-  setSubPartT<Pel>( singleDepthValue, m_apSingleDepthValue, uiAbsPartIdx, uiDepth, uiPUIdx );
-}
-#endif
 #endif
 
@@ -4180 +4089 @@
                   TComMv cMv = cTexMvField.getMv() + cMvRounding;
                   cMv >>=2;          
-#if !(NTT_BUG_FIX_TK54)
-                  this->clipMv( cMv );
-#endif
                   pcMvFieldSP[2*iPartition + uiCurrRefListId].setMvField(cMv, iValidDepRef);
                 }
@@ -4197 +4103 @@
               }
             }
-#if !SHARP_SUBBLOCK_CLEAN_K0044
-            if (iPUHeight + iPUWidth == 12)
-            {
-              if (puhInterDirSP[iPartition] == 3)
-              {
-                puhInterDirSP[iPartition] = 1;
-                pcMvFieldSP[2*iPartition + 1].setMvField(TComMv(0,0), -1);
-              }
-            }
-#endif
 
             iPartition ++;
@@ -5422 +5318 @@
 }
 
-#if SONY_MV_V_CONST_C0078
+#if H_MV
 Void TComDataCU::checkMV_V (TComMv&  rcMv,  RefPicList eRefPicList, int iRefIdx )
 {
@@ -5780 +5676 @@
   }
 
-  if ( bIsCurrRefLongTerm || bIsColRefLongTerm ) // CY: this condition equals to both bIsCurrRefLongTerm and bIsColRefLongTerm being 1
+  if ( bIsCurrRefLongTerm || bIsColRefLongTerm )
   {
 #if H_3D_TMVP
-#if !H_3D_FIX_TMVP_SCALING_VIEW_ID
-    Int iCurrViewId    = m_pcSlice->getViewIndex (); 
-    Int iCurrRefViewId = m_pcSlice->getRefPic(eRefPicList, riRefIdx)->getViewIndex (); 
-    Int iColViewId     = pColCU->getSlice()->getViewIndex(); 
-    Int iColRefViewId  = pColCU->getSlice()->getRefPic( eColRefPicList, pColCU->getCUMvField(eColRefPicList)->getRefIdx(uiAbsPartAddr))->getViewIndex(); 
-#else
     Int iCurrViewId    = m_pcSlice->getViewId (); 
     Int iCurrRefViewId = m_pcSlice->getRefPic(eRefPicList, riRefIdx)->getViewId (); 
     Int iColViewId     = pColCU->getSlice()->getViewId(); 
     Int iColRefViewId  = pColCU->getSlice()->getRefPic( eColRefPicList, pColCU->getCUMvField(eColRefPicList)->getRefIdx(uiAbsPartAddr))->getViewId(); 
-#endif
-#if H_3D_TMVP_SCALING_FIX_K0053
     iScale = 4096;
     if ( iCurrRefViewId != iCurrViewId && iColViewId != iColRefViewId )
-#endif
       iScale = xGetDistScaleFactor( iCurrViewId, iCurrRefViewId, iColViewId, iColRefViewId );
-#if H_3D_TMVP_FIX_TICKET_97 
     if ( bMRG && iScale != 4096 && m_pcSlice->getIvMvScalingFlag( ) ) 
-#else
-    if ( iScale != 4096 && m_pcSlice->getIvMvScalingFlag( ) )
-#endif
     {
       rcMv = cColMv.scaleMv( iScale );
@@ -5815 +5698 @@
 #endif
   }
-  else // CY: both bIsCurrRefLongTerm and bIsColRefLongTerm are 0
+  else
   {
     iScale = xGetDistScaleFactor(iCurrPOC, iCurrRefPOC, iColPOC, iColRefPOC);
@@ -5980 +5863 @@
 #endif
 #if H_3D_IV_MERGE
-#if SEC_ARP_REM_ENC_RESTRICT_K0035
 Void TComDataCU::getDispforDepth (UInt uiPartIdx, UInt uiPartAddr, DisInfo* pDisp)
-#else
-Bool TComDataCU::getDispforDepth (UInt uiPartIdx, UInt uiPartAddr, DisInfo* pDisp)
-#endif
 {
 
@@ -6000 +5879 @@
       pDisp->m_acNBDV = cMv;
       pDisp->m_aVIdxCan = iViewIdx;
-#if !SEC_ARP_REM_ENC_RESTRICT_K0035
-      return true;
-#endif
-  }
-#if !SEC_ARP_REM_ENC_RESTRICT_K0035
-  return false;
-#endif
-}
-#endif
-
-#if SEC_DEPTH_INTRA_SKIP_MODE_K0033
+  }
+}
+#endif
+
+#if H_3D
 Bool TComDataCU::getNeighDepth ( UInt uiPartIdx, UInt uiPartAddr, Pel* pNeighDepth, Int index )
 {
-#if NEIGHBORING_PIX_AVAILABILITY_FIX
   UInt  uiPartIdxLT, uiPartIdxRT;
   this->deriveLeftRightTopIdxAdi( uiPartIdxLT, uiPartIdxRT, 0, 0 );
@@ -6066 +5938 @@
 
   return bDepAvail;
-#else
-  Bool bDepAvail = false;
-  Pel *pDepth  = this->getPic()->getPicYuvRec()->getLumaAddr();
-  Int iDepStride =  this->getPic()->getPicYuvRec()->getStride();
-
-  Int xP, yP, nPSW, nPSH;
-  this->getPartPosition(uiPartIdx, xP, yP, nPSW, nPSH);
-  UInt PicHeight=this->getPic()->getPicYuvRec()->getHeight();
-  UInt PicWidth=this->getPic()->getPicYuvRec()->getWidth();
-  switch(index)
-  {
-  case 0: // Mid Left
-    if( ( xP != 0 ) && ( ( yP + ( nPSH >> 1 ) ) < PicHeight ) )
-    {
-      *pNeighDepth = pDepth[ (yP+(nPSH>>1)) * iDepStride + (xP-1) ];
-      bDepAvail = true;
-    }
-    break;
-  case 1: // Mid Above
-    if( ( yP != 0 ) && ( ( xP + ( nPSW >> 1 ) ) < PicWidth ) )
-    {
-      *pNeighDepth = pDepth[ (yP-1) * iDepStride + (xP + (nPSW>>1)) ];
-      bDepAvail = true;
-    }
-    break;
-  default:
-    break;
-  }
-  return bDepAvail;
-#endif
-}
-#else
-#if H_3D_SINGLE_DEPTH
-Bool TComDataCU::getNeighDepth (UInt uiPartIdx, UInt uiPartAddr, Pel* pNeighDepth, Int index)
-{
-
-  Bool bDepAvail = false;
-  Pel *pDepth  = this->getPic()->getPicYuvRec()->getLumaAddr();
-  Int iDepStride =  this->getPic()->getPicYuvRec()->getStride();
-
-  Int xP, yP, nPSW, nPSH;
-  this->getPartPosition(uiPartIdx, xP, yP, nPSW, nPSH);
-  UInt PicHeight=this->getPic()->getPicYuvRec()->getHeight();
-  UInt PicWidth=this->getPic()->getPicYuvRec()->getWidth();
-  switch(index)
-  {
-  case 0: // Mid Left
-    if( ( xP != 0 ) && ( ( yP + ( nPSH >> 1 ) ) < PicHeight ) )
-    {
-      *pNeighDepth = pDepth[ (yP+(nPSH>>1)) * iDepStride + (xP-1) ];
-      bDepAvail = true;
-    }
-    break;
-  case 1: // Mid Above
-    if( ( yP != 0 ) && ( ( xP + ( nPSW >> 1 ) ) < PicWidth ) )
-    {
-      *pNeighDepth = pDepth[ (yP-1) * iDepStride + (xP + (nPSW>>1)) ];
-      bDepAvail = true;
-    }
-    break;
-  default:
-      break;
-  }
-  return bDepAvail;
-}
-#endif
-#endif
-
+}
+#endif
 #if H_3D_NBDV 
 //Notes from QC:
@@ -6139 +5945 @@
 //TBD#2: set of DvMCP values need to be done as part of inter-view motion prediction process. Remove this comment once merge related integration is done
 //To be checked: Parallel Merge features for NBDV, related to DV_DERIVATION_PARALLEL_B0096 and LGE_IVMP_PARALLEL_MERGE_B0136 are not integrated. The need of these features due to the adoption of CU-based NBDV is not clear. We need confirmation on this, especially by proponents
-#if SEC_ARP_REM_ENC_RESTRICT_K0035
 Void TComDataCU::getDisMvpCandNBDV( DisInfo* pDInfo
-#else
-Bool TComDataCU::getDisMvpCandNBDV( DisInfo* pDInfo
-#endif
 #if H_3D_NBDV_REF
 , Bool bDepthRefine
@@ -6151 +5953 @@
   //// ******* Init variables ******* /////
   // Init disparity struct for results
-#if !SEC_ARP_REM_ENC_RESTRICT_K0035
-  pDInfo->bDV = false;   
-#endif
   pDInfo->m_aVIdxCan = -1;
 
@@ -6217 +6016 @@
       if( bCheck )
       {
-#if !(NTT_BUG_FIX_TK54)
-        clipMv(cColMv);
-#endif
         pDInfo->m_acNBDV = cColMv;
         pDInfo->m_aVIdxCan  = iTargetViewIdx;
@@ -6239 +6035 @@
 #else
         picDepth = getSlice()->getIvPic( true, iTargetViewIdx );
-#if !BUG_FIX_TK65
-        assert(picDepth != NULL);
-#endif
 #endif
         if (picDepth && bDepthRefine)
@@ -6248 +6041 @@
         pDInfo->m_acDoNBDV  = cColMv;
 #endif //H_3D_NBDV_REF
-#if SEC_ARP_REM_ENC_RESTRICT_K0035
         return;
-#else
-        return true;
-#endif
       }
     }
@@ -6269 +6058 @@
 #endif
     ) )
-#if SEC_ARP_REM_ENC_RESTRICT_K0035
     return;
-#else
-    return true;
-#endif
 
   //// ******* Get disparity from above block ******* /////
@@ -6285 +6070 @@
 #endif
       ) )
-#if SEC_ARP_REM_ENC_RESTRICT_K0035
       return;
-#else
-      return true;
-#endif
   }
 
@@ -6302 +6083 @@
         {
           TComMv cDispVec = cIDVInfo.m_acMvCand[iList][ curPos ];
-#if !(NTT_BUG_FIX_TK54)
-          clipMv( cDispVec );
-#endif
           pDInfo->m_acNBDV = cDispVec;
           pDInfo->m_aVIdxCan = cIDVInfo.m_aVIdxCan[iList][ curPos ];
@@ -6324 +6102 @@
 #else
           TComPic* picDepth = getSlice()->getIvPic( true, pDInfo->m_aVIdxCan );
-#if !BUG_FIX_TK65
-          assert(picDepth!=NULL);
-#endif
 #endif
 
@@ -6335 +6110 @@
           pDInfo->m_acDoNBDV = cDispVec;
 #endif
-#if SEC_ARP_REM_ENC_RESTRICT_K0035
           return;
-#else
-          return true;
-#endif
         }
       }
@@ -6375 +6146 @@
       pDInfo->m_acDoNBDV = defaultDV;
 #endif
-#if !SEC_ARP_REM_ENC_RESTRICT_K0035
-      return true;
-#endif
-  }
-#if !SEC_ARP_REM_ENC_RESTRICT_K0035
-  return false; 
-#endif
+  }
 }
 
@@ -6423 +6188 @@
     Pel iDisp = getMcpFromDM( pcBaseViewDepthPicYuv, cMvPred, iBlkX, iBlkY, iWidth, iHeight, aiShiftLUT );
     cMvPred->setHor( iDisp );
-#if !(NTT_BUG_FIX_TK54)
-    clipMv(*cMvPred);
-#endif
   }
 }
@@ -6451 +6213 @@
         if (refViewIdx != m_pcSlice->getViewIndex()) 
         {
-#if !(NTT_BUG_FIX_TK54)
-          clipMv(cMvPred);
-#endif
           pNbDvInfo->m_acNBDV = cMvPred;
           pNbDvInfo->m_aVIdxCan = refViewIdx;
@@ -6472 +6231 @@
 #else
           picDepth   = getSlice()->getIvPic (true, refViewIdx );
-#if !BUG_FIX_TK65
-          assert(picDepth != NULL);
-#endif
 #endif
           UInt uiPartIdx = 0;   //Notes from MTK: Please confirm that using 0 as partition index and partition address is correct for CU-level DoNBDV
@@ -6870 +6626 @@
 #endif
 #endif
-#if !(NTT_BUG_FIX_TK54)
-                      clipMv( cMv );
-#endif
                       paiPdmRefIdx  [ uiCurrRefListId ] = iPdmRefIdx;
                       pacPdmMv      [ uiCurrRefListId ] = cMv;
@@ -6931 +6684 @@
                             }
 
-#if !(NTT_BUG_FIX_TK54)
-                            clipMv( cMv );
-#endif
                             bLoop_stop = true;
 
@@ -6954 +6704 @@
 
               }
-#if !SHARP_SUBBLOCK_CLEAN_K0044
-              if (iSPHeight + iSPWidth == 12)
-              {
-                if (puhInterDirSP[iPartition] == 3)
-                {
-                  puhInterDirSP[iPartition] = 1;
-                  pcMvFieldSP[2*iPartition + 1].setMvField(TComMv(0,0), -1);
-                }
-              }
-#endif
               iPartition ++;
             }
@@ -6996 +6736 @@
       Int         iBaseAbsPartIdx;
 
-#if SEC_SHIFTED_IVMC_POS_K0036
       Int offsetW = (iLoopCan == 0) ? 0 : ( iWidth  * 2 );
       Int offsetH = (iLoopCan == 0) ? 0 : ( iHeight * 2 );
-#else
-      Int offsetW = (iLoopCan == 0) ? 0 : ( ((iWidth /2)*4) + 4 );
-      Int offsetH = (iLoopCan == 0) ? 0 : ( ((iHeight/2)*4) + 4 );
-#endif
 
       Int         iBasePosX   = Clip3( 0, pcBaseRec->getWidth () - 1, iCurrPosX + ( (cDv.getHor() + offsetW + 2 ) >> 2 ) );
@@ -7048 +6783 @@
 #endif
 #endif
-#if !(NTT_BUG_FIX_TK54)
-                    clipMv( cMv );
-#endif
                     paiPdmRefIdx  [ (uiCurrRefListId + (iLoopCan<<2)) ] = iPdmRefIdx;
                     pacPdmMv      [ (uiCurrRefListId + (iLoopCan<<2)) ] = cMv;
@@ -7104 +6836 @@
 #endif
             cMv.setVer( 0 );
-#if !(NTT_BUG_FIX_TK54)
-            clipMv( cMv );
-#endif
             pacPdmMv      [iRefListId + 2 + (iLoopCan<<2)] = cMv;
           }

branches/HTM-14.0-dev0/source/Lib/TLibCommon/TComDataCU.h

@@ -110 +110 @@
   // -------------------------------------------------------------------------------------------------------------------
   Bool*         m_skipFlag;           ///< array of skip flags
-#if SEC_DEPTH_INTRA_SKIP_MODE_K0033
+#if H_3D
   Bool*         m_bDISFlag;         
   UInt*         m_uiDISType;
-#else
-#if H_3D_SINGLE_DEPTH
-  Bool*         m_singleDepthFlag;           ///< array of single depth flags
-  Pel*          m_apSingleDepthValue;
-#endif
 #endif
   Char*         m_pePartSize;         ///< array of partition sizes
@@ -350 +345 @@
   Void         setSkipFlag           ( UInt idx, Bool skip)     { m_skipFlag[idx] = skip;   }
   Void         setSkipFlagSubParts   ( Bool skip, UInt absPartIdx, UInt depth );
-#if SEC_DEPTH_INTRA_SKIP_MODE_K0033
+#if H_3D
   Bool*        getDISFlag            ()                         { return m_bDISFlag;          }
   Bool         getDISFlag            ( UInt idx)                { return m_bDISFlag[idx];     }
@@ -360 +355 @@
   Void         getDISType            ( UInt idx, UInt uiDISType)     { m_uiDISType[idx] = uiDISType;   }
   Void         setDISTypeSubParts    ( UInt uiDISType, UInt uiAbsPartIdx, UInt uiPUIdx, UInt uiDepth );
-#else
-#if H_3D_SINGLE_DEPTH
-  Bool*        getSingleDepthFlag            ()                        { return m_singleDepthFlag;          }
-  Bool         getSingleDepthFlag            (UInt idx)                { return m_singleDepthFlag[idx];     }
-  Void         setSingleDepthFlag           ( UInt idx, Bool singleDepth)     { m_singleDepthFlag[idx] = singleDepth;   }
-  Void         setSingleDepthFlagSubParts   ( Bool singleDepth, UInt absPartIdx, UInt depth );
-
-  Pel*         getSingleDepthValue( ) { return m_apSingleDepthValue; }
-  Pel          getSingleDepthValue            (UInt idx)                { return m_apSingleDepthValue[idx];     }
-  Void         setSingleDepthValue           ( UInt idx, Pel pDepthValue)     { m_apSingleDepthValue[idx] = pDepthValue;   }
-  Void         setSingleDepthValueSubParts   (Pel singleDepthValue, UInt uiAbsPartIdx, UInt uiPUIdx, UInt uiDepth );
-#endif  
 #endif
   Char*         getPredictionMode     ()                        { return m_pePredMode;        }
@@ -506 +489 @@
   );
   Bool          xGetColDisMV      ( Int currCandPic, RefPicList eRefPicList, Int refidx, Int uiCUAddr, Int uiPartUnitIdx, TComMv& rcMv, Int & iTargetViewIdx, Int & iStartViewIdx );
-#if SEC_ARP_REM_ENC_RESTRICT_K0035
   Void          getDisMvpCandNBDV ( DisInfo* pDInfo
-#else
-  Bool          getDisMvpCandNBDV ( DisInfo* pDInfo
-#endif
 #if H_3D_NBDV_REF
    , Bool bDepthRefine = false
@@ -517 +496 @@
    
 #if H_3D
-#if SEC_ARP_REM_ENC_RESTRICT_K0035
   Void          getDispforDepth  ( UInt uiPartIdx, UInt uiPartAddr, DisInfo* cDisp);
-#else
-  Bool          getDispforDepth  ( UInt uiPartIdx, UInt uiPartAddr, DisInfo* cDisp);
-#endif
   Bool          getDispMvPredCan(UInt uiPartIdx, RefPicList eRefPicList, Int iRefIdx, Int* paiPdmRefIdx, TComMv* pacPdmMv, DisInfo* pDis, Int* iPdm );
-#endif
-#if SEC_DEPTH_INTRA_SKIP_MODE_K0033
+
    Bool          getNeighDepth (UInt uiPartIdx, UInt uiPartAddr, Pel* pNeighDepth, Int index);
-#else
-#if H_3D_SINGLE_DEPTH
-   Bool          getNeighDepth (UInt uiPartIdx, UInt uiPartAddr, Pel* pNeighDepth, Int index);
-#endif
 #endif
 #if H_3D_NBDV_REF
@@ -625 +595 @@
   
   Void          clipMv                ( TComMv&     rcMv     );
-#if SONY_MV_V_CONST_C0078
+#if H_MV
   Void          checkMV_V (TComMv&  rcMv,  RefPicList eRefPicList, int iRefIdx );
 #endif

branches/HTM-14.0-dev0/source/Lib/TLibCommon/TComMotionInfo.h

@@ -63 +63 @@
 typedef struct _DisCand 
 {
-#if !SEC_ARP_REM_ENC_RESTRICT_K0035
-  Bool bDV;
-#endif
   TComMv m_acNBDV;              // DV from NBDV
 #if H_3D_NBDV_REF 

branches/HTM-14.0-dev0/source/Lib/TLibCommon/TComPrediction.cpp

@@ -630 +630 @@
 
 #if H_3D_DBBP
-#if HS_DBBP_CLEAN_K0048
 PartSize TComPrediction::getPartitionSizeFromDepth(Pel* pDepthPels, UInt uiDepthStride, UInt uiSize, TComDataCU*& pcCU)
-#else
-PartSize TComPrediction::getPartitionSizeFromDepth(Pel* pDepthPels, UInt uiDepthStride, UInt uiSize)
-#endif
 {
   // find virtual partitioning for this CU based on depth block
@@ -643 +639 @@
   Int iSumDepth = 0;
   Int iSubSample = 4;
-#if HS_DBBP_CLEAN_K0048
   Int iPictureWidth = pcCU->getSlice()->getIvPic (true, pcCU->getDvInfo(0).m_aVIdxCan)->getPicYuvRec()->getWidth();
   Int iPictureHeight = pcCU->getSlice()->getIvPic (true, pcCU->getDvInfo(0).m_aVIdxCan)->getPicYuvRec()->getHeight();
@@ -675 +670 @@
     if (!(iBlkY+y+4>iPictureHeight))
     pDepthPels += uiDepthStride*iSubSample;
-#else
-  for (Int y=0; y<uiSize; y+=iSubSample)
-  {
-    for (Int x=0; x<uiSize; x+=iSubSample)
-    {
-      Int depthPel = pDepthPels[x];
-      
-      iSumDepth += depthPel;
-    }
-    
-    // next row
-    pDepthPels += uiDepthStride*iSubSample;
-#endif
   }
   
@@ -705 +687 @@
     for (Int x=0; x<uiSize; x+=iSubSample)
     {
-#if HS_DBBP_CLEAN_K0048
       Int depthPel = 0;
 if (iBlkX+x>iPictureWidth)
@@ -716 +697 @@
      t=x;
 }
-#else
-      Int depthPel = pDepthPels[x];
-#endif
       
       // decide which segment this pixel belongs to
@@ -747 +725 @@
     
     // next row
-#if HS_DBBP_CLEAN_K0048
     if (!(iBlkY+y+4>iPictureHeight))
-#endif
     pDepthPels += uiDepthStride*iSubSample;
   }
@@ -773 +749 @@
 }
 
-#if HS_DBBP_CLEAN_K0048
 Bool TComPrediction::getSegmentMaskFromDepth( Pel* pDepthPels, UInt uiDepthStride, UInt uiWidth, UInt uiHeight, Bool* pMask, TComDataCU*& pcCU)
-#else
-Bool TComPrediction::getSegmentMaskFromDepth( Pel* pDepthPels, UInt uiDepthStride, UInt uiWidth, UInt uiHeight, Bool* pMask )
-#endif
 {
   // segmentation of texture block --> mask IDs
@@ -786 +758 @@
   Int uiMinDepth = MAX_INT;
   Int uiMaxDepth = 0;
-#if HS_DBBP_CLEAN_K0048
   uiMinDepth = pDepthPels[ 0 ];
   uiMaxDepth = pDepthPels[ 0 ];
@@ -848 +819 @@
     uiMaxDepth = std::max( uiMaxDepth, (Int)pDepthPels[ uiDepthStride * (uiHeight - 1) + uiWidth - 1 ]);
   }
-#else
-  iSumDepth  = pDepthPels[ 0 ];
-  iSumDepth += pDepthPels[ uiWidth - 1 ];
-  iSumDepth += pDepthPels[ uiDepthStride * (uiHeight - 1) ];
-  iSumDepth += pDepthPels[ uiDepthStride * (uiHeight - 1) + uiWidth - 1 ];
-
-  uiMinDepth = pDepthPels[ 0 ];
-  uiMinDepth = std::min( uiMinDepth, (Int)pDepthPels[ uiWidth - 1 ]);
-  uiMinDepth = std::min( uiMinDepth, (Int)pDepthPels[ uiDepthStride * (uiHeight - 1) ]);
-  uiMinDepth = std::min( uiMinDepth, (Int)pDepthPels[ uiDepthStride * (uiHeight - 1) + uiWidth - 1 ]);
-
-  uiMaxDepth = pDepthPels[ 0 ];
-  uiMaxDepth = std::max( uiMaxDepth, (Int)pDepthPels[ uiWidth - 1 ]);
-  uiMaxDepth = std::max( uiMaxDepth, (Int)pDepthPels[ uiDepthStride * (uiHeight - 1) ]);
-  uiMaxDepth = std::max( uiMaxDepth, (Int)pDepthPels[ uiDepthStride * (uiHeight - 1) + uiWidth - 1 ]);
-#endif
 
   // don't generate mask for blocks with small depth range (encoder decision)
@@ -885 +840 @@
     for (Int x=0; x<uiHeight; x++)
     {
-#if HS_DBBP_CLEAN_K0048
       Int depthPel = 0;
       if (iBlkX+x>iPictureWidth)
@@ -896 +850 @@
         t=x;
       }
-#else
-      Int depthPel = pDepthPels[x];
-#endif
 
       // decide which segment this pixel belongs to
@@ -916 +867 @@
 
     // next row
-#if HS_DBBP_CLEAN_K0048
     if (!(iBlkY+y+1>iPictureHeight))
-#endif
       pDepthPels += uiDepthStride;
     pMask += MAX_CU_SIZE;
@@ -1293 +1242 @@
   TComMv      cMv         = pcCU->getCUMvField( eRefPicList )->getMv( uiPartAddr );
   pcCU->clipMv(cMv);
-#if SONY_MV_V_CONST_C0078
+#if H_MV
   pcCU->checkMV_V(cMv, eRefPicList, iRefIdx );
 #endif
@@ -1393 +1342 @@
 #if H_3D_NBDV
   DisInfo cDistparity;
-#if SEC_ARP_REM_ENC_RESTRICT_K0035
   cDistparity.m_acNBDV = pcCU->getDvInfo(0).m_acNBDV;
   cDistparity.m_aVIdxCan = pcCU->getDvInfo(uiPartAddr).m_aVIdxCan;
 #else
-  cDistparity.bDV           = pcCU->getDvInfo(uiPartAddr).bDV;
-  if( cDistparity.bDV )
-  {
-    cDistparity.m_acNBDV = pcCU->getDvInfo(0).m_acNBDV;
-    assert(pcCU->getDvInfo(uiPartAddr).bDV ==  pcCU->getDvInfo(0).bDV);
-    cDistparity.m_aVIdxCan = pcCU->getDvInfo(uiPartAddr).m_aVIdxCan;
-  }
-#endif
-#else
   assert(0); // ARP can be applied only when a DV is available
 #endif
-#if SEC_ARP_REM_ENC_RESTRICT_K0035
   UChar dW = pcCU->getARPW ( uiPartAddr );
-#else
-  UChar dW = cDistparity.bDV ? pcCU->getARPW ( uiPartAddr ) : 0;
-#endif
-
-#if !SEC_ARP_REM_ENC_RESTRICT_K0035
-  if( cDistparity.bDV ) 
-#endif
+
   {
     Int arpRefIdx = pcCU->getSlice()->getFirstTRefIdx(eRefPicList);
@@ -1468 +1400 @@
       pYuvB0->clear(); pYuvB1->clear();
     }
-#if !SEC_ARP_REM_ENC_RESTRICT_K0035
-    assert ( cDistparity.bDV );
-#endif    
     TComMv cNBDV = cDistparity.m_acNBDV;
     pcCU->clipMv( cNBDV );

branches/HTM-14.0-dev0/source/Lib/TLibCommon/TComPrediction.h

@@ -175 +175 @@
   
 #if H_3D_DBBP
-#if HS_DBBP_CLEAN_K0048
   PartSize      getPartitionSizeFromDepth(Pel* pDepthPels, UInt uiDepthStride, UInt uiSize, TComDataCU*& pcCU);
   Bool          getSegmentMaskFromDepth( Pel* pDepthPels, UInt uiDepthStride, UInt uiWidth, UInt uiHeight, Bool* pMask, TComDataCU*& pcCU);
-#else
-  PartSize      getPartitionSizeFromDepth(Pel* pDepthPels, UInt uiDepthStride, UInt uiSize);
-  Bool          getSegmentMaskFromDepth( Pel* pDepthPels, UInt uiDepthStride, UInt uiWidth, UInt uiHeight, Bool* pMask );
-#endif
   Void          combineSegmentsWithMask( TComYuv* pInYuv[2], TComYuv* pOutYuv, Bool* pMask, UInt uiWidth, UInt uiHeight, UInt uiPartAddr, UInt partSize );
 #endif

branches/HTM-14.0-dev0/source/Lib/TLibCommon/TComRdCost.cpp

@@ -341 +341 @@
     else if( eDFunc >= DF_HADS && eDFunc <= DF_HADS16N )
     {
-#if !RWTH_DBBP_NO_SATD_K0028
-      rcDistParam.DistFunc = TComRdCost::xGetMaskedHADs;
-#else
       rcDistParam.DistFunc = TComRdCost::xGetMaskedSAD;
-#endif
     }
     else if( eDFunc >= DF_VSD && eDFunc <= DF_VSD16N )
@@ -445 +441 @@
   if( m_bUseMask )
   {
-#if !RWTH_DBBP_NO_SATD_K0028
-    rcDistParam.DistFunc = (bHADME)?TComRdCost::xGetMaskedHADs:TComRdCost::xGetMaskedSAD;
-#else
     rcDistParam.DistFunc = TComRdCost::xGetMaskedSAD;
-#endif
   }
 #endif
@@ -472 +464 @@
   if( m_bUseMask )
   {
-#if !RWTH_DBBP_NO_SATD_K0028
-    rcDP.DistFunc = (bHadamard)?TComRdCost::xGetMaskedHADs:TComRdCost::xGetMaskedSAD;
-#else
     rcDP.DistFunc = TComRdCost::xGetMaskedSAD;
-#endif
   }
 #endif
@@ -729 +717 @@
 }
 
-#if !RWTH_DBBP_NO_SATD_K0028
-UInt TComRdCost::xGetMaskedHADs( DistParam* pcDtParam )
-{
-  AOF(!pcDtParam->bApplyWeight);
-#if H_3D_IC
-  AOF(!pcDtParam->bUseIC);
-#endif
-  Pel* piOrg   = pcDtParam->pOrg;
-  Pel* piCur   = pcDtParam->pCur;
-  Int  iRows   = pcDtParam->iRows;
-  Int  iCols   = pcDtParam->iCols;
-  Int  iStrideCur = pcDtParam->iStrideCur;
-  Int  iStrideOrg = pcDtParam->iStrideOrg;
-  Int  iStep  = pcDtParam->iStep;
-  
-  Int  x, y;
-  
-  UInt uiSum = 0;
-  
-#if NS_HAD
-  if( ( ( iRows % 8 == 0) && (iCols % 8 == 0) && ( iRows == iCols ) ) || ( ( iRows % 8 == 0 ) && (iCols % 8 == 0) && !pcDtParam->bUseNSHAD ) )
-#else
-    if( ( iRows % 8 == 0) && (iCols % 8 == 0) )
-#endif
-    {
-      Int  iOffsetOrg = iStrideOrg<<3;
-      Int  iOffsetCur = iStrideCur<<3;
-      for ( y=0; y<iRows; y+= 8 )
-      {
-        for ( x=0; x<iCols; x+= 8 )
-        {
-          if( piOrg[x] != DBBP_INVALID_SHORT )
-          {
-            uiSum += xCalcHADs8x8( &piOrg[x], &piCur[x*iStep], iStrideOrg, iStrideCur, iStep );
-          }
-        }
-        piOrg += iOffsetOrg;
-        piCur += iOffsetCur;
-      }
-    }
-#if NS_HAD
-    else if ( ( iCols > 8 ) && ( iCols > iRows ) && pcDtParam->bUseNSHAD )
-    {
-      Int  iOffsetOrg = iStrideOrg<<2;
-      Int  iOffsetCur = iStrideCur<<2;
-      for ( y=0; y<iRows; y+= 4 )
-      {
-        for ( x=0; x<iCols; x+= 16 )
-        {
-          if( piOrg[x] != DBBP_INVALID_SHORT )
-          {
-            uiSum += xCalcHADs16x4( &piOrg[x], &piCur[x*iStep], iStrideOrg, iStrideCur, iStep );
-          }
-        }
-        piOrg += iOffsetOrg;
-        piCur += iOffsetCur;
-      }
-    }
-    else if ( ( iRows > 8 ) && ( iCols < iRows ) && pcDtParam->bUseNSHAD )
-    {
-      Int  iOffsetOrg = iStrideOrg<<4;
-      Int  iOffsetCur = iStrideCur<<4;
-      for ( y=0; y<iRows; y+= 16 )
-      {
-        for ( x=0; x<iCols; x+= 4 )
-        {
-          if( piOrg[x] != DBBP_INVALID_SHORT )
-          {
-            uiSum += xCalcHADs4x16( &piOrg[x], &piCur[x*iStep], iStrideOrg, iStrideCur, iStep );
-          }
-        }
-        piOrg += iOffsetOrg;
-        piCur += iOffsetCur;
-      }
-    }
-#endif
-    else if( ( iRows % 4 == 0) && (iCols % 4 == 0) )
-    {
-      Int  iOffsetOrg = iStrideOrg<<2;
-      Int  iOffsetCur = iStrideCur<<2;
-      
-      for ( y=0; y<iRows; y+= 4 )
-      {
-        for ( x=0; x<iCols; x+= 4 )
-        {
-          if( piOrg[x] != DBBP_INVALID_SHORT )
-          {
-            uiSum += xCalcHADs4x4( &piOrg[x], &piCur[x*iStep], iStrideOrg, iStrideCur, iStep );
-          }
-        }
-        piOrg += iOffsetOrg;
-        piCur += iOffsetCur;
-      }
-    }
-    else if( ( iRows % 2 == 0) && (iCols % 2 == 0) )
-    {
-      Int  iOffsetOrg = iStrideOrg<<1;
-      Int  iOffsetCur = iStrideCur<<1;
-      for ( y=0; y<iRows; y+=2 )
-      {
-        for ( x=0; x<iCols; x+=2 )
-        {
-          if( piOrg[x] != DBBP_INVALID_SHORT )
-          {
-            uiSum += xCalcHADs2x2( &piOrg[x], &piCur[x*iStep], iStrideOrg, iStrideCur, iStep );
-          }
-        }
-        piOrg += iOffsetOrg;
-        piCur += iOffsetCur;
-      }
-    }
-    else
-    {
-      assert(false);
-    }
-  
-  return uiSum >> DISTORTION_PRECISION_ADJUSTMENT(pcDtParam->bitDepth-8);
-}
-#endif
 
 UInt TComRdCost::xGetMaskedVSD( DistParam* pcDtParam )

branches/HTM-14.0-dev0/source/Lib/TLibCommon/TComRdCost.h

@@ -320 +320 @@
   static UInt xGetMaskedSSE     ( DistParam* pcDtParam );
   static UInt xGetMaskedSAD     ( DistParam* pcDtParam );
-#if !RWTH_DBBP_NO_SATD_K0028
-  static UInt xGetMaskedHADs    ( DistParam* pcDtParam );
-#endif
   static UInt xGetMaskedVSD     ( DistParam* pcDtParam );
 #endif

branches/HTM-14.0-dev0/source/Lib/TLibCommon/TComRom.cpp

@@ -745 +745 @@
   assert( uiWidth == uiHeight );
 
-#if SHARP_DMM_CLEAN_K0042
   Int posStart = 0, posEnd = 0;
-#else
-  UChar    uhStartX = 0,    uhStartY = 0,    uhEndX = 0,    uhEndY = 0;
-  Int   iStepStartX = 0, iStepStartY = 0, iStepEndX = 0, iStepEndY = 0;
-#endif
 
   UInt uiBlockSize = 0;
@@ -762 +757 @@
   for( UInt uiOri = 0; uiOri < 6; uiOri++ )
   {
-#if !SHARP_DMM_CLEAN_K0042
-    // init the edge line parameters for each of the 6 wedgelet types
-    switch( uiOri )
-    {
-    case( 0 ): {  uhStartX = 0;               uhStartY = 0;               uhEndX = 0;               uhEndY = 0;               iStepStartX = +1; iStepStartY =  0; iStepEndX =  0; iStepEndY = +1; break; }
-    case( 1 ): {  uhStartX = (uiBlockSize-1); uhStartY = 0;               uhEndX = (uiBlockSize-1); uhEndY = 0;               iStepStartX =  0; iStepStartY = +1; iStepEndX = -1; iStepEndY =  0; break; }
-    case( 2 ): {  uhStartX = (uiBlockSize-1); uhStartY = (uiBlockSize-1); uhEndX = (uiBlockSize-1); uhEndY = (uiBlockSize-1); iStepStartX = -1; iStepStartY =  0; iStepEndX =  0; iStepEndY = -1; break; }
-    case( 3 ): {  uhStartX = 0;               uhStartY = (uiBlockSize-1); uhEndX = 0;               uhEndY = (uiBlockSize-1); iStepStartX =  0; iStepStartY = -1; iStepEndX = +1; iStepEndY =  0; break; }
-    case( 4 ): {  uhStartX = 0;               uhStartY = 0;               uhEndX = 0;               uhEndY = (uiBlockSize-1); iStepStartX = +1; iStepStartY =  0; iStepEndX = +1; iStepEndY =  0; break; }
-    case( 5 ): {  uhStartX = (uiBlockSize-1); uhStartY = 0;               uhEndX = 0;               uhEndY = 0;               iStepStartX =  0; iStepStartY = +1; iStepEndX =  0; iStepEndY = +1; break; }
-    }
-#endif
-
-#if SHARP_DMM_CLEAN_K0042
+
     posEnd = (Int) racWedgeList.size();
     if (uiOri == 0 || uiOri == 4)
     {
-#endif
     for( Int iK = 0; iK < uiBlockSize; iK += (uiWidth>=16 ?2:1))
     {
       for( Int iL = 0; iL < uiBlockSize; iL += ((uiWidth>=16 && uiOri<4)?2:1) )
       {
-#if SHARP_DMM_CLEAN_K0042
         Int xS = iK;
         Int yS = 0;
@@ -790 +770 @@
         Int yE = (uiOri == 0) ? iL : uiBlockSize - 1;
         cTempWedgelet.setWedgelet( xS, yS, xE, yE, uiOri, eWedgeRes, ((iL%2)==0 && (iK%2)==0) );
-#else
-        cTempWedgelet.setWedgelet( uhStartX + (iK*iStepStartX) , uhStartY + (iK*iStepStartY), uhEndX + (iL*iStepEndX), uhEndY + (iL*iStepEndY), (UChar)uiOri, eWedgeRes, ((iL%2)==0 && (iK%2)==0) );
-#endif
         addWedgeletToList( cTempWedgelet, racWedgeList, racWedgeRefList );
       }
     }
-#if SHARP_DMM_CLEAN_K0042
     }
     else
@@ -807 +783 @@
     }
     posStart = posEnd;
-#endif
   }
 

branches/HTM-14.0-dev0/source/Lib/TLibCommon/TComSlice.cpp

@@ -137 +137 @@
 #endif
 #if H_3D
-#if HHI_INTER_COMP_PRED_K0052
 , m_inCmpPredFlag                 ( false )
-#endif
-#if HHI_CAM_PARA_K0052
 , m_numViews                        ( 0    )
-#endif
 , m_depthToDisparityB             ( NULL )
 , m_depthToDisparityF             ( NULL )
-#endif
-#if SEC_DEPTH_INTRA_SKIP_MODE_K0033
+
 , m_bApplyDIS                     (false)
-#else
-#if H_3D_SINGLE_DEPTH
-, m_bApplySingleDepthMode         (false)
-#endif
 #endif
 #endif
@@ -191 +182 @@
   m_iDefaultRefViewIdx = -1;
   m_bDefaultRefViewIdxAvailableFlag = false;
-#if HHI_INTER_COMP_PRED_K0052
+#if H_3D
   m_ivMvPredFlag           = false;
   m_ivMvScalingFlag        = false;
@@ -214 +205 @@
   m_puiSubstreamSizes = NULL;
 #if H_3D
-#if HHI_CAM_PARA_K0052   
   for( UInt i = 0; i < m_numViews; i++ )
-#else
-  for( UInt i = 0; i < getViewIndex(); i++ )
-#endif
   {
     if ( m_depthToDisparityB && m_depthToDisparityB[ i ] )
@@ -604 +591 @@
   UInt NumPocLtCurr = 0;
   Int i;
-
-#if HHI_RES_PRED_K0052
+#if H_3D
   m_pocsInCurrRPSs.clear();
 #endif
-
   for(i=0; i < m_pcRPS->getNumberOfNegativePictures(); i++)
   {
@@ -619 +604 @@
       NumPocStCurr0++;
       pcRefPic->setCheckLTMSBPresent(false);  
-#if HHI_RES_PRED_K0052
+#if H_3D
       m_pocsInCurrRPSs.push_back( pcRefPic->getPOC() ); 
 #endif
@@ -635 +620 @@
       NumPocStCurr1++;
       pcRefPic->setCheckLTMSBPresent(false);  
-#if HHI_RES_PRED_K0052
+#if H_3D
       m_pocsInCurrRPSs.push_back( pcRefPic->getPOC() ); 
 #endif
@@ -650 +635 @@
       RefPicSetLtCurr[NumPocLtCurr] = pcRefPic;
       NumPocLtCurr++;
-#if HHI_RES_PRED_K0052
+#if H_3D
       m_pocsInCurrRPSs.push_back( pcRefPic->getPOC() ); 
 #endif
@@ -662 +647 @@
 
   Int numPocInterCurr = NumPocStCurr0 + NumPocStCurr1 + NumPocLtCurr; 
-#if HHI_RES_PRED_K0052
+#if H_3D
   assert( numPocInterCurr == (Int) m_pocsInCurrRPSs.size() ); 
 #endif
@@ -837 +822 @@
 Void TComSlice::setCamparaSlice( Int** aaiScale, Int** aaiOffset )
 {  
-#if HHI_CAM_PARA_K0052
   Int voiInVps      = m_pcVPS->getVoiInVps(getViewIndex() ); 
   if( m_pcVPS->getNumCp( voiInVps ) > 0 )
@@ -855 +839 @@
     }
   } 
-#else
-  if( m_pcVPS->hasCamParInSliceHeader( m_viewIndex ) )
-  {    
-    for( UInt uiBaseViewIndex = 0; uiBaseViewIndex < m_viewIndex; uiBaseViewIndex++ )
-    {
-      m_aaiCodedScale [ 0 ][ uiBaseViewIndex ] = aaiScale [ uiBaseViewIndex ][     m_viewIndex ];
-      m_aaiCodedScale [ 1 ][ uiBaseViewIndex ] = aaiScale [     m_viewIndex ][ uiBaseViewIndex ];
-      m_aaiCodedOffset[ 0 ][ uiBaseViewIndex ] = aaiOffset[ uiBaseViewIndex ][     m_viewIndex ];
-      m_aaiCodedOffset[ 1 ][ uiBaseViewIndex ] = aaiOffset[     m_viewIndex ][ uiBaseViewIndex ];
-    }
-  } 
-#endif
 }
 #endif
@@ -1165 +1137 @@
   }
 #endif
-#if SEC_DEPTH_INTRA_SKIP_MODE_K0033
+#if H_3D
   m_bApplyDIS = pSrc->m_bApplyDIS;
-#else
-#if H_3D_SINGLE_DEPTH
-  m_bApplySingleDepthMode = pSrc->m_bApplySingleDepthMode;
-#endif
 #endif
 #if H_3D_IC
@@ -2217 +2185 @@
 {
   m_numViews = 1; 
-#if HHI_VIEW_ID_LIST_I5_J0107 || HHI_INTER_COMP_PRED_K0052
 #if H_3D
   AOF( m_viewOIdxList.size() == 0 ); 
@@ -2223 +2190 @@
   m_viewOIdxList.push_back( 0 );        
 #endif
-#endif
 
   for( Int i = 0; i <=  getMaxLayersMinus1(); i++ )
@@ -2241 +2207 @@
       {
         m_numViews++;
-#if HHI_VIEW_ID_LIST_I5_J0107  || HHI_INTER_COMP_PRED_K0052
 #if H_3D
         m_viewOIdxList.push_back( getViewOrderIdx( lId ) );        
 #endif
-#endif
       }
     }
@@ -2271 +2235 @@
     }
   }
-#if !BUG_FIX_TK65
-  assert( foundLayerIdinNuh != -1 ); 
-#endif
   return foundLayerIdinNuh;
 }
@@ -2281 +2242 @@
   Int i = 0, j = 0;
 
-#if HHI_CAM_PARA_K0052
   m_numCp    = new Int [ iNumViews ];
   m_cpRefVoi = new Int*[ iNumViews ];
@@ -2287 +2247 @@
 
   m_cpPresentFlag  = new Bool*[ iNumViews ]; 
-#else
-  m_bCamParPresent = new Bool[ iNumViews ];
-  m_bCamParInSliceHeader = new Bool[ iNumViews ];
-#endif
   
 
@@ -2297 +2253 @@
   for ( i = 0; i < iNumViews ; i++ )
   {
-#if HHI_CAM_PARA_K0052
     m_cpInSliceSegmentHeaderFlag[i] = false;     
-#else
-    m_bCamParPresent[i] = false; 
-    m_bCamParInSliceHeader[i] = false; 
-#endif
     
     m_aaaiCodedScale[i] = new Int*[ 2 ];
     m_aaaiCodedOffset[i] = new Int*[ 2 ];
 
-#if HHI_CAM_PARA_K0052
     m_numCp   [i] = 0; 
     m_cpRefVoi[i] = new Int[ iNumViews ];
@@ -2316 +2266 @@
       m_cpPresentFlag[i][j] = false; 
     }
-#endif
     for ( j = 0; j < 2; j++ )
     {
@@ -2335 +2284 @@
   Int i = 0, j = 0;
 
-#if !HHI_CAM_PARA_K0052
-  if ( m_bCamParPresent != NULL )
-  {
-    delete [] m_bCamParPresent;
-  }
-  if ( m_bCamParInSliceHeader != NULL )
-  {
-    delete [] m_bCamParInSliceHeader;
-  }
-#else
   if ( m_numCp != NULL )
   {
@@ -2373 +2312 @@
     delete [] m_cpInSliceSegmentHeaderFlag;
   }
-#endif
 
 
@@ -2404 +2342 @@
 
 
-#if !HHI_CAM_PARA_K0052
-Void TComVPS::initCamParaVPS( UInt uiViewIndex, Bool bCamParPresent, UInt uiCamParPrecision, Bool bCamParSlice, Int** aaiScale, Int** aaiOffset )
-{
-  AOT( uiViewIndex != 0 && !bCamParSlice && ( aaiScale == 0 || aaiOffset == 0 ) );  
-
-  m_uiCamParPrecision = ( ( uiViewIndex != 0 )? uiCamParPrecision : 0 );
-  m_bCamParPresent[ uiViewIndex ] = (( uiViewIndex != 0 )? bCamParPresent  : false );
-  m_bCamParInSliceHeader[ uiViewIndex ]  = ( (uiViewIndex != 0)? bCamParSlice  : false );
-
-  if( !m_bCamParInSliceHeader[ uiViewIndex ] )
-  {
-    for( UInt uiBaseViewIndex = 0; uiBaseViewIndex < uiViewIndex; uiBaseViewIndex++ )
-    {
-      m_aaaiCodedScale [ uiViewIndex ][ 0 ][ uiBaseViewIndex ] = aaiScale [ uiBaseViewIndex ][     uiViewIndex ];
-      m_aaaiCodedScale [ uiViewIndex ][ 1 ][ uiBaseViewIndex ] = aaiScale [     uiViewIndex ][ uiBaseViewIndex ];
-      m_aaaiCodedOffset[ uiViewIndex ][ 0 ][ uiBaseViewIndex ] = aaiOffset[ uiBaseViewIndex ][     uiViewIndex ];
-      m_aaaiCodedOffset[ uiViewIndex ][ 1 ][ uiBaseViewIndex ] = aaiOffset[     uiViewIndex ][ uiBaseViewIndex ];
-    }
-  }
-}
-#endif
 
 #endif // H_3D
@@ -2858 +2775 @@
 , m_interViewMvVertConstraintFlag (false)
 #endif
-#if H_3D
-#if !HHI_CAM_PARA_K0052
-, m_bCamParInSliceHeader      (false)
-#endif
-#endif
 {
   for ( Int i = 0; i < MAX_TLAYER; i++ )
@@ -3885 +3797 @@
       {
         Int layerIdInNuh = getRefPicLayerId( i );
-#if HHI_RES_PRED_K0052
+
         TComPic* picV = getIvPic( getIsDepth(), getVPS()->getViewIndex( layerIdInNuh ) );
         assert( picV != NULL ); 
@@ -3900 +3812 @@
 
         if (getFirstTRefIdx(eRefPicList) >= 0 && refRpRefAvailFlag )
-#else
-        Int viewIdx = getVPS()->getViewId( layerIdInNuh );
-        TComPic*pcPicPrev = ivPicLists->getPic(viewIdx, 0, prevPOC);
-        if (getFirstTRefIdx(eRefPicList) >= 0 && pcPicPrev && pcPicPrev->getSlice( 0 )->isReferenced())
-#endif
         {
           m_arpRefPicAvailable[eRefPicList][layerIdInNuh] = true;
@@ -4087 +3994 @@
     return; 
 
-#if HHI_CAM_PARA_K0052
   m_numViews = getVPS()->getNumViews(); 
-#endif
   /// GT: Allocation should be moved to a better place later; 
   if ( m_depthToDisparityB == NULL )
   {
-#if HHI_CAM_PARA_K0052    
     m_depthToDisparityB = new Int*[ m_numViews ];
     for ( Int i = 0; i < getVPS()->getNumViews(); i++ )
-#else
-    m_depthToDisparityB = new Int*[ getViewIndex() ];
-    for ( Int i = 0; i < getViewIndex(); i++ )
-#endif
     {
       m_depthToDisparityB[ i ] = new Int[ Int(1 << g_bitDepthY) ]; 
@@ -4108 +4008 @@
   if ( m_depthToDisparityF == NULL )
   {
-#if HHI_CAM_PARA_K0052    
     m_depthToDisparityF = new Int*[ m_numViews ];
     for ( Int i = 0; i < m_numViews; i++ )
-#else
-    m_depthToDisparityF= new Int*[ getViewIndex() ];
-    for ( Int i = 0; i < getViewIndex(); i++ )
-#endif
     {
       m_depthToDisparityF[ i ] = new Int[ Int(1 << g_bitDepthY) ]; 
@@ -4125 +4020 @@
   TComVPS* vps = getVPS(); 
 
-#if HHI_CAM_PARA_K0052
   Int log2Div = g_bitDepthY - 1 + vps->getCpPrecision();
   Int voiInVps = vps->getVoiInVps( getViewIndex() ); 
@@ -4155 +4049 @@
     }
   }
-#else
-  Int log2Div = g_bitDepthY - 1 + vps->getCamParPrecision();
-
-  Int viewIndex = getViewIndex();
-
-  Bool camParaSH = vps->hasCamParInSliceHeader( viewIndex );
-
-  Int* codScale     = camParaSH ? m_aaiCodedScale [ 0 ] : vps->getCodedScale    ( viewIndex ); 
-  Int* codOffset    = camParaSH ? m_aaiCodedOffset[ 0 ] : vps->getCodedOffset   ( viewIndex ); 
-  Int* invCodScale  = camParaSH ? m_aaiCodedScale [ 1 ] : vps->getInvCodedScale ( viewIndex ); 
-  Int* invCodOffset = camParaSH ? m_aaiCodedOffset[ 1 ] : vps->getInvCodedOffset( viewIndex ); 
-
-  for (Int i = 0; i <= ( getViewIndex() - 1); i++)
-  {
-    for ( Int d = 0; d <= ( ( 1 << g_bitDepthY ) - 1 ); d++ )
-    {
-      Int offset =    ( codOffset  [ i ] << g_bitDepthY ) + ( ( 1 << log2Div ) >> 1 );         
-      m_depthToDisparityB[ i ][ d ] = ( codScale [ i ] * d + offset ) >> log2Div; 
-
-      Int invOffset = ( invCodOffset[ i ] << g_bitDepthY ) + ( ( 1 << log2Div ) >> 1 );         
-      m_depthToDisparityF[ i ][ d ] = ( invCodScale[ i ] * d + invOffset ) >> log2Div; 
-    }
-  }
-#endif
 }
 #endif
@@ -4222 +4092 @@
   Bool depthFlag = getIsDepth();
 
-#if !HHI_INTER_COMP_PRED_K0052
-  Bool depthOfRefViewsAvailFlag = false; 
-  Bool textOfCurViewAvailFlag = false; 
-
-  TComVPS* vps = getVPS(); 
-
-  if( !depthFlag )
-  {
-    depthOfRefViewsAvailFlag = true;
-    for( Int i = 0; i <= vps->getNumRefListLayers( getLayerId() ) - 1; i++)
-    {
-      Bool curDepthAvailableFlag = false;    
-      for (Int j = 0; j <= vps->getMaxLayersMinus1(); j++ )
-      {
-        if ( vps->getDirectDependencyFlag( vps->getLayerIdInVps( getLayerId() ), j )
-          && vps->getVpsDepthFlag        ( vps->getLayerIdInNuh( j ) ) == 1
-          && vps->getViewOrderIdx( vps->getLayerIdInNuh( j ) ) == vps->getViewOrderIdx( vps->getIdRefListLayer( getLayerId(), i ) )
-          && vps->getDependencyId( vps->getLayerIdInNuh( j ) ) == 0
-          && vps->getAuxId       ( vps->getLayerIdInNuh( j ) ) == 0
-          )
-        {
-          curDepthAvailableFlag = true; 
-        }
-      }
-      if ( !curDepthAvailableFlag )
-      {
-        depthOfRefViewsAvailFlag = false; 
-      }    
-    }
-  }
-  else
-  {
-    for (Int j = 0; j <= vps->getMaxLayersMinus1(); j++ )
-    {
-      if ( vps->getDirectDependencyFlag( vps->getLayerIdInVps( getLayerId() ), j ) 
-        && vps->getVpsDepthFlag( vps->getLayerIdInNuh( j ) ) == 0
-        && vps->getViewOrderIdx( vps->getLayerIdInNuh( j ) ) == getViewIndex() 
-        && vps->getDependencyId( vps->getLayerIdInNuh( j ) ) == 0
-        && vps->getAuxId       ( vps->getLayerIdInNuh( j ) ) == 0
-        )
-      {        
-        textOfCurViewAvailFlag = true; 
-      }
-    }
-  }
-
-
-  Bool lidG0  = ( getLayerId() > 0 );
-  Bool nRLLG0 =  ( getVPS()->getNumRefListLayers( getLayerId() ) > 0 );     
-
-  TComSps3dExtension* sps3dExt = getSPS()->getSps3dExtension();
-
-  m_ivMvPredFlag           = sps3dExt->getIvMvPredFlag         ( depthFlag ) && lidG0 && nRLLG0                           ;                             
-  m_ivMvScalingFlag        = sps3dExt->getIvMvScalingFlag      ( depthFlag ) && lidG0                                    ;                             
-  m_ivResPredFlag          = sps3dExt->getIvResPredFlag        ( depthFlag ) && lidG0 && nRLLG0                           ;                               
-  m_depthRefinementFlag    = sps3dExt->getDepthRefinementFlag  ( depthFlag ) && lidG0           && depthOfRefViewsAvailFlag;                            
-  m_viewSynthesisPredFlag  = sps3dExt->getViewSynthesisPredFlag( depthFlag ) && lidG0 && nRLLG0 && depthOfRefViewsAvailFlag;                          
-  m_depthBasedBlkPartFlag  = sps3dExt->getDepthBasedBlkPartFlag( depthFlag ) && lidG0           && depthOfRefViewsAvailFlag;                          
-  m_mpiFlag                = sps3dExt->getMpiFlag              ( depthFlag ) && lidG0           &&   textOfCurViewAvailFlag;
-  m_intraContourFlag       = sps3dExt->getIntraContourFlag     ( depthFlag ) && lidG0           &&   textOfCurViewAvailFlag;
-  m_intraSdcWedgeFlag      = sps3dExt->getIntraSdcWedgeFlag    ( depthFlag ) && lidG0                                     ;                          
-  m_qtPredFlag             = sps3dExt->getQtPredFlag           ( depthFlag ) && lidG0           &&   textOfCurViewAvailFlag;
-  m_interSdcFlag           = sps3dExt->getInterSdcFlag         ( depthFlag ) && lidG0                                    ;  
-#if SEC_DEPTH_INTRA_SKIP_MODE_K0033
-  m_depthIntraSkipFlag     = sps3dExt->getDepthIntraSkipFlag   ( depthFlag ) && lidG0                                    ;                          
-#else
-  m_intraSingleFlag        = sps3dExt->getIntraSingleFlag      ( depthFlag ) && lidG0                                    ;                          
-#endif
-
-  m_subPbSize              = lidG0 ? ( 1 << ( sps3dExt->getLog2SubPbSizeMinus3   ( depthFlag ) + 3 ) ) : getSPS()->getMaxCUWidth();  
-  m_mpiSubPbSize           = 1 << ( sps3dExt->getLog2MpiSubPbSizeMinus3( depthFlag ) + 3 );
-#else
   Bool nRLLG0 =  ( getVPS()->getNumRefListLayers( getLayerId() ) > 0 );     
 
@@ -4301 +4099 @@
   m_ivMvScalingFlag        = sps3dExt->getIvMvScalingFlag      ( depthFlag )                                 ;                             
   m_ivResPredFlag          = sps3dExt->getIvResPredFlag        ( depthFlag ) && nRLLG0                       ;                               
-#if HHI_CAM_PARA_K0052
   m_depthRefinementFlag    = sps3dExt->getDepthRefinementFlag  ( depthFlag )           && getInCompPredFlag() && m_cpAvailableFlag;
   m_viewSynthesisPredFlag  = sps3dExt->getViewSynthesisPredFlag( depthFlag ) && nRLLG0 && getInCompPredFlag() && m_cpAvailableFlag;
-#else
-  m_depthRefinementFlag    = sps3dExt->getDepthRefinementFlag  ( depthFlag )           && getInCompPredFlag();                            
-  m_viewSynthesisPredFlag  = sps3dExt->getViewSynthesisPredFlag( depthFlag ) && nRLLG0 && getInCompPredFlag();                            
-#endif
   m_depthBasedBlkPartFlag  = sps3dExt->getDepthBasedBlkPartFlag( depthFlag )           && getInCompPredFlag();                          
   m_mpiFlag                = sps3dExt->getMpiFlag              ( depthFlag )           && getInCompPredFlag();
@@ -4319 +4112 @@
   m_mpiSubPbSize           =  1 << ( sps3dExt->getLog2MpiSubPbSizeMinus3( depthFlag ) + 3 );
 
-#endif
 
 #if H_3D_OUTPUT_ACTIVE_TOOLS
@@ -4325 +4117 @@
   std::cout << "DepthFlag:              :" << getIsDepth()             << std::endl;
   std::cout << "ViewOrderIdx:           :" << getViewIndex()           << std::endl;
-#if HHI_INTER_COMP_PRED_K0052
   std::cout << "InterCmpPredAvailableFlag:" << getInCmpPredAvailFlag() << std::endl;
   std::cout << "InterCompPredFlag       :"  << getInCompPredFlag()     << std::endl;
-  //std::cout << "TextOfCurViewAvailFlag  :" << textOfCurViewAvailFlag   << std::endl;
-#else
-  std::cout << "DepthOfRefViewsAvailFlag:" << depthOfRefViewsAvailFlag << std::endl;
-  std::cout << "TextOfCurViewAvailFlag  :" << textOfCurViewAvailFlag   << std::endl;
-#endif
   
   std::cout << "ivMvPredFlag            :" << m_ivMvPredFlag           << std::endl;
@@ -4345 +4131 @@
   std::cout << "qtPredFlag              :" << m_qtPredFlag             << std::endl;
   std::cout << "interSdcFlag            :" << m_interSdcFlag           << std::endl;
-#if SEC_DEPTH_INTRA_SKIP_MODE_K0033
   std::cout << "depthIntraSkipFlag      :" << m_depthIntraSkipFlag     << std::endl;    
-#else
-  std::cout << "intraSingleFlag         :" << m_intraSingleFlag        << std::endl;    
-#endif
   std::cout << "subPbSize               :" << m_subPbSize              << std::endl;
   std::cout << "mpiSubPbSize            :" << m_mpiSubPbSize           << std::endl;

branches/HTM-14.0-dev0/source/Lib/TLibCommon/TComSlice.h

@@ -914 +914 @@
   // VPS EXTENSION 2 SYNTAX ELEMENTS
 #if H_3D
-#if HHI_CAM_PARA_K0052  
   Int*        m_numCp;  
   Int**       m_cpRefVoi;
@@ -920 +919 @@
   Int         m_cpPrecision;
   Bool*       m_cpInSliceSegmentHeaderFlag;
-#else
-  UInt        m_uiCamParPrecision;
-  Bool*       m_bCamParInSliceHeader;
-  Bool*       m_bCamParPresent;
-#endif
   Int         ***m_aaaiCodedScale ;
   Int         ***m_aaaiCodedOffset;
 
-#if HHI_VIEW_ID_LIST_I5_J0107 ||  HHI_INTER_COMP_PRED_K0052
   std::vector<Int>  m_viewOIdxList;
-#endif
-#if HHI_INTER_COMP_PRED_K0052
   std::vector< std::vector<Bool> > m_viewCompLayerPresentFlag;
   std::vector< std::vector<Int>  > m_viewCompLayerId;
-#endif
 #endif
 
@@ -1163 +1153 @@
   Int     getNumViews()                                                    { return m_numViews; }
   Void    initNumViews();
-#if HHI_INTER_COMP_PRED_K0052
 #if H_3D
   Void   initViewCompLayer( )
@@ -1191 +1180 @@
     }
   };
-#endif
-#endif
-
-#if HHI_VIEW_ID_LIST_I5_J0107 || HHI_INTER_COMP_PRED_K0052
+
+
   Int     getViewOIdxList( Int i )                                         { return m_viewOIdxList[i]; }
-#if HHI_CAM_PARA_K0052
   std::vector<Int> getViewOIdxList( )                                               { return m_viewOIdxList; }
-#endif
-#endif
-
-#if HHI_INTER_COMP_PRED_K0052
-#if HHI_CAM_PARA_K0052
+
   Int     getVoiInVps( Int viewOIdx )                                      
-#else
-  Int     getInvViewOIdxList( Int viewOIdx )                                      
-#endif
   {    
     for ( Int i = 0; i < m_viewOIdxList.size(); i++ )
@@ -1219 +1198 @@
   };
 
-#if HHI_CAM_PARA_K0052
   Bool    getViewCompLayerPresentFlag (Int i, Bool d ) { return  m_viewCompLayerPresentFlag[ getVoiInVps(i) ][d]; }
   Bool    getViewCompLayerId          (Int i, Bool d ) { return  m_viewCompLayerId         [ getVoiInVps(i) ][d]; }
-#else
-  Bool    getViewCompLayerPresentFlag (Int i, Bool d ) { return  m_viewCompLayerPresentFlag[ getInvViewOIdxList(i) ][d]; }
-  Bool    getViewCompLayerId          (Int i, Bool d ) { return  m_viewCompLayerId         [ getInvViewOIdxList(i) ][d]; }
-#endif
 #endif
   Bool    getDependencyFlag( Int i, Int j )                                { return m_dependencyFlag[i][j]; }
@@ -1347 +1321 @@
   Void createCamPars(Int iNumViews);
   Void deleteCamPars();
-#if HHI_CAM_PARA_K0052
   Void initCamParaVPS( Int vOIdxInVps, Int numCp, Bool cpInSliceSegmentHeaderFlag, Int* cpRefVoi, Int** aaiScale, Int** aaiOffset ); 
-#else
-  Void initCamParaVPS      (  UInt uiViewIndex, Bool bCamParPresent = false, UInt uiCamParPrecision = 0, Bool bCamParSlice = false, Int** aaiScale = 0, Int** aaiOffset = 0 );
-#endif
-  
-#if HHI_CAM_PARA_K0052
+  
 
   Void setCpPrecision( Int  val ) { m_cpPrecision = val; } 
@@ -1403 +1372 @@
   Bool getCpPresentFlag( Int i, Int m )           { return m_cpPresentFlag[i][m]; }   
 
-#else
-  UInt getCamParPrecision    ()  { return m_uiCamParPrecision; }
-
-  Bool getCamParPresent      ( Int viewIndex )  { return m_bCamParPresent[viewIndex]; }
-  Void setCamParPresent      ( Int viewIndex, Bool val )  { m_bCamParPresent[viewIndex] = val; }
-  Bool hasCamParInSliceHeader( Int viewIndex )  { return m_bCamParInSliceHeader[viewIndex]; }
-  Void setHasCamParInSliceHeader( Int viewIndex, Bool b )  { m_bCamParInSliceHeader[viewIndex] = b; }
-#endif
 
 
@@ -1705 +1666 @@
       m_qtPredFlag            [d] = false; 
       m_interSdcFlag          [d] = false; 
-#if SEC_DEPTH_INTRA_SKIP_MODE_K0033
       m_depthIntraSkipFlag    [d] = false;   
-#else
-      m_intraSingleFlag       [d] = false; 
-#endif
     }
   }
@@ -1752 +1709 @@
   Bool getInterSdcFlag( Int d ) { return m_interSdcFlag[d]; } 
 
-#if SEC_DEPTH_INTRA_SKIP_MODE_K0033
   Void setDepthIntraSkipFlag( Int d, Bool flag ) { m_depthIntraSkipFlag[d] = flag; } 
   Bool getDepthIntraSkipFlag( Int d ) { return m_depthIntraSkipFlag[d]; } 
-#else
-  Void setIntraSingleFlag( Int d, Bool flag ) { m_intraSingleFlag[d] = flag; } 
-  Bool getIntraSingleFlag( Int d ) { return m_intraSingleFlag[d]; } 
-#endif
 
 private:
@@ -1775 +1727 @@
   Bool        m_qtPredFlag            [2];
   Bool        m_interSdcFlag          [2];
-#if SEC_DEPTH_INTRA_SKIP_MODE_K0033
   Bool        m_depthIntraSkipFlag    [2];  
-#else
-  Bool        m_intraSingleFlag       [2];  
-#endif
 };
 
@@ -1884 +1832 @@
 #if H_3D
   TComSps3dExtension m_sps3dExtension; 
-#if !HHI_CAM_PARA_K0052
-  UInt        m_uiCamParPrecision;
-  Bool        m_bCamParInSliceHeader;
-#endif
   Int         m_aaiCodedScale [2][MAX_NUM_LAYERS];
   Int         m_aaiCodedOffset[2][MAX_NUM_LAYERS];
@@ -2517 +2461 @@
   UInt                 m_nARPStepNum; 
   Int         m_aiFirstTRefIdx    [2]; 
-#if HHI_RES_PRED_K0052
   std::vector<Int> m_pocsInCurrRPSs; 
-#endif
 #endif
 #if H_3D_IC
@@ -2526 +2468 @@
 #endif
 #if H_3D
-#if HHI_INTER_COMP_PRED_K0052
   std::vector<Int> m_inCmpRefViewIdcs;
   Bool       m_inCmpPredAvailFlag; 
   Bool       m_inCmpPredFlag; 
-#endif
-#if HHI_CAM_PARA_K0052
   Bool       m_cpAvailableFlag; 
   Int        m_numViews; 
-#endif
   TComPic*   m_ivPicsCurrPoc [2][MAX_NUM_LAYERS];  
   Int**      m_depthToDisparityB; 
@@ -2540 +2478 @@
 #endif
 #endif
-#if SEC_DEPTH_INTRA_SKIP_MODE_K0033
   Bool      m_bApplyDIS;
-#else
-#if H_3D_SINGLE_DEPTH
-  Bool      m_bApplySingleDepthMode;
-#endif
-#endif
 #if H_3D_IC
   Int *m_aICEnableCandidate;
@@ -2565 +2497 @@
   Bool m_qtPredFlag           ;
   Bool m_interSdcFlag         ;
-#if SEC_DEPTH_INTRA_SKIP_MODE_K0033
   Bool m_depthIntraSkipFlag   ;
-#else
-  Bool m_intraSingleFlag      ;
-#endif
   Int  m_mpiSubPbSize         ; 
   Int  m_subPbSize            ; 
@@ -2637 +2565 @@
   Int       getRefPOC           ( RefPicList e, Int iRefIdx)    { return  m_aiRefPOCList[e][iRefIdx];   }
 #if H_3D
-#if HHI_INTER_COMP_PRED_K0052
   Bool      getInCmpPredAvailFlag( )                             { return m_inCmpPredAvailFlag;    } 
-#if HHI_CAM_PARA_K0052
   Bool      getCpAvailableFlag( )                             { return m_cpAvailableFlag;    } 
-#endif
   Bool      getInCompPredFlag( )                                 { return m_inCmpPredFlag;         }    
   Void      setInCompPredFlag( Bool b )                          { m_inCmpPredFlag = b;            }    
   Int       getInCmpRefViewIdcs( Int i )                         { return m_inCmpRefViewIdcs  [i]; }
   Int       getNumCurCmpLIds( )                                  { return (Int) m_inCmpRefViewIdcs.size(); } 
-#endif
   TComPic*  getIvPic            ( Bool depthFlag, Int viewIndex){ return  m_ivPicsCurrPoc[ depthFlag ? 1 : 0 ][ viewIndex ]; }
 #endif
@@ -2875 +2799 @@
   Void      setFirstTRefIdx        ( RefPicList e, Int i )         { m_aiFirstTRefIdx[e]    = i;      }
   Bool      getArpRefPicAvailable( RefPicList e, Int viewIdx) {return m_arpRefPicAvailable[e][getVPS()->getLayerIdInNuh(viewIdx, 0)]; }
-#if HHI_RES_PRED_K0052
   std::vector<Int> getPocsInCurrRPSs()                             { return m_pocsInCurrRPSs; }; 
-#endif
 #endif
   Void      setIsDepth            ( Bool isDepth )   { m_isDepth = isDepth; }
@@ -2886 +2808 @@
   Int*      getInvCodedScale      ()  { return m_aaiCodedScale [1]; }
   Int*      getInvCodedOffset     ()  { return m_aaiCodedOffset[1]; }
-#if HHI_CAM_PARA_K0052
   Void      setCpScale( Int j, Int  val ) { m_aaiCodedScale[0][j] = val; } 
   Int       getCpScale( Int j ) { return m_aaiCodedScale[0][j]; } 
@@ -2898 +2819 @@
   Void      setCpInvOff( Int j, Int  val ) { m_aaiCodedOffset[1][j] = val; } 
   Int       getCpInvOff( Int j ) { return m_aaiCodedOffset[1][j]; } 
-#endif
 
 #endif
@@ -2906 +2826 @@
   Void    setDepthToDisparityLUTs();
 
-#if HHI_CAM_PARA_K0052
   Int* getDepthToDisparityB( Int refViewIdx ) { return m_depthToDisparityB[ getVPS()->getVoiInVps( refViewIdx) ]; }; 
   Int* getDepthToDisparityF( Int refViewIdx ) { return m_depthToDisparityF[ getVPS()->getVoiInVps( refViewIdx) ]; }; 
-#else
-  Int* getDepthToDisparityB( Int refViewIdx ) { return m_depthToDisparityB[ refViewIdx ]; }; 
-  Int* getDepthToDisparityF( Int refViewIdx ) { return m_depthToDisparityF[ refViewIdx ]; }; 
-#endif
 #endif
 #if H_3D_IC
@@ -3015 +2930 @@
 #if H_3D
   // 3D-HEVC tool parameters
-#if HHI_INTER_COMP_PRED_K0052
   Void deriveInCmpPredAndCpAvailFlag()
   { 
@@ -3032 +2946 @@
     }
 
-#if HHI_CAM_PARA_K0052
     m_cpAvailableFlag = true;
     m_inCmpRefViewIdcs.clear();
-#endif
     Bool allRefCmpLayersAvailFlag = true;
 
@@ -3041 +2953 @@
     {      
       m_inCmpRefViewIdcs.push_back( getVPS()->getViewOrderIdx( curCmpLIds[ i ] ));
-#if HHI_CAM_PARA_K0052
       if( !getVPS()->getCpPresentFlag( getVPS()->getVoiInVps( getViewIndex() ),  getVPS()->getVoiInVps( m_inCmpRefViewIdcs[ i ] ) ) )
       {
         m_cpAvailableFlag = false;
       }
-#endif
       Bool refCmpCurLIdAvailFlag = false;
       if( getVPS()->getViewCompLayerPresentFlag( m_inCmpRefViewIdcs[ i ], !getIsDepth() ) )
@@ -3087 +2997 @@
   };
 
-#endif
 
   Void init3dToolParameters();   
-#if HHI_INTER_COMP_PRED_K0052
   Void checkInCompPredRefLayers()
   {
@@ -3105 +3013 @@
   };
 
-#endif
   Bool getIvMvPredFlag           ( ) { return m_ivMvPredFlag           ; };
   Bool getIvMvScalingFlag        ( ) { return m_ivMvScalingFlag        ; };
@@ -3117 +3024 @@
   Bool getQtPredFlag             ( ) { return m_qtPredFlag             ; };
   Bool getInterSdcFlag           ( ) { return m_interSdcFlag           ; };
-#if SEC_DEPTH_INTRA_SKIP_MODE_K0033
   Bool getDepthIntraSkipFlag     ( ) { return m_depthIntraSkipFlag     ; };
-#else
-  Bool getIntraSingleFlag        ( ) { return m_intraSingleFlag        ; };
-#endif
 
   Int  getMpiSubPbSize           ( ) { return m_mpiSubPbSize           ; }; 

branches/HTM-14.0-dev0/source/Lib/TLibCommon/TComWedgelet.cpp

@@ -177 +177 @@
 }
 
-#if SHARP_DMM_CLEAN_K0042
 Void TComWedgelet::generateWedgePatternByRotate(const TComWedgelet &rcWedge, Int rotate)
 {
@@ -210 +209 @@
   m_uiHeight = rcWedge.m_uiHeight;
 }
-#endif
 
 Void TComWedgelet::xGenerateWedgePattern()
@@ -228 +226 @@
   xDrawEdgeLine( uhXs, uhYs, uhXe, uhYe, pbTempPattern, iTempStride );
 
-#if SHARP_DMM_CLEAN_K0042
   Int shift = (m_eWedgeRes == HALF_PEL) ? 1 : 0;
   Int endPos = uhYe>>shift;
@@ -242 +239 @@
     m_pbPattern[k] = pbTempPattern[k];
   };
-#else
-  switch( m_uhOri )
-  {
-  case( 0 ): { for( UInt iX = 0;                 iX < uhXs;            iX++ ) { UInt iY = 0;                 while( pbTempPattern[(iY * iTempStride) + iX] == false ) { pbTempPattern[(iY * iTempStride) + iX] = true; iY++; } } } break;
-  case( 1 ): { for( UInt iY = 0;                 iY < uhYs;            iY++ ) { UInt iX = uiTempBlockSize-1; while( pbTempPattern[(iY * iTempStride) + iX] == false ) { pbTempPattern[(iY * iTempStride) + iX] = true; iX--; } } } break;
-  case( 2 ): { for( UInt iX = uiTempBlockSize-1; iX > uhXs;            iX-- ) { UInt iY = uiTempBlockSize-1; while( pbTempPattern[(iY * iTempStride) + iX] == false ) { pbTempPattern[(iY * iTempStride) + iX] = true; iY--; } } } break;
-  case( 3 ): { for( UInt iY = uiTempBlockSize-1; iY > uhYs;            iY-- ) { UInt iX = 0;                 while( pbTempPattern[(iY * iTempStride) + iX] == false ) { pbTempPattern[(iY * iTempStride) + iX] = true; iX++; } } } break;
-  case( 4 ): 
-    { 
-      if( (uhXs+uhXe) < uiTempBlockSize ) { for( UInt iY = 0; iY < uiTempBlockSize; iY++ ) { UInt iX = 0;                 while( pbTempPattern[(iY * iTempStride) + iX] == false ) { pbTempPattern[(iY * iTempStride) + iX] = true; iX++; } } }
-      else                                { for( UInt iY = 0; iY < uiTempBlockSize; iY++ ) { UInt iX = uiTempBlockSize-1; while( pbTempPattern[(iY * iTempStride) + iX] == false ) { pbTempPattern[(iY * iTempStride) + iX] = true; iX--; } } }
-    }
-    break;
-  case( 5 ): 
-    { 
-      if( (uhYs+uhYe) < uiTempBlockSize ) { for( UInt iX = 0; iX < uiTempBlockSize; iX++ ) { UInt iY = 0;                 while( pbTempPattern[(iY * iTempStride) + iX] == false ) { pbTempPattern[(iY * iTempStride) + iX] = true; iY++; } } }
-      else                                { for( UInt iX = 0; iX < uiTempBlockSize; iX++ ) { UInt iY = uiTempBlockSize-1; while( pbTempPattern[(iY * iTempStride) + iX] == false ) { pbTempPattern[(iY * iTempStride) + iX] = true; iY--; } } }
-    }
-  }
-
-  clear();
-  switch( m_eWedgeRes )
-  {
-  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
-    {
-      Int iStride = getStride();
-
-      UInt uiOffX, uiOffY;
-      switch( m_uhOri )
-      {
-      case( 0 ): { uiOffX = 0; uiOffY = 0; } break;
-      case( 1 ): { uiOffX = 1; uiOffY = 0; } break;
-      case( 2 ): { uiOffX = 1; uiOffY = 1; } break;
-      case( 3 ): { uiOffX = 0; uiOffY = 1; } break;
-      case( 4 ): 
-        { 
-          if( (uhXs+uhXe) < uiTempBlockSize ) { uiOffX = 0; uiOffY = 0; }
-          else                                { uiOffX = 1; uiOffY = 0; }
-        } 
-        break;
-      case( 5 ): 
-        { 
-          if( (uhYs+uhYe) < uiTempBlockSize ) { uiOffX = 0; uiOffY = 0; }
-          else                                { uiOffX = 0; uiOffY = 1; }
-        } 
-        break;
-      default:   { uiOffX = 0; uiOffY = 0; } break;
-      }
-
-      for(Int iY = 0; iY < m_uiHeight; iY++)
-      {
-        for(Int iX = 0; iX < m_uiWidth; iX++)
-        {
-          m_pbPattern[(iY * iStride) + iX] = pbTempPattern[(((iY<<1)+uiOffY) * iTempStride) + ((iX<<1)+uiOffX)];
-        }
-      }
-    }
-    break;
-  }
-#endif
 
   if( pbTempPattern )
@@ -345 +281 @@
   for( Int x = x0; x <= x1; x++ )
   {
-#if SHARP_DMM_CLEAN_K0042
     Int shift = (m_eWedgeRes == HALF_PEL) ? 1 : 0;
     Int stride = iPatternStride >> shift;
     if( steep ) { pbPattern[((x>>shift) * stride) + (y>>shift)] = true; }
     else        { pbPattern[((y>>shift) * stride) + (x>>shift)] = true; }
-#else
-    if( steep ) { pbPattern[(x * iPatternStride) + y] = true; }
-    else        { pbPattern[(y * iPatternStride) + x] = true; }
-#endif
 
     error += deltaerr;

branches/HTM-14.0-dev0/source/Lib/TLibCommon/TComWedgelet.h

@@ -124 +124 @@
   Bool*           getScaledPattern(UInt uiWidth);
 
-#if SHARP_DMM_CLEAN_K0042
   Void  generateWedgePatternByRotate(const TComWedgelet &rcWedge, Int rotate);
-#endif
   Void  setWedgelet( UChar uhXs, UChar uhYs, UChar uhXe, UChar uhYe, UChar uhOri, WedgeResolution eWedgeRes, Bool bIsCoarse = false );
   Void  findClosestAngle();

branches/HTM-14.0-dev0/source/Lib/TLibCommon/TypeDef.h

@@ -65 +65 @@
 #define H_3D          ( HEVC_EXT == 2)
 
-#if H_MV
-#define SONY_MV_V_CONST_C0078            1   // Control disparity vector search range via configuration file
-#define H_MV_FIX_CONF_WINDOW             1   
-#endif
-
-#define NTT_BUG_FIX_TK54    1
-#define BUG_FIX_TK65        1
-
-#define MTK_I0093           1
-
-#define RWTH_DBBP_NO_SATD_K0028       1
+
 /////////////////////////////////////////////////////////////////////////////////////////
 ///////////////////////////////////   MAJOR DEFINES   ///////////////////////////////////  
@@ -85 +75 @@
 
 #if H_3D
-#define SEC_DEPTH_INTRA_SKIP_MODE_K0033   1   // Depth intra skip mode
-
-#if SEC_DEPTH_INTRA_SKIP_MODE_K0033
-#define NEIGHBORING_PIX_AVAILABILITY_FIX  1
-#endif
-
-
 #define H_3D_QTLPC                        1   // OL_QTLIMIT_PREDCODING_B0068 //JCT3V-B0068
                                               // HHI_QTLPC_RAU_OFF_C0160 JCT3V-C0160 change 2: quadtree limitation and predictive coding switched off in random access units 
@@ -129 +112 @@
                                               // SHARP_ARP_CHROMA_I0104     
                                               // MTK_I0072_IVARP_SCALING_FIX
-#define SEC_ARP_VIEW_REF_CHECK_J0037      1   // Signaling iv_res_pred_weight_idx when the current slice has both view and temporal reference picture(s), JCT3V-J0037 item1
-
-#define SEC_ARP_REM_ENC_RESTRICT_K0035    1   // Removal of encoder restriction of ARP, JCT3V-K0035
+                                              // SEC_ARP_VIEW_REF_CHECK_J0037    Signaling iv_res_pred_weight_idx when the current slice has both view and temporal reference picture(s), JCT3V-J0037 item1
+                                              // SEC_ARP_REM_ENC_RESTRICT_K0035    Removal of encoder restriction of ARP, JCT3V-K0035
 
 #define H_3D_IC                           1   // Illumination Compensation, JCT3V-B0045, JCT3V-C0046, JCT3V-D0060
@@ -200 +182 @@
                                               // 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 SEC_SHIFTED_IVMC_POS_K0036        1   // Position Derivation for Shifted-IVMC, JCT3V-K0036
+                                              // SEC_SHIFTED_IVMC_POS_K0036    Position Derivation for Shifted-IVMC, JCT3V-K0036
 
 
 #define H_3D_TMVP                         1   // QC_TMVP_C0047 
                                               // Sony_M23639
-#if H_3D_TMVP
-#define H_3D_TMVP_SCALING_FIX_K0053       1   // QC/CY for K0053
-#endif
+                                              // H_3D_TMVP_SCALING_FIX_K0053       1   // QC/CY for K0053
+
 
 #define H_3D_DIM                          1   // DIM, Depth intra modes, includes:
@@ -249 +229 @@
                                               // MTK_DLT_CODING_FIX_H0091 
                                               // HS_DMM_SIGNALLING_I0120
-                                              // SHARP_DMM1_I0110 // LUT size reduction for DMM1 proposed in JCT3V-I0110 
+                                              // SHARP_DMM1_I0110 LUT size reduction for DMM1 proposed in JCT3V-I0110 
                                               // FAST_SDC_OFFSET_DECISION_I0084
                                               // SEPARATE_FLAG_I0085
@@ -256 +236 @@
                                               // MTK_DMM_SIM_J0035
                                               // MTK_J0033
-                                              // SHARP_DLT_SIMP_J0029              1   // DLT(DepthValue2Idx[]) table derivation cleanup
-
-#if !SEC_DEPTH_INTRA_SKIP_MODE_K0033
-#define H_3D_SINGLE_DEPTH                 1   // Single depth mode proposed in JCT3V-I0095
-                                              // HS_SP_SIMP_J0066
-                                              // SINGLE_DEPTH_SIMP_J0115           1 
-                                              // MTK_SINGLE_DEPTH_VPS_FLAG_J0060   1   // Add VPS control flags and remove slice header control flag for single depth, JCT3V-J0060
-#endif
+                                              // SHARP_DLT_SIMP_J0029 DLT(DepthValue2Idx[]) table derivation cleanup
+                                              // SHARP_DMM_CLEAN_K0042             1   // Generate DMM pattern with rotation 
+
 
 #define H_3D_INTER_SDC                    1   // INTER SDC, Inter simplified depth coding
@@ -269 +244 @@
                                               // SEC_INTER_SDC_G0101 Improved inter SDC with multiple DC candidates
 
-#define H_3D_SPIVMP                       1   // H_3D_SPIVMP    // JCT3V-F0110: Sub-PU level inter-view motion prediction
+#define H_3D_SPIVMP                       1   // H_3D_SPIVMP JCT3V-F0110: Sub-PU level inter-view motion prediction
                                               // SEC_SPIVMP_MCP_SIZE_G0077, Apply SPIVMP only to 2Nx2N partition, JCT3V-G0077
                                               // QC_SPIVMP_MPI_G0119 Sub-PU level MPI merge candidate
@@ -280 +255 @@
                                               // SEC_DBBP_FILTERING_H0104 
                                               // 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. 
-                                              // SEC_DBBP_EXPLICIT_SIG_I0077       1   // Remove the partition derivation and signal dbbp_flag only when the partition mode is 2NxN/Nx2N, JCT3V-I0077
+                                              // 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. 
+                                              // SEC_DBBP_EXPLICIT_SIG_I0077 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
-                                              // SEC_DBBP_VIEW_REF_CHECK_J0037     1   // Signaling dbbp_flag when the current slice has view reference picture(s), JCT3V-J0037 item4
-#define HS_DBBP_CLEAN_K0048     1 
+                                              // SHARP_DBBP_SIMPLE_FLTER_I0109 Simple condition and one dimensional filter for DBBP
+                                              // SEC_DBBP_DMM4_THRESHOLD_I0076 Simplification of threshold derivation for DBBP and DMM4, JCT3V-I0076
+                                              // SEC_DBBP_VIEW_REF_CHECK_J0037 Signaling dbbp_flag when the current slice has view reference picture(s), JCT3V-J0037 item4
+                                              // RWTH_DBBP_NO_SATD_K0028
+                                              // HS_DBBP_CLEAN_K0048
 
 #define H_3D_DDD                          1   // Disparity derived depth coding
                                               // LGE_DDD_REMOVAL_J0042_J0030 DDD removal
 
+#define H_3D_DIS                          1   // Depth intra skip 
+                                              // SEC_DEPTH_INTRA_SKIP_MODE_K0033  Depth intra skip mode
+
 #define H_3D_FCO                          0   // Flexible coding order for 3D
-#if H_3D_FCO
-#define H_3D_FCO                          1
-#endif
 
 #define H_3D_FAST_INTRA_SDC               1   // I0123
@@ -300 +276 @@
 // OTHERS
                                               // MTK_SONY_PROGRESSIVE_MV_COMPRESSION_E0170 // Progressive MV Compression, JCT3V-E0170
-#define H_3D_REN_MAX_DEV_OUT              0   // Output maximal possible shift deviation 
+
 #define H_3D_FAST_TEXTURE_ENCODING        1   // Fast merge mode decision and early CU determination for texture component of dependent view, JCT3V-E0173
                                               // MTK_FAST_TEXTURE_ENCODING_E0173
 #if H_3D_DIM
-#define H_3D_FAST_DEPTH_INTRA             1   // Fast DMM and RBC Mode Selection
+#define H_3D_FAST_DEPTH_INTRA             1   // Fast DMM Selection
                                               // SCU_HS_FAST_DEPTH_INTRA_E0238_HHIFIX
 #endif
 
 //HLS
-//HHI_DEPENDENCY_SIGNALLING_I1_J0107
-//HHI_TOOL_PARAMETERS_I2_J0107
-//HHI_VPS_3D_EXTENSION_I3_J0107
+                                             // HHI_DEPENDENCY_SIGNALLING_I1_J0107
+                                             // HHI_TOOL_PARAMETERS_I2_J0107
+                                             // HHI_VPS_3D_EXTENSION_I3_J0107
+                                             // HHI_INTER_COMP_PRED_K0052
+                                             // HHI_RES_PRED_K0052       
+                                             // HHI_CAM_PARA_K0052       
+                                             // H_3D_DIRECT_DEP_TYPE     
 
 // Rate Control
@@ -319 +299 @@
 #endif // H_3D
 
-
-
 /////////////////////////////////////////////////////////////////////////////////////////
 ///////////////////////////////////   DERIVED DEFINES ///////////////////////////////////  
 /////////////////////////////////////////////////////////////////////////////////////////
 
-// Fixes
-
-#define FIX_TICKET_95                          1   // pps_scaling_list_ref_layer_id parsing
-
 #if H_3D
 #define H_3D_DISABLE_CHROMA                    1 
-#define HHI_VIEW_ID_LIST_I5_J0107              0
-#define HHI_INTER_COMP_PRED_K0052              1
-#define HHI_RES_PRED_K0052                     1
-#define HHI_CAM_PARA_K0052                     1
-#define HHI_MOVE_SYN_K0052                     1
-#define H_3D_ANNEX_SELECTION_FIX               1
-#define H_3D_TMVP_FIX_TICKET_97                1
-#define H_3D_DIRECT_DEP_TYPE                   1
-#define H_3D_FIX_TMVP_SCALING_VIEW_ID          1
-#endif
-#define H_MV_FIX_REF_LAYER_PIC_FLAG            1
-#define H_MV_FIX_NUM_VIEWS                     1
 #define H_3D_OUTPUT_ACTIVE_TOOLS               0
-
-#if !SEC_DEPTH_INTRA_SKIP_MODE_K0033
-///// ***** SINGLE DEPTH MODE *********
-#if H_3D_SINGLE_DEPTH
-#define SINGLE_DEPTH_MODE_CAND_LIST_SIZE            2 // size of the sample candidate list
-
-#endif
 #endif
 
@@ -384 +339 @@
                                               // HHI_DEPTH_INTRA_SEARCH_RAU_C0160
                                               // LG_ZEROINTRADEPTHRESI_A0087
-#define SHARP_DMM_CLEAN_K0042             1   // Generate DMM pattern with rotation 
-
-#define TICKET083_IVPFLAG_FIX             1
-#define SHARP_SUBBLOCK_CLEAN_K0044        1   // Remove unused bipred restriction
 
 #endif
@@ -434 +385 @@
 // TBD: Check if integration is necessary. 
 
-#define H_MV_HLS_FIX                         1
+
 #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

branches/HTM-14.0-dev0/source/Lib/TLibDecoder/TDecCAVLC.cpp

@@ -39 +39 @@
 #include "SEIread.h"
 #include "TDecSlice.h"
-#if H_3D_ANNEX_SELECTION_FIX
+#if H_3D
 #include "TDecTop.h"
 #endif
@@ -93 +93 @@
 TDecCavlc::TDecCavlc()
 {
-#if !HHI_CAM_PARA_K0052
-#if H_3D
-  m_aaiTempScale            = new Int* [ MAX_NUM_LAYERS ];
-  m_aaiTempOffset           = new Int* [ MAX_NUM_LAYERS ];
-  for( UInt uiVId = 0; uiVId < MAX_NUM_LAYERS; uiVId++ )
-  {
-    m_aaiTempScale            [ uiVId ] = new Int [ MAX_NUM_LAYERS ];
-    m_aaiTempOffset           [ uiVId ] = new Int [ MAX_NUM_LAYERS ];
-  }
-#endif
-#endif
 }
 
 TDecCavlc::~TDecCavlc()
 {
-#if !HHI_CAM_PARA_K0052
-#if H_3D
-  for( UInt uiVId = 0; uiVId < MAX_NUM_LAYERS; uiVId++ )
-  {
-    delete [] m_aaiTempScale            [ uiVId ];
-    delete [] m_aaiTempOffset           [ uiVId ];
-  }
-  delete [] m_aaiTempScale;
-  delete [] m_aaiTempOffset;
-#endif
-#endif
 }
 
@@ -1048 +1026 @@
       READ_FLAG( uiCode, "qt_pred_flag" ); sps3dExt->setQtPredFlag( d, uiCode == 1 );
       READ_FLAG( uiCode, "inter_sdc_flag" ); sps3dExt->setInterSdcFlag( d, uiCode == 1 );
-#if SEC_DEPTH_INTRA_SKIP_MODE_K0033
       READ_FLAG( uiCode, "intra_skip_flag" ); sps3dExt->setDepthIntraSkipFlag( d, uiCode == 1 );
-#else
-      READ_FLAG( uiCode, "intra_single_flag" ); sps3dExt->setIntraSingleFlag( d, uiCode == 1 );
-#endif
     }
   }
@@ -1063 +1037 @@
   READ_FLAG( uiCode, "poc_reset_info_present_flag" ); pcPPS->setPocResetInfoPresentFlag( uiCode == 1 );
   READ_FLAG( uiCode, "pps_infer_scaling_list_flag" ); pcPPS->setPpsInferScalingListFlag( uiCode == 1 );
-#if FIX_TICKET_95
   if (pcPPS->getPpsInferScalingListFlag())
   {
   READ_CODE( 6, uiCode, "pps_scaling_list_ref_layer_id" ); pcPPS->setPpsScalingListRefLayerId( uiCode );
   }
-#else
-  READ_CODE( 6, uiCode, "pps_scaling_list_ref_layer_id" ); pcPPS->setPpsScalingListRefLayerId( uiCode );
-#endif
 
   UInt numRefLocOffsets;; 
@@ -1336 +1306 @@
   }
 
-#if HHI_INTER_COMP_PRED_K0052
 #if H_3D
   pcVPS->initViewCompLayer( ); 
-#endif
 #endif
 
@@ -1929 +1897 @@
 Void TDecCavlc::parseVPS3dExtension( TComVPS* pcVPS )
 {
-#if HHI_CAM_PARA_K0052
   UInt uiCode;   
   READ_UVLC( uiCode, "cp_precision"); pcVPS->setCpPrecision( uiCode ) ;
@@ -1959 +1926 @@
   }
   pcVPS->deriveCpPresentFlag(); 
-#else
-  UInt uiCode; 
-
-  UInt uiCamParPrecision = 0; 
-  Bool bCamParSlice      = false; 
-  Bool bCamParPresentFlag = false;
-
-  READ_UVLC( uiCamParPrecision, "cp_precision" );
-#if HHI_VIEW_ID_LIST_I5_J0107
-  for (Int n = 1; n < pcVPS->getNumViews(); n++)
-  {
-    Int viewIndex = pcVPS->getViewOIdxList( n ); 
-#else
-  for (UInt viewIndex=1; viewIndex<pcVPS->getNumViews(); viewIndex++)
-  {
-#endif
-    pcVPS->setCamParPresent         ( viewIndex, false );
-    pcVPS->setHasCamParInSliceHeader( viewIndex, false );
-    READ_FLAG( uiCode, "cp_present_flag[i]" );                  bCamParPresentFlag = ( uiCode == 1);
-    if ( bCamParPresentFlag )
-    {
-      READ_FLAG( uiCode, "cp_in_slice_segment_header_flag[i]" );          bCamParSlice = ( uiCode == 1);
-      if ( !bCamParSlice )
-      {
-#if HHI_VIEW_ID_LIST_I5_J0107
-        for( UInt m = 0; m < n; n++ )
-        {
-          Int uiBaseIndex = pcVPS->getViewOIdxList ( m ); 
-          Int iCode; 
-          READ_SVLC( iCode, "vps_cp_scale" );                m_aaiTempScale  [ uiBaseIndex ][ viewIndex ]   = iCode;
-          READ_SVLC( iCode, "vps_cp_off" );                  m_aaiTempOffset [ uiBaseIndex ][ viewIndex ]   = iCode;
-          READ_SVLC( iCode, "vps_cp_inv_scale_plus_scale" ); m_aaiTempScale  [ viewIndex   ][ uiBaseIndex ] = iCode - m_aaiTempScale [ uiBaseIndex ][ viewIndex ];
-          READ_SVLC( iCode, "vps_cp_inv_off_plus_off" );     m_aaiTempOffset [ viewIndex   ][ uiBaseIndex ] = iCode - m_aaiTempOffset[ uiBaseIndex ][ viewIndex ];
-        }
-      }
-      pcVPS->initCamParaVPS( viewIndex, bCamParPresentFlag, uiCamParPrecision, bCamParSlice, m_aaiTempScale, m_aaiTempOffset ); 
-#else
-        for( UInt uiBaseIndex = 0; uiBaseIndex < viewIndex; uiBaseIndex++ )
-        {
-          Int iCode; 
-          READ_SVLC( iCode, "vps_cp_scale" );                m_aaiTempScale  [ uiBaseIndex ][ viewIndex ]   = iCode;
-          READ_SVLC( iCode, "vps_cp_off" );                  m_aaiTempOffset [ uiBaseIndex ][ viewIndex ]   = iCode;
-          READ_SVLC( iCode, "vps_cp_inv_scale_plus_scale" ); m_aaiTempScale  [ viewIndex   ][ uiBaseIndex ] = iCode - m_aaiTempScale [ uiBaseIndex ][ viewIndex ];
-          READ_SVLC( iCode, "vps_cp_inv_off_plus_off" );     m_aaiTempOffset [ viewIndex   ][ uiBaseIndex ] = iCode - m_aaiTempOffset[ uiBaseIndex ][ viewIndex ];
-        }
-      }
-      pcVPS->initCamParaVPS( viewIndex, bCamParPresentFlag, uiCamParPrecision, bCamParSlice, m_aaiTempScale, m_aaiTempOffset ); 
-#endif
-    }
-  }
-#endif
 }
 #endif
@@ -2070 +1986 @@
 #endif
   rpcSlice->setSPS(sps);
-#if !HHI_INTER_COMP_PRED_K0052
-#if H_3D
-  rpcSlice->init3dToolParameters();
-#endif
-#endif
   rpcSlice->setPPS(pps);
   if( pps->getDependentSliceSegmentsEnabledFlag() && ( !firstSliceSegmentInPic ))
@@ -2468 +2379 @@
       }
     }
-#if HHI_INTER_COMP_PRED_K0052
 #if H_3D
     if ( getDecTop()->decProcAnnexI() )
@@ -2479 +2389 @@
       rpcSlice->init3dToolParameters(); 
     }
-#endif
 #endif
 #endif
@@ -2662 +2571 @@
     }
 #if H_3D_IC
-#if H_3D_ANNEX_SELECTION_FIX
     else if(    rpcSlice->getViewIndex() && ( rpcSlice->getSliceType() == P_SLICE || rpcSlice->getSliceType() == B_SLICE ) 
              && !rpcSlice->getIsDepth() && vps->getNumRefListLayers( layerId ) > 0 
              && getDecTop()->decProcAnnexI()
            )
-#else
-    else if( rpcSlice->getViewIndex() && ( rpcSlice->getSliceType() == P_SLICE || rpcSlice->getSliceType() == B_SLICE ) && !rpcSlice->getIsDepth() && vps->getNumRefListLayers( layerId ) > 0 )
-#endif
     {
       UInt uiCodeTmp = 0;
@@ -2766 +2671 @@
     rpcSlice->setLFCrossSliceBoundaryFlag( (uiCode==1)?true:false);
 
-#if HHI_CAM_PARA_K0052
 #if H_3D
     if ( getDecTop()->decProcAnnexI() )
@@ -2784 +2688 @@
     }
 #endif
-#endif
   }
   
@@ -2808 +2711 @@
   }
 
-#if !HHI_CAM_PARA_K0052
-#if H_3D
-#if H_3D_FCO
-  if( rpcSlice->getVPS()->hasCamParInSliceHeader( rpcSlice->getViewIndex() )  && rpcSlice->getIsDepth() )
-#else
-  if( rpcSlice->getVPS()->hasCamParInSliceHeader( rpcSlice->getViewIndex() )  && !rpcSlice->getIsDepth() )
-#endif
-  {
-    UInt uiViewIndex = rpcSlice->getViewIndex();
-    for( UInt uiBaseIndex = 0; uiBaseIndex < uiViewIndex; uiBaseIndex++ )
-    {
-      READ_SVLC( iCode, "cp_scale" );                m_aaiTempScale [ uiBaseIndex ][ uiViewIndex ] = iCode;
-      READ_SVLC( iCode, "cp_off" );                  m_aaiTempOffset[ uiBaseIndex ][ uiViewIndex ] = iCode;
-      READ_SVLC( iCode, "cp_inv_scale_plus_scale" ); m_aaiTempScale [ uiViewIndex ][ uiBaseIndex ] = iCode - m_aaiTempScale [ uiBaseIndex ][ uiViewIndex ];
-      READ_SVLC( iCode, "cp_inv_off_plus_off" );     m_aaiTempOffset[ uiViewIndex ][ uiBaseIndex ] = iCode - m_aaiTempOffset[ uiBaseIndex ][ uiViewIndex ];
-    }
-    rpcSlice->setCamparaSlice( m_aaiTempScale, m_aaiTempOffset );
-  }
-#endif
-#endif
 
   if(pps->getSliceHeaderExtensionPresentFlag())
@@ -3100 +2983 @@
   assert(0);
 }
-
-#if SEC_DEPTH_INTRA_SKIP_MODE_K0033
+#if H_3D
 Void TDecCavlc::parseDIS( TComDataCU* /*pcCU*/, UInt /*uiAbsPartIdx*/, UInt /*uiDepth*/ )
 {
   assert(0);
 }
-#else
-#if H_3D_SINGLE_DEPTH
-Void TDecCavlc::parseSingleDepthMode( TComDataCU* /*pcCU*/, UInt /*uiAbsPartIdx*/, UInt /*uiDepth*/ )
-{
-  assert(0);
-}
-#endif
 #endif
 

branches/HTM-14.0-dev0/source/Lib/TLibDecoder/TDecCAVLC.h

@@ -52 +52 @@
 // Class definition
 // ====================================================================================================================
-#if H_3D_ANNEX_SELECTION_FIX
+#if H_3D
 class TDecTop;
 #endif
-
 /// CAVLC decoder class
 class TDecCavlc : public SyntaxElementParser, public TDecEntropyIf
@@ -66 +65 @@
   void  parseShortTermRefPicSet            (TComSPS* pcSPS, TComReferencePictureSet* pcRPS, Int idx);
   
-
-#if !HHI_CAM_PARA_K0052
 #if H_3D
-  Int**    m_aaiTempScale;
-  Int**    m_aaiTempOffset;
-#endif
-#endif
-#if H_3D_ANNEX_SELECTION_FIX
   TDecTop*  m_decTop;
 #endif
@@ -118 +110 @@
   Void  parsePPS            ( TComPPS* pcPPS);
 #endif
-#if H_3D_ANNEX_SELECTION_FIX
+#if H_3D
   Void  setDecTop           ( TDecTop* decTop ) { m_decTop = decTop; }; 
 #endif
@@ -136 +128 @@
   
   Void  parseSkipFlag       ( TComDataCU* pcCU, UInt uiAbsPartIdx, UInt uiDepth );
-#if SEC_DEPTH_INTRA_SKIP_MODE_K0033
+#if H_3D
   Void  parseDIS            ( TComDataCU* pcCU, UInt uiAbsPartIdx, UInt uiDepth );
-#else
-#if H_3D_SINGLE_DEPTH
-  Void  parseSingleDepthMode        ( TComDataCU* pcCU, UInt uiAbsPartIdx, UInt uiDepth );
-#endif
 #endif
   Void  parseCUTransquantBypassFlag( TComDataCU* pcCU, UInt uiAbsPartIdx, UInt uiDepth );
@@ -182 +170 @@
   Void  parseScalingList               ( TComScalingList* scalingList );
   Void xDecodeScalingList    ( TComScalingList *scalingList, UInt sizeId, UInt listId);
-
-#if H_3D_ANNEX_SELECTION_FIX
+#if H_3D
   TDecTop*  getDecTop()      { return m_decTop; };
 #endif

branches/HTM-14.0-dev0/source/Lib/TLibDecoder/TDecCu.cpp

@@ -310 +310 @@
 #if H_3D_NBDV 
   DisInfo DvInfo; 
-#if !SEC_ARP_REM_ENC_RESTRICT_K0035
-  DvInfo.bDV = false;
-#endif
   DvInfo.m_acNBDV.setZero();
   DvInfo.m_aVIdxCan = 0;
@@ -347 +344 @@
       if( pcCU->getSlice()->getIsDepth())
       {
-#if SEC_ARP_REM_ENC_RESTRICT_K0035
         m_ppcCU[uiDepth]->getDispforDepth(0, 0, &DvInfo);
-#else
-        DvInfo.bDV = m_ppcCU[uiDepth]->getDispforDepth(0, 0, &DvInfo);
-#endif
       }
       else
@@ -359 +352 @@
       if( pcCU->getSlice()->getDepthBasedBlkPartFlag() )  //Notes from QC: please check the condition for DoNBDV. Remove this comment once it is done.
       {
-#if SEC_ARP_REM_ENC_RESTRICT_K0035
         m_ppcCU[uiDepth]->getDisMvpCandNBDV(&DvInfo, true);
-#else
-        DvInfo.bDV = m_ppcCU[uiDepth]->getDisMvpCandNBDV(&DvInfo, true);
-#endif
       }
       else
 #endif
       {
-#if SEC_ARP_REM_ENC_RESTRICT_K0035
         m_ppcCU[uiDepth]->getDisMvpCandNBDV(&DvInfo);
-#else
-        DvInfo.bDV = m_ppcCU[uiDepth]->getDisMvpCandNBDV(&DvInfo);
-#endif
       }
 #if H_3D_IV_MERGE
@@ -545 +530 @@
     return;
   }
-#if SEC_DEPTH_INTRA_SKIP_MODE_K0033
+#if H_3D
   m_pcEntropyDecoder->decodeDIS( pcCU, uiAbsPartIdx, uiDepth );
   if(!pcCU->getDISFlag(uiAbsPartIdx))
   {
-#else
-#if H_3D_SINGLE_DEPTH
-  m_pcEntropyDecoder->decodeSingleDepthMode( pcCU, uiAbsPartIdx, uiDepth );
-  if(!pcCU->getSingleDepthFlag(uiAbsPartIdx))
-  {
-#endif
 #endif
   m_pcEntropyDecoder->decodePredMode( pcCU, uiAbsPartIdx, uiDepth );
   m_pcEntropyDecoder->decodePartSize( pcCU, uiAbsPartIdx, uiDepth );
 
-#if !HHI_MOVE_SYN_K0052
-#if H_3D_DIM_SDC
-  m_pcEntropyDecoder->decodeSDCFlag( pcCU, uiAbsPartIdx, uiDepth );
-#endif
-#endif
   if (pcCU->isIntra( uiAbsPartIdx ) && pcCU->getPartitionSize( uiAbsPartIdx ) == SIZE_2Nx2N )
   {
@@ -570 +544 @@
     if(pcCU->getIPCMFlag(uiAbsPartIdx))
     {
-#if HHI_MOVE_SYN_K0052
 #if H_3D_DIM_SDC
       m_pcEntropyDecoder->decodeSDCFlag( pcCU, uiAbsPartIdx, uiDepth );
-#endif
 #endif
       xFinishDecodeCU( pcCU, uiAbsPartIdx, uiDepth, ruiIsLast );
@@ -593 +565 @@
   m_pcEntropyDecoder->decodeCoeff( pcCU, uiAbsPartIdx, uiDepth, uiCurrWidth, uiCurrHeight, bCodeDQP );
   setdQPFlag( bCodeDQP );
-#if SEC_DEPTH_INTRA_SKIP_MODE_K0033
-  }
-#else
-#if H_3D_SINGLE_DEPTH
-  }
-#endif
+#if H_3D
+  }
 #endif
   xFinishDecodeCU( pcCU, uiAbsPartIdx, uiDepth, ruiIsLast );
@@ -688 +656 @@
       break;
     case MODE_INTRA:
-#if SEC_DEPTH_INTRA_SKIP_MODE_K0033
+#if H_3D
       if( m_ppcCU[uiDepth]->getDISFlag(0) )
       {
@@ -700 +668 @@
 #endif
       else
-#else
-#if H_3D_SINGLE_DEPTH
-      if( m_ppcCU[uiDepth]->getSingleDepthFlag(0) )
-        xReconIntraSingleDepth( m_ppcCU[uiDepth], 0, uiDepth );
-#if H_3D_DIM_SDC
-      else if( m_ppcCU[uiDepth]->getSDCFlag(0) )
-        xReconIntraSDC( m_ppcCU[uiDepth], 0, uiDepth );
-#endif
-      else
-#else
-#if H_3D_DIM_SDC
-      if( m_ppcCU[uiDepth]->getSDCFlag(0) )
-        xReconIntraSDC( m_ppcCU[uiDepth], 0, uiDepth );
-      else
-#endif
-#endif
 #endif
       xReconIntraQT( m_ppcCU[uiDepth], uiDepth );
@@ -751 +703 @@
 }
 
-#if SEC_DEPTH_INTRA_SKIP_MODE_K0033
+#if H_3D
 Void TDecCu::xReconDIS( TComDataCU* pcCU, UInt uiAbsPartIdx, UInt uiDepth )
 {
@@ -828 +780 @@
   }
 }
-#else
-#if H_3D_SINGLE_DEPTH
-Void TDecCu::xReconIntraSingleDepth( TComDataCU* pcCU, UInt uiAbsPartIdx, UInt uiDepth )
-{
-  UInt uiWidth        = pcCU->getWidth  ( 0 );
-  UInt uiHeight       = pcCU->getHeight ( 0 );
-
-  TComYuv* pcRecoYuv  = m_ppcYuvReco[uiDepth];
-
-  UInt    uiStride    = pcRecoYuv->getStride  ();
-  Pel*    piReco      = pcRecoYuv->getLumaAddr( uiAbsPartIdx );
-
-
-  AOF( uiWidth == uiHeight );
-  AOF( uiAbsPartIdx == 0 );
-
-  //construction of depth candidates
-  Pel testDepth;
-  Pel DepthNeighbours[2];
-  Int index =0;
-  for( Int i = 0; (i < 2) && (index<SINGLE_DEPTH_MODE_CAND_LIST_SIZE) ; i++ )
-  {
-    if(!pcCU->getNeighDepth (0, uiAbsPartIdx, &testDepth, i))
-    {
-      continue;
-    }
-    DepthNeighbours[index]=testDepth;
-    index++;
-  }
-
-  if(index==0)
-  {
-    DepthNeighbours[index]=1<<(g_bitDepthY-1);
-    index++;
-  }
-
-  if(index==1)
-  {
-    DepthNeighbours[index]=ClipY(DepthNeighbours[0] + 1 );
-    index++;
-  }
-
-  for( UInt uiY = 0; uiY < uiHeight; uiY++ )
-  {
-    for( UInt uiX = 0; uiX < uiWidth; uiX++ )
-    {
-      piReco[ uiX ] =DepthNeighbours[(Int)pcCU->getSingleDepthValue(uiAbsPartIdx)];
-    }
-    piReco     += uiStride;
-  }
-
-  // clear UV
-  UInt  uiStrideC     = pcRecoYuv->getCStride();
-  Pel   *pRecCb       = pcRecoYuv->getCbAddr();
-  Pel   *pRecCr       = pcRecoYuv->getCrAddr();
-
-  for (Int y=0; y<uiHeight/2; y++)
-  {
-    for (Int x=0; x<uiWidth/2; x++)
-    {
-      pRecCb[x] = 1<<(g_bitDepthC-1);
-      pRecCr[x] = 1<<(g_bitDepthC-1);
-    }
-
-    pRecCb += uiStrideC;
-    pRecCr += uiStrideC;
-  }
-}
-#endif
-#endif
-
+#endif
 #if H_3D_INTER_SDC
 Void TDecCu::xReconInterSDC( TComDataCU* pcCU, UInt uiAbsPartIdx, UInt uiDepth )
@@ -962 +844 @@
   // compute mask by segmenting depth block
   Bool pMask[MAX_CU_SIZE*MAX_CU_SIZE];
-#if HS_DBBP_CLEAN_K0048
   Bool bValidMask = m_pcPrediction->getSegmentMaskFromDepth(pDepthPels, uiDepthStride, pcCU->getWidth(0), pcCU->getHeight(0), pMask, pcCU);
-#else
-  Bool bValidMask = m_pcPrediction->getSegmentMaskFromDepth(pDepthPels, uiDepthStride, pcCU->getWidth(0), pcCU->getHeight(0), pMask);
-#endif
   AOF(bValidMask);
   

branches/HTM-14.0-dev0/source/Lib/TLibDecoder/TDecCu.h

@@ -123 +123 @@
   Void setdQPFlag               ( Bool b )                { m_bDecodeDQP = b;           }
   Void xFillPCMBuffer           (TComDataCU* pCU, UInt depth);
-#if SEC_DEPTH_INTRA_SKIP_MODE_K0033
+#if H_3D
   Void xReconDIS               ( TComDataCU* pcCU, UInt uiAbsPartIdx, UInt uiDepth );
-#else
-#if H_3D_SINGLE_DEPTH
-  Void xReconIntraSingleDepth( TComDataCU* pcCU, UInt uiAbsPartIdx, UInt uiDepth );
-#endif
 #endif
 #if H_3D_DIM_SDC

branches/HTM-14.0-dev0/source/Lib/TLibDecoder/TDecEntropy.cpp

@@ -52 +52 @@
   m_pcEntropyDecoderIf->parseSkipFlag( pcCU, uiAbsPartIdx, uiDepth );
 }
-
-#if SEC_DEPTH_INTRA_SKIP_MODE_K0033
+#if H_3D
 Void TDecEntropy::decodeDIS( TComDataCU* pcCU, UInt uiAbsPartIdx, UInt uiDepth )
 {
@@ -63 +62 @@
   m_pcEntropyDecoderIf->parseDIS( pcCU, uiAbsPartIdx, uiDepth );
 }
-#else
-#if H_3D_SINGLE_DEPTH
-Void TDecEntropy::decodeSingleDepthMode( TComDataCU* pcCU, UInt uiAbsPartIdx, UInt uiDepth )
-{
-  if( !pcCU->getSlice()->getIntraSingleFlag() )
-  {
-    return;
-  }  
-
-  m_pcEntropyDecoderIf->parseSingleDepthMode( pcCU, uiAbsPartIdx, uiDepth );
-}
-#endif
 #endif
 
@@ -161 +148 @@
 {
   m_pcEntropyDecoderIf->parsePartSize( pcCU, uiAbsPartIdx, uiDepth );
-#if !HHI_MOVE_SYN_K0052  
-#if H_3D_DBBP
-if( pcCU->getSlice()->getDepthBasedBlkPartFlag() && (pcCU->getPartitionSize(uiAbsPartIdx) == SIZE_2NxN || pcCU->getPartitionSize(uiAbsPartIdx) == SIZE_Nx2N) && pcCU->getWidth(uiAbsPartIdx) > 8 && pcCU->getSlice()->getDefaultRefViewIdxAvailableFlag() )
-  {
-    decodeDBBPFlag(pcCU, uiAbsPartIdx, uiDepth);
-  }
-#endif
-#endif
 }
 
@@ -176 +155 @@
   {
     decodeIntraDirModeLuma  ( pcCU, uiAbsPartIdx, uiDepth );
-#if HHI_MOVE_SYN_K0052
+#if H_3D_DIM_SDC
     decodeSDCFlag   ( pcCU, uiAbsPartIdx, uiDepth );    
-#endif
-#if H_3D_DIM_SDC
 #if H_3D_DISABLE_CHROMA
-#if !HHI_MOVE_SYN_K0052
-    if(!pcCU->getSDCFlag(uiAbsPartIdx) && !pcCU->getSlice()->getIsDepth() )
-#else
     if(!pcCU->getSDCFlag(uiAbsPartIdx) && pcCU->getSlice()->getSPS()->getChromaFormatIdc() != 0  )
-#endif
 #else
     if(!pcCU->getSDCFlag(uiAbsPartIdx))
@@ -265 +238 @@
   pcSubCU->copyDVInfoFrom( pcCU, uiAbsPartIdx);
 #endif
-#if HHI_MOVE_SYN_K0052
+#if H_3D
   for ( UInt uiPartIdx = 0, uiSubPartIdx = uiAbsPartIdx; uiPartIdx < uiNumPU; uiPartIdx++, uiSubPartIdx += uiPUOffset )
   {
@@ -475 +448 @@
       decodeMergeIndex( pcCU, uiPartIdx, uiSubPartIdx, uiDepth );
       UInt uiMergeIndex = pcCU->getMergeIndex(uiSubPartIdx);
-#if H_3D_ARP
-      decodeARPW  ( pcCU, uiAbsPartIdx, uiDepth );
-#endif
-#if H_3D_IC
-      decodeICFlag( pcCU, uiAbsPartIdx, uiDepth );
-#endif
-#if H_3D_DBBP
       if ( pcCU->getSlice()->getPPS()->getLog2ParallelMergeLevelMinus2() && ePartSize != SIZE_2Nx2N && pcSubCU->getWidth( 0 ) <= 8 && pcCU->getDBBPFlag(uiAbsPartIdx) == false )
-#else
-      if ( pcCU->getSlice()->getPPS()->getLog2ParallelMergeLevelMinus2() && ePartSize != SIZE_2Nx2N && pcSubCU->getWidth( 0 ) <= 8 ) 
-#endif
       {
         pcSubCU->setPartSizeSubParts( SIZE_2Nx2N, 0, uiDepth );
         if ( !isMerged )
         {
-#if H_3D_VSP
-          Int vspFlag[MRG_MAX_NUM_CANDS_MEM];
-          memset(vspFlag, 0, sizeof(Int)*MRG_MAX_NUM_CANDS_MEM);
-#if H_3D_SPIVMP
-          memset(bSPIVMPFlag, false, sizeof(Bool)*MRG_MAX_NUM_CANDS_MEM);
-#endif
-          pcSubCU->initAvailableFlags();
-          pcSubCU->getInterMergeCandidates( 0, 0, cMvFieldNeighbours, uhInterDirNeighbours, numValidMergeCand);
-          pcSubCU->xGetInterMergeCandidates( 0, 0, cMvFieldNeighbours, uhInterDirNeighbours
-#if H_3D_SPIVMP
-            , pcMvFieldSP, puhInterDirSP
-#endif
-            , numValidMergeCand );
-          pcSubCU->buildMCL( cMvFieldNeighbours, uhInterDirNeighbours, vspFlag
-#if H_3D_SPIVMP
-            , bSPIVMPFlag
-#endif
-            , numValidMergeCand );
-          pcCU->setVSPFlagSubParts( vspFlag[uiMergeIndex], uiSubPartIdx, uiPartIdx, uiDepth );
-
-#else
-#if H_3D
-          pcSubCU->initAvailableFlags();
-          pcSubCU->getInterMergeCandidates( 0, 0, cMvFieldNeighbours, uhInterDirNeighbours, numValidMergeCand);
-          pcSubCU->xGetInterMergeCandidates( 0, 0, cMvFieldNeighbours, uhInterDirNeighbours, numValidMergeCand );
-
-#else
           pcSubCU->getInterMergeCandidates( 0, 0, cMvFieldNeighbours, uhInterDirNeighbours, numValidMergeCand );
-#endif
-#endif
           isMerged = true;
         }
@@ -527 +461 @@
       {
         uiMergeIndex = pcCU->getMergeIndex(uiSubPartIdx);
-#if H_3D_VSP
-        Int vspFlag[MRG_MAX_NUM_CANDS_MEM];
-        memset(vspFlag, 0, sizeof(Int)*MRG_MAX_NUM_CANDS_MEM);
-#if H_3D_SPIVMP
-        memset(bSPIVMPFlag, false, sizeof(Bool)*MRG_MAX_NUM_CANDS_MEM);
-#endif
-        pcSubCU->initAvailableFlags();
         pcSubCU->getInterMergeCandidates( uiSubPartIdx-uiAbsPartIdx, uiPartIdx, cMvFieldNeighbours, uhInterDirNeighbours, numValidMergeCand, uiMergeIndex );
-        pcSubCU->xGetInterMergeCandidates( uiSubPartIdx-uiAbsPartIdx, uiPartIdx, cMvFieldNeighbours, uhInterDirNeighbours
-#if H_3D_SPIVMP
-          , pcMvFieldSP, puhInterDirSP
-#endif
-          ,numValidMergeCand, uiMergeIndex );
-        pcSubCU->buildMCL( cMvFieldNeighbours, uhInterDirNeighbours, vspFlag
-#if H_3D_SPIVMP
-          , bSPIVMPFlag
-#endif
-          ,numValidMergeCand );
-        pcCU->setVSPFlagSubParts( vspFlag[uiMergeIndex], uiSubPartIdx, uiPartIdx, uiDepth );
-#else
-#if H_3D
-        pcSubCU->initAvailableFlags();
-        pcSubCU->getInterMergeCandidates( uiSubPartIdx-uiAbsPartIdx, uiPartIdx, cMvFieldNeighbours, uhInterDirNeighbours, numValidMergeCand, uiMergeIndex );
-        pcSubCU->xGetInterMergeCandidates( uiSubPartIdx-uiAbsPartIdx, uiPartIdx, cMvFieldNeighbours, uhInterDirNeighbours, numValidMergeCand, uiMergeIndex );
-#else
-        pcSubCU->getInterMergeCandidates( uiSubPartIdx-uiAbsPartIdx, uiPartIdx, cMvFieldNeighbours, uhInterDirNeighbours, numValidMergeCand, uiMergeIndex );
-#endif
-#endif
       }
       pcCU->setInterDirSubParts( uhInterDirNeighbours[uiMergeIndex], uiSubPartIdx, uiPartIdx, uiDepth );
@@ -567 +474 @@
           pcCU->getCUMvField( RefPicList( uiRefListIdx ) )->setAllMvd( cTmpMv, ePartSize, uiSubPartIdx, uiDepth, uiPartIdx );
           pcCU->getCUMvField( RefPicList( uiRefListIdx ) )->setAllMvField( cMvFieldNeighbours[ 2*uiMergeIndex + uiRefListIdx ], ePartSize, uiSubPartIdx, uiDepth, uiPartIdx );
-#if H_3D_VSP
-#if H_3D_DBBP
-          if( pcCU->getVSPFlag( uiSubPartIdx ) != 0 && !pcCU->getDBBPFlag( uiAbsPartIdx ) )
-#else
-          if( pcCU->getVSPFlag( uiSubPartIdx ) != 0 )
-#endif
-          {
-            if ( uhInterDirNeighbours[ uiMergeIndex ] & (1<<uiRefListIdx) )
-            {
-              UInt dummy;
-              Int vspSize;
-              Int width, height;
-              pcCU->getPartIndexAndSize( uiPartIdx, dummy, width, height, uiSubPartIdx, pcCU->getTotalNumPart()==256 );
-              pcCU->setMvFieldPUForVSP( pcCU, uiSubPartIdx, width, height, RefPicList( uiRefListIdx ), cMvFieldNeighbours[ 2*uiMergeIndex + uiRefListIdx ].getRefIdx(), vspSize );
-              pcCU->setVSPFlag( uiSubPartIdx, vspSize );
-            }
-          }
-#endif
-        }
-      }
-#if H_3D_SPIVMP
-      pcCU->setSPIVMPFlagSubParts(bSPIVMPFlag[uiMergeIndex], uiSubPartIdx, uiPartIdx, uiDepth );  
-      if (bSPIVMPFlag[uiMergeIndex] != 0)
-      {
-        Int iWidth, iHeight;
-        UInt uiIdx;
-        pcCU->getPartIndexAndSize( uiPartIdx, uiIdx, iWidth, iHeight, uiSubPartIdx, true );
-
-        UInt uiSPAddr;
-
-        Int iNumSPInOneLine, iNumSP, iSPWidth, iSPHeight;
-
-        pcCU->getSPPara(iWidth, iHeight, iNumSP, iNumSPInOneLine, iSPWidth, iSPHeight);
-
-        for (Int iPartitionIdx = 0; iPartitionIdx < iNumSP; iPartitionIdx++)
-        {
-          pcCU->getSPAbsPartIdx(uiSubPartIdx, iSPWidth, iSPHeight, iPartitionIdx, iNumSPInOneLine, uiSPAddr);
-          pcCU->setInterDirSP(puhInterDirSP[iPartitionIdx], uiSPAddr, iSPWidth, iSPHeight);
-          pcCU->getCUMvField( REF_PIC_LIST_0 )->setMvFieldSP(pcCU, uiSPAddr, pcMvFieldSP[2*iPartitionIdx], iSPWidth, iSPHeight);
-          pcCU->getCUMvField( REF_PIC_LIST_1 )->setMvFieldSP(pcCU, uiSPAddr, pcMvFieldSP[2*iPartitionIdx + 1], iSPWidth, iSPHeight);
-        }
-      }
-#endif
+        }
+      }
     }
     else
@@ -706 +572 @@
 }
 
-#if HHI_MOVE_SYN_K0052
+#if H_3D
 Void TDecEntropy::decodeMVPIdxPU( TComDataCU* pcSubCU, UInt uiPartAddr, UInt uiDepth, UInt uiPartIdx, RefPicList eRefList )
 {
@@ -753 +619 @@
   pcSubCU->getCUMvField( eRefList )->setAllMv(cMv, ePartSize, uiPartAddr, 0, uiPartIdx);
 }
-
 #else
 Void TDecEntropy::decodeMVPIdxPU( TComDataCU* pcSubCU, UInt uiPartAddr, UInt uiDepth, UInt uiPartIdx, RefPicList eRefList )
@@ -798 +663 @@
 }
 #endif
+
 Void TDecEntropy::xDecodeTransform( TComDataCU* pcCU, UInt offsetLuma, UInt offsetChroma, UInt uiAbsPartIdx, UInt uiDepth, UInt width, UInt height, UInt uiTrIdx, Bool& bCodeDQP, Int quadtreeTULog2MinSizeInCU)
 {
@@ -1131 +997 @@
 {
   pcCU->setSDCFlagSubParts( false, uiAbsPartIdx, uiDepth );
-#if HHI_MOVE_SYN_K0052
   if ( pcCU->isSkipped( uiAbsPartIdx ) )
   {
     return; 
   }
-#endif
 
 
@@ -1157 +1021 @@
 Void TDecEntropy::decodeDBBPFlag( TComDataCU* pcCU, UInt uiAbsPartIdx, UInt uiDepth )
 {
-#if HHI_MOVE_SYN_K0052
   if( pcCU->getSlice()->getDepthBasedBlkPartFlag() && (pcCU->getPartitionSize(uiAbsPartIdx) == SIZE_2NxN || pcCU->getPartitionSize(uiAbsPartIdx) == SIZE_Nx2N) && pcCU->getWidth(uiAbsPartIdx) > 8 && pcCU->getSlice()->getDefaultRefViewIdxAvailableFlag() )
   {
-#endif
     m_pcEntropyDecoderIf->parseDBBPFlag( pcCU, uiAbsPartIdx, uiDepth );
-#if HHI_MOVE_SYN_K0052
-  }
-#endif
+  }
 }
 #endif

branches/HTM-14.0-dev0/source/Lib/TLibDecoder/TDecEntropy.h

@@ -85 +85 @@
 public:
   virtual Void parseSkipFlag      ( TComDataCU* pcCU, UInt uiAbsPartIdx, UInt uiDepth ) = 0;
-#if SEC_DEPTH_INTRA_SKIP_MODE_K0033
+#if H_3D
   virtual Void parseDIS           ( TComDataCU* pcCU, UInt uiAbsPartIdx, UInt uiDepth ) = 0;
-#else
-#if H_3D_SINGLE_DEPTH
-  virtual Void parseSingleDepthMode       ( TComDataCU* pcCU, UInt uiAbsPartIdx, UInt uiDepth ) = 0;
-#endif
 #endif
   virtual Void parseCUTransquantBypassFlag( TComDataCU* pcCU, UInt uiAbsPartIdx, UInt uiDepth ) = 0;
@@ -152 +148 @@
   Void decodeMvdPU        ( TComDataCU* pcCU, UInt uiAbsPartIdx, UInt uiDepth, UInt uiPartIdx, RefPicList eRefList );
   Void decodeMVPIdxPU     ( TComDataCU* pcSubCU, UInt uiPartAddr, UInt uiDepth, UInt uiPartIdx, RefPicList eRefList );
-#if HHI_MOVE_SYN_K0052
-  Void decodeMvsAMVP       ( TComDataCU* pcSubCU, UInt uiPartAddr, UInt uiDepth, UInt uiPartIdx, RefPicList eRefList );
-#endif  
+#if H_3D
+  Void decodeMvsAMVP       ( TComDataCU* pcSubCU, UInt uiPartAddr, UInt uiDepth, UInt uiPartIdx, 
+RefPicList eRefList );
+#endif
   Void    setEntropyDecoder           ( TDecEntropyIf* p );
   Void    setBitstream                ( TComInputBitstream* p ) { m_pcEntropyDecoderIf->setBitstream(p);                    }
@@ -177 +174 @@
   Void decodeSplitFlag         ( TComDataCU* pcCU, UInt uiAbsPartIdx, UInt uiDepth );
   Void decodeSkipFlag          ( TComDataCU* pcCU, UInt uiAbsPartIdx, UInt uiDepth );
-#if SEC_DEPTH_INTRA_SKIP_MODE_K0033
+#if H_3D
   Void decodeDIS               ( TComDataCU* pcCU, UInt uiAbsPartIdx, UInt uiDepth ) ;
-#else
-#if H_3D_SINGLE_DEPTH
-  Void decodeSingleDepthMode ( TComDataCU* pcCU, UInt uiAbsPartIdx, UInt uiDepth ) ;
-#endif
 #endif
   Void decodeCUTransquantBypassFlag( TComDataCU* pcCU, UInt uiAbsPartIdx, UInt uiDepth );

branches/HTM-14.0-dev0/source/Lib/TLibDecoder/TDecGop.h

@@ -63 +63 @@
 // Class definition
 // ====================================================================================================================
-#if H_3D_ANNEX_SELECTION_FIX
+#if H_3D
 class TDecTop; 
 #endif
@@ -83 +83 @@
   TDecSlice*            m_pcSliceDecoder;
   TComLoopFilter*       m_pcLoopFilter;
-#if H_3D_ANNEX_SELECTION_FIX
+#if H_3D
   TDecTop*              m_decTop; 
 #endif

branches/HTM-14.0-dev0/source/Lib/TLibDecoder/TDecSbac.cpp

@@ -52 +52 @@
 , m_cCUSplitFlagSCModel       ( 1,             1,               NUM_SPLIT_FLAG_CTX            , m_contextModels + m_numContextModels, m_numContextModels )
 , m_cCUSkipFlagSCModel        ( 1,             1,               NUM_SKIP_FLAG_CTX             , m_contextModels + m_numContextModels, m_numContextModels)
-#if SEC_DEPTH_INTRA_SKIP_MODE_K0033
+#if H_3D
 , m_cCUDISFlagSCModel         ( 1,             1,               NUM_DIS_FLAG_CTX             , m_contextModels + m_numContextModels, m_numContextModels)
 , m_cCUDISTypeSCModel         ( 1,             1,               NUM_DIS_TYPE_CTX             , m_contextModels + m_numContextModels, m_numContextModels)
-#else
-#if H_3D_SINGLE_DEPTH
-, m_cCUSingleDepthFlagSCModel        ( 1,             1,               NUM_SINGLEDEPTH_FLAG_CTX             , m_contextModels + m_numContextModels, m_numContextModels)
-, m_cSingleDepthValueSCModel         ( 1,             1,               NUM_SINGLE_DEPTH_VALUE_DATA_CTX      , m_contextModels + m_numContextModels, m_numContextModels)
-#endif
 #endif
 , m_cCUMergeFlagExtSCModel    ( 1,             1,               NUM_MERGE_FLAG_EXT_CTX        , m_contextModels + m_numContextModels, m_numContextModels)
@@ -141 +136 @@
   m_cCUSplitFlagSCModel.initBuffer       ( sliceType, qp, (UChar*)INIT_SPLIT_FLAG );
   m_cCUSkipFlagSCModel.initBuffer        ( sliceType, qp, (UChar*)INIT_SKIP_FLAG );
-#if SEC_DEPTH_INTRA_SKIP_MODE_K0033
+#if H_3D
   m_cCUDISFlagSCModel.initBuffer         ( sliceType, qp, (UChar*)INIT_DIS_FLAG );
   m_cCUDISTypeSCModel.initBuffer         ( sliceType, qp, (UChar*)INIT_DIS_TYPE );
-#else
-#if H_3D_SINGLE_DEPTH
-  m_cCUSingleDepthFlagSCModel.initBuffer        ( sliceType, qp, (UChar*)INIT_SINGLEDEPTH_FLAG );
-  m_cSingleDepthValueSCModel.initBuffer         ( sliceType, qp, (UChar*)INIT_SINGLE_DEPTH_VALUE_DATA );
-#endif
 #endif
   m_cCUMergeFlagExtSCModel.initBuffer    ( sliceType, qp, (UChar*)INIT_MERGE_FLAG_EXT );
@@ -217 +207 @@
   m_cCUSplitFlagSCModel.initBuffer       ( eSliceType, iQp, (UChar*)INIT_SPLIT_FLAG );
   m_cCUSkipFlagSCModel.initBuffer        ( eSliceType, iQp, (UChar*)INIT_SKIP_FLAG );
-#if SEC_DEPTH_INTRA_SKIP_MODE_K0033
+#if H_3D
   m_cCUDISFlagSCModel.initBuffer         ( eSliceType, iQp, (UChar*)INIT_DIS_FLAG );
   m_cCUDISTypeSCModel.initBuffer         ( eSliceType, iQp, (UChar*)INIT_DIS_TYPE );
-#else
-#if H_3D_SINGLE_DEPTH
-  m_cCUSingleDepthFlagSCModel.initBuffer        ( eSliceType, iQp, (UChar*)INIT_SINGLEDEPTH_FLAG );
-  m_cSingleDepthValueSCModel.initBuffer         ( eSliceType, iQp, (UChar*)INIT_SINGLE_DEPTH_VALUE_DATA );
-#endif
 #endif
   m_cCUMergeFlagExtSCModel.initBuffer    ( eSliceType, iQp, (UChar*)INIT_MERGE_FLAG_EXT );
@@ -594 +579 @@
 #endif
 }
-
-#if SEC_DEPTH_INTRA_SKIP_MODE_K0033
+#if H_3D
 Void TDecSbac::parseDIS( TComDataCU* pcCU, UInt uiAbsPartIdx, UInt uiDepth )
 {
@@ -639 +623 @@
   }
 }
-#else
-#if H_3D_SINGLE_DEPTH
-Void TDecSbac::parseSingleDepthMode( TComDataCU* pcCU, UInt uiAbsPartIdx, UInt uiDepth )
-{
-  pcCU->setSingleDepthFlagSubParts( false,        uiAbsPartIdx, uiDepth );
-  UInt uiSymbol = 0;
-  m_pcTDecBinIf->decodeBin( uiSymbol, m_cCUSingleDepthFlagSCModel.get( 0, 0, 0 ) );
-  if( uiSymbol )
-  {
-    pcCU->setSingleDepthFlagSubParts( true,        uiAbsPartIdx, uiDepth );
-    pcCU->setSkipFlagSubParts( false,        uiAbsPartIdx, uiDepth );
-    pcCU->setSDCFlagSubParts( false,        uiAbsPartIdx, uiDepth );
-    pcCU->setPredModeSubParts( MODE_INTRA,  uiAbsPartIdx, uiDepth );
-    pcCU->setPartSizeSubParts( SIZE_2Nx2N, uiAbsPartIdx, uiDepth );
-    pcCU->setLumaIntraDirSubParts (DC_IDX, uiAbsPartIdx, uiDepth );
-    pcCU->setSizeSubParts( g_uiMaxCUWidth>>uiDepth, g_uiMaxCUHeight>>uiDepth, uiAbsPartIdx, uiDepth );
-    pcCU->setMergeFlagSubParts( false , uiAbsPartIdx, 0, uiDepth );
-    pcCU->setTrIdxSubParts(0, uiAbsPartIdx, uiDepth);
-    pcCU->setCbfSubParts(0, 1, 1, uiAbsPartIdx, uiDepth);
-
-    UInt absValDeltaDC = 0;
-
-    UInt uiUnaryIdx = 0;
-    UInt uiNumCand = SINGLE_DEPTH_MODE_CAND_LIST_SIZE;
-    if ( uiNumCand > 1 )
-    {
-      for( ; uiUnaryIdx < uiNumCand - 1; ++uiUnaryIdx )
-      {
-        UInt uiSymbol2 = 0;
-        if ( uiUnaryIdx==0 )
-        {
-          m_pcTDecBinIf->decodeBin( uiSymbol2, m_cSingleDepthValueSCModel.get( 0, 0, 0 ) );
-        }
-        else
-        {
-          m_pcTDecBinIf->decodeBinEP( uiSymbol2);
-        }
-        if( uiSymbol2 == 0 )
-        {
-          break;
-        }
-      }
-    }
-    absValDeltaDC = uiUnaryIdx;
-    pcCU->setSingleDepthValueSubParts((Pel)absValDeltaDC,uiAbsPartIdx, 0, uiDepth);
-  }
-}
-#endif
-#endif
-
+#endif
 /** parse merge flag
  * \param pcCU

branches/HTM-14.0-dev0/source/Lib/TLibDecoder/TDecSbac.h

@@ -125 +125 @@
   
   Void parseSkipFlag      ( TComDataCU* pcCU, UInt uiAbsPartIdx, UInt uiDepth );
-#if SEC_DEPTH_INTRA_SKIP_MODE_K0033
+#if H_3D
   Void parseDIS          ( TComDataCU* pcCU, UInt uiAbsPartIdx, UInt uiDepth );
-#else
-#if H_3D_SINGLE_DEPTH  
-  Void parseSingleDepthMode      ( TComDataCU* pcCU, UInt uiAbsPartIdx, UInt uiDepth );
-#endif
 #endif
   Void parseCUTransquantBypassFlag( TComDataCU* pcCU, UInt uiAbsPartIdx, UInt uiDepth );
@@ -182 +178 @@
   ContextModel3DBuffer m_cCUSplitFlagSCModel;
   ContextModel3DBuffer m_cCUSkipFlagSCModel;
-#if SEC_DEPTH_INTRA_SKIP_MODE_K0033
+#if H_3D
   ContextModel3DBuffer m_cCUDISFlagSCModel;
   ContextModel3DBuffer m_cCUDISTypeSCModel;
-#else
-#if H_3D_SINGLE_DEPTH
-  ContextModel3DBuffer m_cCUSingleDepthFlagSCModel;
-  ContextModel3DBuffer m_cSingleDepthValueSCModel;
-#endif
 #endif
   ContextModel3DBuffer m_cCUMergeFlagExtSCModel;

branches/HTM-14.0-dev0/source/Lib/TLibDecoder/TDecTop.cpp

@@ -76 +76 @@
   xDeleteArray( m_adBaseViewShiftLUT, MAX_NUM_LAYERS, MAX_NUM_LAYERS, 2 );
   xDeleteArray( m_aiBaseViewShiftLUT, MAX_NUM_LAYERS, MAX_NUM_LAYERS, 2 );
-#if HHI_CAM_PARA_K0052
   xDeleteArray( m_receivedIdc, m_vps->getNumViews() );
-#else
-  xDeleteArray( m_receivedIdc, m_uiMaxViewIndex + 1 );
-#endif
 }
 
@@ -95 +91 @@
   m_firstReceivedPoc        = -2; 
 
-#if HHI_CAM_PARA_K0052  
   for (Int i = 0; i <= vps->getMaxLayersMinus1(); i++)
   {
@@ -134 +129 @@
 }
 
-#else
-  m_uiMaxViewIndex            = -1; 
-  for (Int i = 0; i <= vps->getMaxLayersMinus1(); i++)
-  {
-    Int curViewIdx = m_vps->getViewIndex( m_vps->getLayerIdInNuh( i )); 
-    m_bCamParsVaryOverTime = m_bCamParsVaryOverTime || vps->hasCamParInSliceHeader( curViewIdx );
-    m_uiMaxViewIndex = std::max( m_uiMaxViewIndex, curViewIdx  ) ; 
-  }
-  assert( m_receivedIdc == NULL ); 
-  m_receivedIdc = new Int*[ m_uiMaxViewIndex + 1]; 
-  for (Int i = 0; i <= m_uiMaxViewIndex; i++)
-  {
-    m_receivedIdc[i] = new Int[ m_uiMaxViewIndex + 1 ]; 
-  }
-
-  xResetReceivedIdc( true ); 
-
-  for (Int viewIndex = 0; viewIndex <= m_uiMaxViewIndex ; viewIndex++ )
-  {
-    if (m_vps->getCamParPresent( viewIndex ) )
-    {    
-      if( !m_vps->hasCamParInSliceHeader( viewIndex ) ) 
-      {
-        for (Int baseViewIndex = 0; baseViewIndex < viewIndex ; baseViewIndex++ )
-        { 
-          m_receivedIdc   [ baseViewIndex ][ viewIndex ] = -1; 
-          m_aaiCodedScale [ baseViewIndex ][ viewIndex ] = m_vps->getCodedScale    (viewIndex) [ baseViewIndex ];
-          m_aaiCodedOffset[ baseViewIndex ][ viewIndex ] = m_vps->getCodedOffset   (viewIndex) [ baseViewIndex ];
-
-          m_receivedIdc   [ viewIndex ][ baseViewIndex ] = -1; 
-          m_aaiCodedScale [ viewIndex ][ baseViewIndex ] = m_vps->getInvCodedScale (viewIndex) [ baseViewIndex ];
-          m_aaiCodedOffset[ viewIndex ][ baseViewIndex ] = m_vps->getInvCodedOffset(viewIndex) [ baseViewIndex ];
-          xInitLUTs( baseViewIndex, viewIndex, m_aaiCodedScale[ baseViewIndex ][ viewIndex ], m_aaiCodedOffset[ baseViewIndex ][ viewIndex ], m_adBaseViewShiftLUT, m_aiBaseViewShiftLUT );
-          xInitLUTs( viewIndex, baseViewIndex, m_aaiCodedScale[ viewIndex ][ baseViewIndex ], m_aaiCodedOffset[ viewIndex ][ baseViewIndex ], m_adBaseViewShiftLUT, m_aiBaseViewShiftLUT );
-        }
-      }
-    }
-  }
-}
-
-#endif
 
 
@@ -181 +135 @@
 CamParsCollector::xResetReceivedIdc( Bool overWriteFlag )
 {
-#if HHI_CAM_PARA_K0052
   for (Int i = 0; i < m_vps->getNumViews(); i++)
   {  
     for (Int j = 0; j < m_vps->getNumViews(); j++)
     {
-#else
-  for (Int i = 0; i <= m_uiMaxViewIndex; i++)
-  {  
-    for (Int j = 0; j <= m_uiMaxViewIndex; j++)
-    {
-#endif
       if ( overWriteFlag ||  ( m_receivedIdc[i][j] != -1 ) )
       {
@@ -232 +179 @@
   CamParsCollector::xInitLUTs( UInt uiSourceView, UInt uiTargetView, Int iScale, Int iOffset, Double****& radLUT, Int****& raiLUT)
 {
-#if HHI_CAM_PARA_K0052
   Int     iLog2DivLuma   = m_uiBitDepthForLUT + m_vps->getCpPrecision() + 1 - m_iLog2Precision;   AOF( iLog2DivLuma > 0 );
-#else
-  Int     iLog2DivLuma   = m_uiBitDepthForLUT + m_vps->getCamParPrecision() + 1 - m_iLog2Precision;   AOF( iLog2DivLuma > 0 );
-#endif
   Int     iLog2DivChroma = iLog2DivLuma + 1;
 
@@ -313 +256 @@
   }
 
-#if HHI_CAM_PARA_K0052
   UInt voiInVps          = m_vps->getVoiInVps(pcSlice->getViewIndex());  
   if( m_vps->getCpInSliceSegmentHeaderFlag( voiInVps ) ) // check consistency of slice parameters here
@@ -348 +290 @@
     }
   }  
-#else
-  UInt uiViewIndex          = pcSlice->getViewIndex();  
-  if( m_vps->getCamParPresent( uiViewIndex ) )
-  {    
-    if( m_vps->hasCamParInSliceHeader( uiViewIndex ) ) // check consistency of slice parameters here
-    {   
-      for( UInt uiBaseViewIndex = 0; uiBaseViewIndex < uiViewIndex; uiBaseViewIndex++ )
-      {        
-        if ( m_receivedIdc[ uiViewIndex ][ uiBaseViewIndex ] != 0 )
-        {      
-          AOF( m_aaiCodedScale [ uiViewIndex ][ uiBaseViewIndex ] == pcSlice->getInvCodedScale () [ uiBaseViewIndex ] );
-          AOF( m_aaiCodedOffset[ uiViewIndex ][ uiBaseViewIndex ] == pcSlice->getInvCodedOffset() [ uiBaseViewIndex ] );
-        }
-        else
-        {          
-          m_receivedIdc   [ uiViewIndex ][ uiBaseViewIndex ]  = 1; 
-          m_aaiCodedScale [ uiViewIndex ][ uiBaseViewIndex ]  = pcSlice->getInvCodedScale () [ uiBaseViewIndex ];
-          m_aaiCodedOffset[ uiViewIndex ][ uiBaseViewIndex ]  = pcSlice->getInvCodedOffset() [ uiBaseViewIndex ];
-          xInitLUTs( uiViewIndex, uiBaseViewIndex, m_aaiCodedScale[ uiViewIndex ][ uiBaseViewIndex ], m_aaiCodedOffset[ uiViewIndex ][ uiBaseViewIndex ], m_adBaseViewShiftLUT, m_aiBaseViewShiftLUT);
-        }
-        if ( m_receivedIdc[ uiBaseViewIndex ][ uiViewIndex ] != 0 )
-        {      
-          AOF( m_aaiCodedScale [ uiBaseViewIndex ][ uiViewIndex ] == pcSlice->getCodedScale    () [ uiBaseViewIndex ] );
-          AOF( m_aaiCodedOffset[ uiBaseViewIndex ][ uiViewIndex ] == pcSlice->getCodedOffset   () [ uiBaseViewIndex ] );
-        }
-        else
-        {        
-          m_receivedIdc   [ uiBaseViewIndex ][ uiViewIndex ]  = 1; 
-          m_aaiCodedScale [ uiBaseViewIndex ][ uiViewIndex ]  = pcSlice->getCodedScale    () [ uiBaseViewIndex ];
-          m_aaiCodedOffset[ uiBaseViewIndex ][ uiViewIndex ]  = pcSlice->getCodedOffset   () [ uiBaseViewIndex ];
-          xInitLUTs( uiBaseViewIndex, uiViewIndex, m_aaiCodedScale[ uiBaseViewIndex ][ uiViewIndex ], m_aaiCodedOffset[ uiBaseViewIndex ][ uiViewIndex ], m_adBaseViewShiftLUT, m_aiBaseViewShiftLUT);
-        }
-      }
-    }
-  }
-#endif
 
 
@@ -408 +314 @@
     if( iPOC == m_firstReceivedPoc )
     {
-#if HHI_CAM_PARA_K0052
       fprintf( m_pCodedScaleOffsetFile, "#ViewOrderIdx     ViewIdVal\n" );
       fprintf( m_pCodedScaleOffsetFile, "#------------ -------------\n" );
@@ -436 +341 @@
                 m_aaiCodedScale [ baseVoiInVps ][ voiInVps ], 
                 m_aaiCodedOffset[ baseVoiInVps ][ voiInVps ], m_vps->getCpPrecision() );
-#else
-      fprintf( m_pCodedScaleOffsetFile, "#  ViewIndex       ViewId\n" );
-      fprintf( m_pCodedScaleOffsetFile, "#----------- ------------\n" );
-      for( UInt uiViewIndex = 0; uiViewIndex <= m_uiMaxViewIndex; uiViewIndex++ )
-      {
-        fprintf( m_pCodedScaleOffsetFile, "%12d %12d\n", uiViewIndex, m_vps->getViewIdVal( uiViewIndex ) );
-      }
-      fprintf( m_pCodedScaleOffsetFile, "\n\n");
-      fprintf( m_pCodedScaleOffsetFile, "# StartFrame     EndFrame   TargetView     BaseView   CodedScale  CodedOffset    Precision\n" );
-      fprintf( m_pCodedScaleOffsetFile, "#----------- ------------ ------------ ------------ ------------ ------------ ------------\n" );
-    }
-    if( iPOC == m_firstReceivedPoc || m_bCamParsVaryOverTime  )
-    {
-      Int iS = iPOC;
-      Int iE = ( m_bCamParsVaryOverTime ? iPOC : ~( 1 << 31 ) );
-#if HHI_CAM_PARA_K0052
-      for( UInt uiViewIndex = 0; uiViewIndex < m_vps->getNumViews(); uiViewIndex++ )
-      {
-        for( UInt uiBaseIndex = 0; uiBaseIndex < m_vps->getNumViews(); uiBaseIndex++ )
-#else
-      for( UInt uiViewIndex = 0; uiViewIndex <= m_uiMaxViewIndex; uiViewIndex++ )
-      {
-        for( UInt uiBaseIndex = 0; uiBaseIndex <= m_uiMaxViewIndex; uiBaseIndex++ )
-#endif
-        {
-          if( uiViewIndex != uiBaseIndex )
-          {
-            if ( m_receivedIdc[uiBaseIndex][uiViewIndex] != 0 )
-            {            
-#if HHI_CAM_PARA_K0052
-              fprintf( m_pCodedScaleOffsetFile, "%12d %12d %12d %12d %12d %12d %12d\n",
-                iS, iE, uiViewIndex, uiBaseIndex, m_aaiCodedScale[ uiBaseIndex ][ uiViewIndex ], m_aaiCodedOffset[ uiBaseIndex ][ uiViewIndex ], m_vps->getCpPrecision() );
-#else
-              fprintf( m_pCodedScaleOffsetFile, "%12d %12d %12d %12d %12d %12d %12d\n",
-                iS, iE, uiViewIndex, uiBaseIndex, m_aaiCodedScale[ uiBaseIndex ][ uiViewIndex ], m_aaiCodedOffset[ uiBaseIndex ][ uiViewIndex ], m_vps->getCamParPrecision() );
-#endif
-#endif
             }            
           }
@@ -556 +424 @@
   initROM();
 #endif
-#if H_3D_ANNEX_SELECTION_FIX
+#if H_3D
   m_cCavlcDecoder.setDecTop( this ); 
 #endif
@@ -867 +735 @@
 
 #endif
-#if H_3D
-#if !HHI_INTER_COMP_PRED_K0052
-  m_apcSlicePilot->init3dToolParameters();
-#endif
-#endif
   pps->setSPS(sps);
   pps->setNumSubstreams(pps->getEntropyCodingSyncEnabledFlag() ? ((sps->getPicHeightInLumaSamples() + sps->getMaxCUHeight() - 1) / sps->getMaxCUHeight()) * (pps->getNumTileColumnsMinus1() + 1) : 1);
@@ -1098 +961 @@
   xActivateParameterSets();
 
-#if SONY_MV_V_CONST_C0078
+#if H_MV
   //Check Multiview Main profile constraint in G.11.1.1
   //  When ViewOrderIdx[ i ] derived according to any active VPS is equal to 1 
@@ -1230 +1093 @@
   pcPic->setViewIndex( getViewIndex() );
   pcPic->setIsDepth  ( getIsDepth  () );
-#endif
-#endif
-#if HHI_RES_PRED_K0052
   pcSlice->setIvPicLists( m_ivPicLists );         
 #endif
+#endif
+
+
+
 
   if (bNextSlice)
@@ -1271 +1135 @@
 
 #if H_3D
-#if !HHI_RES_PRED_K0052
-    pcSlice->setIvPicLists( m_ivPicLists );         
-#endif
-
-#if HHI_INTER_COMP_PRED_K0052
     pcSlice->checkInCompPredRefLayers(); 
 #if H_3D_IV_MERGE
@@ -1284 +1143 @@
 #endif
 #endif    
-#else
-#if H_3D_IV_MERGE
-#if H_3D_FCO
-    //assert( !getIsDepth() );
-#else
-    assert( !getIsDepth() || ( pcSlice->getTexturePic() != 0 ) );
-#endif
-#endif    
-#endif
 #endif
 #if H_MV

branches/HTM-14.0-dev0/source/Lib/TLibDecoder/TDecTop.h

@@ -97 +97 @@
   TComVPS* m_vps; 
   Int**    m_receivedIdc; 
-#if!HHI_CAM_PARA_K0052
-  Int      m_uiMaxViewIndex; 
-#endif
   Int      m_lastPoc; 
   Int      m_firstReceivedPoc; 
@@ -244 +241 @@
   Bool                    m_isDepth;
   CamParsCollector*       m_pcCamParsCollector;
-#endif
-#if H_3D_ANNEX_SELECTION_FIX
   Int                     m_profileIdc;
 #endif
@@ -305 +300 @@
   Bool                    getIsDepth            ()               { return m_isDepth;    }
   Void                    setCamParsCollector( CamParsCollector* pcCamParsCollector ) { m_pcCamParsCollector = pcCamParsCollector; }
-#endif
-#if H_3D_ANNEX_SELECTION_FIX
+
   Void                    setProfileIdc()
   {        
@@ -331 +325 @@
   Bool                    decProcAnnexI()           { assert( m_profileIdc != -1 ); return ( m_profileIdc == 8); }    
 #endif
-
 #endif
 protected:

branches/HTM-14.0-dev0/source/Lib/TLibEncoder/TEncCavlc.cpp

@@ -40 +40 @@
 #include "SEIwrite.h"
 #include "../TLibCommon/TypeDef.h"
-#if H_3D_ANNEX_SELECTION_FIX
+#if H_3D
 #include "TEncTop.h"
 #endif
@@ -862 +862 @@
   WRITE_FLAG( pcPPS->getPocResetInfoPresentFlag( ) ? 1 : 0 , "poc_reset_info_present_flag" );
   WRITE_FLAG( pcPPS->getPpsInferScalingListFlag( ) ? 1 : 0 , "pps_infer_scaling_list_flag" );
-#if FIX_TICKET_95
   if (pcPPS->getPpsInferScalingListFlag())
   {
     WRITE_CODE( pcPPS->getPpsScalingListRefLayerId( ), 6, "pps_scaling_list_ref_layer_id" );
   }
-#else    
-  WRITE_CODE( pcPPS->getPpsScalingListRefLayerId( ), 6, "pps_scaling_list_ref_layer_id" );
-#endif
   WRITE_UVLC( 0, "num_ref_loc_offsets" );
   WRITE_FLAG( 0 , "colour_mapping_enabled_flag" );
@@ -901 +897 @@
       WRITE_FLAG( sps3dExt->getQtPredFlag( d ) ? 1 : 0 , "qt_pred_flag" );
       WRITE_FLAG( sps3dExt->getInterSdcFlag( d ) ? 1 : 0 , "inter_sdc_flag" );
-#if SEC_DEPTH_INTRA_SKIP_MODE_K0033
       WRITE_FLAG( sps3dExt->getDepthIntraSkipFlag( d ) ? 1 : 0 , "intra_skip_flag" );
-#else
-      WRITE_FLAG( sps3dExt->getIntraSingleFlag( d ) ? 1 : 0 , "intra_single_flag" );
-#endif
     }
   }
@@ -1614 +1606 @@
 Void TEncCavlc::codeVPS3dExtension( TComVPS* pcVPS )
 { 
-#if HHI_CAM_PARA_K0052
   WRITE_UVLC( pcVPS->getCpPrecision( ), "cp_precision" );
   for (Int n = 1; n < pcVPS->getNumViews(); n++)
@@ -1640 +1631 @@
     }
   }  
-#else
-  WRITE_UVLC( pcVPS->getCamParPrecision(), "cp_precision" );
-  for (UInt viewIndex=1; viewIndex<pcVPS->getNumViews(); viewIndex++)
-  {
-    WRITE_FLAG( pcVPS->getCamParPresent(viewIndex) ? 1 : 0, "cp_present_flag[i]" );
-    if ( pcVPS->getCamParPresent(viewIndex) )
-    {
-      WRITE_FLAG( pcVPS->hasCamParInSliceHeader(viewIndex) ? 1 : 0, "cp_in_slice_segment_header_flag[i]" );
-      if ( !pcVPS->hasCamParInSliceHeader(viewIndex) )
-      {
-        for( UInt uiIndex = 0; uiIndex < viewIndex; uiIndex++ )
-        {
-          WRITE_SVLC( pcVPS->getCodedScale    (viewIndex)[ uiIndex ],                                               "vps_cp_scale" );
-          WRITE_SVLC( pcVPS->getCodedOffset   (viewIndex)[ uiIndex ],                                               "vps_cp_off" );
-          WRITE_SVLC( pcVPS->getInvCodedScale (viewIndex)[ uiIndex ] + pcVPS->getCodedScale (viewIndex)[ uiIndex ], "vps_cp_inv_scale_plus_scale" );
-          WRITE_SVLC( pcVPS->getInvCodedOffset(viewIndex)[ uiIndex ] + pcVPS->getCodedOffset(viewIndex)[ uiIndex ], "vps_cp_inv_off_plus_off" );
-        }
-      }
-    }
-  }
-#endif
 }
 #endif
@@ -1945 +1915 @@
 #endif
 
-#if HHI_INTER_COMP_PRED_K0052
 #if H_3D      
   if( getEncTop()->decProcAnnexI() )
@@ -1954 +1923 @@
       }
   }
-#endif
 #endif
     if(pcSlice->getSPS()->getUseSAO())
@@ -2086 +2054 @@
     }
 #if H_3D_IC
-#if H_3D_ANNEX_SELECTION_FIX
     else if( pcSlice->getViewIndex() && ( pcSlice->getSliceType() == P_SLICE || pcSlice->getSliceType() == B_SLICE )
       && !pcSlice->getIsDepth() && vps->getNumRefListLayers( layerId ) > 0 
       && getEncTop()->decProcAnnexI()       
       )
-#else
-    else if( pcSlice->getViewIndex() && ( pcSlice->getSliceType() == P_SLICE || pcSlice->getSliceType() == B_SLICE ) && !pcSlice->getIsDepth() && vps->getNumRefListLayers( layerId ) > 0 )
-#endif
     {
       WRITE_FLAG( pcSlice->getApplyIC() ? 1 : 0, "slice_ic_enable_flag" );
@@ -2148 +2112 @@
       WRITE_FLAG(pcSlice->getLFCrossSliceBoundaryFlag()?1:0, "slice_loop_filter_across_slices_enabled_flag");
     }
-#if HHI_CAM_PARA_K0052
 #if H_3D
     if (getEncTop()->decProcAnnexI() )
@@ -2166 +2129 @@
     }
 #endif
-#endif
-  }
-
-#if !HHI_CAM_PARA_K0052  
-#if H_3D
-#if H_3D_FCO
-  if( pcSlice->getVPS()->hasCamParInSliceHeader( pcSlice->getViewIndex() ) && pcSlice->getIsDepth() )
-#else
-  if( pcSlice->getVPS()->hasCamParInSliceHeader( pcSlice->getViewIndex() ) && !pcSlice->getIsDepth() )
-#endif
-  {
-    for( UInt uiId = 0; uiId < pcSlice->getViewIndex(); uiId++ )
-    {
-      WRITE_SVLC( pcSlice->getCodedScale    ()[ uiId ],                                     "cp_scale" );
-      WRITE_SVLC( pcSlice->getCodedOffset   ()[ uiId ],                                     "cp_off" );
-      WRITE_SVLC( pcSlice->getInvCodedScale ()[ uiId ] + pcSlice->getCodedScale ()[ uiId ], "cp_inv_scale_plus_scale" );
-      WRITE_SVLC( pcSlice->getInvCodedOffset()[ uiId ] + pcSlice->getCodedOffset()[ uiId ], "cp_inv_off_plus_off" );
-    }
-  }
-#endif
-#endif
+  }
+
 
 
@@ -2532 +2476 @@
   assert(0);
 }
-
-#if SEC_DEPTH_INTRA_SKIP_MODE_K0033
+#if H_3D
 Void TEncCavlc::codeDIS( TComDataCU* pcCU, UInt uiAbsPartIdx )
 {
   assert(0);
 }
-#else
-#if H_3D_SINGLE_DEPTH
-Void TEncCavlc::codeSingleDepthMode( TComDataCU* pcCU, UInt uiAbsPartIdx )
-{
-  assert(0);
-}
-#endif
 #endif
 

branches/HTM-14.0-dev0/source/Lib/TLibEncoder/TEncCavlc.h

@@ -68 +68 @@
   TComSlice*    m_pcSlice;
   UInt          m_uiCoeffCost;
-#if H_3D_ANNEX_SELECTION_FIX
+#if H_3D
   TEncTop*      m_encTop; 
 #endif
@@ -129 +129 @@
   Void codeCUTransquantBypassFlag( TComDataCU* pcCU, UInt uiAbsPartIdx );
   Void codeSkipFlag      ( TComDataCU* pcCU, UInt uiAbsPartIdx );
-#if SEC_DEPTH_INTRA_SKIP_MODE_K0033
+#if H_3D
   Void codeDIS           ( TComDataCU* pcCU, UInt uiAbsPartIdx );
-#else
-#if H_3D_SINGLE_DEPTH
-  Void codeSingleDepthMode( TComDataCU* pcCU, UInt uiAbsPartIdx );
-#endif
 #endif
   Void codeMergeFlag     ( TComDataCU* pcCU, UInt uiAbsPartIdx );
@@ -187 +183 @@
   Void codeDFFlag       ( UInt uiCode, const Char *pSymbolName );
   Void codeDFSvlc       ( Int   iCode, const Char *pSymbolName );
-#if H_3D_ANNEX_SELECTION_FIX
+#if H_3D
   TEncTop* getEncTop()               { return m_encTop; };
   Void     setEncTop( TEncTop* et )  {  m_encTop = et; };

branches/HTM-14.0-dev0/source/Lib/TLibEncoder/TEncCfg.h

@@ -78 +78 @@
   Int m_interViewRefPosL[2][MAX_NUM_REF_PICS];  
 #endif
-#if HHI_INTER_COMP_PRED_K0052
+#if H_3D
   Bool m_interCompPredFlag;
 #endif
@@ -98 +98 @@
   , m_numActiveRefLayerPics(0)
 #endif
-#if HHI_INTER_COMP_PRED_K0052
 #if H_3D
   , m_interCompPredFlag(false)
-#endif
 #endif
   {
@@ -188 +186 @@
   Int       m_iSearchRange;                     //  0:Full frame
   Int       m_bipredSearchRange;
-#if SONY_MV_V_CONST_C0078
+#if H_MV
   Bool      m_bUseDisparitySearchRangeRestriction;
   Int       m_iVerticalDisparitySearchRange;
@@ -380 +378 @@
 
   //====== Camera Parameters ======
-#if !HHI_CAM_PARA_K0052
-  UInt      m_uiCamParPrecision;
-  Bool      m_bCamParInSliceHeader;
-  Int**     m_aaiCodedScale;
-  Int**     m_aaiCodedOffset;
-#endif
   TAppComCamPara* m_cameraParameters; 
   
@@ -418 +410 @@
   Bool      m_bUseQTL;
 #endif
-#if H_3D_ANNEX_SELECTION_FIX
+
   Int m_profileIdc;
-#endif
 
 #endif
@@ -435 +426 @@
   , m_isDepth(false)
   , m_bUseVSO(false)
-#if H_3D_ANNEX_SELECTION_FIX
   , m_profileIdc( -1 )
-#endif
 #endif
 #endif
@@ -522 +511 @@
   Void      setSearchRange                  ( Int   i )      { m_iSearchRange = i; }
   Void      setBipredSearchRange            ( Int   i )      { m_bipredSearchRange = i; }
-#if SONY_MV_V_CONST_C0078
+#if H_MV
   Void      setUseDisparitySearchRangeRestriction ( Bool   b )      { m_bUseDisparitySearchRangeRestriction = b; }
   Void      setVerticalDisparitySearchRange ( Int   i )      { m_iVerticalDisparitySearchRange = i; }
@@ -578 +567 @@
   Int       getFastSearch                   ()      { return  m_iFastSearch; }
   Int       getSearchRange                  ()      { return  m_iSearchRange; }
-#if SONY_MV_V_CONST_C0078
+#if H_MV
   Bool      getUseDisparitySearchRangeRestriction ()      { return  m_bUseDisparitySearchRangeRestriction; }
   Int       getVerticalDisparitySearchRange ()            { return  m_iVerticalDisparitySearchRange; }
@@ -923 +912 @@
 
  //==== CAMERA PARAMETERS  ==========
-#if !HHI_CAM_PARA_K0052
-  Void      setCamParPrecision              ( UInt  u )      { m_uiCamParPrecision      = u; }
-  Void      setCamParInSliceHeader          ( Bool  b )      { m_bCamParInSliceHeader   = b; }
-  Void      setCodedScale                   ( Int** p )      { m_aaiCodedScale          = p; }
-  Void      setCodedOffset                  ( Int** p )      { m_aaiCodedOffset         = p; }
-#endif
   Void      setCameraParameters             ( TAppComCamPara* c) { m_cameraParameters   = c; }
 
@@ -976 +959 @@
   Bool      getUseQTL                       ()         { return m_bUseQTL; }
 #endif
-#if H_3D_ANNEX_SELECTION_FIX
   Void                    setProfileIdc( Int a )    { assert( a == 1 || a == 6 || a == 8 ); m_profileIdc = a;  }
   Bool                    decProcAnnexI()           { assert( m_profileIdc != -1 ); return ( m_profileIdc == 8); }    
-#endif
 
 #endif // H_3D

branches/HTM-14.0-dev0/source/Lib/TLibEncoder/TEncCu.cpp

@@ -441 +441 @@
 #if H_3D_VSP
   DisInfo DvInfo; 
-#if !SEC_ARP_REM_ENC_RESTRICT_K0035
-  DvInfo.bDV = false;
-#endif
   DvInfo.m_acNBDV.setZero();
   DvInfo.m_aVIdxCan = 0;
@@ -589 +586 @@
           if (rpcTempCU->getSlice()->getIsDepth() )
           {
-#if SEC_ARP_REM_ENC_RESTRICT_K0035
             rpcTempCU->getDispforDepth(0, 0, &DvInfo);
-#else
-            DvInfo.bDV = rpcTempCU->getDispforDepth(0, 0, &DvInfo);
-#endif
           }
           else
@@ -600 +593 @@
 #if H_3D_NBDV_REF
           if( rpcTempCU->getSlice()->getDepthRefinementFlag() )
-#if SEC_ARP_REM_ENC_RESTRICT_K0035
             rpcTempCU->getDisMvpCandNBDV(&DvInfo, true);
-#else
-            DvInfo.bDV = rpcTempCU->getDisMvpCandNBDV(&DvInfo, true);
-#endif
           else
 #endif 
-#if SEC_ARP_REM_ENC_RESTRICT_K0035
             rpcTempCU->getDisMvpCandNBDV(&DvInfo);
-#else
-            DvInfo.bDV = rpcTempCU->getDisMvpCandNBDV(&DvInfo);
-#endif
 
 #if H_3D_IV_MERGE
@@ -730 +715 @@
     }
 #endif
-#if SEC_DEPTH_INTRA_SKIP_MODE_K0033
+#if H_3D
     rpcTempCU->initEstData( uiDepth, iMinQP, isAddLowestQP  );
     if( rpcBestCU->getSlice()->getDepthIntraSkipFlag() )
@@ -737 +722 @@
       rpcTempCU->initEstData( uiDepth, iMinQP, isAddLowestQP  );
     }
-#else
-#if H_3D_SINGLE_DEPTH
-    rpcTempCU->initEstData( uiDepth, iMinQP, isAddLowestQP  );
-    if( rpcBestCU->getSlice()->getIntraSingleFlag() )
-    {
-      xCheckRDCostSingleDepth( rpcBestCU, rpcTempCU, SIZE_2Nx2N );
-      rpcTempCU->initEstData( uiDepth, iMinQP, isAddLowestQP  );
-    }
-#endif
 #endif
     if(!earlyDetectionSkipMode)
@@ -1058 +1034 @@
           // speedup for inter frames
           if( rpcBestCU->getSlice()->getSliceType() == I_SLICE || 
-              rpcBestCU->getCbf( 0, TEXT_LUMA     ) != 0   ||
-              rpcBestCU->getCbf( 0, TEXT_CHROMA_U ) != 0   ||
-              rpcBestCU->getCbf( 0, TEXT_CHROMA_V ) != 0     
+            rpcBestCU->getCbf( 0, TEXT_LUMA     ) != 0   ||
+            rpcBestCU->getCbf( 0, TEXT_CHROMA_U ) != 0   ||
+            rpcBestCU->getCbf( 0, TEXT_CHROMA_V ) != 0     
 #if H_3D_DIM_ENC
-              || rpcBestCU->getSlice()->getIsDepth()
+            || rpcBestCU->getSlice()->getIsDepth()
 #endif
             ) // avoid very complex intra if it is unlikely
@@ -1068 +1044 @@
 #if H_3D_DIM
             Bool bOnlyIVP = false;
-#if TICKET083_IVPFLAG_FIX
             Bool bUseIVP = true;
-#endif
             if( rpcBestCU->getSlice()->getIsDepth() && !(rpcBestCU->getSlice()->isIRAP()) && 
-                rpcBestCU->getSlice()->getSliceType() != I_SLICE && 
-                rpcBestCU->getCbf( 0, TEXT_LUMA     ) == 0 &&
-                rpcBestCU->getCbf( 0, TEXT_CHROMA_U ) == 0 &&
-                rpcBestCU->getCbf( 0, TEXT_CHROMA_V ) == 0 
+              rpcBestCU->getSlice()->getSliceType() != I_SLICE && 
+              rpcBestCU->getCbf( 0, TEXT_LUMA     ) == 0 &&
+              rpcBestCU->getCbf( 0, TEXT_CHROMA_U ) == 0 &&
+              rpcBestCU->getCbf( 0, TEXT_CHROMA_V ) == 0 
               )
             { 
               bOnlyIVP = true;
-#if TICKET083_IVPFLAG_FIX
               bUseIVP = rpcBestCU->getSlice()->getIntraContourFlag();
-#endif
             }
-#if TICKET083_IVPFLAG_FIX
             if( bUseIVP )
             {
-#endif
-            xCheckRDCostIntra( rpcBestCU, rpcTempCU, SIZE_2Nx2N, bOnlyIVP );
+              xCheckRDCostIntra( rpcBestCU, rpcTempCU, SIZE_2Nx2N, bOnlyIVP );
 #else
             xCheckRDCostIntra( rpcBestCU, rpcTempCU, SIZE_2Nx2N );
@@ -1120 +1090 @@
 #endif
             }
-#if TICKET083_IVPFLAG_FIX
+#if H_3D
           }
 #endif
-          }
+        }
         // test PCM
         if(pcPic->getSlice(0)->getSPS()->getUsePCM()
@@ -1607 +1577 @@
     return;
   }
-#if SEC_DEPTH_INTRA_SKIP_MODE_K0033
+#if H_3D
   m_pcEntropyCoder->encodeDIS( pcCU, uiAbsPartIdx );
   if(!pcCU->getDISFlag(uiAbsPartIdx))
-  {
-#else
-#if H_3D_SINGLE_DEPTH
-  m_pcEntropyCoder->encodeSingleDepthMode( pcCU, uiAbsPartIdx );
-  if(!pcCU->getSingleDepthFlag(uiAbsPartIdx))
-  {
-#endif
-#endif
+#endif
+  {
   m_pcEntropyCoder->encodePredMode( pcCU, uiAbsPartIdx );
   
   m_pcEntropyCoder->encodePartSize( pcCU, uiAbsPartIdx, uiDepth );
   
-#if !HHI_MOVE_SYN_K0052
-#if H_3D_DIM_SDC
-  m_pcEntropyCoder->encodeSDCFlag( pcCU, uiAbsPartIdx, false );
-#endif
-#endif
   if (pcCU->isIntra( uiAbsPartIdx ) && pcCU->getPartitionSize( uiAbsPartIdx ) == SIZE_2Nx2N )
   {
@@ -1632 +1591 @@
     if(pcCU->getIPCMFlag(uiAbsPartIdx))
     {
-#if HHI_MOVE_SYN_K0052
 #if H_3D_DIM_SDC
       m_pcEntropyCoder->encodeSDCFlag( pcCU, uiAbsPartIdx, false );
 #endif  
-#endif
       // Encode slice finish
       finishCU(pcCU,uiAbsPartIdx,uiDepth);
@@ -1645 +1602 @@
   // prediction Info ( Intra : direction mode, Inter : Mv, reference idx )
   m_pcEntropyCoder->encodePredInfo( pcCU, uiAbsPartIdx );
-#if HHI_MOVE_SYN_K0052
   m_pcEntropyCoder->encodeDBBPFlag( pcCU, uiAbsPartIdx );
 #if H_3D_DIM_SDC
   m_pcEntropyCoder->encodeSDCFlag( pcCU, uiAbsPartIdx, false );
 #endif  
-#endif
 #if H_3D_ARP
   m_pcEntropyCoder->encodeARPW( pcCU , uiAbsPartIdx );
@@ -1665 +1620 @@
 #endif
   setdQPFlag( bCodeDQP );
-#if SEC_DEPTH_INTRA_SKIP_MODE_K0033
-  }
-#else
-#if H_3D_SINGLE_DEPTH
-  }
-#endif
+#if H_3D
+  }
 #endif
   // --- write terminating bit ---
@@ -1889 +1840 @@
 #if H_3D_ARP
   Int nARPWMax = rpcTempCU->getSlice()->getARPStepNum() - 1;
-#if SEC_ARP_REM_ENC_RESTRICT_K0035
   if( nARPWMax < 0 || bICFlag )
-#else
-  if( nARPWMax < 0 || !rpcTempCU->getDvInfo(0).bDV || bICFlag )
-#endif
   {
     nARPWMax = 0;
@@ -2059 +2006 @@
 
           rpcTempCU->setSkipFlagSubParts( rpcTempCU->getQtRootCbf(0) == 0, 0, uhDepth );
-#if SEC_DEPTH_INTRA_SKIP_MODE_K0033
+#if H_3D
           rpcTempCU->setDISFlagSubParts( false, 0, uhDepth );
-#else
-#if H_3D_SINGLE_DEPTH
-          rpcTempCU->setSingleDepthFlagSubParts( false, 0, uhDepth );
-#endif
 #endif
 #if H_3D_VSP // possible bug fix
@@ -2105 +2048 @@
               }
               rpcTempCU->setSkipFlagSubParts( false, 0, uhDepth );
-#if SEC_DEPTH_INTRA_SKIP_MODE_K0033
+#if H_3D
               rpcTempCU->setDISFlagSubParts( false, 0, uhDepth );
-#else
-#if H_3D_SINGLE_DEPTH
-              rpcTempCU->setSingleDepthFlagSubParts( false, 0, uhDepth );
-#endif
 #endif
               rpcTempCU->setTrIdxSubParts( 0, 0, uhDepth );
@@ -2233 +2172 @@
   Bool bFirstTime = true;
   Int nARPWMax    = rpcTempCU->getSlice()->getARPStepNum() - 1;
-#if SEC_ARP_REM_ENC_RESTRICT_K0035
   if( nARPWMax < 0 || ePartSize != SIZE_2Nx2N || rpcTempCU->getICFlag(0) )
-#else
-  if( nARPWMax < 0 || ePartSize != SIZE_2Nx2N || !rpcTempCU->getDvInfo(0).bDV || rpcTempCU->getICFlag(0) )
-#endif
   {
     nARPWMax = 0;
@@ -2263 +2198 @@
   
   rpcTempCU->setSkipFlagSubParts( false, 0, uhDepth );
-#if SEC_DEPTH_INTRA_SKIP_MODE_K0033
+#if H_3D
   rpcTempCU->setDISFlagSubParts( false, 0, uhDepth );
-#else
-#if H_3D_SINGLE_DEPTH
-  rpcTempCU->setSingleDepthFlagSubParts( false, 0, uhDepth );
-#endif
 #endif
   rpcTempCU->setPartSizeSubParts  ( ePartSize,  0, uhDepth );
@@ -2377 +2308 @@
       }
       rpcTempCU->setSkipFlagSubParts( false, 0, uhDepth );
-#if SEC_DEPTH_INTRA_SKIP_MODE_K0033
+#if H_3D
       rpcTempCU->setDISFlagSubParts( false, 0, uhDepth );
-#else
-#if H_3D_SINGLE_DEPTH
-      rpcTempCU->setSingleDepthFlagSubParts( false, 0, uhDepth );
-#endif
 #endif
       rpcTempCU->setTrIdxSubParts( 0, 0, uhDepth );
@@ -2492 +2419 @@
 }
 
-#if SEC_DEPTH_INTRA_SKIP_MODE_K0033
 Void TEncCu::xCheckRDCostDIS( TComDataCU*& rpcBestCU, TComDataCU*& rpcTempCU, PartSize eSize )
 {
@@ -2564 +2490 @@
   xCheckBestMode(rpcBestCU, rpcTempCU, uiDepth);
 }
-#else
-#if H_3D_SINGLE_DEPTH
-Void TEncCu::xCheckRDCostSingleDepth( TComDataCU*& rpcBestCU, TComDataCU*& rpcTempCU, PartSize eSize )
-{
-  UInt uiDepth = rpcTempCU->getDepth( 0 );
-  if( !rpcBestCU->getSlice()->getIsDepth() || (eSize != SIZE_2Nx2N))
-  {
-    return;
-  }
-  
-#if H_3D_VSO // M5
-  if( m_pcRdCost->getUseRenModel() )
-  {
-    UInt  uiWidth     = m_ppcOrigYuv[uiDepth]->getWidth   ();
-    UInt  uiHeight    = m_ppcOrigYuv[uiDepth]->getHeight  ();
-    Pel*  piSrc       = m_ppcOrigYuv[uiDepth]->getLumaAddr();
-    UInt  uiSrcStride = m_ppcOrigYuv[uiDepth]->getStride  ();
-    m_pcRdCost->setRenModelData( rpcTempCU, 0, piSrc, uiSrcStride, uiWidth, uiHeight );
-  }
-#endif
-
-  rpcTempCU->setSkipFlagSubParts( false, 0, uiDepth );
-  rpcTempCU->setPartSizeSubParts( SIZE_2Nx2N, 0, uiDepth );
-  rpcTempCU->setPredModeSubParts( MODE_INTRA, 0, uiDepth );
-  rpcTempCU->setCUTransquantBypassSubParts( rpcTempCU->getCUTransquantBypass(0), 0, uiDepth );
-
-  rpcTempCU->setTrIdxSubParts(0, 0, uiDepth);
-  rpcTempCU->setCbfSubParts(0, 1, 1, 0, uiDepth);
-  rpcTempCU->setSingleDepthFlagSubParts(true, 0, uiDepth);
-  rpcTempCU->setLumaIntraDirSubParts (DC_IDX, 0, uiDepth);
-#if H_3D_DIM_SDC
-  rpcTempCU->setSDCFlagSubParts( false, 0, uiDepth);
-#endif
-
-  UInt uiPreCalcDistC;
-  m_pcPredSearch  ->estIntraPredSingleDepth      ( rpcTempCU, m_ppcOrigYuv[uiDepth], m_ppcPredYuvTemp[uiDepth], m_ppcResiYuvTemp[uiDepth], m_ppcRecoYuvTemp[uiDepth], uiPreCalcDistC, false );
-
-
-  m_ppcRecoYuvTemp[uiDepth]->copyToPicLuma(rpcTempCU->getPic()->getPicYuvRec(), rpcTempCU->getAddr(), rpcTempCU->getZorderIdxInCU() );
-  
- 
-  m_pcEntropyCoder->resetBits();
-  if ( rpcTempCU->getSlice()->getPPS()->getTransquantBypassEnableFlag())
-  {
-    m_pcEntropyCoder->encodeCUTransquantBypassFlag( rpcTempCU, 0,          true );
-  }
-  m_pcEntropyCoder->encodeSkipFlag ( rpcTempCU, 0,          true );
-  m_pcEntropyCoder->encodeSingleDepthMode( rpcTempCU, 0,          true );
-  
-
-  m_pcRDGoOnSbacCoder->store(m_pppcRDSbacCoder[uiDepth][CI_TEMP_BEST]);
-  
-  rpcTempCU->getTotalBits() = m_pcEntropyCoder->getNumberOfWrittenBits();
-  rpcTempCU->getTotalBins() = ((TEncBinCABAC *)((TEncSbac*)m_pcEntropyCoder->m_pcEntropyCoderIf)->getEncBinIf())->getBinsCoded();
-
-
-#if H_3D_VSO // M6
-  if( m_pcRdCost->getUseLambdaScaleVSO())  
-    rpcTempCU->getTotalCost() = m_pcRdCost->calcRdCostVSO( rpcTempCU->getTotalBits(), rpcTempCU->getTotalDistortion() );  
-  else
-#endif
-  rpcTempCU->getTotalCost() = m_pcRdCost->calcRdCost( rpcTempCU->getTotalBits(), rpcTempCU->getTotalDistortion() );
- 
-
-  xCheckDQP( rpcTempCU );
-  xCheckBestMode(rpcBestCU, rpcTempCU, uiDepth);
-}
-#endif
-#endif
 
 Void TEncCu::xCheckRDCostInterDBBP( TComDataCU*& rpcBestCU, TComDataCU*& rpcTempCU, Bool bUseMRG )
@@ -2675 +2532 @@
   AOF( uiDepthStride != 0 );
   
-#if HS_DBBP_CLEAN_K0048
   PartSize eVirtualPartSize = m_pcPredSearch->getPartitionSizeFromDepth(pDepthPels, uiDepthStride, uiWidth, rpcTempCU);
 
@@ -2681 +2537 @@
   Bool pMask[MAX_CU_SIZE*MAX_CU_SIZE];
   Bool bValidMask = m_pcPredSearch->getSegmentMaskFromDepth(pDepthPels, uiDepthStride, uiWidth, uiHeight, pMask, rpcTempCU);
-#else
-  PartSize eVirtualPartSize = m_pcPredSearch->getPartitionSizeFromDepth(pDepthPels, uiDepthStride, uiWidth);
-  
-  // derive segmentation mask from depth
-  Bool pMask[MAX_CU_SIZE*MAX_CU_SIZE];
-  Bool bValidMask = m_pcPredSearch->getSegmentMaskFromDepth(pDepthPels, uiDepthStride, uiWidth, uiHeight, pMask);
-#endif
   
   if( !bValidMask )
@@ -2796 +2645 @@
 
   rpcTempCU->setSkipFlagSubParts( false, 0, uiDepth );
-#if SEC_DEPTH_INTRA_SKIP_MODE_K0033
+#if H_3D
   rpcTempCU->setDISFlagSubParts( false, 0, uiDepth );
-#else
-#if H_3D_SINGLE_DEPTH
-  rpcTempCU->setSingleDepthFlagSubParts( false, 0, uiDepth );
-#endif
 #endif
   rpcTempCU->setPartSizeSubParts( eSize, 0, uiDepth );
@@ -2820 +2665 @@
   
 #if H_3D_DIM_SDC
-#if 0 // H_3D_DISABLE_CHROMA
-  if( !rpcTempCU->getSDCFlag( 0 ) && !rpcTempCU->getSlice()->getIsDepth() )
-#else
   if( !rpcTempCU->getSDCFlag( 0 ) )
-#endif
 #endif
   m_pcPredSearch  ->estIntraPredChromaQT( rpcTempCU, m_ppcOrigYuv[uiDepth], m_ppcPredYuvTemp[uiDepth], m_ppcResiYuvTemp[uiDepth], m_ppcRecoYuvTemp[uiDepth], uiPreCalcDistC );
@@ -2834 +2675 @@
   }
   m_pcEntropyCoder->encodeSkipFlag ( rpcTempCU, 0,          true );
-#if SEC_DEPTH_INTRA_SKIP_MODE_K0033
+#if H_3D
   m_pcEntropyCoder->encodeDIS( rpcTempCU, 0,          true );
   if(!rpcTempCU->getDISFlag(0))
   {
-#else
-#if H_3D_SINGLE_DEPTH
-  m_pcEntropyCoder->encodeSingleDepthMode( rpcTempCU, 0,          true );
-  if(!rpcTempCU->getSingleDepthFlag(0))
-  {
-#endif
 #endif
   m_pcEntropyCoder->encodePredMode( rpcTempCU, 0,          true );
   m_pcEntropyCoder->encodePartSize( rpcTempCU, 0, uiDepth, true );
-#if !HHI_MOVE_SYN_K0052
+  m_pcEntropyCoder->encodePredInfo( rpcTempCU, 0,          true );
+  m_pcEntropyCoder->encodeIPCMInfo(rpcTempCU, 0, true );
 #if H_3D_DIM_SDC
   m_pcEntropyCoder->encodeSDCFlag( rpcTempCU, 0, true );
-#endif
-#endif
-  m_pcEntropyCoder->encodePredInfo( rpcTempCU, 0,          true );
-  m_pcEntropyCoder->encodeIPCMInfo(rpcTempCU, 0, true );
-#if HHI_MOVE_SYN_K0052
-#if H_3D_DIM_SDC
-  m_pcEntropyCoder->encodeSDCFlag( rpcTempCU, 0, true );
-#endif
 #endif
 
@@ -2870 +2698 @@
 
   setdQPFlag( bCodeDQP );
-#if SEC_DEPTH_INTRA_SKIP_MODE_K0033
-  }
-#else
-#if H_3D_SINGLE_DEPTH
-  }
-#endif
+#if H_3D
+  }
 #endif
   m_pcRDGoOnSbacCoder->store(m_pppcRDSbacCoder[uiDepth][CI_TEMP_BEST]);
@@ -2904 +2728 @@
 
   rpcTempCU->setSkipFlagSubParts( false, 0, uiDepth );
-#if SEC_DEPTH_INTRA_SKIP_MODE_K0033
+#if H_3D
   rpcTempCU->setDISFlagSubParts( false, 0, uiDepth );
-#else
-#if H_3D_SINGLE_DEPTH
-  rpcTempCU->setSingleDepthFlagSubParts( false, 0, uiDepth );
-#endif
 #endif
   rpcTempCU->setIPCMFlag(0, true);
@@ -2927 +2747 @@
   }
   m_pcEntropyCoder->encodeSkipFlag ( rpcTempCU, 0,          true );
-#if SEC_DEPTH_INTRA_SKIP_MODE_K0033
+#if H_3D
   m_pcEntropyCoder->encodeDIS( rpcTempCU, 0,          true );
-#else
-#if H_3D_SINGLE_DEPTH
-  m_pcEntropyCoder->encodeSingleDepthMode( rpcTempCU, 0,          true );
-#endif
 #endif
   m_pcEntropyCoder->encodePredMode ( rpcTempCU, 0,          true );
   m_pcEntropyCoder->encodePartSize ( rpcTempCU, 0, uiDepth, true );
-#if !HHI_MOVE_SYN_K0052
+  m_pcEntropyCoder->encodeIPCMInfo ( rpcTempCU, 0, true );
 #if H_3D_DIM_SDC
   m_pcEntropyCoder->encodeSDCFlag( rpcTempCU, 0, true );
-#endif
-#endif
-  m_pcEntropyCoder->encodeIPCMInfo ( rpcTempCU, 0, true );
-#if HHI_MOVE_SYN_K0052
-#if H_3D_DIM_SDC
-  m_pcEntropyCoder->encodeSDCFlag( rpcTempCU, 0, true );
-#endif
 #endif
   m_pcRDGoOnSbacCoder->store(m_pppcRDSbacCoder[uiDepth][CI_TEMP_BEST]);

branches/HTM-14.0-dev0/source/Lib/TLibEncoder/TEncCu.h

@@ -159 +159 @@
   Void  xCheckRDCostInterDBBP( TComDataCU*& rpcBestCU, TComDataCU*& rpcTempCU, Bool bUseMRG = false );
 #endif
-#if SEC_DEPTH_INTRA_SKIP_MODE_K0033
+#if H_3D
   Void  xCheckRDCostDIS   ( TComDataCU*& rpcBestCU, TComDataCU*& rpcTempCU, PartSize ePartSize  );
-#else
-#if H_3D_SINGLE_DEPTH
-  Void  xCheckRDCostSingleDepth   ( TComDataCU*& rpcBestCU, TComDataCU*& rpcTempCU, PartSize ePartSize  );
-#endif
 #endif
 #if H_3D_DIM

branches/HTM-14.0-dev0/source/Lib/TLibEncoder/TEncEntropy.cpp

@@ -111 +111 @@
   m_pcEntropyCoderIf->codeSkipFlag( pcCU, uiAbsPartIdx );
 }
-
-#if SEC_DEPTH_INTRA_SKIP_MODE_K0033
+#if H_3D
 Void TEncEntropy::encodeDIS( TComDataCU* pcCU, UInt uiAbsPartIdx, Bool bRD )
 {
@@ -125 +124 @@
   m_pcEntropyCoderIf->codeDIS( pcCU, uiAbsPartIdx );
 }
-#else
-#if H_3D_SINGLE_DEPTH
-Void TEncEntropy::encodeSingleDepthMode( TComDataCU* pcCU, UInt uiAbsPartIdx, Bool bRD )
-{
-  if(!pcCU->getSlice()->getIntraSingleFlag() )
-  {
-    return;
-  }
-  if( bRD )
-  {
-    uiAbsPartIdx = 0;
-  }
-  m_pcEntropyCoderIf->codeSingleDepthMode( pcCU, uiAbsPartIdx );
-}
-#endif
-#endif
-
+#endif
 /** encode merge flag
  * \param pcCU
@@ -271 +254 @@
   m_pcEntropyCoderIf->codePartSize( pcCU, uiAbsPartIdx, uiDepth );
   
-#if !HHI_MOVE_SYN_K0052
-#if H_3D_DBBP
-  if( pcCU->getSlice()->getDepthBasedBlkPartFlag() && (pcCU->getPartitionSize(uiAbsPartIdx) == SIZE_2NxN || pcCU->getPartitionSize(uiAbsPartIdx) == SIZE_Nx2N) && pcCU->getWidth(uiAbsPartIdx) > 8 && pcCU->getSlice()->getDefaultRefViewIdxAvailableFlag() )
-  {
-    encodeDBBPFlag(pcCU, uiAbsPartIdx, bRD);
-  }
-#endif
-#endif
 }
 
@@ -904 +879 @@
 Void TEncEntropy::encodeDBBPFlag( TComDataCU* pcCU, UInt uiAbsPartIdx, Bool bRD )
 {
-#if HHI_MOVE_SYN_K0052
   if( pcCU->getSlice()->getDepthBasedBlkPartFlag() && 
     ( pcCU->getPartitionSize(uiAbsPartIdx) == SIZE_2NxN || 
@@ -911 +885 @@
       pcCU->getSlice()->getDefaultRefViewIdxAvailableFlag() )
   {
-#endif
     if( bRD )
     {
@@ -917 +890 @@
     }
     m_pcEntropyCoderIf->codeDBBPFlag( pcCU, uiAbsPartIdx );
-#if HHI_MOVE_SYN_K0052
-  }
-#endif
+  }
 }
 #endif

branches/HTM-14.0-dev0/source/Lib/TLibEncoder/TEncEntropy.h

@@ -82 +82 @@
   virtual Void codeCUTransquantBypassFlag( TComDataCU* pcCU, UInt uiAbsPartIdx ) = 0;
   virtual Void codeSkipFlag      ( TComDataCU* pcCU, UInt uiAbsPartIdx ) = 0;
-#if SEC_DEPTH_INTRA_SKIP_MODE_K0033
+#if H_3D
   virtual Void codeDIS          ( TComDataCU* pcCU, UInt uiAbsPartIdx ) = 0;
-#else
-#if H_3D_SINGLE_DEPTH
-  virtual Void codeSingleDepthMode      ( TComDataCU* pcCU, UInt uiAbsPartIdx ) = 0;
-#endif
 #endif
   virtual Void codeMergeFlag     ( TComDataCU* pcCU, UInt uiAbsPartIdx ) = 0;
@@ -179 +175 @@
   Void encodeCUTransquantBypassFlag( TComDataCU* pcCU, UInt uiAbsPartIdx, Bool bRD = false );
   Void encodeSkipFlag          ( TComDataCU* pcCU, UInt uiAbsPartIdx, Bool bRD = false );
-#if SEC_DEPTH_INTRA_SKIP_MODE_K0033
+#if H_3D
   Void encodeDIS               ( TComDataCU* pcCU, UInt uiAbsPartIdx, Bool bRD=false );
-#else
-#if H_3D_SINGLE_DEPTH
-  Void encodeSingleDepthMode( TComDataCU* pcCU, UInt uiAbsPartIdx, Bool bRD=false );
-#endif
 #endif
   Void encodePUWise       ( TComDataCU* pcCU, UInt uiAbsPartIdx, Bool bRD = false );

branches/HTM-14.0-dev0/source/Lib/TLibEncoder/TEncGOP.cpp

@@ -395 +395 @@
 Void TEncGOP::initGOP( Int iPOCLast, Int iNumPicRcvd, TComList<TComPic*>& rcListPic, TComList<TComPicYuv*>& rcListPicYuvRecOut, std::list<AccessUnit>& accessUnitsInGOP)
 {
-#if H_MV_ALIGN_HM_15
   xInitGOP( iPOCLast, iNumPicRcvd, rcListPic, rcListPicYuvRecOut, false );
-#else
-  xInitGOP( iPOCLast, iNumPicRcvd, rcListPic, rcListPicYuvRecOut );
-#endif
   m_iNumPicCoded = 0;
 }
@@ -885 +881 @@
     Int numDirectRefLayers = vps    ->getNumDirectRefLayers( getLayerId() ); 
 #endif
-#if HHI_INTER_COMP_PRED_K0052
+#if H_3D
     pcSlice->setIvPicLists( m_ivPicLists );         
 
@@ -893 +889 @@
     GOPEntry gopEntry      = m_pcCfg->getGOPEntry( (pcSlice->getRapPicFlag() && getLayerId() > 0) ? MAX_GOP : iGOPid );     
 #endif
+
+
     
     Bool interLayerPredLayerIdcPresentFlag = false; 
@@ -929 +927 @@
     assert( pcSlice->getNumActiveRefLayerPics() == gopEntry.m_numActiveRefLayerPics ); 
     
-#if HHI_INTER_COMP_PRED_K0052
 #if H_3D
     if ( m_pcEncTop->decProcAnnexI() )
@@ -962 +959 @@
     pcSlice->setMaxNumMergeCand      ( m_pcCfg->getMaxNumMergeCand()   + ( ( pcSlice->getMpiFlag( ) || pcSlice->getIvMvPredFlag( ) || pcSlice->getViewSynthesisPredFlag( )   ) ? 1 : 0 ));
 #endif
-#endif
 
     pcSlice->createInterLayerReferencePictureSet( m_ivPicLists, m_refPicSetInterLayer0, m_refPicSetInterLayer1 ); 
@@ -1009 +1005 @@
       }
     }
-#endif
-#if !HHI_INTER_COMP_PRED_K0052
-#if H_3D
-    pcSlice->setIvPicLists( m_ivPicLists );         
-#if H_3D_IV_MERGE    
-    assert( !m_pcEncTop->getIsDepth() || ( pcSlice->getTexturePic() != 0 ) );
-#endif    
-#endif
 #endif
 #if H_3D_IC

branches/HTM-14.0-dev0/source/Lib/TLibEncoder/TEncSbac.cpp

@@ -58 +58 @@
 , m_cCUSplitFlagSCModel       ( 1,             1,               NUM_SPLIT_FLAG_CTX            , m_contextModels + m_numContextModels, m_numContextModels )
 , m_cCUSkipFlagSCModel        ( 1,             1,               NUM_SKIP_FLAG_CTX             , m_contextModels + m_numContextModels, m_numContextModels)
-#if SEC_DEPTH_INTRA_SKIP_MODE_K0033
+#if H_3D
 , m_cCUDISFlagSCModel         ( 1,             1,               NUM_DIS_FLAG_CTX              , m_contextModels + m_numContextModels, m_numContextModels)
 , m_cCUDISTypeSCModel         ( 1,             1,               NUM_DIS_TYPE_CTX              , m_contextModels + m_numContextModels, m_numContextModels)
-#else
-#if H_3D_SINGLE_DEPTH
-, m_cCUSingleDepthFlagSCModel        ( 1,             1,               NUM_SINGLEDEPTH_FLAG_CTX             , m_contextModels + m_numContextModels, m_numContextModels)
-, m_cSingleDepthValueSCModel         ( 1,             1,               NUM_SINGLE_DEPTH_VALUE_DATA_CTX      , m_contextModels + m_numContextModels, m_numContextModels)
-#endif
 #endif
 , m_cCUMergeFlagExtSCModel    ( 1,             1,               NUM_MERGE_FLAG_EXT_CTX        , m_contextModels + m_numContextModels, m_numContextModels)
@@ -139 +134 @@
   
   m_cCUSkipFlagSCModel.initBuffer        ( eSliceType, iQp, (UChar*)INIT_SKIP_FLAG );
-#if SEC_DEPTH_INTRA_SKIP_MODE_K0033
+#if H_3D
   m_cCUDISFlagSCModel.initBuffer         ( eSliceType, iQp, (UChar*)INIT_DIS_FLAG );
   m_cCUDISTypeSCModel.initBuffer         ( eSliceType, iQp, (UChar*)INIT_DIS_TYPE );
-#else
-#if H_3D_SINGLE_DEPTH
-  m_cCUSingleDepthFlagSCModel.initBuffer        ( eSliceType, iQp, (UChar*)INIT_SINGLEDEPTH_FLAG );
-  m_cSingleDepthValueSCModel.initBuffer         ( eSliceType, iQp, (UChar*)INIT_SINGLE_DEPTH_VALUE_DATA );
-#endif
 #endif
   m_cCUMergeFlagExtSCModel.initBuffer    ( eSliceType, iQp, (UChar*)INIT_MERGE_FLAG_EXT);
@@ -224 +214 @@
       curCost  = m_cCUSplitFlagSCModel.calcCost       ( curSliceType, qp, (UChar*)INIT_SPLIT_FLAG );
       curCost += m_cCUSkipFlagSCModel.calcCost        ( curSliceType, qp, (UChar*)INIT_SKIP_FLAG );
-#if SEC_DEPTH_INTRA_SKIP_MODE_K0033
+#if H_3D
       curCost += m_cCUDISFlagSCModel.calcCost         ( curSliceType, qp, (UChar*)INIT_DIS_FLAG );
       curCost += m_cCUDISTypeSCModel.calcCost         ( curSliceType, qp, (UChar*)INIT_DIS_TYPE );
-#else
-#if H_3D_SINGLE_DEPTH
-      curCost += m_cCUSingleDepthFlagSCModel.calcCost        ( curSliceType, qp, (UChar*)INIT_SINGLEDEPTH_FLAG );
-      curCost += m_cSingleDepthValueSCModel.calcCost         ( curSliceType, qp, (UChar*)INIT_SINGLE_DEPTH_VALUE_DATA );
-#endif
 #endif
       curCost += m_cCUMergeFlagExtSCModel.calcCost    ( curSliceType, qp, (UChar*)INIT_MERGE_FLAG_EXT);
@@ -302 +287 @@
   
   m_cCUSkipFlagSCModel.initBuffer        ( eSliceType, iQp, (UChar*)INIT_SKIP_FLAG );
-#if SEC_DEPTH_INTRA_SKIP_MODE_K0033
+#if H_3D
   m_cCUDISFlagSCModel.initBuffer         ( eSliceType, iQp, (UChar*)INIT_DIS_FLAG );
   m_cCUDISTypeSCModel.initBuffer         ( eSliceType, iQp, (UChar*)INIT_DIS_TYPE );
-#else
-#if H_3D_SINGLE_DEPTH
-  m_cCUSingleDepthFlagSCModel.initBuffer        ( eSliceType, iQp, (UChar*)INIT_SINGLEDEPTH_FLAG );
-  m_cSingleDepthValueSCModel.initBuffer         ( eSliceType, iQp, (UChar*)INIT_SINGLE_DEPTH_VALUE_DATA );
-#endif
 #endif
   m_cCUMergeFlagExtSCModel.initBuffer    ( eSliceType, iQp, (UChar*)INIT_MERGE_FLAG_EXT);
@@ -466 +446 @@
   m_pcBinIf->encodeBinsEP( bins, numBins );
 }
-
-#if SEC_DEPTH_INTRA_SKIP_MODE_K0033
+#if H_3D
 Void TEncSbac::codeDIS( TComDataCU* pcCU, UInt uiAbsPartIdx )
 {
@@ -498 +477 @@
   }
 }
-#else
-#if H_3D_SINGLE_DEPTH
-Void TEncSbac::codeSingleDepthMode( TComDataCU* pcCU, UInt uiAbsPartIdx )
-{
-  UInt uiSymbol = pcCU->getSingleDepthFlag(uiAbsPartIdx ) ? 1 : 0;
-  m_pcBinIf->encodeBin( uiSymbol, m_cCUSingleDepthFlagSCModel.get( 0, 0, 0 ) );
-  if(uiSymbol)
-  {
-    UInt uiUnaryIdx = (UInt) pcCU->getSingleDepthValue(uiAbsPartIdx);
-    UInt uiNumCand = SINGLE_DEPTH_MODE_CAND_LIST_SIZE;
-    if ( uiNumCand > 1 )
-    {
-      for( UInt ui = 0; ui < uiNumCand - 1; ++ui )
-      {
-        const UInt uiSymbol2 = ui == uiUnaryIdx ? 0 : 1;
-        if ( ui==0 )
-        {
-          m_pcBinIf->encodeBin( uiSymbol2, m_cSingleDepthValueSCModel.get( 0, 0, 0 ) );
-        }
-        else
-        {
-          m_pcBinIf->encodeBinEP( uiSymbol2 );
-        }
-        if( uiSymbol2 == 0 )
-        {
-          break;
-        }
-      }
-    }
-  }
-}
-#endif
-#endif
-
+#endif
 /** Coding of coeff_abs_level_minus3
  * \param uiSymbol value of coeff_abs_level_minus3

branches/HTM-14.0-dev0/source/Lib/TLibEncoder/TEncSbac.h

@@ -146 +146 @@
   Void codeCUTransquantBypassFlag( TComDataCU* pcCU, UInt uiAbsPartIdx );
   Void codeSkipFlag      ( TComDataCU* pcCU, UInt uiAbsPartIdx );
-#if SEC_DEPTH_INTRA_SKIP_MODE_K0033
+#if H_3D
   Void codeDIS           ( TComDataCU* pcCU, UInt uiAbsPartIdx );
-#else
-#if H_3D_SINGLE_DEPTH
-  Void codeSingleDepthMode( TComDataCU* pcCU, UInt uiAbsPartIdx );
-#endif
 #endif
   Void codeMergeFlag     ( TComDataCU* pcCU, UInt uiAbsPartIdx );
@@ -219 +215 @@
   ContextModel3DBuffer m_cCUSplitFlagSCModel;
   ContextModel3DBuffer m_cCUSkipFlagSCModel;
-#if SEC_DEPTH_INTRA_SKIP_MODE_K0033
+#if H_3D
   ContextModel3DBuffer m_cCUDISFlagSCModel;
   ContextModel3DBuffer m_cCUDISTypeSCModel;
-#else
-#if H_3D_SINGLE_DEPTH
-  ContextModel3DBuffer m_cCUSingleDepthFlagSCModel;
-  ContextModel3DBuffer m_cSingleDepthValueSCModel;
-#endif
 #endif
   ContextModel3DBuffer m_cCUMergeFlagExtSCModel;

branches/HTM-14.0-dev0/source/Lib/TLibEncoder/TEncSearch.cpp

@@ -915 +915 @@
         }
         m_pcEntropyCoder->encodeSkipFlag( pcCU, 0, true );
-#if SEC_DEPTH_INTRA_SKIP_MODE_K0033
+#if H_3D
         m_pcEntropyCoder->encodeDIS(pcCU, 0, true );
         if(!pcCU->getDISFlag(uiAbsPartIdx))
-#else
-#if H_3D_SINGLE_DEPTH
-        m_pcEntropyCoder->encodeSingleDepthMode(pcCU, 0, true );
-        if(!pcCU->getSingleDepthFlag(uiAbsPartIdx))
-#endif
 #endif
           m_pcEntropyCoder->encodePredMode( pcCU, 0, true );
       }
-#if SEC_DEPTH_INTRA_SKIP_MODE_K0033
+#if H_3D
       else
       {
         m_pcEntropyCoder->encodeDIS(pcCU, 0, true );
       }
-#else
-#if H_3D_SINGLE_DEPTH
-      else
-      {
-        m_pcEntropyCoder->encodeSingleDepthMode(pcCU, 0, true );
-      }
-#endif
-#endif
-#if SEC_DEPTH_INTRA_SKIP_MODE_K0033
+#endif
+#if H_3D
       if(!pcCU->getDISFlag(uiAbsPartIdx))
       {
-#else
-#if H_3D_SINGLE_DEPTH
-      if(!pcCU->getSingleDepthFlag(uiAbsPartIdx))
-      {
-#endif
 #endif
         m_pcEntropyCoder  ->encodePartSize( pcCU, 0, pcCU->getDepth(0), true );
 
-#if !HHI_MOVE_SYN_K0052
-#if H_3D_DIM_SDC
-        m_pcEntropyCoder->encodeSDCFlag( pcCU, 0, true );
-#endif
-#endif
         if (pcCU->isIntra(0) && pcCU->getPartitionSize(0) == SIZE_2Nx2N )
         {
@@ -960 +938 @@
           if ( pcCU->getIPCMFlag (0))
           {
-#if HHI_MOVE_SYN_K0052
 #if H_3D_DIM_SDC
             m_pcEntropyCoder->encodeSDCFlag( pcCU, 0, true );
 #endif
-#endif
             return;
           }
         }
-#if SEC_DEPTH_INTRA_SKIP_MODE_K0033
-      }
-#else
-#if H_3D_SINGLE_DEPTH
-      }
-#endif
-#endif
-    }
-#if SEC_DEPTH_INTRA_SKIP_MODE_K0033
+#if H_3D
+      }
+#endif
+    }
+#if H_3D
     if(!pcCU->getDISFlag(uiAbsPartIdx))
     {
-#else
-#if H_3D_SINGLE_DEPTH
-    if(!pcCU->getSingleDepthFlag(uiAbsPartIdx))
-    {
-#endif
 #endif
       // luma prediction mode
@@ -992 +959 @@
           m_pcEntropyCoder->encodeIntraDirModeLuma ( pcCU, 0 );
 #if H_3D_DIM_SDC
-#if HHI_MOVE_SYN_K0052
-#if H_3D_DIM_SDC
           m_pcEntropyCoder->encodeSDCFlag( pcCU, 0, true );
-#endif
-#endif
           if( pcCU->getSlice()->getIsDepth() && ( !pcCU->getSDCFlag( 0 ) ) && getDimType( pcCU->getLumaIntraDir( 0 ) ) < DIM_NUM_TYPE ) 
           {
@@ -1013 +976 @@
           {
             m_pcEntropyCoder->encodeIntraDirModeLuma ( pcCU, uiPart * uiQNumParts );
-
-#if HHI_MOVE_SYN_K0052
+#if H_3D_SDC
           }
           m_pcEntropyCoder->encodeSDCFlag( pcCU, 0, true );
           for( UInt uiPart = 0; uiPart < 4; uiPart++ )
           {
-#endif
-#if H_3D_DIM_SDC
             if( pcCU->getSlice()->getIsDepth() && ( !pcCU->getSDCFlag( uiPart * uiQNumParts ) ) && getDimType( pcCU->getLumaIntraDir( uiPart * uiQNumParts ) ) < DIM_NUM_TYPE ) 
             {
@@ -1032 +992 @@
           m_pcEntropyCoder->encodeIntraDirModeLuma ( pcCU, uiAbsPartIdx );
 #if H_3D_DIM_SDC
-#if HHI_MOVE_SYN_K0052
           if( uiAbsPartIdx == 0 )  
           {
             m_pcEntropyCoder->encodeSDCFlag( pcCU, 0, true );
           }
-#endif
           if( pcCU->getSlice()->getIsDepth() && ( !pcCU->getSDCFlag( uiAbsPartIdx ) ) && getDimType( pcCU->getLumaIntraDir( uiAbsPartIdx ) ) < DIM_NUM_TYPE ) 
           {
@@ -1044 +1002 @@
 #endif
         }
-      }
-#if SEC_DEPTH_INTRA_SKIP_MODE_K0033
-    }
-#else
-#if H_3D_SINGLE_DEPTH
-    }
-#endif
-#endif
+#if H_3D
+      }
+#endif
+    }
   }
   if( bChroma )
@@ -1914 +1868 @@
 }
 
-#if SEC_DEPTH_INTRA_SKIP_MODE_K0033
+#if H_3D
 Void TEncSearch::xIntraCodingDIS( TComDataCU* pcCU, UInt uiAbsPartIdx, TComYuv* pcOrgYuv, TComYuv* pcPredYuv, Dist& ruiDist, Double& dRDCost, UInt uiPredMode )
 {
@@ -2006 +1960 @@
     dRDCost = m_pcRdCost->calcRdCost( uiBits, ruiDist );
 }
-#else
-#if H_3D_SINGLE_DEPTH
-Void TEncSearch::xIntraCodingSingleDepth( TComDataCU* pcCU, UInt uiAbsPartIdx, TComYuv* pcOrgYuv, TComYuv* pcPredYuv, Dist& ruiDist, Double& dRDCost, Int iTestDepthIdx, Pel *DepthNeighbor )
-{
-  UInt    uiWidth           = pcCU     ->getWidth   ( 0 );
-  UInt    uiHeight          = pcCU     ->getHeight  ( 0 );
-  UInt    uiStride          = pcOrgYuv ->getStride  ();
-  Pel*    piOrg             = pcOrgYuv ->getLumaAddr( uiAbsPartIdx );
-  Pel*    piPred            = pcPredYuv->getLumaAddr( uiAbsPartIdx );
-
-  AOF( uiWidth == uiHeight );
-  AOF( uiAbsPartIdx == 0 );
-  pcCU->setSingleDepthValueSubParts((Pel)iTestDepthIdx,uiAbsPartIdx, 0, pcCU->getDepth(0));  
-  //===== reconstruction =====
-
-  for( UInt uiY = 0; uiY < uiHeight; uiY++ )
-  {
-    for( UInt uiX = 0; uiX < uiWidth; uiX++ )
-    {
-    piPred[ uiX ] = DepthNeighbor[iTestDepthIdx];
-    }
-    piPred     += uiStride;
-  }
-
-  // clear UV
-  UInt  uiStrideC     = pcPredYuv->getCStride();
-  Pel   *pRecCb       = pcPredYuv->getCbAddr();
-  Pel   *pRecCr       = pcPredYuv->getCrAddr();
-
-  for (Int y=0; y<uiHeight/2; y++)
-  {
-    for (Int x=0; x<uiWidth/2; x++)
-    {
-      pRecCb[x] = 1<<(g_bitDepthC-1);
-      pRecCr[x] = 1<<(g_bitDepthC-1);
-    }
-
-    pRecCb += uiStrideC;
-    pRecCr += uiStrideC;
-  }
-
-  piPred            = pcPredYuv->getLumaAddr( uiAbsPartIdx );
-  //===== determine distortion =====
-#if H_3D_VSO
-  if ( m_pcRdCost->getUseVSO() )
-    ruiDist = m_pcRdCost->getDistPartVSO  ( pcCU, uiAbsPartIdx, piPred, uiStride, piOrg, uiStride, uiWidth, uiHeight, false );
-  else
-#endif
-    ruiDist = m_pcRdCost->getDistPart(g_bitDepthY, piPred, uiStride, piOrg, uiStride, uiWidth, uiHeight );
-
-  //===== determine rate and r-d cost =====
-  m_pcEntropyCoder->resetBits();
-  m_pcEntropyCoder->encodeSingleDepthMode( pcCU, 0, true );
-  UInt uiBits = m_pcEntropyCoder->getNumberOfWrittenBits();
-
-#if H_3D_VSO
-  if ( m_pcRdCost->getUseLambdaScaleVSO())
-    dRDCost = m_pcRdCost->calcRdCostVSO( uiBits, ruiDist );
-  else
-#endif
-    dRDCost = m_pcRdCost->calcRdCost( uiBits, ruiDist );
-}
-#endif
-#endif
-
+#endif
 #if H_3D_DIM_SDC
 Void TEncSearch::xIntraCodingSDC( TComDataCU* pcCU, UInt uiAbsPartIdx, TComYuv* pcOrgYuv, TComYuv* pcPredYuv, Dist& ruiDist, Double& dRDCost, Bool bZeroResidual, Int iSDCDeltaResi  )
@@ -2318 +2208 @@
 
   m_pcEntropyCoder->encodePartSize( pcCU, 0, pcCU->getDepth( 0 ), true );
-#if !HHI_MOVE_SYN_K0052
-  m_pcEntropyCoder->encodeSDCFlag( pcCU, 0, true );
-#endif
 
   // encode pred direction + DC residual data
   m_pcEntropyCoder->encodePredInfo( pcCU, 0, true );
-#if HHI_MOVE_SYN_K0052
+#if H_3D_SDC
   m_pcEntropyCoder->encodeSDCFlag( pcCU, 0, true );
 #endif
@@ -3021 +2908 @@
   pcCU->setChromIntraDirSubParts( uiBestMode, 0, pcCU->getDepth( 0 ) );
 }
-
-#if SEC_DEPTH_INTRA_SKIP_MODE_K0033
+#if H_3D
 Void TEncSearch::estIntraPredDIS( TComDataCU* pcCU, 
                                   TComYuv*    pcOrgYuv, 
@@ -3081 +2967 @@
   pcCU->getTotalDistortion() = uiBestDist;
 }
-#else
-#if H_3D_SINGLE_DEPTH
-Void 
-TEncSearch::estIntraPredSingleDepth( TComDataCU* pcCU, 
-                           TComYuv*    pcOrgYuv, 
-                           TComYuv*    pcPredYuv, 
-                           TComYuv*    pcResiYuv, 
-                           TComYuv*    pcRecoYuv,
-                           UInt&       ruiDistC,
-                           Bool        bLumaOnly )
-{
-  UInt    uiDepth        = pcCU->getDepth(0);
-  UInt    uiWidth        = pcCU->getWidth (0);
-  UInt    uiHeight       = pcCU->getHeight(0);
-
-
-  Pel* piOrg         = pcOrgYuv ->getLumaAddr( 0, uiWidth );
-  UInt uiStride      = pcPredYuv->getStride();
-
-  Int index=0;
-  Pel testDepth;
-  Pel DepthNeighbours[2];
-  //construction of depth candidates
-  for( Int i = 0; (i < 2)  && (index<SINGLE_DEPTH_MODE_CAND_LIST_SIZE) ; i++ )
-  {
-    if(!pcCU->getNeighDepth (0, 0, &testDepth, i))
-    {
-      continue;
-    }
-    DepthNeighbours[index]=testDepth;
-    index++;
-  }
-
-  if(index==0)
-  {
-    DepthNeighbours[index]=1<<(g_bitDepthY-1);
-    index++;
-  }
-
-  if(index==1)
-  {
-    DepthNeighbours[index]=ClipY(DepthNeighbours[0] + 1 );
-    index++;
-  }
-
-
-  Dist   uiDist = 0;
-  Double dCost   = 0.0;
-  Dist    uiBestDist = 0;
-  Double  dBestCost   = MAX_DOUBLE;
-  Pel     pBestSingleDepthValue = 0;
-
-  for( Int testdepthidx = 0; testdepthidx < index ; testdepthidx++ )
-  {
-      // set context models
-      m_pcRDGoOnSbacCoder->load( m_pppcRDSbacCoder[uiDepth][CI_CURR_BEST] );
-
-      // determine residual for partition
-      uiDist = 0;
-      dCost   = 0.0;
-#if H_3D_VSO // M36
-      if( m_pcRdCost->getUseRenModel() )
-      {
-        m_pcRdCost->setRenModelData( pcCU, 0, piOrg, uiStride, uiWidth, uiHeight );
-      }
-#endif
-      xIntraCodingSingleDepth(pcCU, 0, pcOrgYuv, pcPredYuv, uiDist, dCost, testdepthidx, DepthNeighbours);
-      // check r-d cost
-      if( dCost < dBestCost )
-      {
-        uiBestDist = uiDist;
-        dBestCost   = dCost;
-        pBestSingleDepthValue = pcCU->getSingleDepthValue(0);
-        // copy reconstruction
-        pcPredYuv->copyPartToPartYuv(pcRecoYuv, 0, uiWidth, uiHeight);
-      }
-  } // depth index loop
-
-
-  pcCU->setSingleDepthValueSubParts((Pel)pBestSingleDepthValue,0, 0, uiDepth);
-  assert(pBestSingleDepthValue>=0);
-
-  //===== reset context models =====
-  m_pcRDGoOnSbacCoder->load(m_pppcRDSbacCoder[uiDepth][CI_CURR_BEST]);
-  
-  //===== set distortion (rate and r-d costs are determined later) =====
-  pcCU->getTotalDistortion() = uiBestDist;
-}
-
-#endif 
-#endif
-
+#endif
 Void 
 TEncSearch::estIntraPredQT( TComDataCU* pcCU, 
@@ -3337 +3132 @@
     if( m_pcEncCfg->getIsDepth() && uiWidth >= DIM_MIN_SIZE && uiWidth <= DIM_MAX_SIZE && uiWidth == uiHeight )
     {
-#if TICKET083_IVPFLAG_FIX
       if( bOnlyIVP )
-#else
-      if( bOnlyIVP && pcCU->getSlice()->getIntraContourFlag() )
-#endif
       {
         TComWedgelet* dmm4Segmentation = new TComWedgelet( uiWidth, uiHeight );
@@ -5534 +5325 @@
   TComMv      cMvPred = *pcMvPred;
   
-#if SONY_MV_V_CONST_C0078
+#if H_MV
   Bool bMv_VRng_Restricted = false;
   if( m_pcEncCfg->getUseDisparitySearchRangeRestriction()
@@ -5601 +5392 @@
 
 
-#if SONY_MV_V_CONST_C0078
+#if H_MV
 Void TEncSearch::xSetSearchRange ( TComDataCU* pcCU, TComMv& cMvPred, Int iSrchRng, TComMv& rcMvSrchRngLT, TComMv& rcMvSrchRngRB, Bool bMv_VRng_Restricted, Int iVerDispSrchRng )
 #else
@@ -5621 +5412 @@
   rcMvSrchRngRB.setVer( cTmpMvPred.getVer() + (iSrchRng << iMvShift) );
   
-#if SONY_MV_V_CONST_C0078
+#if H_MV
   if ( bMv_VRng_Restricted ) {
     Int iRestrictMvVrange = ( iVerDispSrchRng - 1 ) << iMvShift ; // -1 to consider subpel search
@@ -7369 +7160 @@
     const UInt uiQTTempAccessLayer = pcCU->getSlice()->getSPS()->getQuadtreeTULog2MaxSize() - uiLog2TrSize;
 
-#if 0 //H_3D_DISABLE_CHROMA
-    Bool  bCodeChroma   = !pcCU->getSlice()->getIsDepth();
-#else
     Bool  bCodeChroma   = true;
-#endif
     UInt  uiTrModeC     = uiTrMode;
     UInt  uiLog2TrSizeC = uiLog2TrSize-1;
@@ -7515 +7302 @@
     }
     m_pcEntropyCoder->encodeSkipFlag ( pcCU, 0, true );
-#if SEC_DEPTH_INTRA_SKIP_MODE_K0033
+#if H_3D
     m_pcEntropyCoder->encodeDIS ( pcCU, 0, true );
-#else
-#if H_3D_SINGLE_DEPTH
-    m_pcEntropyCoder->encodeSingleDepthMode ( pcCU, 0, true );
-#endif
 #endif
     m_pcEntropyCoder->encodePredMode( pcCU, 0, true );
     m_pcEntropyCoder->encodePartSize( pcCU, 0, pcCU->getDepth(0), true );
-#if !HHI_MOVE_SYN_K0052
+    m_pcEntropyCoder->encodePredInfo( pcCU, 0, true );
 #if H_3D_DIM_SDC
     m_pcEntropyCoder->encodeSDCFlag( pcCU, 0, true );
 #endif
-#endif 
-    m_pcEntropyCoder->encodePredInfo( pcCU, 0, true );
-#if HHI_MOVE_SYN_K0052
-#if H_3D_DIM_SDC
-    m_pcEntropyCoder->encodeSDCFlag( pcCU, 0, true );
-#endif
-#endif
 #if H_3D_ARP
     m_pcEntropyCoder->encodeARPW( pcCU , 0  );
@@ -7541 +7317 @@
     m_pcEntropyCoder->encodeICFlag( pcCU, 0, true );
 #endif
-#if HHI_MOVE_SYN_K0052
+#if H_3D
     m_pcEntropyCoder->encodeDBBPFlag( pcCU, 0, true );
 #endif

branches/HTM-14.0-dev0/source/Lib/TLibEncoder/TEncSearch.h

@@ -191 +191 @@
                                   TComYuv*    pcRecoYuv,
                                   UInt        uiPreCalcDistC );
-#if SEC_DEPTH_INTRA_SKIP_MODE_K0033
+#if H_3D
   Void  estIntraPredDIS        ( TComDataCU* pcCU, 
                                  TComYuv*    pcOrgYuv, 
@@ -199 +199 @@
                                  UInt&       ruiDistC,
                                  Bool        bLumaOnly );
-#else
-#if H_3D_SINGLE_DEPTH
-  Void  estIntraPredSingleDepth  ( TComDataCU* pcCU, 
-                                  TComYuv*    pcOrgYuv, 
-                                  TComYuv*    pcPredYuv, 
-                                  TComYuv*    pcResiYuv, 
-                                  TComYuv*    pcRecoYuv,
-                                  UInt&       ruiDistC,
-                                  Bool        bLumaOnly );
-#endif
-#endif
-  
+#endif  
   /// encoder estimation - inter prediction (non-skip)
   Void predInterSearch          ( TComDataCU* pcCU,
@@ -364 +353 @@
                                     UInt         uiAbsPartIdx,
                                     UInt         stateU0V1Both2 );
-#if SEC_DEPTH_INTRA_SKIP_MODE_K0033
+
+#if H_3D
   Void xIntraCodingDIS           ( TComDataCU* pcCU, UInt uiAbsPartIdx, TComYuv* pcOrgYuv, TComYuv* pcPredYuv, Dist& ruiDist, Double& dRDCost, UInt uiPredMode );
-#else
-#if H_3D_SINGLE_DEPTH
-  Void xIntraCodingSingleDepth( TComDataCU* pcCU, UInt uiAbsPartIdx, TComYuv* pcOrgYuv, TComYuv* pcPredYuv, Dist& ruiDist, Double& dRDCost, Int iTestDepthIdx, Pel * DepthNeighbor );
-#endif
 #endif
 #if H_3D_DIM
@@ -480 +466 @@
                                     UInt&         ruiSAD );
   
-#if SONY_MV_V_CONST_C0078
+#if H_MV
   Void xSetSearchRange           (  TComDataCU* pcCU, 
                                     TComMv& cMvPred, 

branches/HTM-14.0-dev0/source/Lib/TLibEncoder/TEncSlice.cpp

@@ -215 +215 @@
   rpcSlice->setPicOutputFlag( true );
   rpcSlice->setPOC( pocCurr );
-#if !HHI_INTER_COMP_PRED_K0052
-#if H_3D
-    rpcSlice->init3dToolParameters(); 
-#endif
-#endif
 #if H_3D_IC
   rpcSlice->setApplyIC( false );
@@ -612 +607 @@
   rpcSlice->setSliceSegmentMode     ( m_pcCfg->getSliceSegmentMode()     );
   rpcSlice->setSliceSegmentArgument ( m_pcCfg->getSliceSegmentArgument() );
-#if !HHI_INTER_COMP_PRED_K0052
-#if H_3D_IV_MERGE
-  rpcSlice->setMaxNumMergeCand      ( m_pcCfg->getMaxNumMergeCand()   + ( ( rpcSlice->getMpiFlag( ) || rpcSlice->getIvMvPredFlag( ) || rpcSlice->getViewSynthesisPredFlag( )   ) ? 1 : 0 ));
-#else
-  rpcSlice->setMaxNumMergeCand        ( m_pcCfg->getMaxNumMergeCand()        );
-#endif
-#else
 #if !H_3D
   rpcSlice->setMaxNumMergeCand        ( m_pcCfg->getMaxNumMergeCand()        );
-#endif
 #endif
   xStoreWPparam( pPPS->getUseWP(), pPPS->getWPBiPred() );

branches/HTM-14.0-dev0/source/Lib/TLibEncoder/TEncTop.cpp

@@ -91 +91 @@
   m_aICEnableNum = NULL;
 #endif
-#if H_3D_ANNEX_SELECTION_FIX
+#if H_3D
   m_cCavlcCoder.setEncTop(this); 
 #endif
@@ -417 +417 @@
 #endif
 #if H_3D
-#if HHI_CAM_PARA_K0052
   pcPicCurr->setScaleOffset( m_cameraParameters->getCodedScale(), m_cameraParameters->getCodedOffset() );
-#else
-  pcPicCurr->setScaleOffset( m_aaiCodedScale, m_aaiCodedOffset );
-#endif
 #endif
 }
@@ -768 +764 @@
     m_cSPS.setSpsInferScalingListFlag   ( true ); 
     m_cSPS.setSpsScalingListRefLayerId( m_cVPS->getIdRefLayer( getLayerId(), 0 ) ); 
-#if SONY_MV_V_CONST_C0078
+#if H_MV
     if ( m_bUseDisparitySearchRangeRestriction )
     {