Changeset 294 in 3DVCSoftware

Timestamp:

19 Feb 2013, 20:33:52 (12 years ago)

Author:

tech

Message:

Removed HM-6.1 related guard macros.

Location:

branches/HTM-5.1-dev0/source

Files:

• App/TAppDecoder/TAppDecTop.cpp (modified) (6 diffs)
• App/TAppDecoder/TAppDecTop.h (modified) (1 diff)
• App/TAppEncoder/TAppEncCfg.cpp (modified) (26 diffs)
• App/TAppEncoder/TAppEncCfg.h (modified) (10 diffs)
• App/TAppEncoder/TAppEncTop.cpp (modified) (33 diffs)
• App/TAppRenderer/TAppRendererTop.cpp (modified) (4 diffs)
• Lib/TLibCommon/CommonDef.h (modified) (4 diffs)
• Lib/TLibCommon/ContextModel.cpp (modified) (3 diffs)
• Lib/TLibCommon/ContextModel.h (modified) (1 diff)
• Lib/TLibCommon/ContextTables.h (modified) (16 diffs)
• Lib/TLibCommon/NAL.h (modified) (5 diffs)
• Lib/TLibCommon/TComAdaptiveLoopFilter.cpp (modified) (30 diffs)
• Lib/TLibCommon/TComAdaptiveLoopFilter.h (modified) (14 diffs)
• Lib/TLibCommon/TComBitStream.cpp (modified) (3 diffs)
• Lib/TLibCommon/TComBitStream.h (modified) (3 diffs)
• Lib/TLibCommon/TComDataCU.cpp (modified) (105 diffs)
• Lib/TLibCommon/TComDataCU.h (modified) (11 diffs)
• Lib/TLibCommon/TComLoopFilter.cpp (modified) (12 diffs)
• Lib/TLibCommon/TComLoopFilter.h (modified) (1 diff)
• Lib/TLibCommon/TComMv.h (modified) (1 diff)
• Lib/TLibCommon/TComPattern.cpp (modified) (4 diffs)
• Lib/TLibCommon/TComPattern.h (modified) (1 diff)
• Lib/TLibCommon/TComPic.cpp (modified) (1 diff)
• Lib/TLibCommon/TComPicSym.h (modified) (1 diff)
• Lib/TLibCommon/TComPrediction.cpp (modified) (8 diffs)
• Lib/TLibCommon/TComResidualGenerator.cpp (modified) (2 diffs)
• Lib/TLibCommon/TComRom.cpp (modified) (15 diffs)
• Lib/TLibCommon/TComRom.h (modified) (5 diffs)
• Lib/TLibCommon/TComSampleAdaptiveOffset.cpp (modified) (23 diffs)
• Lib/TLibCommon/TComSampleAdaptiveOffset.h (modified) (5 diffs)
• Lib/TLibCommon/TComSlice.cpp (modified) (40 diffs)
• Lib/TLibCommon/TComSlice.h (modified) (47 diffs)
• Lib/TLibCommon/TComTrQuant.cpp (modified) (77 diffs)
• Lib/TLibCommon/TComTrQuant.h (modified) (7 diffs)
• Lib/TLibCommon/TypeDef.h (modified) (18 diffs)
• Lib/TLibDecoder/NALread.cpp (modified) (4 diffs)
• Lib/TLibDecoder/TDecBinCoder.h (modified) (2 diffs)
• Lib/TLibDecoder/TDecBinCoderCABAC.cpp (modified) (14 diffs)
• Lib/TLibDecoder/TDecBinCoderCABAC.h (modified) (3 diffs)
• Lib/TLibDecoder/TDecCAVLC.cpp (modified) (69 diffs)
• Lib/TLibDecoder/TDecCAVLC.h (modified) (4 diffs)
• Lib/TLibDecoder/TDecCu.cpp (modified) (14 diffs)
• Lib/TLibDecoder/TDecEntropy.cpp (modified) (14 diffs)
• Lib/TLibDecoder/TDecEntropy.h (modified) (7 diffs)
• Lib/TLibDecoder/TDecGop.cpp (modified) (12 diffs)
• Lib/TLibDecoder/TDecGop.h (modified) (2 diffs)
• Lib/TLibDecoder/TDecSbac.cpp (modified) (56 diffs)
• Lib/TLibDecoder/TDecSbac.h (modified) (5 diffs)
• Lib/TLibDecoder/TDecSlice.cpp (modified) (13 diffs)
• Lib/TLibDecoder/TDecTop.cpp (modified) (17 diffs)
• Lib/TLibDecoder/TDecTop.h (modified) (1 diff)
• Lib/TLibEncoder/NALwrite.cpp (modified) (4 diffs)
• Lib/TLibEncoder/NALwrite.h (modified) (3 diffs)
• Lib/TLibEncoder/TEncAdaptiveLoopFilter.cpp (modified) (54 diffs)
• Lib/TLibEncoder/TEncAdaptiveLoopFilter.h (modified) (16 diffs)
• Lib/TLibEncoder/TEncBinCoder.h (modified) (1 diff)
• Lib/TLibEncoder/TEncBinCoderCABAC.cpp (modified) (5 diffs)
• Lib/TLibEncoder/TEncBinCoderCABAC.h (modified) (1 diff)
• Lib/TLibEncoder/TEncCavlc.cpp (modified) (48 diffs)
• Lib/TLibEncoder/TEncCavlc.h (modified) (5 diffs)
• Lib/TLibEncoder/TEncCfg.h (modified) (25 diffs)
• Lib/TLibEncoder/TEncCu.cpp (modified) (23 diffs)
• Lib/TLibEncoder/TEncCu.h (modified) (3 diffs)
• Lib/TLibEncoder/TEncEntropy.cpp (modified) (38 diffs)
• Lib/TLibEncoder/TEncEntropy.h (modified) (11 diffs)
• Lib/TLibEncoder/TEncGOP.cpp (modified) (46 diffs)
• Lib/TLibEncoder/TEncSampleAdaptiveOffset.cpp (modified) (18 diffs)
• Lib/TLibEncoder/TEncSampleAdaptiveOffset.h (modified) (2 diffs)
• Lib/TLibEncoder/TEncSbac.cpp (modified) (65 diffs)
• Lib/TLibEncoder/TEncSbac.h (modified) (6 diffs)
• Lib/TLibEncoder/TEncSearch.cpp (modified) (37 diffs)
• Lib/TLibEncoder/TEncSearch.h (modified) (1 diff)
• Lib/TLibEncoder/TEncSlice.cpp (modified) (37 diffs)
• Lib/TLibEncoder/TEncTop.cpp (modified) (16 diffs)
• Lib/TLibExtractor/TExtrTop.cpp (modified) (1 diff)
• Lib/TLibVideoIO/TVideoIOYuv.cpp (modified) (4 diffs)
• Lib/TLibVideoIO/TVideoIOYuv.h (modified) (1 diff)

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

@@ -369 +369 @@
       if(newPicture[viewDepthId])
       {
-#if H0567_DPB_PARAMETERS_PER_TEMPORAL_LAYER
         xWriteOutput( pcListPic[viewDepthId], viewDepthId, nalu.m_temporalId );
-#else
-        xWriteOutput( pcListPic[viewDepthId], viewDepthId );
-#endif
       }
     }
@@ -440 +436 @@
 }
 
-#if H0567_DPB_PARAMETERS_PER_TEMPORAL_LAYER
 Void TAppDecTop::xWriteOutput( TComList<TComPic*>* pcListPic, Int viewDepthId, UInt tId )
-#else
-Void TAppDecTop::xWriteOutput( TComList<TComPic*>* pcListPic, Int viewDepthId )
-#endif
 {
   TComList<TComPic*>::iterator iterPic   = pcListPic->begin();
@@ -463 +455 @@
   {
     TComPic* pcPic = *(iterPic);
-#if PIC_CROPPING
     TComSPS *sps = pcPic->getSlice(0)->getSPS();
-#endif
     
-#if H0567_DPB_PARAMETERS_PER_TEMPORAL_LAYER
     if ( pcPic->getOutputMark() && (not_displayed >  pcPic->getSlice(0)->getSPS()->getNumReorderPics(tId) && pcPic->getPOC() > m_pocLastDisplay[viewDepthId]))
-#else
-    if ( pcPic->getOutputMark() && (not_displayed >  pcPic->getSlice(0)->getSPS()->getNumReorderFrames() && pcPic->getPOC() > m_pocLastDisplay[viewDepthId]))
-#endif
     {
       // write to file
@@ -477 +463 @@
       if ( m_pchReconFile )
       {
-#if PIC_CROPPING
         m_tVideoIOYuvReconFile[viewDepthId]->write( pcPic->getPicYuvRec(), sps->getPicCropLeftOffset(), sps->getPicCropRightOffset(), sps->getPicCropTopOffset(), sps->getPicCropBottomOffset() );
-#else
-        m_tVideoIOYuvReconFile[viewDepthId]->write( pcPic->getPicYuvRec(), pcPic->getSlice(0)->getSPS()->getPad() );
-#endif
       }
       
@@ -526 +508 @@
   {
     TComPic* pcPic = *(iterPic);
-#if PIC_CROPPING
     TComSPS *sps = pcPic->getSlice(0)->getSPS();
-#endif
 
     if ( pcPic->getOutputMark() )
@@ -535 +515 @@
       if ( m_pchReconFile )
       {
-#if PIC_CROPPING
         m_tVideoIOYuvReconFile[viewDepthId]->write( pcPic->getPicYuvRec(), sps->getPicCropLeftOffset(), sps->getPicCropRightOffset(), sps->getPicCropTopOffset(), sps->getPicCropBottomOffset() );
-#else
-        m_tVideoIOYuvReconFile[viewDepthId]->write( pcPic->getPicYuvRec(), pcPic->getSlice(0)->getSPS()->getPad() );
-#endif
       }
       

branches/HTM-5.1-dev0/source/App/TAppDecoder/TAppDecTop.h

@@ -121 +121 @@
 //  Void  xInitDecLib       (); ///< initialize decoder class
   
-#if H0567_DPB_PARAMETERS_PER_TEMPORAL_LAYER
   Void  xWriteOutput      ( TComList<TComPic*>* pcListPic, Int viewDepthId, UInt tId); ///< write YUV to file
-#else
-  Void  xWriteOutput      ( TComList<TComPic*>* pcListPic, Int viewDepthId ); ///< write YUV to file
-#endif
   Void  xFlushOutput      ( TComList<TComPic*>* pcListPic, Int viewDepthId ); ///< flush all remaining decoded pictures to file
 

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

@@ -233 +233 @@
   ("SourceWidth,-wdt",        m_iSourceWidth,           0,                            "Source picture width")
   ("SourceHeight,-hgt",       m_iSourceHeight,          0,                            "Source picture height")
-#if PIC_CROPPING
   ("CroppingMode",            m_croppingMode,           0,                            "Cropping mode (0: no cropping, 1:automatic padding, 2: padding, 3:cropping")
   ("CropLeft",                m_cropLeft,               0,                            "Left cropping/padding for cropping mode 3")
@@ -241 +240 @@
   ("HorizontalPadding,-pdx",  m_aiPad[0],               0,                            "horizontal source padding for cropping mode 2")
   ("VerticalPadding,-pdy",    m_aiPad[1],               0,                            "vertical source padding for cropping mode 2")
-#endif
   ("InputBitDepth",         m_uiInputBitDepth, 8u, "bit-depth of input file")
   ("BitDepth",              m_uiInputBitDepth, 8u, "deprecated alias of InputBitDepth")
   ("OutputBitDepth",        m_uiOutputBitDepth, 0u, "bit-depth of output file")
   ("InternalBitDepth",      m_uiInternalBitDepth, 0u, "Internal bit-depth (BitDepth+BitIncrement)")
-#if !PIC_CROPPING
-  ("HorizontalPadding,-pdx",m_aiPad[0],      0, "horizontal source padding size")
-  ("VerticalPadding,-pdy",  m_aiPad[1],      0, "vertical source padding size")
-  ("PAD",                   m_bUsePAD,   false, "automatic source padding of multiple of 16" )
-#endif
   ("FrameRate,-fr",         m_iFrameRate,        0, "Frame rate")
   ("FrameSkip,-fs",         m_FrameSkip,         0u, "Number of frames to skip at start of input YUV")
@@ -279 +272 @@
   ("DecodingRefreshType,-dr",m_iDecodingRefreshType, 0, "intra refresh, (0:none 1:CRA 2:IDR)")
   ("GOPSize,g",      m_iGOPSize,      1, "GOP size of temporal structure")
-#if !H0567_DPB_PARAMETERS_PER_TEMPORAL_LAYER
-  ("MaxNumberOfReorderPictures",   m_numReorderFrames,               -1, "Max. number of reorder pictures: -1: encoder determines value, >=0: set explicitly")
-  ("MaxNumberOfReferencePictures", m_maxNumberOfReferencePictures, 6, "Max. number of reference pictures")
-#endif
   ("ListCombination,-lc", m_bUseLComb, true, "combined reference list flag for uni-prediction in B-slices")
   ("LCModification", m_bLCMod, false, "enables signalling of combined reference list derivation")
@@ -321 +310 @@
   ("TemporalLayerQPOffset_L3,-tq3", m_aiTLayerQPOffset[3], MAX_QP + 1, "QP offset of temporal layer 3")
   
-#if !H0566_TLA
-  ("TLayeringBasedOnCodingStruct,-tl", m_bTLayering, false, "Temporal ID is set based on the hierarchical coding structure")
-  
-  ("TLayerSwitchingFlag_L0,-ts0", m_abTLayerSwitchingFlag[0], false, "Switching flag for temporal layer 0")
-  ("TLayerSwitchingFlag_L1,-ts1", m_abTLayerSwitchingFlag[1], false, "Switching flag for temporal layer 1")
-  ("TLayerSwitchingFlag_L2,-ts2", m_abTLayerSwitchingFlag[2], false, "Switching flag for temporal layer 2")
-  ("TLayerSwitchingFlag_L3,-ts3", m_abTLayerSwitchingFlag[3], false, "Switching flag for temporal layer 3")
-#endif
 
   /* Entropy coding parameters */
@@ -349 +330 @@
   ("IVSEnable",                       m_bUseIVS                 , true         , "Use inter-view vector scaling" )
 #endif
-#if DBL_CONTROL
   ("DeblockingFilterControlPresent", m_DeblockingFilterControlPresent, true)
-#endif
 
   /* Camera Paremetes */
@@ -412 +391 @@
   ("ALF", m_abUseALF, std::vector<Bool>(1,true), "Enables ALF")
   ("SAO", m_abUseSAO, std::vector<Bool>(1, true), "SAO")
-#if SAO_UNIT_INTERLEAVING
   ("MaxNumOffsetsPerPic", m_maxNumOffsetsPerPic, 2048, "2048: default")   
   ("SAOInterleaving", m_saoInterleavingFlag, false, "0: SAO Picture Mode, 1: SAO Interleaving ")   
-#endif
 
   ("ALFEncodePassReduction", m_iALFEncodePassReduction, 0, "0:Original 16-pass, 1: 1-pass, 2: 2-pass encoding")
 
   ("ALFMaxNumFilter,-ALFMNF", m_iALFMaxNumberFilters, 16, "16: No Constrained, 1-15: Constrained max number of filter")
-#if LCU_SYNTAX_ALF
   ("ALFParamInSlice", m_bALFParamInSlice, false, "ALF parameters in 0: APS, 1: slice header")
   ("ALFPicBasedEncode", m_bALFPicBasedEncode, true, "ALF picture-based encoding 0: false, 1: true")
-#endif
 
     ("SliceMode",            m_iSliceMode,           0, "0: Disable all Recon slice limits, 1: Enforce max # of LCUs, 2: Enforce max # of bytes")
@@ -446 +421 @@
     ("TileInfoPresentFlag",         m_iColumnRowInfoPresent,         1,          "0: tiles parameters are NOT present in the PPS. 1: tiles parameters are present in the PPS")
     ("UniformSpacingIdc",           m_iUniformSpacingIdr,            0,          "Indicates if the column and row boundaries are distributed uniformly")
-#if !REMOVE_TILE_DEPENDENCE
-    ("TileBoundaryIndependenceIdc", m_iTileBoundaryIndependenceIdr,  1,          "Indicates if the column and row boundaries break the prediction")
-#endif
     ("NumTileColumnsMinus1",        m_iNumColumnsMinus1,             0,          "Number of columns in a picture minus 1")
     ("ColumnWidthArray",            cfg_ColumnWidth,                 string(""), "Array containing ColumnWidth values in units of LCU")
@@ -463 +435 @@
     ("ScalingList",                 m_useScalingListId,              0,          "0: no scaling list, 1: default scaling lists, 2: scaling lists specified in ScalingListFile")
     ("ScalingListFile",             cfg_ScalingListFile,             string(""), "Scaling list file name")
-#if MULTIBITS_DATA_HIDING
     ("SignHideFlag,-SBH",                m_signHideFlag, 1)
     ("SignHideThreshold,-TSIG",          m_signHidingThreshold,         4)
-#endif
 #if HHI_DMM_WEDGE_INTRA || HHI_DMM_PRED_TEX
   ("DMM",                         m_bUseDMM,                       false,      "depth model modes flag")
@@ -484 +454 @@
   ("FEN", m_bUseFastEnc, false, "fast encoder setting")
   ("ECU", m_bUseEarlyCU, false, "Early CU setting") 
-#if FAST_DECISION_FOR_MRG_RD_COST
   ("FDM", m_useFastDecisionForMerge, true, "Fast decision for Merge RD Cost") 
-#endif
   ("CFM", m_bUseCbfFastMode, false, "Cbf fast mode setting")
 #if HHI_INTERVIEW_SKIP
@@ -624 +592 @@
   }
 
-#if PIC_CROPPING
   switch (m_croppingMode)
   {
@@ -674 +641 @@
     }
   }
-#else
-
-  // compute source padding size
-  if ( m_bUsePAD )
-  {
-    if ( m_iSourceWidth%MAX_PAD_SIZE )
-    {
-      m_aiPad[0] = (m_iSourceWidth/MAX_PAD_SIZE+1)*MAX_PAD_SIZE - m_iSourceWidth;
-    }
-    
-    if ( m_iSourceHeight%MAX_PAD_SIZE )
-    {
-      m_aiPad[1] = (m_iSourceHeight/MAX_PAD_SIZE+1)*MAX_PAD_SIZE - m_iSourceHeight;
-    }
-  }
-  m_iSourceWidth  += m_aiPad[0];
-  m_iSourceHeight += m_aiPad[1];
-#endif
   
   // allocate slice-based dQP values
@@ -897 +846 @@
   xConfirmPara( (m_iIntraPeriod > 0 && m_iIntraPeriod < m_iGOPSize) || m_iIntraPeriod == 0, "Intra period must be more than GOP size, or -1 , not 0" );
   xConfirmPara( m_iDecodingRefreshType < 0 || m_iDecodingRefreshType > 2,                   "Decoding Refresh Type must be equal to 0, 1 or 2" );
-#if H0736_AVC_STYLE_QP_RANGE
   xConfirmPara( m_aiQP[0] < -6 * ((Int)m_uiInternalBitDepth - 8) || m_aiQP[0] > 51,         "QP exceeds supported range (-QpBDOffsety to 51)" );
   if ( m_aiQP.size() >= 2 )
@@ -903 +851 @@
     xConfirmPara( m_aiQP[1] < -6 * ((Int)m_uiInternalBitDepth - 8) || m_aiQP[1] > 51,       "QP depth exceeds supported range (-QpBDOffsety to 51)" );
   }
-#else
-  xConfirmPara( m_aiQP[0] < 0 || m_aiQP[0] > 51,                                             "QP exceeds supported range (0 to 51)" );
-  if ( m_aiQP.size() >= 2 )
-  {
-    xConfirmPara( m_aiQP[1] < 0 || m_aiQP[1] > 51,                                           "QP Depth exceeds supported range (0 to 51)" );
-  }
-#endif
   xConfirmPara( m_iALFEncodePassReduction < 0 || m_iALFEncodePassReduction > 2,             "ALFEncodePassReduction must be equal to 0, 1 or 2");
-#if LCU_SYNTAX_ALF
   xConfirmPara( m_iALFMaxNumberFilters < 1,                                                 "ALFMaxNumFilter should be larger than 1");  
-#else
-  xConfirmPara( m_iALFMaxNumberFilters < 1 || m_iALFMaxNumberFilters > 16,                  "ALFMaxNumFilter exceeds supported range (1 to 16)");  
-#endif
   xConfirmPara( m_loopFilterBetaOffsetDiv2 < -13 || m_loopFilterBetaOffsetDiv2 > 13,          "Loop Filter Beta Offset div. 2 exceeds supported range (-13 to 13)");
   xConfirmPara( m_loopFilterTcOffsetDiv2 < -13 || m_loopFilterTcOffsetDiv2 > 13,              "Loop Filter Tc Offset div. 2 exceeds supported range (-13 to 13)");
@@ -941 +878 @@
   xConfirmPara( m_uiMaxCUWidth < 16,                                                        "Maximum partition width size should be larger than or equal to 16");
   xConfirmPara( m_uiMaxCUHeight < 16,                                                       "Maximum partition height size should be larger than or equal to 16");
-#if PIC_CROPPING
   xConfirmPara( (m_iSourceWidth  % (m_uiMaxCUWidth  >> (m_uiMaxCUDepth-1)))!=0,             "Resulting coded frame width must be a multiple of the minimum CU size");
   xConfirmPara( (m_iSourceHeight % (m_uiMaxCUHeight >> (m_uiMaxCUDepth-1)))!=0,             "Resulting coded frame height must be a multiple of the minimum CU size");
-#else
-  xConfirmPara( (m_iSourceWidth  % (m_uiMaxCUWidth  >> (m_uiMaxCUDepth-1)))!=0,             "Frame width should be multiple of minimum CU size");
-  xConfirmPara( (m_iSourceHeight % (m_uiMaxCUHeight >> (m_uiMaxCUDepth-1)))!=0,             "Frame height should be multiple of minimum CU size");
-#endif
   
   xConfirmPara( m_uiQuadtreeTULog2MinSize < 2,                                        "QuadtreeTULog2MinSize must be 2 or greater.");
@@ -1005 +937 @@
   }
 #if ADAPTIVE_QP_SELECTION
-#if H0736_AVC_STYLE_QP_RANGE
   xConfirmPara( m_bUseAdaptQpSelect == true && m_aiQP[0] < 0,                                              "AdaptiveQpSelection must be disabled when QP < 0.");
   xConfirmPara( m_bUseAdaptQpSelect == true && m_aiQP[1] < 0,                                              "AdaptiveQpSelection must be disabled when QP < 0.");
   xConfirmPara( m_bUseAdaptQpSelect == true && (m_iChromaQpOffset !=0 || m_iChromaQpOffset2nd != 0 ),  "AdaptiveQpSelection must be disabled when ChromaQpOffset is not equal to 0.");
-#endif
 #endif
 
@@ -1020 +950 @@
   }
 
-#if FIXED_NUMBER_OF_TILES_SLICE_MODE
   xConfirmPara( m_iSliceMode < 0 || m_iSliceMode > 3, "SliceMode exceeds supported range (0 to 3)" );
-#endif
   if (m_iSliceMode!=0)
   {
     xConfirmPara( m_iSliceArgument < 1 ,         "SliceArgument should be larger than or equal to 1" );
   }
-#if FIXED_NUMBER_OF_TILES_SLICE_MODE
   if (m_iSliceMode==3)
   {
     xConfirmPara( m_iSliceGranularity > 0 ,      "When SliceMode == 3 is chosen, the SliceGranularity must be 0" );
   }
-#endif
   xConfirmPara( m_iEntropySliceMode < 0 || m_iEntropySliceMode > 2, "EntropySliceMode exceeds supported range (0 to 2)" );
   if (m_iEntropySliceMode!=0)
@@ -1042 +968 @@
   xConfirmPara( m_iSliceGranularity > m_iMaxCuDQPDepth, "SliceGranularity must be smaller smaller than or equal to maximum dqp depth" );
 
-#if NO_COMBINED_PARALLEL
   bool tileFlag = (m_iNumColumnsMinus1 > 0 || m_iNumRowsMinus1 > 0 );
   xConfirmPara( tileFlag && m_iEntropySliceMode,            "Tile and Entropy Slice can not be applied together");
   xConfirmPara( tileFlag && m_iWaveFrontSynchro,            "Tile and Wavefront can not be applied together");
   xConfirmPara( m_iWaveFrontSynchro && m_iEntropySliceMode, "Wavefront and Entropy Slice can not be applied together");  
-#endif
 
   // max CU width and height should be power of 2
@@ -1239 +1163 @@
       for( Int i = 0; i < MAX_GOP; i++ ) { isOK[i] = false; }
       Int numOK = 0;
-#if !H0567_DPB_PARAMETERS_PER_TEMPORAL_LAYER
-      Int numReorderFramesRequired=0;
-      m_maxNumberOfReferencePictures=0;
-      Int lastDisp = -1;
-#endif
       m_extraRPSs[viewId] = 0;
       //start looping through frames in coding order until we can verify that the GOP structure is correct.
@@ -1427 +1346 @@
             }
           }
-#if !H0567_DPB_PARAMETERS_PER_TEMPORAL_LAYER
-          if(m_maxNumberOfReferencePictures<numRefs)
-          {
-            m_maxNumberOfReferencePictures=numRefs;
-          }
-#endif
           refList[numRefs] = curPOC;
           numRefs++;
-#if !H0567_DPB_PARAMETERS_PER_TEMPORAL_LAYER
-          Int nonDisplayed=0;
-          for(Int i=0; i<numRefs; i++) 
-          {
-            if(refList[i]==lastDisp+1) 
-            {
-              lastDisp=refList[i];
-              i=0;
-            }
-          }
-          for(Int i=0; i<numRefs; i++) 
-          {
-            if(refList[i]>lastDisp)
-            {
-              nonDisplayed++;
-            }
-          }
-          if(nonDisplayed>numReorderFramesRequired)
-          {
-            numReorderFramesRequired=nonDisplayed;
-          }
-#endif
         }
         checkGOP++;
       }
-#if !H0567_DPB_PARAMETERS_PER_TEMPORAL_LAYER
-      if (m_numReorderFrames == -1)
-      {
-        m_numReorderFrames = numReorderFramesRequired;
-      }
-#endif
       xConfirmPara( errorGOP, "Invalid GOP structure given" );
-#if H0566_TLA
       m_maxTempLayer[viewId] = 1;
-#endif
       for( Int i = 0; i < m_iGOPSize; i++ ) 
       {
-#if H0566_TLA
         if( m_GOPListsMvc[viewId][i].m_temporalId >= m_maxTempLayer[viewId] )
         {
           m_maxTempLayer[viewId] = m_GOPListsMvc[viewId][i].m_temporalId + 1;
         }
-#endif
         xConfirmPara( m_GOPListsMvc[viewId][i].m_sliceType != 'B' && m_GOPListsMvc[viewId][i].m_sliceType != 'P', "Slice type must be equal to B or P" );
       }
 
-#if H0567_DPB_PARAMETERS_PER_TEMPORAL_LAYER
       for( Int i = 0; i < MAX_TLAYER; i++ )
       {
@@ -1538 +1418 @@
         m_maxDecPicBuffering[viewId][MAX_TLAYER-1] = m_numReorderPics[viewId][MAX_TLAYER-1];
       }
-#endif
-
-#if H0567_DPB_PARAMETERS_PER_TEMPORAL_LAYER
+
       xConfirmPara( m_bUseLComb == false && m_numReorderPics[viewId][MAX_TLAYER-1] != 0, "ListCombination can only be 0 in low delay coding (more precisely when L0 and L1 are identical)" );  // Note however this is not the full necessary condition as ref_pic_list_combination_flag can only be 0 if L0 == L1.
-#else
-      xConfirmPara( m_bUseLComb==false && m_numReorderFrames!=0, "ListCombination can only be 0 in low delay coding (more precisely when L0 and L1 are identical)" );  // Note however this is not the full necessary condition as ref_pic_list_combination_flag can only be 0 if L0 == L1.
-      xConfirmPara( m_numReorderFrames < numReorderFramesRequired, "For the used GOP the encoder requires more pictures for reordering than specified in MaxNumberOfReorderPictures" );
-#endif
     }
   }
@@ -1655 +1529 @@
     }
   }
-#if PIC_CROPPING
   printf("Real     Format              : %dx%d %dHz\n", m_iSourceWidth - m_cropLeft - m_cropRight, m_iSourceHeight - m_cropTop - m_cropBottom, m_iFrameRate );
-#else
-  printf("Real     Format              : %dx%d %dHz\n", m_iSourceWidth - m_aiPad[0], m_iSourceHeight-m_aiPad[1], m_iFrameRate );
-#endif
   printf("Internal Format              : %dx%d %dHz\n", m_iSourceWidth, m_iSourceHeight, m_iFrameRate );
   printf("Frame index                  : %u - %d (%d frames)\n", m_FrameSkip, m_FrameSkip+m_iFrameToBeEncoded-1, m_iFrameToBeEncoded );
@@ -1727 +1597 @@
   
   printf("TOOL CFG General: ");  
-#if LCU_SYNTAX_ALF
   printf("ALFMNF:%d ", m_iALFMaxNumberFilters);
   printf("ALFInSlice:%d ", m_bALFParamInSlice);
   printf("ALFPicEnc:%d ", m_bALFPicBasedEncode);
-#endif
   printf("IBD:%d ", !!g_uiBitIncrement);
   printf("HAD:%d ", m_bUseHADME           );
@@ -1737 +1605 @@
   printf("SQP:%d ", m_uiDeltaQpRD         );
   printf("ASR:%d ", m_bUseASR             );
-#if !PIC_CROPPING
-  printf("PAD:%d ", m_bUsePAD             );
-#endif
   printf("LComb:%d ", m_bUseLComb         );
   printf("LCMod:%d ", m_bLCMod         );
   printf("FEN:%d ", m_bUseFastEnc         );
   printf("ECU:%d ", m_bUseEarlyCU         );
-#if FAST_DECISION_FOR_MRG_RD_COST
   printf("FDM:%d ", m_useFastDecisionForMerge );
-#endif
   printf("CFM:%d ", m_bUseCbfFastMode         );
   printf("RQT:%d ", 1     );
@@ -1761 +1624 @@
   }
   printf("CIP:%d ", m_bUseConstrainedIntraPred);
-#if BURST_IPCM
   printf("PCM:%d ", (m_usePCM && (1<<m_uiPCMLog2MinSize) <= m_uiMaxCUWidth)? 1 : 0);
-#else
-  printf("PCM:%d ", ((1<<m_uiPCMLog2MinSize) <= m_uiMaxCUWidth)? 1 : 0);
-#endif
-#if SAO_UNIT_INTERLEAVING
   printf("SAOInterleaving:%d ", (m_saoInterleavingFlag)?(1):(0));
-#endif
 #if LOSSLESS_CODING
   printf("LosslessCuEnabled:%d ", (m_useLossless)? 1:0 );
@@ -1774 +1631 @@
   printf("WPP:%d ", (Int)m_bUseWeightPred);
   printf("WPB:%d ", m_uiBiPredIdc);
-#if !REMOVE_TILE_DEPENDENCE
-  printf("TileBoundaryIndependence:%d ", m_iTileBoundaryIndependenceIdr ); 
-#endif
   printf("TileLocationInSliceHdr:%d ", m_iTileLocationInSliceHeaderFlag);
   printf("TileMarker:%d", m_iTileMarkerFlag);
@@ -1799 +1653 @@
 #endif
 
-#if MULTIBITS_DATA_HIDING
   printf(" SignBitHidingFlag:%d SignBitHidingThreshold:%d", m_signHideFlag, m_signHidingThreshold);
-#endif
   printf("\n");
   printf("TOOL CFG VIDEO  : ");

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

@@ -73 +73 @@
   Int       m_iSourceWidth;                                   ///< source width in pixel
   Int       m_iSourceHeight;                                  ///< source height in pixel
-#if PIC_CROPPING
   Int       m_croppingMode;
   Int       m_cropLeft;
@@ -79 +78 @@
   Int       m_cropTop;
   Int       m_cropBottom;
-#endif
   Int       m_iFrameToBeEncoded;                              ///< number of encoded frames
-#if !PIC_CROPPING
-  Bool      m_bUsePAD;                                        ///< flag for using source padding
-#endif
   Int       m_aiPad[2];                                       ///< number of padded pixels for width and height
   
@@ -100 +95 @@
   Int       m_extraRPSs[MAX_VIEW_NUM];
   GOPEntryMvc m_GOPListsMvc[MAX_VIEW_NUM][MAX_GOP+1];
-#if H0567_DPB_PARAMETERS_PER_TEMPORAL_LAYER
   Int       m_numReorderPics[MAX_VIEW_NUM][MAX_TLAYER];       ///< total number of reorder pictures
   Int       m_maxDecPicBuffering[MAX_VIEW_NUM][MAX_TLAYER];   ///< total number of reference pictures needed for decoding
-#else
-  Int       m_numReorderFrames;                               ///< total number of reorder pictures
-  Int       m_maxNumberOfReferencePictures;                   ///< total number of reference pictures needed for decoding
-#endif
   Bool      m_bUseLComb;                                      ///< flag for using combined reference list for uni-prediction in B-slices (JCTVC-D421)
   Bool      m_bLCMod;                                         ///< flag for specifying whether the combined reference list for uni-prediction in B-slices is uploaded explicitly
@@ -136 +126 @@
   Int       m_iQPAdaptationRange;                             ///< dQP range by QP adaptation
   
-#if H0566_TLA
   Int       m_maxTempLayer[MAX_VIEW_NUM];                     ///< Max temporal layer
-#else
-  Bool      m_bTLayering;                                     ///< indicates whether temporal IDs are set based on the hierarchical coding structure
-  Bool      m_abTLayerSwitchingFlag[MAX_TLAYER];              ///< temporal layer switching flags corresponding to each temporal layer
-#endif
 
   // coding unit (CU) definition
@@ -179 +164 @@
   Bool      m_bUseIVS;                                        ///< flag for using inter-view vector scaling
 #endif
-#if SAO_UNIT_INTERLEAVING
   Int       m_maxNumOffsetsPerPic;                            ///< SAO maximun number of offset per picture
   Bool      m_saoInterleavingFlag;                            ///< SAO interleaving flag
-#endif
   // coding tools (loop filter)
   vector<Bool> m_abUseALF;                                    ///< flag for using adaptive loop filter [0] - video, [1] - depth
@@ -188 +171 @@
   
   Int       m_iALFMaxNumberFilters;                           ///< ALF Max Number Filters in one picture
-#if LCU_SYNTAX_ALF
   Bool      m_bALFParamInSlice;
   Bool      m_bALFPicBasedEncode;
-#endif
 
   vector<Bool> m_abLoopFilterDisable;                         ///< flag for using deblocking filter filter [0] - video, [1] - depth
@@ -197 +178 @@
   Int       m_loopFilterBetaOffsetDiv2;                     ///< beta offset for deblocking filter
   Int       m_loopFilterTcOffsetDiv2;                       ///< tc offset for deblocking filter
-#if DBL_CONTROL
   Bool      m_DeblockingFilterControlPresent;                 ///< deblocking filter control present flag in PPS
-#endif
  
   Bool      m_bUseLMChroma;                                  ///< JL: Chroma intra prediction based on luma signal
@@ -242 +221 @@
 #endif
 
-#if FAST_DECISION_FOR_MRG_RD_COST
   Bool      m_useFastDecisionForMerge;         ///< flag for using Fast Decision Merge RD-Cost 
-#endif
   Bool      m_bUseCbfFastMode;                 ///< flag for using Cbf Fast PU Mode Decision
   Int       m_iSliceMode;                      ///< 0: Disable all Recon slice limits, 1 : Maximum number of largest coding units per slice, 2: Maximum number of bytes in a slice
@@ -257 +234 @@
   Int       m_iColumnRowInfoPresent;
   Int       m_iUniformSpacingIdr;
-#if !REMOVE_TILE_DEPENDENCE
-  Int       m_iTileBoundaryIndependenceIdr;
-#endif
   Int       m_iNumColumnsMinus1;
   char*     m_pchColumnWidth;
@@ -287 +261 @@
 #endif
 
-#if MULTIBITS_DATA_HIDING
   Int       m_signHideFlag;
   Int       m_signHidingThreshold;
-#endif
 #if HHI_MPI
   Bool      m_bUseMVI;  ///< flag for using Motion Vector Inheritance for depth map coding

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

@@ -97 +97 @@
     m_acTEncTopList[iViewIdx]->setSourceWidth                  ( m_iSourceWidth );
     m_acTEncTopList[iViewIdx]->setSourceHeight                 ( m_iSourceHeight );
-#if PIC_CROPPING
     m_acTEncTopList[iViewIdx]->setCroppingMode                 ( m_croppingMode );
     m_acTEncTopList[iViewIdx]->setCropLeft                     ( m_cropLeft );
@@ -103 +102 @@
     m_acTEncTopList[iViewIdx]->setCropTop                      ( m_cropTop );
     m_acTEncTopList[iViewIdx]->setCropBottom                   ( m_cropBottom );
-#endif
     m_acTEncTopList[iViewIdx]->setFrameToBeEncoded             ( m_iFrameToBeEncoded );
     m_acTEncTopList[iViewIdx]->setViewId                       ( iViewIdx );
@@ -138 +136 @@
     m_acTEncTopList[iViewIdx]->setGopList                      ( m_GOPListsMvc[iViewIdx] );
     m_acTEncTopList[iViewIdx]->setExtraRPSs                    ( m_extraRPSs[iViewIdx] );
-#if H0567_DPB_PARAMETERS_PER_TEMPORAL_LAYER
     for(Int i = 0; i < MAX_TLAYER; i++)
     {
@@ -144 +141 @@
       m_acTEncTopList[iViewIdx]->setMaxDecPicBuffering         ( m_maxDecPicBuffering[iViewIdx][i], i );
     }
-#else
-    m_acTEncTopList[iViewIdx]->setNumReorderFrames             ( m_numReorderFrames );
-    m_acTEncTopList[iViewIdx]->setMaxNumberOfReferencePictures ( m_maxNumberOfReferencePictures );
-#endif
     for( UInt uiLoop = 0; uiLoop < MAX_TLAYER; ++uiLoop )
     {
@@ -157 +150 @@
     m_acTEncTopList[iViewIdx]->setPad                          ( m_aiPad );
     
-#if H0566_TLA
     m_acTEncTopList[iViewIdx]->setMaxTempLayer                 ( m_maxTempLayer[iViewIdx] );
-#else
-    m_acTEncTopList[iViewIdx]->setTLayering                    ( m_bTLayering );
-    m_acTEncTopList[iViewIdx]->setTLayerSwitchingFlag          ( m_abTLayerSwitchingFlag );
-#endif
 
     m_acTEncTopList[iViewIdx]->setDisInter4x4                  ( m_bDisInter4x4);
@@ -176 +164 @@
     m_acTEncTopList[iViewIdx]->setLoopFilterBetaOffset         ( m_loopFilterBetaOffsetDiv2  );
     m_acTEncTopList[iViewIdx]->setLoopFilterTcOffset           ( m_loopFilterTcOffsetDiv2    );
-#if DBL_CONTROL
     m_acTEncTopList[iViewIdx]->setDeblockingFilterControlPresent( m_DeblockingFilterControlPresent);
-#endif
 
   //====== Motion search ========
@@ -201 +187 @@
 #if LOSSLESS_CODING
     Int lowestQP;
-#if H0736_AVC_STYLE_QP_RANGE
     lowestQP =  - ( (Int)(6*(g_uiBitDepth + g_uiBitIncrement - 8)) );
-#else
-    lowestQP = 0;
-#endif
     if ((m_iMaxDeltaQP == 0 ) && (m_aiQP[0] == lowestQP) && (m_useLossless == true))
     {
@@ -260 +242 @@
     m_acTEncTopList[iViewIdx]->setdQPs                         ( m_aidQP        );
     m_acTEncTopList[iViewIdx]->setUseRDOQ                      ( m_abUseRDOQ[0] );
-#if !PIC_CROPPING
-    m_acTEncTopList[iViewIdx]->setUsePAD                       ( m_bUsePAD      );
-#endif
     m_acTEncTopList[iViewIdx]->setQuadtreeTULog2MaxSize        ( m_uiQuadtreeTULog2MaxSize );
     m_acTEncTopList[iViewIdx]->setQuadtreeTULog2MinSize        ( m_uiQuadtreeTULog2MinSize );
@@ -269 +248 @@
     m_acTEncTopList[iViewIdx]->setUseFastEnc                   ( m_bUseFastEnc  );
     m_acTEncTopList[iViewIdx]->setUseEarlyCU                   ( m_bUseEarlyCU  ); 
-#if FAST_DECISION_FOR_MRG_RD_COST
     m_acTEncTopList[iViewIdx]->setUseFastDecisionForMerge      ( m_useFastDecisionForMerge  );
-#endif
     m_acTEncTopList[iViewIdx]->setUseCbfFastMode               ( m_bUseCbfFastMode  );
 #if HHI_INTERVIEW_SKIP
@@ -304 +281 @@
       m_acTEncTopList[iViewIdx]->setSliceArgument ( m_iSliceArgument * ( iNumPartInCU >> ( m_iSliceGranularity << 1 ) ) );
     }
-#if FIXED_NUMBER_OF_TILES_SLICE_MODE
     if(m_iSliceMode==AD_HOC_SLICES_FIXED_NUMBER_OF_TILES_IN_SLICE)
     {
       m_acTEncTopList[iViewIdx]->setSliceArgument ( m_iSliceArgument );
     }
-#endif
     m_acTEncTopList[iViewIdx]->setSliceGranularity        ( m_iSliceGranularity         );
     if(m_iSliceMode == 0 )
@@ -327 +302 @@
     m_acTEncTopList[iViewIdx]->setUseIVS               ( m_bUseIVS          );
 #endif
-#if SAO_UNIT_INTERLEAVING
     m_acTEncTopList[iViewIdx]->setMaxNumOffsetsPerPic (m_maxNumOffsetsPerPic);
     m_acTEncTopList[iViewIdx]->setSaoInterleavingFlag (m_saoInterleavingFlag);
-#endif
     m_acTEncTopList[iViewIdx]->setPCMInputBitDepthFlag  ( m_bPCMInputBitDepthFlag); 
     m_acTEncTopList[iViewIdx]->setPCMFilterDisableFlag  ( m_bPCMFilterDisableFlag); 
@@ -338 +311 @@
     m_acTEncTopList[iViewIdx]->setColumnRowInfoPresent       ( m_iColumnRowInfoPresent );
     m_acTEncTopList[iViewIdx]->setUniformSpacingIdr          ( m_iUniformSpacingIdr );
-#if !REMOVE_TILE_DEPENDENCE
-    m_acTEncTopList[iViewIdx]->setTileBoundaryIndependenceIdr( m_iTileBoundaryIndependenceIdr );
-#endif
     m_acTEncTopList[iViewIdx]->setNumColumnsMinus1           ( m_iNumColumnsMinus1 );
     m_acTEncTopList[iViewIdx]->setNumRowsMinus1              ( m_iNumRowsMinus1 );
@@ -357 +327 @@
     m_acTEncTopList[iViewIdx]->setMaxTileMarkerOffset         ( m_dMaxTileMarkerOffset );
     m_acTEncTopList[iViewIdx]->setTileBehaviorControlPresentFlag( m_iTileBehaviorControlPresentFlag );
-#if !REMOVE_TILE_DEPENDENCE
-    if(m_iTileBoundaryIndependenceIdr == 0 || uiTilesCount == 1)
-#else
     if(uiTilesCount == 1)
-#endif
     {
       m_bLFCrossTileBoundaryFlag = true; 
@@ -376 +342 @@
     m_acTEncTopList[iViewIdx]->setUseScalingListId           ( m_useScalingListId  );
     m_acTEncTopList[iViewIdx]->setScalingListFile            ( m_scalingListFile   );
-#if MULTIBITS_DATA_HIDING
     m_acTEncTopList[iViewIdx]->setSignHideFlag(m_signHideFlag);
     m_acTEncTopList[iViewIdx]->setTSIG(m_signHidingThreshold);
-#endif
-
-#if LCU_SYNTAX_ALF
+
     if(uiTilesCount > 1)
     {
@@ -389 +352 @@
     m_acTEncTopList[iViewIdx]->setALFParamInSlice              ( m_bALFParamInSlice);
     m_acTEncTopList[iViewIdx]->setALFPicBasedEncode            ( m_bALFPicBasedEncode);
-#endif
 
     //====== Depth tools ========
@@ -445 +407 @@
       m_acTEncDepthTopList[iViewIdx]->setSourceWidth                  ( m_iSourceWidth );
       m_acTEncDepthTopList[iViewIdx]->setSourceHeight                 ( m_iSourceHeight );
-#if PIC_CROPPING
       m_acTEncDepthTopList[iViewIdx]->setCroppingMode                 ( m_croppingMode );
       m_acTEncDepthTopList[iViewIdx]->setCropLeft                     ( m_cropLeft );
@@ -451 +412 @@
       m_acTEncDepthTopList[iViewIdx]->setCropTop                      ( m_cropTop );
       m_acTEncDepthTopList[iViewIdx]->setCropBottom                   ( m_cropBottom );
-#endif
       m_acTEncDepthTopList[iViewIdx]->setFrameToBeEncoded             ( m_iFrameToBeEncoded );
       m_acTEncDepthTopList[iViewIdx]->setViewId                       ( iViewIdx );
@@ -480 +440 @@
       m_acTEncDepthTopList[iViewIdx]->setGopList                      ( m_GOPListsMvc[iViewIdx] );
       m_acTEncDepthTopList[iViewIdx]->setExtraRPSs                    ( m_extraRPSs[iViewIdx] );
-#if H0567_DPB_PARAMETERS_PER_TEMPORAL_LAYER
       for(Int i = 0; i < MAX_TLAYER; i++)
       {
@@ -486 +445 @@
         m_acTEncDepthTopList[iViewIdx]->setMaxDecPicBuffering         ( m_maxDecPicBuffering[iViewIdx][i], i );
       }
-#else
-      m_acTEncDepthTopList[iViewIdx]->setNumReorderFrames             ( m_numReorderFrames );
-      m_acTEncDepthTopList[iViewIdx]->setMaxNumberOfReferencePictures ( m_maxNumberOfReferencePictures );
-#endif
       for( UInt uiLoop = 0; uiLoop < MAX_TLAYER; ++uiLoop )
       {
@@ -499 +454 @@
       m_acTEncDepthTopList[iViewIdx]->setPad                          ( m_aiPad );
 
-#if H0566_TLA
       m_acTEncDepthTopList[iViewIdx]->setMaxTempLayer                 ( m_maxTempLayer[iViewIdx] );
-#else
-      m_acTEncDepthTopList[iViewIdx]->setTLayering                    ( m_bTLayering );
-      m_acTEncDepthTopList[iViewIdx]->setTLayerSwitchingFlag          ( m_abTLayerSwitchingFlag );
-#endif
 
       m_acTEncDepthTopList[iViewIdx]->setDisInter4x4                  ( m_bDisInter4x4);
@@ -518 +468 @@
       m_acTEncDepthTopList[iViewIdx]->setLoopFilterBetaOffset         ( m_loopFilterBetaOffsetDiv2  );
       m_acTEncDepthTopList[iViewIdx]->setLoopFilterTcOffset           ( m_loopFilterTcOffsetDiv2    );
-#if DBL_CONTROL
       m_acTEncDepthTopList[iViewIdx]->setDeblockingFilterControlPresent( m_DeblockingFilterControlPresent);
-#endif
 
       //====== Motion search ========
@@ -560 +508 @@
       m_acTEncDepthTopList[iViewIdx]->setdQPs                         ( m_aidQPdepth   );
       m_acTEncDepthTopList[iViewIdx]->setUseRDOQ                      ( m_abUseRDOQ[1] );
-#if !PIC_CROPPING
-      m_acTEncDepthTopList[iViewIdx]->setUsePAD                       ( m_bUsePAD      );
-#endif
       m_acTEncDepthTopList[iViewIdx]->setQuadtreeTULog2MaxSize        ( m_uiQuadtreeTULog2MaxSize );
       m_acTEncDepthTopList[iViewIdx]->setQuadtreeTULog2MinSize        ( m_uiQuadtreeTULog2MinSize );
@@ -569 +514 @@
       m_acTEncDepthTopList[iViewIdx]->setUseFastEnc                   ( m_bUseFastEnc  );
       m_acTEncDepthTopList[iViewIdx]->setUseEarlyCU                   ( m_bUseEarlyCU  ); 
-#if FAST_DECISION_FOR_MRG_RD_COST
       m_acTEncDepthTopList[iViewIdx]->setUseFastDecisionForMerge      ( m_useFastDecisionForMerge  );
-#endif
       m_acTEncDepthTopList[iViewIdx]->setUseCbfFastMode               ( m_bUseCbfFastMode  );
 #if HHI_INTERVIEW_SKIP
@@ -633 +576 @@
         m_acTEncDepthTopList[iViewIdx]->setSliceArgument ( m_iSliceArgument * ( iNumPartInCU >> ( m_iSliceGranularity << 1 ) ) );
       }
-#if FIXED_NUMBER_OF_TILES_SLICE_MODE
       if(m_iSliceMode==AD_HOC_SLICES_FIXED_NUMBER_OF_TILES_IN_SLICE)
       {
         m_acTEncDepthTopList[iViewIdx]->setSliceArgument ( m_iSliceArgument );
       }
-#endif
       m_acTEncDepthTopList[iViewIdx]->setSliceGranularity        ( m_iSliceGranularity         );
       if(m_iSliceMode == 0 )
@@ -652 +593 @@
      m_acTEncDepthTopList[iViewIdx]->setUseIVS                ( m_bUseIVS );
 #endif
-#if SAO_UNIT_INTERLEAVING
       m_acTEncDepthTopList[iViewIdx]->setMaxNumOffsetsPerPic (m_maxNumOffsetsPerPic);
       m_acTEncDepthTopList[iViewIdx]->setSaoInterleavingFlag (m_saoInterleavingFlag);
-#endif
       m_acTEncDepthTopList[iViewIdx]->setPCMInputBitDepthFlag  ( m_bPCMInputBitDepthFlag); 
       m_acTEncDepthTopList[iViewIdx]->setPCMFilterDisableFlag  ( m_bPCMFilterDisableFlag); 
@@ -663 +602 @@
       m_acTEncDepthTopList[iViewIdx]->setColumnRowInfoPresent       ( m_iColumnRowInfoPresent );
       m_acTEncDepthTopList[iViewIdx]->setUniformSpacingIdr          ( m_iUniformSpacingIdr );
-#if !REMOVE_TILE_DEPENDENCE
-      m_acTEncDepthTopList[iViewIdx]->setTileBoundaryIndependenceIdr( m_iTileBoundaryIndependenceIdr );
-#endif
       m_acTEncDepthTopList[iViewIdx]->setNumColumnsMinus1           ( m_iNumColumnsMinus1 );
       m_acTEncDepthTopList[iViewIdx]->setNumRowsMinus1              ( m_iNumRowsMinus1 );
@@ -682 +618 @@
       m_acTEncDepthTopList[iViewIdx]->setMaxTileMarkerOffset         ( m_dMaxTileMarkerOffset );
       m_acTEncDepthTopList[iViewIdx]->setTileBehaviorControlPresentFlag( m_iTileBehaviorControlPresentFlag );
-#if !REMOVE_TILE_DEPENDENCE
-      if(m_iTileBoundaryIndependenceIdr == 0 || uiTilesCount == 1)
-#else
       if(uiTilesCount == 1)
-#endif
       {
         m_bLFCrossTileBoundaryFlag = true; 
@@ -701 +633 @@
       m_acTEncDepthTopList[iViewIdx]->setUseScalingListId           ( m_useScalingListId  );
       m_acTEncDepthTopList[iViewIdx]->setScalingListFile            ( m_scalingListFile   );
-#if MULTIBITS_DATA_HIDING
       m_acTEncDepthTopList[iViewIdx]->setSignHideFlag(m_signHideFlag);
       m_acTEncDepthTopList[iViewIdx]->setTSIG(m_signHidingThreshold);
-#endif
-
-#if LCU_SYNTAX_ALF
+
       if(uiTilesCount > 1)
       {
@@ -714 +643 @@
       m_acTEncDepthTopList[iViewIdx]->setALFParamInSlice              ( m_bALFParamInSlice);
       m_acTEncDepthTopList[iViewIdx]->setALFPicBasedEncode            ( m_bALFPicBasedEncode);
-#endif
 
   //====== Depth tools ========
@@ -1325 +1253 @@
         if (m_pchReconFileList[iViewIdx])
         {
-#if PIC_CROPPING
           m_acTVideoIOYuvReconFileList[iViewIdx]->write( pcPicYuvRec, m_cropLeft, m_cropRight, m_cropTop, m_cropBottom );
-#else
-          m_acTVideoIOYuvReconFileList[iViewIdx]->write( pcPicYuvRec, m_aiPad );
-#endif
         }
       }
@@ -1336 +1260 @@
         if (m_pchDepthReconFileList[iViewIdx])
         {
-#if PIC_CROPPING
           m_acTVideoIOYuvDepthReconFileList[iViewIdx]->write( pcPicYuvRec, m_cropLeft, m_cropRight, m_cropTop, m_cropBottom );
-#else
-          m_acTVideoIOYuvDepthReconFileList[iViewIdx]->write( pcPicYuvRec, m_aiPad );
-#endif
         }
       }
@@ -1393 +1313 @@
     {
     case NAL_UNIT_CODED_SLICE:
-#if H0566_TLA
 #if !QC_REM_IDV_B0046
     case NAL_UNIT_CODED_SLICE_IDV:
@@ -1399 +1318 @@
     case NAL_UNIT_CODED_SLICE_TLA:
     case NAL_UNIT_CODED_SLICE_CRA:
-#else
-    case NAL_UNIT_CODED_SLICE_DATAPART_A:
-    case NAL_UNIT_CODED_SLICE_DATAPART_B:
-    case NAL_UNIT_CODED_SLICE_CDR:
-#endif
     case NAL_UNIT_CODED_SLICE_IDR:
     case NAL_UNIT_SPS:

branches/HTM-5.1-dev0/source/App/TAppRenderer/TAppRendererTop.cpp

@@ -429 +429 @@
       // Write Output
 
-#if PIC_CROPPING
       m_apcTVideoIOYuvSynthOutput[m_bSweep ? 0 : iSynthViewIdx]->write( pcPicYuvSynthOut, 0, 0, 0, 0 );
-#else
-      m_apcTVideoIOYuvSynthOutput[m_bSweep ? 0 : iSynthViewIdx]->write( pcPicYuvSynthOut, aiPad );
-#endif
     }
     iFrame++;
@@ -665 +661 @@
 
           // Write Output
-#if PIC_CROPPING
           m_apcTVideoIOYuvSynthOutput[m_bSweep ? 0 : iModelNum]->write( pcPicYuvSynthOut, 0 ,0 ,0, 0 );
-#else
-          m_apcTVideoIOYuvSynthOutput[m_bSweep ? 0 : iModelNum]->write( pcPicYuvSynthOut, aiPad );
-#endif
         }
       }
@@ -867 +859 @@
 
       // Write Output
-#if PIC_CROPPING
       m_apcTVideoIOYuvSynthOutput[m_bSweep ? 0 : iSynthViewIdx]->write( pcPicYuvSynthOut, 0, 0, 0, 0 );
-#else
-      m_apcTVideoIOYuvSynthOutput[m_bSweep ? 0 : iSynthViewIdx]->write( pcPicYuvSynthOut, aiPad );
-#endif
     }
     iFrame++;
@@ -998 +986 @@
 
       // Write Output
-#if PIC_CROPPING
       m_apcTVideoIOYuvSynthOutput[iViewIdx-1]->write( pcPicYuvSynthOut, 0, 0, 0 );
-#else
-      m_apcTVideoIOYuvSynthOutput[iViewIdx-1]->write( pcPicYuvSynthOut, aiPad );
-#endif
 
     }

branches/HTM-5.1-dev0/source/Lib/TLibCommon/CommonDef.h

@@ -437 +437 @@
 
 // Explicit temporal layer QP offset
-#if H0567_DPB_PARAMETERS_PER_TEMPORAL_LAYER
 #define MAX_TLAYER                  8           ///< max number of temporal layer
-#else
-#define MAX_TLAYER                  4           ///< max number of temporal layer
-#endif
 #define HB_LAMBDA_FOR_LDC           1           ///< use of B-style lambda for non-key pictures in low-delay mode
 
@@ -466 +462 @@
 #define MAX_NUM_REF_PICS 16
 
-#if !NAL_REF_FLAG
-enum NalRefIdc
-{
-  NAL_REF_IDC_PRIORITY_LOWEST = 0,
-  NAL_REF_IDC_PRIORITY_LOW,
-  NAL_REF_IDC_PRIORITY_HIGH,
-  NAL_REF_IDC_PRIORITY_HIGHEST
-};
-#endif
 
 enum NalUnitType
@@ -480 +467 @@
   NAL_UNIT_UNSPECIFIED_0 = 0,
   NAL_UNIT_CODED_SLICE,
-#if H0566_TLA
 #if QC_REM_IDV_B0046
   NAL_UNIT_RESERVED,
@@ -488 +474 @@
   NAL_UNIT_CODED_SLICE_TLA,
   NAL_UNIT_CODED_SLICE_CRA,
-#else
-  NAL_UNIT_CODED_SLICE_DATAPART_A,
-  NAL_UNIT_CODED_SLICE_DATAPART_B,
-  NAL_UNIT_CODED_SLICE_CDR,
-#endif
   NAL_UNIT_CODED_SLICE_IDR,
   NAL_UNIT_SEI,

branches/HTM-5.1-dev0/source/Lib/TLibCommon/ContextModel.cpp

@@ -56 +56 @@
 Void ContextModel::init( Int qp, Int initValue )
 {
-#if H0736_AVC_STYLE_QP_RANGE
   qp = Clip3(0, 51, qp);
-#endif
 
-#if CABAC_LINEAR_INIT
   Int  slope      = (initValue>>4)*5 - 45;
   Int  offset     = ((initValue&15)<<3)-16;
@@ -66 +63 @@
   UInt mpState    = (initState >= 64 );
   m_ucState       = ( (mpState? (initState - 64):(63 - initState)) <<1) + mpState;
-#else
-  Int m = m_slopes[initValue>>4];
-  Int n = initValue & 15;
-  
-  Int val = max( 0, min( 3839, (n<<8) + m * (qp-26) + 128 ) );
-  val -= 1920;
-  Int valMps = val >= 0;
-  val = ( val ^ (val>>11) ) + 128;
-  Int segmentIdx = val >> 8;
-  Int pStateIdx = m_accumulatedSegOffset[segmentIdx] + ( (val&255) * m_segOffset[segmentIdx] >> 8);
-  
-  m_ucState = (pStateIdx<<1) + valMps;
-#endif
 }
 
@@ -143 +127 @@
 #endif
 };
-#if !CABAC_LINEAR_INIT
-const Int ContextModel::m_slopes[16] = { -239, -143, -85, -51, -31, -19, -11, 0, 11, 19, 31, 51, 85, 143, 239, 399 };
-const Int ContextModel::m_segOffset[8]            = {   6,  7,  5,  7, 10, 14, 16,  1 };
-const Int ContextModel::m_accumulatedSegOffset[8] = {  -3,  3, 10, 15, 22, 32, 46, 62 };
-#endif
 //! \}

branches/HTM-5.1-dev0/source/Lib/TLibCommon/ContextModel.h

@@ -103 +103 @@
   static UChar m_nextState[128][2];
 #endif
-#if !CABAC_LINEAR_INIT
-  static const Int m_slopes[16];
-  static const Int m_segOffset[8];
-  static const Int m_accumulatedSegOffset[8];
-#endif
 #if CABAC_INIT_FLAG
   UInt          m_binsCoded;

branches/HTM-5.1-dev0/source/Lib/TLibCommon/ContextTables.h

@@ -57 +57 @@
 
 #define NUM_MERGE_FLAG_EXT_CTX        1       ///< number of context models for merge flag of merge extended
-#if MRG_IDX_CTX_RED
 #define NUM_MERGE_IDX_EXT_CTX         1       ///< number of context models for merge index of merge extended
-#else
-#define NUM_MERGE_IDX_EXT_CTX         4       ///< number of context models for merge index of merge extended
-#endif
 
 #if HHI_INTER_VIEW_RESIDUAL_PRED
@@ -69 +65 @@
 #define NUM_ALF_CTRL_FLAG_CTX         1       ///< number of context models for ALF control flag
 #define NUM_PART_SIZE_CTX             4       ///< number of context models for partition size
-#if AMP_CTX
 #define NUM_CU_AMP_CTX                1       ///< number of context models for partition size (AMP)
-#else
-#define NUM_CU_X_POS_CTX              2       ///< number of context models for partition size (AMP)
-#define NUM_CU_Y_POS_CTX              2       ///< number of context models for partition size (AMP)
-#endif
 #define NUM_PRED_MODE_CTX             1       ///< number of context models for prediction mode
 
@@ -95 +86 @@
 #define NUM_SIG_FLAG_CTX_LUMA         27      ///< number of context models for luma sig flag
 #define NUM_SIG_FLAG_CTX_CHROMA       21      ///< number of context models for chroma sig flag
-#if LAST_CTX_REDUCTION
 #define NUM_CTX_LAST_FLAG_XY          15      ///< number of context models for last coefficient position
-#else
-#define NUM_CTX_LAST_FLAG_XY          18      ///< number of context models for last coefficient position
-#endif
-
-#if LEVEL_CTX_LUMA_RED
+
 #define NUM_ONE_FLAG_CTX              24      ///< number of context models for greater than 1 flag
 #define NUM_ONE_FLAG_CTX_LUMA         16      ///< number of context models for greater than 1 flag of luma
 #define NUM_ONE_FLAG_CTX_CHROMA        8      ///< number of context models for greater than 1 flag of chroma
-#if RESTRICT_GR1GR2FLAG_NUMBER
 #define NUM_ABS_FLAG_CTX               6      ///< number of context models for greater than 2 flag
 #define NUM_ABS_FLAG_CTX_LUMA          4      ///< number of context models for greater than 2 flag of luma
 #define NUM_ABS_FLAG_CTX_CHROMA        2      ///< number of context models for greater than 2 flag of chroma
-#else
-#define NUM_ABS_FLAG_CTX              18      ///< number of context models for greater than 2 flag
-#define NUM_ABS_FLAG_CTX_LUMA         12      ///< number of context models for greater than 2 flag of luma
-#define NUM_ABS_FLAG_CTX_CHROMA        6      ///< number of context models for greater than 2 flag of chroma
-#endif
-#else
-#define NUM_ONE_FLAG_CTX              32      ///< number of context models for greater than 1 flag
-#define NUM_ONE_FLAG_CTX_LUMA         24      ///< number of context models for greater than 1 flag of luma
-#define NUM_ONE_FLAG_CTX_CHROMA        8      ///< number of context models for greater than 1 flag of chroma
-#if RESTRICT_GR1GR2FLAG_NUMBER
-#define NUM_ABS_FLAG_CTX               8      ///< number of context models for greater than 2 flag
-#define NUM_ABS_FLAG_CTX_LUMA          6      ///< number of context models for greater than 2 flag of luma
-#define NUM_ABS_FLAG_CTX_CHROMA        2      ///< number of context models for greater than 2 flag of chroma
-#else
-#define NUM_ABS_FLAG_CTX              24      ///< number of context models for greater than 2 flag
-#define NUM_ABS_FLAG_CTX_LUMA         18      ///< number of context models for greater than 2 flag of luma
-#define NUM_ABS_FLAG_CTX_CHROMA        6      ///< number of context models for greater than 2 flag of chroma
-#endif
-#endif
 
 #define NUM_MVP_IDX_CTX               2       ///< number of context models for MVP index
@@ -138 +104 @@
 #define NUM_SAO_UVLC_CTX              2       ///< number of context models for SAO UVLC
 #define NUM_SAO_SVLC_CTX              3       ///< number of context models for SAO SVLC
-#if SAO_UNIT_INTERLEAVING
 #define NUM_SAO_RUN_CTX               3       ///< number of context models for AO SVLC (filter coeff.)
 #define NUM_SAO_MERGE_LEFT_FLAG_CTX   3       ///< number of context models for AO SVLC (filter coeff.)
 #define NUM_SAO_MERGE_UP_FLAG_CTX     1       ///< number of context models for AO SVLC (filter coeff.)
 #define NUM_SAO_TYPE_IDX_CTX          2       ///< number of context models for AO SVLC (filter coeff.)
-#endif
-#if CABAC_LINEAR_INIT
 #define CNU                          154      ///< dummy initialization value for unused context models 'Context model Not Used'
-#else
-#define CNU                          119      ///< dummy initialization value for unused context models 'Context model Not Used'
-#endif
 
 #if HHI_DMM_WEDGE_INTRA || HHI_DMM_PRED_TEX
@@ -181 +141 @@
 
 // initial probability for split flag
-#if CABAC_LINEAR_INIT
 static const UChar 
 INIT_SPLIT_FLAG[3][NUM_SPLIT_FLAG_CTX] =  
@@ -227 +186 @@
 INIT_MERGE_IDX_EXT[3][NUM_MERGE_IDX_EXT_CTX] =  
 {
-#if MRG_IDX_CTX_RED
   { CNU, }, 
   { 122, }, 
   { 137, }, 
-#else
-  { CNU,  CNU,  CNU,  CNU, }, 
-  { 122,  138,  153,  182, }, 
-  { 137,  139,  154,  139, }, 
-#endif
 };
 
@@ -256 +209 @@
 };
 
-#if AMP_CTX
 static const UChar 
 INIT_CU_AMP_POS[3][NUM_CU_AMP_CTX] =  
@@ -264 +216 @@
   { 154, }, 
 };
-#else
-static const UChar 
-INIT_CU_X_POS[3][NUM_CU_X_POS_CTX] =  
-{
-  { CNU,  CNU, }, 
-  { 154,  139, }, 
-  { 154,  139, }, 
-};
-
-static const UChar 
-INIT_CU_Y_POS[3][NUM_CU_Y_POS_CTX] =  
-{
-  { CNU,  CNU, }, 
-  { 154,  154, }, 
-  { 154,  139, }, 
-};
-#endif
 
 static const UChar 
@@ -358 +293 @@
 };
 
-#if LAST_CTX_REDUCTION
 static const UChar 
 INIT_LAST[3][2*NUM_CTX_LAST_FLAG_XY] =  
@@ -372 +306 @@
   }, 
 };
-#else
-static const UChar 
-INIT_LAST[3][2*NUM_CTX_LAST_FLAG_XY] =  
-{
-  { 110,  110,  124,  110,  140,  111,  124,  125,  111,  127,  111,  138,  111,  156,  127,  127,  111,   94,
-    108,  123,   63,   63,  139,  124,   93,  108,  125,  111,  110,   63,  CNU,  CNU,  CNU,  CNU,  CNU,  CNU, 
-  }, 
-  { 125,  110,  124,  110,  125,  110,  153,  125,  111,  111,  110,  153,  139,  111,  111,  111,  125,  139, 
-    108,  123,  108,  152,  124,   94,  123,  137,  139,  110,  110,  154,  CNU,  CNU,  CNU,  CNU,  CNU,  CNU, 
-  }, 
-  { 125,  110,  124,  110,  125,  110,  153,  125,  111,  111,  110,  153,  139,  111,  111,  111,  125,  139,  
-    108,  123,   93,  152,  124,   94,  123,  152,  139,  110,  110,  154,  CNU,  CNU,  CNU,  CNU,  CNU,  CNU, 
-  }, 
-};
-#endif
 
 static const UChar 
@@ -410 +329 @@
 };
 
-#if LEVEL_CTX_LUMA_RED
 static const UChar 
 INIT_ONE_FLAG[3][NUM_ONE_FLAG_CTX] = 
@@ -419 +337 @@
 };
 
-#if RESTRICT_GR1GR2FLAG_NUMBER
 static const UChar 
 INIT_ABS_FLAG[3][NUM_ABS_FLAG_CTX] =  
@@ -427 +344 @@
   { 107,  167,   91,  107,  107,  167, }, 
 };
-#else
-static const UChar 
-INIT_ABS_FLAG[3][NUM_ABS_FLAG_CTX] =  
-{
-  { 138,  139,  111,  153,  139,  111,  136,  167,  139,  167,  153,  139,  152,  139,  140,  152,  184,  141, }, 
-  { 107,  153,  125,  167,  153,  140,   91,  137,  153,  122,  167,  139,  107,  153,  140,  167,  183,  140, }, 
-  { 107,  153,  125,  167,  153,  140,   91,  137,  153,  107,  167,  139,  107,  153,  140,  167,  183,  140, }, 
-};
-#endif
-#else
-static const UChar 
-INIT_ONE_FLAG[3][NUM_ONE_FLAG_CTX] = 
-{
-  { 140,   92,  137,  138,  140,  152,  138,  139,  126,  168,  139,  139,  153,   74,  149,   92,  139,  107,  122,  152,  110,   93,  152,  138,  140,  179,  166,  182,  140,  227,  122,  197, }, 
-  { 154,  196,  196,  167,  154,  152,  167,  182,  155,  139,  139,  139,  182,  134,  149,  136,  153,  121,  136,  137,  139,  122,  152,  167,  169,  194,  166,  167,  154,  167,  137,  182, }, 
-  { 154,  196,  167,  167,  154,  152,  167,  182,  155,  139,  139,  139,  182,  134,  149,  136,  153,  121,  136,  122,  139,  107,  152,  152,  169,  208,  166,  167,  154,  152,  167,  182, }, 
-};
-
-#if RESTRICT_GR1GR2FLAG_NUMBER
-static const UChar 
-INIT_ABS_FLAG[3][NUM_ABS_FLAG_CTX] =  
-{
-  { 138,  153,  139,  136,  167,  153,  152,  152, }, 
-  { 107,  167,  139,   91,  122,  152,  107,  167, }, 
-  { 107,  167,  139,   91,  107,   93,  107,  167, }, 
-};
-#else
-static const UChar 
-INIT_ABS_FLAG[3][NUM_ABS_FLAG_CTX] =  
-{
-  { 138,  139,  111,  153,  139,  111,  139,  125,  111,  136,  167,  139,  167,  153,  139,  153,  139,  110,  152,  139,  140,  152,  184,  141, }, 
-  { 107,  153,  125,  167,  153,  140,  139,  154,  155,   91,  137,  153,  122,  167,  139,  152,  138,  139,  107,  153,  140,  167,  183,  140, }, 
-  { 107,  153,  125,  167,  153,  140,  139,  154,  155,   91,  137,  153,  107,  167,  139,   93,  138,  139,  107,  153,  140,  167,  183,  140, }, 
-};
-#endif
-#endif
 
 static const UChar 
@@ -520 +401 @@
 };
 
-#if SAO_UNIT_INTERLEAVING 
 static const UChar 
 INIT_SAO_MERGE_LEFT_FLAG[3][NUM_SAO_MERGE_LEFT_FLAG_CTX] = 
@@ -544 +424 @@
   { 200,  140, }, 
 };
-#endif
 
 static const UChar 
@@ -553 +432 @@
 { CNU,  153,  138,  138,  CNU,  CNU,  CNU,  CNU,  CNU,  CNU, }, 
 };
-#else
-static const UChar
-INIT_SPLIT_FLAG[3][NUM_SPLIT_FLAG_CTX] =
-{
-  {
-     87,  74, 107,
-    
-  },
-  {
-     84, 103, 105,
-    
-  },
-  {
-     84, 103, 105,
-    
-  },
-};
-
-// initial probability for skip flag
-static const UChar
-INIT_SKIP_FLAG[3][NUM_SKIP_FLAG_CTX] =
-{
-  {
-    CNU, CNU, CNU,
-    
-  },
-  {
-    165, 168, 154,
-    
-  },
-  {
-    165, 168, 154,
-    
-  },
-};
-
-// initial probability for skip flag
-static const UChar
-INIT_ALF_CTRL_FLAG[3][NUM_ALF_CTRL_FLAG_CTX] =
-{
-  {
-    153,
-    
-  },
-  {
-     87,
-    
-  },
-  {
-    135,
-    
-  },
-};
-
-// initial probability for merge flag
-static const UChar
-INIT_MERGE_FLAG_EXT[3][NUM_MERGE_FLAG_EXT_CTX] =
-{
-  {
-    CNU,
-    
-  },
-  {
-    72,
-    
-  },
-  {
-    119,
-    
-  },
-};
-
-static const UChar
-INIT_MERGE_IDX_EXT[3][NUM_MERGE_IDX_EXT_CTX] =
-{
-#if MRG_IDX_CTX_RED
-  {
-    CNU,
-    
-  },
-  {
-    100,
-    
-  },
-  {
-    116,
-  },
-#else
-  {
-    CNU, CNU, CNU, CNU,
-    
-  },
-  {
-    100,  86, 102, 133,
-    
-  },
-  {
-    116,  87, 119, 103,
-    
-  },
-#endif
-};
-
-// initial probability for PU size
-static const UChar
-INIT_PART_SIZE[3][NUM_PART_SIZE_CTX] =
-{
-  {
-    167, CNU, CNU, CNU,
-    
-  },
-  {
-    119,  87, CNU, CNU,
-    
-  },
-  {
-    119,  87, CNU, CNU,
-    
-  },
-};
-#if AMP_CTX
-static const UChar
-INIT_CU_AMP_POS[3][NUM_CU_AMP_CTX] =
-{
-  {
-    CNU, 
-  },
-  {
-    119, 
-  },
-  {
-    119, 
-  },
-};
-#else
-// initial probability for AMP split position (X)
-static const UChar
-INIT_CU_X_POS[3][NUM_CU_X_POS_CTX] =
-{
-  {
-    CNU, CNU,
-    
-  },
-  {
-    119, 103,
-    
-  },
-  {
-    119, 103,
-    
-  },
-};
-
-// initial probability for AMP split position (Y)
-static const UChar
-INIT_CU_Y_POS[3][NUM_CU_Y_POS_CTX] =
-{
-  {
-    CNU, CNU,
-    
-  },
-  {
-    119, 119,
-    
-  },
-  {
-    119, 103,
-    
-  },
-};
-#endif
-// initial probability for prediction mode
-static const UChar
-INIT_PRED_MODE[3][NUM_PRED_MODE_CTX] =
-{
-  {
-    CNU,
-    
-  },
-  {
-    114,
-    
-  },
-  {
-    98,
-    
-  },
-};
-
-// initial probability for intra direction of luma
-static const UChar
-INIT_INTRA_PRED_MODE[3][NUM_ADI_CTX] =
-{
-  {
-    167,
-    
-  },
-  {
-    119,
-    
-  },
-  {
-    150,
-    
-  },
-};
-
-// initial probability for intra direction of chroma
-static const UChar
-INIT_CHROMA_PRED_MODE[3][NUM_CHROMA_PRED_CTX] =
-{
-  {
-    53, 103,
-    
-  },
-  {
-    85,  87,
-    
-  },
-  {
-    101,  87,
-    
-  },
-};
-
-// initial probability for temporal direction
-static const UChar
-INIT_INTER_DIR[3][NUM_INTER_DIR_CTX] =
-{
-  {
-    CNU, CNU, CNU, CNU,
-    
-  },
-  {
-    CNU, CNU, CNU, CNU,
-    
-  },
-  {
-    41,  39,  38,  36,
-    
-  },
-};
-
-// initial probability for motion vector difference
-static const UChar
-INIT_MVD[3][NUM_MV_RES_CTX] =
-{
-  {
-    CNU, CNU,
-    
-  },
-  {
-    120, 166,
-    
-  },
-  {
-    135, 166,
-    
-  },
-};
-
-// initial probability for reference frame index
-static const UChar
-INIT_REF_PIC[3][NUM_REF_NO_CTX] =
-{
-  {
-    CNU, CNU, CNU, CNU,
-    
-  },
-  {
-    102, 118, 103, CNU,
-    
-  },
-  {
-    118, 118, 134, CNU,
-    
-  },
-};
-
-// initial probability for dQP
-static const UChar
-INIT_DQP[3][NUM_DELTA_QP_CTX] =
-{
-  {
-    CNU, CNU, CNU, 
-    
-  },
-  {
-    CNU, CNU, CNU, 
-    
-  },
-  {
-    CNU, CNU, CNU, 
-    
-  },
-};
-
-static const UChar
-INIT_QT_CBF[3][2*NUM_QT_CBF_CTX] =
-{
-  {
-     73,  74, CNU, CNU, CNU,
-     55,  86, 133, CNU, CNU,
-    
-  },
-  {
-    102,  89, CNU, CNU, CNU,
-    114,  84, 117, CNU, CNU,
-    
-  },
-  {
-    102,  89, CNU, CNU, CNU,
-    114,  68, 117, CNU, CNU,
-    
-  },
-};
-
-static const UChar
-INIT_QT_ROOT_CBF[3][NUM_QT_ROOT_CBF_CTX] =
-{
-  {
-    CNU,
-    
-  },
-  {
-    39,
-    
-  },
-  {
-    39,
-    
-  },
-};
-
-#if LAST_CTX_REDUCTION
-static const UChar
-INIT_LAST[3][2*NUM_CTX_LAST_FLAG_XY] =
-{
-  {
-    72,  72,  71,  72, 104,  89,  88,  89,  59,  73,  89, 106,  60,  59,  43,   
-    54,  70,  53,  CNU, CNU, CNU,  CNU, CNU, CNU,  CNU, CNU, CNU, CNU, CNU, CNU,
-  },
-  {
-    57,  72,  55,  72,  57,  72,   88,  73,  73,  72,  103,  73,  89,  73,  57,  
-    54,  70,  54,  CNU, CNU, CNU,  CNU, CNU, CNU,  CNU, CNU, CNU, CNU, CNU, CNU,
-  },
-  {
-    88,  72,  71,  72,  57,  72,  88,  73,  73,  72,   103,  73,  89,  73,  57,   
-    54,  70,  69,   CNU, CNU, CNU,  CNU, CNU, CNU,  CNU, CNU, CNU, CNU, CNU, CNU,
-  },
-};
-#else
-static const UChar
-INIT_LAST[3][2*NUM_CTX_LAST_FLAG_XY] =
-{
-  {
-    72,  72,  71,  72, 104,  89,  71,  88,  89,  59,  73,  86,  89, 106,  60,  59,  43,  55,
-    54,  70,  53,  53,  87,  71,  69,  54,  88,  73,  72,  53, CNU, CNU, CNU, CNU, CNU, CNU,
-    
-  },
-  {
-    57,  72,  71,  72,  57,  72, 102,  88,  73,  73,  72, 102, 103,  73,  89,  73,  57,  87,
-    54,  70,  54, 101,  71,  55,  70, 116, 103,  72,  72, 119, CNU, CNU, CNU, CNU, CNU, CNU,
-    
-  },
-  {
-    88,  72,  71,  72,  57,  72, 102,  88,  73,  73,  72, 118, 103,  73,  89,  73,  57,  87,
-    54,  70,  69,  85,  71,  55,  70,  85, 103,  72,  72, 119, CNU, CNU, CNU, CNU, CNU, CNU,
-    
-  },
-};
-#endif
-
-static const UChar
-INIT_SIG_CG_FLAG[3][2 * NUM_SIG_CG_FLAG_CTX] = 
-{
-  {
-    83, 122,
-    98, 121,
-    
-  },
-  {
-    99, 120,
-    67, 119,
-    
-  },
-  {
-    99, 120,
-    67, 119,
-    
-  },
-};
-
-static const UChar
-INIT_SIG_FLAG[3][NUM_SIG_FLAG_CTX] =
-{
-  {
-    74,  73,  88,  72,  72,  55,  71,  54,  71,  88, 103,  71,  53,  87, 134,  86,  84,  70,  68,  89,  90,  84,  88,  74, 130, 118,  88,
-    120,  87, 149,  70,  52, 118, 133, 116, 114, 129, 132, 162, 115,  51, 115,  66, 120,  74, 115,  87,  89,
-  },
-  {
-    152, 119, 103, 118,  87,  70,  70,  53, 118, 134, 118, 101,  68,  85, 101, 116, 100,  68,  67, 136, 168, 147, 150, 120, 115, 118, 119,
-    136, 102,  70,  53,  67, 117, 102, 117, 115, 114,  84, 115,  99, 100,  83, 114, 152, 168, 131, 150, 120,
-  },
-  {
-    152, 119, 103, 118,  87,  70,  70,  53,  71, 103, 118, 101,  68,  85, 101, 116, 116,  68,  67, 152, 168, 147, 150, 120, 115, 118, 119,
-    136, 102,  86,  84,  67, 117, 102, 117, 115,  99, 100, 115,  99, 100,  83, 114, 152, 152, 131, 150, 120,
-  },
-};
-
-#if LEVEL_CTX_LUMA_RED
-static const UChar
-INIT_ONE_FLAG[3][NUM_ONE_FLAG_CTX] =
-{
-  {
-    104,  68, 116,  86, 104, 132,  86,  87, 102,  66, 114,  68,  87,  84, 100, 101, 
-      104, 130, 147, 149, 104, 196, 100, 165,
-  },
-  {
-    119, 179, 179, 164, 119,  85, 117, 149, 133,  98, 114, 115, 118,  99, 115, 116,
-      135, 146, 147, 164, 119, 148, 116, 133,
-  },
-  {
-    119, 179, 148, 164, 119,  85, 117, 149, 133,  98, 114, 115, 118,  99, 115, 100,
-      135, 177, 147, 164, 119, 132, 148, 149,
-  },
-};
-
-#if RESTRICT_GR1GR2FLAG_NUMBER
-static const UChar
-INIT_ABS_FLAG[3][NUM_ABS_FLAG_CTX] =
-{
-  {
-    86, 102, 115, 117, 101, 101,
-  },
-  {
-    84, 117, 83, 100, 84, 117,
-  },
-  {
-    84, 117, 83,  84, 84, 117,
-  },
-};
-#else
-static const UChar
-INIT_ABS_FLAG[3][NUM_ABS_FLAG_CTX] =
-{
-  {
-    86, 103,  73, 102, 103,  73, 115, 117, 103, 117, 118, 103,
-      101, 103, 104, 101, 167, 121,
-  },
-  {
-    84, 102,  88, 117, 118, 104, 83, 116, 118, 100, 117,  87,
-      84, 118, 120, 117, 150, 120,
-    },
-    {
-      84, 102,  88, 117, 118, 104, 83, 116, 118,  84, 117,  87,
-        84, 118, 120, 117, 150, 120,
-    },
-};
-#endif
-#else
-static const UChar
-INIT_ONE_FLAG[3][NUM_ONE_FLAG_CTX] =
-{
-  {
-    104,  68, 116,  86, 104, 132,  86,  87, 105, 134,  87, 103, 102,  66, 114,  68,  87,  84, 100, 101,  72,  69, 101,  86,
-    104, 130, 147, 149, 104, 196, 100, 165,
-  },
-  {
-    119, 179, 179, 164, 119,  85, 117, 149, 136, 103, 103, 103, 133,  98, 114, 115, 118,  99, 115, 116,  87, 100,  85, 117,
-    135, 146, 147, 164, 119, 148, 116, 133,
-  },
-  {
-    119, 179, 148, 164, 119,  85, 117, 149, 136,  87, 103, 103, 133,  98, 114, 115, 118,  99, 115, 100,  87,  84,  85,  85,
-    135, 177, 147, 164, 119, 132, 148, 149,
-  },
-};
-
-#if RESTRICT_GR1GR2FLAG_NUMBER
-static const UChar
-INIT_ABS_FLAG[3][NUM_ABS_FLAG_CTX] =
-{
-  {
-    86, 102, 103, 115, 117, 102, 101, 101,
-  },
-  {
-    84, 117, 103, 83, 100, 85, 84, 117, 
-  },
-  {
-    84, 117, 87, 83, 84, 69, 84, 117,
-  },
-};
-#else
-static const UChar
-INIT_ABS_FLAG[3][NUM_ABS_FLAG_CTX] =
-{
-  {
-    86, 103,  73, 102, 103,  73, 103,  88,  89, 115, 117, 103, 117, 118, 103, 102, 103,  72,
-    101, 103, 104, 101, 167, 121,
-  },
-  {
-    84, 102,  88, 117, 118, 104, 103, 119, 136,  83, 116, 118, 100, 117,  87,  85,  86, 103,
-    84, 118, 120, 117, 150, 120,
-  },
-  {
-    84, 102,  88, 117, 118, 104,  87, 119, 136,  83, 116, 118,  84, 117,  87,  69,  86,  87,
-    84, 118, 120, 117, 150, 120,
-  },
-};
-#endif
-#endif
-// initial probability for motion vector predictor index
-static const UChar
-INIT_MVP_IDX[3][NUM_MVP_IDX_CTX] =
-{
-  {
-    CNU, CNU,
-    
-  },
-  {
-    134, CNU,
-    
-  },
-  {
-    134, CNU,
-    
-  },
-};
-
-// initial probability for ALF flag
-static const UChar
-INIT_ALF_FLAG[3][NUM_ALF_FLAG_CTX] =
-{
-  {
-    118,
-    
-  },
-  {
-    102,
-    
-  },
-  {
-    102,
-    
-  },
-};
-
-// initial probability for ALF side information (unsigned)
-static const UChar
-INIT_ALF_UVLC[3][NUM_ALF_UVLC_CTX] =
-{
-  {
-    120, 119,
-    
-  },
-  {
-    119, 119,
-    
-  },
-  {
-    119, 119,
-    
-  },
-};
-
-// initial probability for ALF side information (signed)
-static const UChar
-INIT_ALF_SVLC[3][NUM_ALF_SVLC_CTX] =
-{
-  {
-    139, 119, 124,
-    
-  },
-  {
-     90, 119, 140,
-    
-  },
-  {
-     90, 119, 124,
-    
-  },
-};
-
-// initial probability for SAO flag
-static const UChar
-INIT_SAO_FLAG[3][NUM_SAO_FLAG_CTX] =
-{
-  {
-    119,
-    
-  },
-  {
-    102,
-    
-  },
-  {
-    102,
-    
-  },
-};
-
-// initial probability for SAO side information (unsigned)
-static const UChar
-INIT_SAO_UVLC[3][NUM_SAO_UVLC_CTX] =
-{
-  {
-     61, 104,
-    
-  },
-  {
-    168, 120,
-    
-  },
-  {
-    184, 120,
-    
-  },
-};
-
-// initial probability for SAO side information (signed)
-static const UChar
-INIT_SAO_SVLC[3][NUM_SAO_SVLC_CTX] =
-{
-  {
-    171, 119, 199,
-    
-  },
-  {
-    169, 119, 151,
-    
-  },
-  {
-    169, 119, 151,
-    
-  },
-};
-
-#if SAO_UNIT_INTERLEAVING
-static const UChar
-INIT_SAO_MERGE_LEFT_FLAG[3][NUM_SAO_MERGE_LEFT_FLAG_CTX] =
-{
-  {
-    118, 118, 118,
-  },
-  {
-    102, 102, 102,
-    },
-    {
-      102, 102, 102,
-    },
-};
-
-static const UChar
-INIT_SAO_MERGE_UP_FLAG[3][NUM_SAO_MERGE_UP_FLAG_CTX] =
-{
-  {
-    109, 
-  },
-  {
-    102,
-  },
-  {
-    102,
-  },
-};
-static const UChar
-INIT_SAO_TYPE_IDX[3][NUM_SAO_TYPE_IDX_CTX] =
-{
-  {
-    64, 104 
-  },
-  {
-  168, 120
-  },
-  {
-    184, 120
-  },
-};
-static const Short
-INIT_SAO_RUN[3][NUM_SAO_RUN_CTX][2] =
-{
-  {
-    {   11,   57 }, {   -1,   62 }, {    0,   64 }
-  },
-  {
-    {    6,   66 }, {   -1,   64 }, {    0,   64 }
-  },
-  {
-    {    1,   73 }, {    2,   61 }, {    0,   64 }
-  }
-};
-#endif
-
-static const UChar
-INIT_TRANS_SUBDIV_FLAG[3][NUM_TRANS_SUBDIV_FLAG_CTX] =
-{
-  {
-    CNU, 162, 148, 100, CNU, CNU, CNU, CNU, CNU, CNU,
-    
-  },
-  {
-    CNU,  71,  86,  55, CNU, CNU, CNU, CNU, CNU, CNU,
-    
-  },
-  {
-    CNU, 102,  86,  86, CNU, CNU, CNU, CNU, CNU, CNU,
-    
-  },
-};
-#endif
 
 #if HHI_DMM_WEDGE_INTRA || HHI_DMM_PRED_TEX

branches/HTM-5.1-dev0/source/Lib/TLibCommon/NAL.h

@@ -46 +46 @@
 {
   NalUnitType m_nalUnitType; ///< nal_unit_type
-#if NAL_REF_FLAG
   Bool        m_nalRefFlag;  ///< nal_ref_flag
-#else
-  NalRefIdc   m_nalRefIDC;   ///< nal_ref_idc
-#endif
 #if VIDYO_VPS_INTEGRATION|QC_MVHEVC_B0046
   unsigned    m_layerId;
@@ -58 +54 @@
   Bool        m_isDepth;     ///< is_depth
   unsigned    m_temporalId;  ///< temporal_id
-#if !H0388
-  bool        m_OutputFlag;  ///< output_flag
-#endif
 #endif
 
   /** construct an NALunit structure with given header values. */
-#if H0388
-#if NAL_REF_FLAG
   NALUnit(
     NalUnitType nalUnitType,
@@ -86 +77 @@
     ,m_temporalId  (temporalId)
   {}
-#else
-  NALUnit(
-    NalUnitType  nalUnitType,
-    NalRefIdc    nalRefIDC,
-    Int          viewId,
-    Bool         isDepth,
-    unsigned temporalID = 0)
-  {
-    m_nalUnitType = nalUnitType;
-    m_nalRefIDC   = nalRefIDC;
-#if !VIDYO_VPS_INTEGRATION
-    m_viewId      = viewId;
-    m_isDepth     = isDepth;
-#else
-    m_layerId = layerId;
-#endif
-    m_temporalId  = temporalID;
-  }
-#endif
-#else
-  NALUnit(
-    NalUnitType  nalUnitType,
-    NalRefIdc    nalRefIDC,
-#if !VIDYO_VPS_INTEGRATION    
-    Int          viewId,
-    Bool         isDepth,
-#else
-    unsigned         layerId,
-#endif
-    unsigned     temporalID = 0,
-    bool         outputFlag = true)
-  {
-    m_nalUnitType = nalUnitType;
-    m_nalRefIDC   = nalRefIDC;
-#if !VIDYO_VPS_INTEGRATION
-    m_viewId      = viewId;
-    m_isDepth     = isDepth;
-#else
-    m_layerId = layerId;
-#endif
-    m_temporalId  = temporalID;
-    m_OutputFlag  = outputFlag;
-  }
-#endif
 
   /** default constructor - no initialization; must be perfomed by user */
@@ -138 +85 @@
   {
     return m_nalUnitType == NAL_UNIT_CODED_SLICE_IDR
-#if H0566_TLA
 #if !QC_REM_IDV_B0046    
         || m_nalUnitType == NAL_UNIT_CODED_SLICE_IDV
@@ -144 +90 @@
         || m_nalUnitType == NAL_UNIT_CODED_SLICE_CRA
         || m_nalUnitType == NAL_UNIT_CODED_SLICE_TLA
-#else
-        || m_nalUnitType == NAL_UNIT_CODED_SLICE_CDR
-#endif
         || m_nalUnitType == NAL_UNIT_CODED_SLICE;
   }

branches/HTM-5.1-dev0/source/Lib/TLibCommon/TComAdaptiveLoopFilter.cpp

@@ -46 +46 @@
 
 
-#if !LCU_SYNTAX_ALF
-ALFParam::~ALFParam()
-{
-  if (coeff_chroma != NULL)
-  {
-    delete[] coeff_chroma;
-  }
-  if (coeffmulti)
-  {
-    for (Int i=0; i<NO_VAR_BINS; i++)
-    {
-      if (coeffmulti[i] != NULL)
-      {
-        delete[] coeffmulti[i];
-      }
-    }
-    delete[] coeffmulti;
-  }
-
-  if (nbSPred != NULL)
-  {
-    delete[] nbSPred;
-  }
-  if (filterPattern != NULL)
-  {
-    delete[] filterPattern;
-  }
-}
-#endif
 
 // ====================================================================================================================
@@ -80 +51 @@
 // ====================================================================================================================
 
-#if ALF_SINGLE_FILTER_SHAPE
 Int TComAdaptiveLoopFilter::weightsShape1Sym[ALF_MAX_NUM_COEF+1] = 
 { 
@@ -109 +79 @@
   depthIntShape1Sym
 };
-#else
-//Shape0: Star5x5
-Int TComAdaptiveLoopFilter::weightsShape0Sym[10] = 
-{
-  2,    2,    2,    
-  2, 2, 2,        
-  2, 2, 1, 1
-};
-
-
-//Shape1: Cross9x9
-Int TComAdaptiveLoopFilter::weightsShape1Sym[10] = 
-{ 
-              2,
-              2,
-              2,
-              2,
-  2, 2, 2, 2, 1, 
-              1
-};
-
-
-Int* TComAdaptiveLoopFilter::weightsTabShapes[NUM_ALF_FILTER_SHAPE] =
-{
-  weightsShape0Sym, weightsShape1Sym
-};
-
-Int TComAdaptiveLoopFilter::m_sqrFiltLengthTab[NUM_ALF_FILTER_SHAPE] =
-{
-  9, 9
-};
-
-// Shape0
-Int depthIntShape0Sym[10] = 
-{
-  1,    3,    1,
-  3, 4, 3, 
-  3, 4, 5, 5                 
-};
-// Shape1
-Int depthIntShape1Sym[10] = 
-{
-              5,
-              6,
-              7,
-              8,
-  5, 6, 7, 8, 9, 
-              9  
-};
-
-
-Int* pDepthIntTabShapes[NUM_ALF_FILTER_SHAPE] =
-{ 
-  depthIntShape0Sym, depthIntShape1Sym
-};
-#endif
-
-#if LCU_SYNTAX_ALF
+
 Int kTableShape1[ALF_MAX_NUM_COEF+1] = 
 {      
@@ -179 +92 @@
   kTableShape1
 };
-#endif
 
 // ====================================================================================================================
@@ -194 +106 @@
 }
 
-#if LCU_SYNTAX_ALF
 /// AlfCUCtrlInfo
 Void AlfCUCtrlInfo::reset()
@@ -530 +441 @@
 }
 
-#endif
 
 
@@ -543 +453 @@
   m_pvpAlfLCU    = NULL;
   m_pvpSliceTileAlfLCU = NULL;
-#if LCU_SYNTAX_ALF
   for(Int c=0; c< NUM_ALF_COMPONENT; c++)
   {
@@ -550 +459 @@
   m_varImg = NULL;
   m_filterCoeffSym = NULL;
-#endif
 
 }
@@ -755 +663 @@
 Void TComAdaptiveLoopFilter::create( Int iPicWidth, Int iPicHeight, UInt uiMaxCUWidth, UInt uiMaxCUHeight, UInt uiMaxCUDepth )
 {
-#if LCU_SYNTAX_ALF
   destroy();
-#endif
   if ( !m_pcTempPicYuv )
   {
@@ -765 +671 @@
   m_img_height = iPicHeight;
   m_img_width = iPicWidth;
-#if LCU_SYNTAX_ALF
   initMatrix_Pel(&(m_varImg), m_img_height, m_img_width);
-#else
-  for(Int i=0; i< NUM_ALF_CLASS_METHOD; i++)
-  {
-    initMatrix_Pel(&(m_varImgMethods[i]), m_img_height, m_img_width);
-  }
-#endif
   initMatrix_int(&m_filterCoeffSym, NO_VAR_BINS, ALF_MAX_NUM_COEF);
   UInt uiNumLCUsInWidth   = m_img_width  / uiMaxCUWidth;
@@ -782 +681 @@
   m_uiNumCUsInFrame = uiNumLCUsInWidth* uiNumLCUsInHeight; 
 
-#if LCU_SYNTAX_ALF
   m_numLCUInPicWidth = uiNumLCUsInWidth;
   m_numLCUInPicHeight= uiNumLCUsInHeight;
   m_lcuHeight = uiMaxCUHeight;
-#if ALF_SINGLE_FILTER_SHAPE
   m_lineIdxPadBot = m_lcuHeight - 4 - 3; // DFRegion, Vertical Taps
-#else
-  m_lineIdxPadBot = m_lcuHeight - 4 - 4; // DFRegion, Vertical Taps
-#endif
   m_lineIdxPadTop = m_lcuHeight - 4; // DFRegion
 
   m_lcuHeightChroma = m_lcuHeight>>1;
-#if ALF_SINGLE_FILTER_SHAPE
   m_lineIdxPadBotChroma = m_lcuHeightChroma - 2 - 3; // DFRegion, Vertical Taps
-#else
-  m_lineIdxPadBotChroma = m_lcuHeightChroma - 2 - 4; // DFRegion, Vertical Taps
-#endif
   m_lineIdxPadTopChroma = m_lcuHeightChroma - 2 ; // DFRegion
 
   createLCUAlfInfo();
-#else
-  createRegionIndexMap(m_varImgMethods[ALF_RA], m_img_width, m_img_height);
-#endif
 }
 
@@ -813 +700 @@
     m_pcTempPicYuv->destroy();
     delete m_pcTempPicYuv;
-#if LCU_SYNTAX_ALF
     m_pcTempPicYuv = NULL;
-#endif
-  }
-#if LCU_SYNTAX_ALF
+  }
   if(m_varImg != NULL)
   {
@@ -828 +712 @@
     m_filterCoeffSym = NULL;
   }
-#else
-  for(Int i=0; i< NUM_ALF_CLASS_METHOD; i++)
-  {
-    destroyMatrix_Pel(m_varImgMethods[i]);
-  }
-  destroyMatrix_int(m_filterCoeffSym);
-#endif
-#if LCU_SYNTAX_ALF
   destroyLCUAlfInfo();
-#endif
-
-}
-
-#if !LCU_SYNTAX_ALF
-// --------------------------------------------------------------------------------------------------------------------
-// allocate / free / copy functions
-// --------------------------------------------------------------------------------------------------------------------
-Void TComAdaptiveLoopFilter::allocALFParam(ALFParam* pAlfParam)
-{
-  pAlfParam->alf_flag = 0;
-  pAlfParam->coeff_chroma = new Int[ALF_MAX_NUM_COEF];
-  ::memset(pAlfParam->coeff_chroma, 0, sizeof(Int)*ALF_MAX_NUM_COEF );
-  pAlfParam->coeffmulti = new Int*[NO_VAR_BINS];
-  for (int i=0; i<NO_VAR_BINS; i++)
-  {
-    pAlfParam->coeffmulti[i] = new Int[ALF_MAX_NUM_COEF];
-    ::memset(pAlfParam->coeffmulti[i],        0, sizeof(Int)*ALF_MAX_NUM_COEF );
-  }
-  pAlfParam->nbSPred = new Int[NO_VAR_BINS];
-  ::memset(pAlfParam->nbSPred, 0, sizeof(Int)*NO_VAR_BINS);
-  pAlfParam->filterPattern = new Int[NO_VAR_BINS];
-  ::memset(pAlfParam->filterPattern, 0, sizeof(Int)*NO_VAR_BINS);
-  pAlfParam->alf_pcr_region_flag = 0;
-}
-
-Void TComAdaptiveLoopFilter::freeALFParam(ALFParam* pAlfParam)
-{
-  assert(pAlfParam != NULL);
-  if (pAlfParam->coeff_chroma != NULL)
-  {
-    delete[] pAlfParam->coeff_chroma;
-    pAlfParam->coeff_chroma = NULL;
-  }
-  for (int i=0; i<NO_VAR_BINS; i++)
-  {
-    delete[] pAlfParam->coeffmulti[i];
-    pAlfParam->coeffmulti[i] = NULL;
-  }
-  delete[] pAlfParam->coeffmulti;
-  pAlfParam->coeffmulti = NULL;
-
-  delete[] pAlfParam->nbSPred;
-  pAlfParam->nbSPred = NULL;
-
-  delete[] pAlfParam->filterPattern;
-  pAlfParam->filterPattern = NULL;
-}
-
-
-Void TComAdaptiveLoopFilter::copyALFParam(ALFParam* pDesAlfParam, ALFParam* pSrcAlfParam)
-{
-  pDesAlfParam->alf_flag = pSrcAlfParam->alf_flag;
-  pDesAlfParam->chroma_idc = pSrcAlfParam->chroma_idc;
-  pDesAlfParam->num_coeff = pSrcAlfParam->num_coeff;
-  pDesAlfParam->filter_shape_chroma = pSrcAlfParam->filter_shape_chroma;
-  pDesAlfParam->num_coeff_chroma = pSrcAlfParam->num_coeff_chroma;
-  pDesAlfParam->alf_pcr_region_flag = pSrcAlfParam->alf_pcr_region_flag;
-  ::memcpy(pDesAlfParam->coeff_chroma, pSrcAlfParam->coeff_chroma, sizeof(Int)*ALF_MAX_NUM_COEF);
-  pDesAlfParam->filter_shape = pSrcAlfParam->filter_shape;
-  ::memcpy(pDesAlfParam->filterPattern, pSrcAlfParam->filterPattern, sizeof(Int)*NO_VAR_BINS);
-  pDesAlfParam->startSecondFilter = pSrcAlfParam->startSecondFilter;
-
-  //Coeff send related
-  pDesAlfParam->filters_per_group = pSrcAlfParam->filters_per_group; //this can be updated using codedVarBins
-  pDesAlfParam->predMethod = pSrcAlfParam->predMethod;
-  ::memcpy(pDesAlfParam->nbSPred, pSrcAlfParam->nbSPred, sizeof(Int)*NO_VAR_BINS);
-  for (int i=0; i<NO_VAR_BINS; i++)
-  {
-    ::memcpy(pDesAlfParam->coeffmulti[i], pSrcAlfParam->coeffmulti[i], sizeof(Int)*ALF_MAX_NUM_COEF);
-  }
-}
-// --------------------------------------------------------------------------------------------------------------------
-// prediction of filter coefficients
-// --------------------------------------------------------------------------------------------------------------------
-
-Void TComAdaptiveLoopFilter::predictALFCoeffChroma( ALFParam* pAlfParam )
-{
-  Int i, sum, pred, N;
-  const Int* pFiltMag = NULL;
-  pFiltMag = weightsTabShapes[pAlfParam->filter_shape_chroma];
-  N = pAlfParam->num_coeff_chroma;
-  sum=0;
-  for(i=0; i<N;i++)
-  {
-    sum+=pFiltMag[i]*pAlfParam->coeff_chroma[i];
-  }
-  pred=(1<<ALF_NUM_BIT_SHIFT)-(sum-pAlfParam->coeff_chroma[N-1]);
-#if ALF_CHROMA_COEF_PRED_HARMONIZATION
-  pAlfParam->coeff_chroma[N-1]=pAlfParam->coeff_chroma[N-1] - pred;
-#else
-  pAlfParam->coeff_chroma[N-1]=pred-pAlfParam->coeff_chroma[N-1];
-#endif
-}
-
-#if ALF_CHROMA_COEF_PRED_HARMONIZATION
-Void TComAdaptiveLoopFilter::reconstructALFCoeffChroma( ALFParam* pAlfParam )
-{
-  Int i, sum, pred, N;
-  const Int* pFiltMag = NULL;
-  pFiltMag = weightsTabShapes[pAlfParam->filter_shape_chroma];
-  N = pAlfParam->num_coeff_chroma;
-  sum=0;
-  for(i=0; i<N;i++)
-  {
-    sum+=pFiltMag[i]*pAlfParam->coeff_chroma[i];
-  }
-  pred=(1<<ALF_NUM_BIT_SHIFT)-(sum-pAlfParam->coeff_chroma[N-1]);
-  pAlfParam->coeff_chroma[N-1]=pred+ pAlfParam->coeff_chroma[N-1];
-}
-#endif
-#endif
+
+}
+
 
 // --------------------------------------------------------------------------------------------------------------------
@@ -954 +721 @@
 // --------------------------------------------------------------------------------------------------------------------
 
-#if LCU_SYNTAX_ALF
 /** ALF reconstruction process for one picture
  * \param [in, out] pcPic the decoded/filtered picture (input: decoded picture; output filtered picture)
@@ -1113 +879 @@
 }
 
-#else
-
-/**
- \param [in, out] pcPic         picture (TComPic) class (input/output)
- \param [in] pcAlfParam    ALF parameter
- \param [in,out] vAlfCUCtrlParam ALF CU control parameters
- \todo   for temporal buffer, it uses residual picture buffer, which may not be safe. Make it be safer.
- */
-Void TComAdaptiveLoopFilter::ALFProcess(TComPic* pcPic, ALFParam* pcAlfParam, std::vector<AlfCUCtrlInfo>& vAlfCUCtrlParam)
-{
-  assert(m_uiNumSlicesInPic == vAlfCUCtrlParam.size());
-  if(!pcAlfParam->alf_flag)
-  {
-    return;
-  }
-
-  m_lcuHeight     = pcPic->getSlice(0)->getSPS()->getMaxCUHeight();
-#if ALF_SINGLE_FILTER_SHAPE
-  m_lineIdxPadBot = m_lcuHeight - 4 - 3;             // DFRegion, Vertical Taps
-#else
-  m_lineIdxPadBot = m_lcuHeight - 4 - 4;             // DFRegion, Vertical Taps
-#endif
-  m_lineIdxPadTop = m_lcuHeight - 4;                 // DFRegion
-
-  m_lcuHeightChroma     = m_lcuHeight>>1;
-#if ALF_SINGLE_FILTER_SHAPE
-  m_lineIdxPadBotChroma = m_lcuHeightChroma - 2 - 3; // DFRegion, Vertical Taps
-#else
-  m_lineIdxPadBotChroma = m_lcuHeightChroma - 2 - 4; // DFRegion, Vertical Taps
-#endif
-  m_lineIdxPadTopChroma = m_lcuHeightChroma - 2 ;    // DFRegion
-
-  TComPicYuv* pcPicYuvRec    = pcPic->getPicYuvRec();
-  TComPicYuv* pcPicYuvExtRec = m_pcTempPicYuv;
-    pcPicYuvRec   ->copyToPic          ( pcPicYuvExtRec );
-    pcPicYuvExtRec->setBorderExtension ( false );
-    pcPicYuvExtRec->extendPicBorder    ();
-
-  if(m_uiNumSlicesInPic == 1)
-  {
-    AlfCUCtrlInfo* pcAlfCtrlParam = &(vAlfCUCtrlParam[0]);
-    if(pcAlfCtrlParam->cu_control_flag)
-    {
-      UInt idx = 0;
-      for(UInt uiCUAddr = 0; uiCUAddr < pcPic->getNumCUsInFrame(); uiCUAddr++)
-      {
-        TComDataCU *pcCU = pcPic->getCU(uiCUAddr);
-        setAlfCtrlFlags(pcAlfCtrlParam, pcCU, 0, 0, idx);
-      }
-    }
-  }
-  else
-  {
-    transferCtrlFlagsFromAlfParam(vAlfCUCtrlParam);
-  }
-  xALFLuma(pcPic, pcAlfParam, vAlfCUCtrlParam, pcPicYuvExtRec, pcPicYuvRec);
-  if(pcAlfParam->chroma_idc)
-  {
-#if ALF_CHROMA_COEF_PRED_HARMONIZATION
-    reconstructALFCoeffChroma(pcAlfParam);
-#else
-    predictALFCoeffChroma(pcAlfParam);
-#endif
-    checkFilterCoeffValue(pcAlfParam->coeff_chroma, pcAlfParam->num_coeff_chroma, true );
-
-    xALFChroma( pcAlfParam, pcPicYuvExtRec, pcPicYuvRec);
-  }
-}
-#endif
 // ====================================================================================================================
 // Protected member functions
@@ -1216 +913 @@
 }
 
-#if !LCU_SYNTAX_ALF
-
-Void TComAdaptiveLoopFilter::xALFLuma(TComPic* pcPic, ALFParam* pcAlfParam, std::vector<AlfCUCtrlInfo>& vAlfCUCtrlParam,TComPicYuv* pcPicDec, TComPicYuv* pcPicRest)
-{
-  Int    LumaStride = pcPicDec->getStride();
-  Pel* pDec = pcPicDec->getLumaAddr();
-  Pel* pRest = pcPicRest->getLumaAddr();
-
-  decodeFilterSet(pcAlfParam, m_varIndTab, m_filterCoeffSym);
-
-  m_uiVarGenMethod = pcAlfParam->alf_pcr_region_flag;
-  m_varImg         = m_varImgMethods[m_uiVarGenMethod];
-  calcVar(m_varImg, pRest, LumaStride, pcAlfParam->alf_pcr_region_flag);
-
-  if(!m_bUseNonCrossALF)
-  {
-    Bool bCUCtrlEnabled = false;
-    for(UInt s=0; s< m_uiNumSlicesInPic; s++)
-    {
-      if(!pcPic->getValidSlice(s))
-      {
-        continue;
-      }
-      if( vAlfCUCtrlParam[s].cu_control_flag == 1)
-      {
-        bCUCtrlEnabled = true;
-      }
-    }
-
-    if(bCUCtrlEnabled)  
-    {
-      xCUAdaptive(pcPic, pcAlfParam->filter_shape, pRest, pDec, LumaStride);
-    }  
-    else
-    {
-      filterLuma(pRest, pDec, LumaStride, 0, m_img_height-1, 0, m_img_width-1,  pcAlfParam->filter_shape, m_filterCoeffSym, m_varIndTab, m_varImg);
-    }
-  }
-  else
-  {
-    Pel* pTemp = m_pcSliceYuvTmp->getLumaAddr();
-    for(UInt s=0; s< m_uiNumSlicesInPic; s++)
-    {
-      if(!pcPic->getValidSlice(s)) 
-      {
-        continue;
-      }
-      std::vector< std::vector<AlfLCUInfo*> > & vpSliceTileAlfLCU = m_pvpSliceTileAlfLCU[s];
-
-      for(Int t=0; t< (Int)vpSliceTileAlfLCU.size(); t++)
-      {
-        std::vector<AlfLCUInfo*> & vpAlfLCU = vpSliceTileAlfLCU[t];
-
-        copyRegion(vpAlfLCU, pTemp, pDec, LumaStride);
-        extendRegionBorder(vpAlfLCU, pTemp, LumaStride);
-        if(vAlfCUCtrlParam[s].cu_control_flag == 1)
-        {
-          xCUAdaptiveRegion(vpAlfLCU, pTemp, pRest, LumaStride, pcAlfParam->filter_shape, m_filterCoeffSym, m_varIndTab, m_varImg);
-        }
-        else
-        {
-          filterLumaRegion(vpAlfLCU, pTemp, pRest, LumaStride, pcAlfParam->filter_shape, m_filterCoeffSym, m_varIndTab, m_varImg);
-        }
-      }
-    }
-  }
-}
-
-Void TComAdaptiveLoopFilter::decodeFilterSet(ALFParam* pcAlfParam, Int* varIndTab, Int** filterCoeff)
-{
-  // reconstruct merge table
-  memset(m_varIndTab, 0, NO_VAR_BINS * sizeof(Int));
-  if(pcAlfParam->filters_per_group > 1)
-  {
-    for(Int i = 1; i < NO_VAR_BINS; ++i)
-    {
-      if(pcAlfParam->filterPattern[i])
-      {
-        varIndTab[i] = varIndTab[i-1] + 1;
-      }
-      else
-      {
-        varIndTab[i] = varIndTab[i-1];
-      }
-    }
-  }
-  predictALFCoeffLuma( pcAlfParam);
-  // reconstruct filter sets
-  reconstructFilterCoeffs( pcAlfParam, filterCoeff);
-
-}
-
-
-Void TComAdaptiveLoopFilter::filterLuma(Pel *pImgRes, Pel *pImgPad, Int stride, 
-  Int ypos, Int yposEnd, Int xpos, Int xposEnd, 
-  Int filtNo, Int** filterSet, Int* mergeTable, Pel** ppVarImg)
-{
-  static Int numBitsMinus1= (Int)ALF_NUM_BIT_SHIFT;
-  static Int offset       = (1<<( (Int)ALF_NUM_BIT_SHIFT-1));
-  static Int shiftHeight  = (Int)(log((double)VAR_SIZE_H)/log(2.0));
-  static Int shiftWidth   = (Int)(log((double)VAR_SIZE_W)/log(2.0));
-
-  Pel *pImgPad1,*pImgPad2,*pImgPad3,*pImgPad4;
-  Pel *pVar;
-  Int i, j, pixelInt;
-  Int *coef = NULL;
-
-  pImgPad    += (ypos*stride);
-  pImgRes    += (ypos*stride);
-
-  Int yLineInLCU;
-  Int paddingLine;
-#if !ALF_SINGLE_FILTER_SHAPE
-  Int varInd = 0;
-#endif
-  Int newCenterCoeff[4][NO_VAR_BINS];
-
-  for(i=0; i< 4; i++)
-  {
-    ::memset(&(newCenterCoeff[i][0]), 0, sizeof(Int)*NO_VAR_BINS);
-  }
-
-#if ALF_SINGLE_FILTER_SHAPE
-  if(filtNo == ALF_CROSS9x7_SQUARE3x3)
-#else
-  if(filtNo == ALF_CROSS9x9)
-#endif
-  {
-    for (i=0; i<NO_VAR_BINS; i++)
-    {
-      coef = filterSet[i];
-      //VB line 1
-      newCenterCoeff[0][i] = coef[8] + ((coef[0] + coef[1] + coef[2] + coef[3])<<1);
-      //VB line 2 
-      newCenterCoeff[1][i] = coef[8] + ((coef[0] + coef[1] + coef[2])<<1);
-      //VB line 3 
-      newCenterCoeff[2][i] = coef[8] + ((coef[0] + coef[1])<<1);
-      //VB line 4 
-      newCenterCoeff[3][i] = coef[8] + ((coef[0])<<1);
-    }
-  }
-
-
-  switch(filtNo)
-  {
-#if !ALF_SINGLE_FILTER_SHAPE
-  case ALF_STAR5x5:
-    {
-      for(i= ypos; i<= yposEnd; i++)
-      {
-
-        yLineInLCU = i % m_lcuHeight;   
-
-        if (yLineInLCU<m_lineIdxPadBot || i-yLineInLCU+m_lcuHeight >= m_img_height)
-        {
-          pImgPad1 = pImgPad +   stride;
-          pImgPad2 = pImgPad -   stride;
-          pImgPad3 = pImgPad + 2*stride;
-          pImgPad4 = pImgPad - 2*stride;
-        }
-        else if (yLineInLCU<m_lineIdxPadTop)
-        {
-          paddingLine = - yLineInLCU + m_lineIdxPadTop - 1;
-          pImgPad1 = pImgPad + min(paddingLine, 1)*stride;
-          pImgPad2 = pImgPad -   stride;
-          pImgPad3 = pImgPad + min(paddingLine, 2)*stride;
-          pImgPad4 = pImgPad - 2*stride;
-        }
-        else
-        {
-          paddingLine = yLineInLCU - m_lineIdxPadTop ;
-          pImgPad1 = pImgPad + stride;
-          pImgPad2 = pImgPad - min(paddingLine, 1)*stride;
-          pImgPad3 = pImgPad + 2*stride;
-          pImgPad4 = pImgPad - min(paddingLine, 2)*stride;
-        } 
-
-        pVar = ppVarImg[i>>shiftHeight] + (xpos>>shiftWidth);
-
-        if ( (yLineInLCU == m_lineIdxPadTop || yLineInLCU == m_lineIdxPadTop-1) && i-yLineInLCU+m_lcuHeight < m_img_height ) 
-        {
-          for(j= xpos; j<= xposEnd; j++)
-          {
-            pImgRes[j] = pImgPad[j];
-          }
-        }
-        else if ( (yLineInLCU == m_lineIdxPadTop+1 || yLineInLCU == m_lineIdxPadTop-2) && i-yLineInLCU+m_lcuHeight < m_img_height ) 
-        {
-          for(j= xpos; j<= xposEnd ; j++)
-          {
-            if (j % VAR_SIZE_W==0) 
-            {
-              coef = filterSet[mergeTable[*(pVar++)]];
-            }
-
-            pixelInt  = 0;
-
-            pixelInt += coef[0]* (pImgPad3[j+2]+pImgPad4[j-2]);
-            pixelInt += coef[1]* (pImgPad3[j  ]+pImgPad4[j  ]);
-            pixelInt += coef[2]* (pImgPad3[j-2]+pImgPad4[j+2]);
-
-            pixelInt += coef[3]* (pImgPad1[j+1]+pImgPad2[j-1]);
-            pixelInt += coef[4]* (pImgPad1[j  ]+pImgPad2[j  ]);
-            pixelInt += coef[5]* (pImgPad1[j-1]+pImgPad2[j+1]);
-
-            pixelInt += coef[6]* (pImgPad[j+2]+pImgPad[j-2]);
-            pixelInt += coef[7]* (pImgPad[j+1]+pImgPad[j-1]);
-            pixelInt += coef[8]* (pImgPad[j  ]);
-
-            pixelInt=(int)((pixelInt+offset) >> numBitsMinus1);
-            pImgRes[j] = ( Clip( pixelInt ) + pImgPad[j] ) >> 1;
-          }
-        }
-        else
-        {
-
-        for(j= xpos; j<= xposEnd ; j++)
-        {
-          if (j % VAR_SIZE_W==0) 
-          {
-            coef = filterSet[mergeTable[*(pVar++)]];
-          }
-
-          pixelInt  = 0;
-
-          pixelInt += coef[0]* (pImgPad3[j+2]+pImgPad4[j-2]);
-          pixelInt += coef[1]* (pImgPad3[j  ]+pImgPad4[j  ]);
-          pixelInt += coef[2]* (pImgPad3[j-2]+pImgPad4[j+2]);
-
-          pixelInt += coef[3]* (pImgPad1[j+1]+pImgPad2[j-1]);
-          pixelInt += coef[4]* (pImgPad1[j  ]+pImgPad2[j  ]);
-          pixelInt += coef[5]* (pImgPad1[j-1]+pImgPad2[j+1]);
-
-          pixelInt += coef[6]* (pImgPad[j+2]+pImgPad[j-2]);
-          pixelInt += coef[7]* (pImgPad[j+1]+pImgPad[j-1]);
-          pixelInt += coef[8]* (pImgPad[j  ]);
-
-          pixelInt=(Int)((pixelInt+offset) >> numBitsMinus1);
-          pImgRes[j] = Clip( pixelInt );
-        }
-
-        }
-
-        pImgPad += stride;
-        pImgRes += stride;
-      }
-    }
-    break;
-  case ALF_CROSS9x9:
-    {
-      Pel *pImgPad5, *pImgPad6, *pImgPad7, *pImgPad8;
-#else
-  case ALF_CROSS9x7_SQUARE3x3:
-    {
-      Pel *pImgPad5, *pImgPad6;
-#endif
-      for(i= ypos; i<= yposEnd; i++)
-      {
-        yLineInLCU = i % m_lcuHeight;   
-
-        if (yLineInLCU<m_lineIdxPadBot || i-yLineInLCU+m_lcuHeight >= m_img_height)
-        {
-          pImgPad1 = pImgPad +   stride;
-          pImgPad2 = pImgPad -   stride;
-          pImgPad3 = pImgPad + 2*stride;
-          pImgPad4 = pImgPad - 2*stride;
-          pImgPad5 = pImgPad + 3*stride;
-          pImgPad6 = pImgPad - 3*stride;
-#if !ALF_SINGLE_FILTER_SHAPE
-          pImgPad7 = pImgPad + 4*stride;
-          pImgPad8 = pImgPad - 4*stride;
-#endif
-        }
-        else if (yLineInLCU<m_lineIdxPadTop)
-        {
-          paddingLine = - yLineInLCU + m_lineIdxPadTop - 1;
-#if ALF_SINGLE_FILTER_SHAPE
-          pImgPad1 = (paddingLine < 1) ? pImgPad : pImgPad + min(paddingLine, 1)*stride;
-          pImgPad2 = (paddingLine < 1) ? pImgPad : pImgPad -   stride;
-          pImgPad3 = (paddingLine < 2) ? pImgPad : pImgPad + min(paddingLine, 2)*stride;
-          pImgPad4 = (paddingLine < 2) ? pImgPad : pImgPad - 2*stride;
-          pImgPad5 = (paddingLine < 3) ? pImgPad : pImgPad + min(paddingLine, 3)*stride;
-          pImgPad6 = (paddingLine < 3) ? pImgPad : pImgPad - 3*stride;
-#else
-          pImgPad1 = pImgPad + min(paddingLine, 1)*stride;
-          pImgPad2 = pImgPad -   stride;
-          pImgPad3 = pImgPad + min(paddingLine, 2)*stride;
-          pImgPad4 = pImgPad - 2*stride;
-          pImgPad5 = pImgPad + min(paddingLine, 3)*stride;
-          pImgPad6 = pImgPad - 3*stride;
-          pImgPad7 = pImgPad + min(paddingLine, 4)*stride;
-          pImgPad8 = pImgPad - 4*stride;
-#endif
-        }
-        else
-        {
-          paddingLine = yLineInLCU - m_lineIdxPadTop ;
-#if ALF_SINGLE_FILTER_SHAPE
-          pImgPad1 = (paddingLine < 1) ? pImgPad : pImgPad +   stride;
-          pImgPad2 = (paddingLine < 1) ? pImgPad : pImgPad - min(paddingLine, 1)*stride;
-          pImgPad3 = (paddingLine < 2) ? pImgPad : pImgPad + 2*stride;
-          pImgPad4 = (paddingLine < 2) ? pImgPad : pImgPad - min(paddingLine, 2)*stride;
-          pImgPad5 = (paddingLine < 3) ? pImgPad : pImgPad + 3*stride;
-          pImgPad6 = (paddingLine < 3) ? pImgPad : pImgPad - min(paddingLine, 3)*stride;
-#else
-          pImgPad1 = pImgPad + stride;
-          pImgPad2 = pImgPad - min(paddingLine, 1)*stride;
-          pImgPad3 = pImgPad + 2*stride;
-          pImgPad4 = pImgPad - min(paddingLine, 2)*stride;
-          pImgPad5 = pImgPad + 3*stride;
-          pImgPad6 = pImgPad - min(paddingLine, 3)*stride;
-          pImgPad7 = pImgPad + 4*stride;
-          pImgPad8 = pImgPad - min(paddingLine, 4)*stride;
-#endif
-        } 
-
-        pVar = ppVarImg[i>>shiftHeight] + (xpos>>shiftWidth);
-
-#if ALF_SINGLE_FILTER_SHAPE
-        {
-          for(j= xpos; j<= xposEnd ; j++)
-          {
-            if (j % VAR_SIZE_W==0) 
-            {
-              coef = filterSet[mergeTable[*(pVar++)]];
-            }
-
-            pixelInt  = 0;
-
-            pixelInt += coef[0]* (pImgPad5[j]+pImgPad6[j]);
-            pixelInt += coef[1]* (pImgPad3[j]+pImgPad4[j]);
-            pixelInt += coef[2]* (pImgPad1[j-1]+pImgPad2[j+1]);
-            pixelInt += coef[3]* (pImgPad1[j]+pImgPad2[j]);
-            pixelInt += coef[4]* (pImgPad1[j+1]+pImgPad2[j-1]);
-            pixelInt += coef[5]* (pImgPad[j+4]+pImgPad[j-4]);
-            pixelInt += coef[6]* (pImgPad[j+3]+pImgPad[j-3]);
-            pixelInt += coef[7]* (pImgPad[j+2]+pImgPad[j-2]);
-            pixelInt += coef[8]* (pImgPad[j+1]+pImgPad[j-1]);
-            pixelInt += coef[9]* (pImgPad[j  ]);
-
-            pixelInt=(Int)((pixelInt+offset) >> numBitsMinus1);
-            pImgRes[j] = Clip( pixelInt );
-          }
-        }
-#else
-        if ( (yLineInLCU == m_lineIdxPadTop || yLineInLCU == m_lineIdxPadTop-1) && i-yLineInLCU+m_lcuHeight < m_img_height ) 
-        {
-          for(j= xpos; j<= xposEnd ; j++)
-          {
-            if (j % VAR_SIZE_W==0) 
-            {
-              varInd = *(pVar++);
-              coef = filterSet[mergeTable[varInd]];
-            }
-
-            pixelInt  = 0;
-
-            pixelInt += coef[4]* (pImgPad[j+4]+pImgPad[j-4]);
-            pixelInt += coef[5]* (pImgPad[j+3]+pImgPad[j-3]);
-            pixelInt += coef[6]* (pImgPad[j+2]+pImgPad[j-2]);
-            pixelInt += coef[7]* (pImgPad[j+1]+pImgPad[j-1]);
-            pixelInt += newCenterCoeff[0][mergeTable[varInd]]* (pImgPad[j]);
-
-            pixelInt=(int)((pixelInt+offset) >> numBitsMinus1);
-            pImgRes[j] = Clip( pixelInt );
-          }
-        }
-        else if ( (yLineInLCU == m_lineIdxPadTop+1 || yLineInLCU == m_lineIdxPadTop-2) && i-yLineInLCU+m_lcuHeight < m_img_height ) 
-        {
-          for(j= xpos; j<= xposEnd ; j++)
-          {
-            if (j % VAR_SIZE_W==0) 
-            {
-              varInd = *(pVar++);
-              coef = filterSet[mergeTable[varInd]];
-            }
-
-            pixelInt  = 0;
-
-            pixelInt += coef[3]* (pImgPad1[j]+pImgPad2[j]);
-
-            pixelInt += coef[4]* (pImgPad[j+4]+pImgPad[j-4]);
-            pixelInt += coef[5]* (pImgPad[j+3]+pImgPad[j-3]);
-            pixelInt += coef[6]* (pImgPad[j+2]+pImgPad[j-2]);
-            pixelInt += coef[7]* (pImgPad[j+1]+pImgPad[j-1]);
-            pixelInt += newCenterCoeff[1][mergeTable[varInd]]* (pImgPad[j]);
-
-            pixelInt=(int)((pixelInt+offset) >> numBitsMinus1);
-            pImgRes[j] = Clip( pixelInt );
-          }
-        }
-        else if ( (yLineInLCU == m_lineIdxPadTop+2 || yLineInLCU == m_lineIdxPadTop-3) && i-yLineInLCU+m_lcuHeight < m_img_height ) 
-        {
-          for(j= xpos; j<= xposEnd ; j++)
-          {
-            if (j % VAR_SIZE_W==0) 
-            {
-              varInd = *(pVar++);
-              coef = filterSet[mergeTable[varInd]];
-            }
-
-            pixelInt  = 0;
-
-            pixelInt += coef[2]* (pImgPad3[j]+pImgPad4[j]);
-
-            pixelInt += coef[3]* (pImgPad1[j]+pImgPad2[j]);
-
-            pixelInt += coef[4]* (pImgPad[j+4]+pImgPad[j-4]);
-            pixelInt += coef[5]* (pImgPad[j+3]+pImgPad[j-3]);
-            pixelInt += coef[6]* (pImgPad[j+2]+pImgPad[j-2]);
-            pixelInt += coef[7]* (pImgPad[j+1]+pImgPad[j-1]);
-            pixelInt += newCenterCoeff[2][mergeTable[varInd]]* (pImgPad[j  ]);
-
-            pixelInt=(int)((pixelInt+offset) >> numBitsMinus1);
-            pImgRes[j] = Clip( pixelInt );
-          }
-        }
-        else if ( (yLineInLCU == m_lineIdxPadTop+3 || yLineInLCU == m_lineIdxPadTop-4) && i-yLineInLCU+m_lcuHeight < m_img_height ) 
-        {
-          for(j= xpos; j<= xposEnd ; j++)
-          {
-            if (j % VAR_SIZE_W==0) 
-            {
-              varInd = *(pVar++);
-              coef = filterSet[mergeTable[varInd]];
-            }
-
-            pixelInt  = 0;
-
-            pixelInt += coef[1]* (pImgPad5[j]+pImgPad6[j]);
-
-            pixelInt += coef[2]* (pImgPad3[j]+pImgPad4[j]);
-
-            pixelInt += coef[3]* (pImgPad1[j]+pImgPad2[j]);
-
-            pixelInt += coef[4]* (pImgPad[j+4]+pImgPad[j-4]);
-            pixelInt += coef[5]* (pImgPad[j+3]+pImgPad[j-3]);
-            pixelInt += coef[6]* (pImgPad[j+2]+pImgPad[j-2]);
-            pixelInt += coef[7]* (pImgPad[j+1]+pImgPad[j-1]);
-            pixelInt += newCenterCoeff[3][mergeTable[varInd]]* (pImgPad[j  ]);
-
-            pixelInt=(int)((pixelInt+offset) >> numBitsMinus1);
-            pImgRes[j] = Clip( pixelInt );
-          }
-        }
-        else
-        {
-          for(j= xpos; j<= xposEnd ; j++)
-          {
-            if (j % VAR_SIZE_W==0) 
-            {
-              coef = filterSet[mergeTable[*(pVar++)]];
-            }
-
-            pixelInt  = 0;
-
-            pixelInt += coef[0]* (pImgPad7[j]+pImgPad8[j]);
-
-            pixelInt += coef[1]* (pImgPad5[j]+pImgPad6[j]);
-
-            pixelInt += coef[2]* (pImgPad3[j]+pImgPad4[j]);
-
-            pixelInt += coef[3]* (pImgPad1[j]+pImgPad2[j]);
-
-            pixelInt += coef[4]* (pImgPad[j+4]+pImgPad[j-4]);
-            pixelInt += coef[5]* (pImgPad[j+3]+pImgPad[j-3]);
-            pixelInt += coef[6]* (pImgPad[j+2]+pImgPad[j-2]);
-            pixelInt += coef[7]* (pImgPad[j+1]+pImgPad[j-1]);
-            pixelInt += coef[8]* (pImgPad[j  ]);
-
-            pixelInt=(Int)((pixelInt+offset) >> numBitsMinus1);
-            pImgRes[j] = Clip( pixelInt );
-          }
-        }
-#endif
-        pImgPad += stride;
-        pImgRes += stride;
-      }
-    }
-    break;
-  default:
-    {
-      printf("Not a supported filter shape\n");
-      assert(0);
-      exit(1);
-    }
-  }
-}
-
-
-
-Void TComAdaptiveLoopFilter::xCUAdaptive(TComPic* pcPic, Int filtNo, Pel *imgYFilt, Pel *imgYRec, Int Stride)
-{
-  // for every CU, call CU-adaptive ALF process
-  for( UInt uiCUAddr = 0; uiCUAddr < pcPic->getNumCUsInFrame() ; uiCUAddr++ )
-  {
-    TComDataCU* pcCU = pcPic->getCU( uiCUAddr );
-    xSubCUAdaptive(pcCU, filtNo, imgYFilt, imgYRec, 0, 0, Stride);
-  }
-}
-
-Void TComAdaptiveLoopFilter::xSubCUAdaptive(TComDataCU* pcCU, Int filtNo, Pel *imgYFilt, Pel *imgYRec, UInt uiAbsPartIdx, UInt uiDepth, Int Stride)
-{
-  TComPic* pcPic = pcCU->getPic();
-
-  if(pcPic==NULL)
-  {
-    return;
-  }
-  Bool bBoundary = false;
-  UInt uiLPelX   = pcCU->getCUPelX() + g_auiRasterToPelX[ g_auiZscanToRaster[uiAbsPartIdx] ];
-  UInt uiRPelX   = uiLPelX + (g_uiMaxCUWidth>>uiDepth)  - 1;
-  UInt uiTPelY   = pcCU->getCUPelY() + g_auiRasterToPelY[ g_auiZscanToRaster[uiAbsPartIdx] ];
-  UInt uiBPelY   = uiTPelY + (g_uiMaxCUHeight>>uiDepth) - 1;
-
-  // check picture boundary
-  if ( ( uiRPelX >= m_img_width ) || ( uiBPelY >= m_img_height ) )
-  {
-    bBoundary = true;
-  }
-
-  if ( ( ( uiDepth < pcCU->getDepth( uiAbsPartIdx ) ) && ( uiDepth < (g_uiMaxCUDepth-g_uiAddCUDepth) ) ) || bBoundary )
-  {
-    UInt uiQNumParts = ( pcPic->getNumPartInCU() >> (uiDepth<<1) )>>2;
-    for ( UInt uiPartUnitIdx = 0; uiPartUnitIdx < 4; uiPartUnitIdx++, uiAbsPartIdx+=uiQNumParts )
-    {
-      uiLPelX   = pcCU->getCUPelX() + g_auiRasterToPelX[ g_auiZscanToRaster[uiAbsPartIdx] ];
-      uiTPelY   = pcCU->getCUPelY() + g_auiRasterToPelY[ g_auiZscanToRaster[uiAbsPartIdx] ];
-
-      if( ( uiLPelX < m_img_width ) && ( uiTPelY < m_img_height ) )
-        xSubCUAdaptive(pcCU, filtNo, imgYFilt, imgYRec, uiAbsPartIdx, uiDepth+1, Stride);
-    }
-    return;
-  }
-
-  if ( pcCU->getAlfCtrlFlag(uiAbsPartIdx) )
-  {
-    filterLuma(imgYFilt, imgYRec, Stride, uiTPelY, min(uiBPelY,(unsigned int)(m_img_height-1)), uiLPelX, min(uiRPelX,(unsigned int)(m_img_width-1))
-      ,filtNo, m_filterCoeffSym, m_varIndTab, m_varImg);
-  }
-}
-
-/** Predict ALF luma filter coefficients. Centre coefficient is always predicted. Left neighbour is predicted according to flag.
- */
-Void TComAdaptiveLoopFilter::predictALFCoeffLuma(ALFParam* pcAlfParam)
-{
-  Int sum, coeffPred, ind;
-  const Int* pFiltMag = NULL;
-  pFiltMag = weightsTabShapes[pcAlfParam->filter_shape];
-  for(ind = 0; ind < pcAlfParam->filters_per_group; ++ind)
-  {
-    sum = 0;
-    for(Int i = 0; i < pcAlfParam->num_coeff-2; i++)
-    {
-      sum +=  pFiltMag[i]*pcAlfParam->coeffmulti[ind][i];
-    }
-    if(pcAlfParam->nbSPred[ind]==0)
-    {
-      if((pcAlfParam->predMethod==0)|(ind==0))
-      {
-        coeffPred = ((1<<ALF_NUM_BIT_SHIFT)-sum) >> 2;
-      }
-      else
-      {
-        coeffPred = (0-sum) >> 2;
-      }
-      pcAlfParam->coeffmulti[ind][pcAlfParam->num_coeff-2] = coeffPred + pcAlfParam->coeffmulti[ind][pcAlfParam->num_coeff-2];
-    }
-    sum += pFiltMag[pcAlfParam->num_coeff-2]*pcAlfParam->coeffmulti[ind][pcAlfParam->num_coeff-2];
-    if((pcAlfParam->predMethod==0)|(ind==0))
-    {
-      coeffPred = (1<<ALF_NUM_BIT_SHIFT)-sum;
-    }
-    else
-    {
-      coeffPred = -sum;
-    }
-    pcAlfParam->coeffmulti[ind][pcAlfParam->num_coeff-1] = coeffPred + pcAlfParam->coeffmulti[ind][pcAlfParam->num_coeff-1];
-  }
-}
-
-Void TComAdaptiveLoopFilter::reconstructFilterCoeffs(ALFParam* pcAlfParam,int **pfilterCoeffSym)
-{
-  int i, ind;
-
-  // Copy non zero filters in filterCoeffTmp
-  for(ind = 0; ind < pcAlfParam->filters_per_group; ++ind)
-  {
-    for(i = 0; i < pcAlfParam->num_coeff; i++)
-    {
-      pfilterCoeffSym[ind][i] = pcAlfParam->coeffmulti[ind][i];
-    }
-  }
-  // Undo prediction
-  for(ind = 1; ind < pcAlfParam->filters_per_group; ++ind)
-  {
-    if(pcAlfParam->predMethod)
-    {
-      // Prediction
-      for(i = 0; i < pcAlfParam->num_coeff; ++i)
-      {
-        pfilterCoeffSym[ind][i] = (int)(pfilterCoeffSym[ind][i] + pfilterCoeffSym[ind - 1][i]);
-      }
-    }
-  }
-
-  for(ind = 0; ind < pcAlfParam->filters_per_group; ind++)
-  {
-    checkFilterCoeffValue(pfilterCoeffSym[ind], pcAlfParam->num_coeff, false );
-  }
-}
-
-
-#endif
 
 static Pel Clip_post(int high, int val)
@@ -1836 +919 @@
 }
 
-#if !LCU_SYNTAX_ALF
-
-/** Calculate ALF grouping indices for block-based (BA) mode
- * \param [out] imgYvar grouping indices buffer
- * \param [in] imgYpad picture buffer
- * \param [in] stride picture stride size
- * \param [in] adaptationMode  ALF_BA or ALF_RA mode
- */
-Void TComAdaptiveLoopFilter::calcVar(Pel **imgYvar, Pel *imgYpad, Int stride, Int adaptationMode)
-{
-  if(adaptationMode == ALF_RA) 
-  {
-    return;
-  }
-  static Int shiftH = (Int)(log((double)VAR_SIZE_H)/log(2.0));
-  static Int shiftW = (Int)(log((double)VAR_SIZE_W)/log(2.0));
-  static Int varmax = (Int)NO_VAR_BINS-1;
-#if ALF_16_BA_GROUPS
-  static Int th[NO_VAR_BINS] = {0, 1, 2, 2, 3, 3, 3, 4, 4, 4, 4, 5, 5, 5, 5, 5}; 
-  static Int avgVarTab[3][6] = { {0,  1,  2,  3,  4,  5,},
-  {0,  6,  7,  8,  9, 10,},
-  {0, 11, 12, 13, 14, 15}   };
-#else
-  static Int step1  = (Int)((Int)(NO_VAR_BINS)/3) - 1;  
-  static Int th[NO_VAR_BINS] = {0, 1, 2, 2, 2, 3, 3, 3, 3, 3, 4, 4, 4, 4, 4, 4}; 
-#endif  
-  Int i, j, avgvar, vertical, horizontal,direction, yoffset;
-  Pel *pimgYpad, *pimgYpadup, *pimgYpaddown;
-
-  for(i = 0; i < m_img_height - 3; i=i+4)
-  {
-    yoffset      = ((i)*stride) + stride;
-    pimgYpad     = &imgYpad [yoffset];
-    pimgYpadup   = &imgYpad [yoffset + stride];
-    pimgYpaddown = &imgYpad [yoffset - stride];
-
-    for(j = 0; j < m_img_width - 3 ; j=j+4)
-    {
-      // Compute at sub-sample by 2
-      vertical   =  abs((pimgYpad[j+1]<<1  ) - pimgYpaddown[j+1]   - pimgYpadup[j+1]);
-      horizontal =  abs((pimgYpad[j+1]<<1  ) - pimgYpad    [j+2]   - pimgYpad  [j  ]);
-
-      vertical   += abs((pimgYpad[j+2]<<1  ) - pimgYpaddown[j+2]   - pimgYpadup[j+2]);
-      horizontal += abs((pimgYpad[j+2]<<1  ) - pimgYpad    [j+3]   - pimgYpad  [j+1]);
-
-      vertical   += abs((pimgYpad[j+1+stride]<<1) - pimgYpaddown[j+1+stride] - pimgYpadup[j+1+stride]);
-      horizontal += abs((pimgYpad[j+1+stride]<<1) - pimgYpad    [j+2+stride] - pimgYpad  [j+stride  ]);
-
-      vertical   += abs((pimgYpad[j+2+stride]<<1) - pimgYpaddown[j+2+stride] - pimgYpadup[j+2+stride]);
-      horizontal += abs((pimgYpad[j+2+stride]<<1) - pimgYpad    [j+3+stride] - pimgYpad  [j+1+stride]);
-
-      direction = 0;
-      if (vertical > 2*horizontal) 
-      {
-        direction = 1; //vertical
-      }
-      if (horizontal > 2*vertical)
-      {
-        direction = 2; //horizontal
-      }
-
-      avgvar = (vertical + horizontal) >> 2;
-      avgvar = (Pel) Clip_post(varmax, avgvar >>(g_uiBitIncrement+1));
-      avgvar = th[avgvar];
-#if ALF_16_BA_GROUPS
-      avgvar = avgVarTab[direction][avgvar];
-#else      
-      avgvar = Clip_post(step1, (Int) avgvar ) + (step1+1)*direction;
-#endif
-      imgYvar[(i )>>shiftH][(j)>>shiftW] = avgvar;
-    }
-  }
-}
-
-Void TComAdaptiveLoopFilter::createRegionIndexMap(Pel **imgYVar, Int imgWidth, Int imgHeight)
-{
-  int varStepSizeWidth = VAR_SIZE_W;
-  int varStepSizeHeight = VAR_SIZE_H;
-  int shiftHeight = (int)(log((double)varStepSizeHeight)/log(2.0));
-  int shiftWidth = (int)(log((double)varStepSizeWidth)/log(2.0));
-
-  int i, j;
-  int regionTable[NO_VAR_BINS] = {0, 1, 4, 5, 15, 2, 3, 6, 14, 11, 10, 7, 13, 12,  9,  8}; 
-  int xInterval;
-  int yInterval;
-  int yIndex;
-  int yIndexOffset;
-  int yStartLine;
-  int yEndLine;
-
-  xInterval = ((( (imgWidth+63)/64) + 1) / 4 * 64)>>shiftWidth;  
-  yInterval = ((((imgHeight+63)/64) + 1) / 4 * 64)>>shiftHeight;
-
-  for (yIndex = 0; yIndex < 4 ; yIndex++)
-  {
-    yIndexOffset = yIndex * 4;
-    yStartLine = yIndex * yInterval;
-    yEndLine   = (yIndex == 3) ? imgHeight>>shiftHeight : (yStartLine+yInterval);
-
-    for(i = yStartLine; i < yEndLine ; i++)
-    {
-      for(j = 0; j < xInterval ; j++)
-      {
-        imgYVar[i][j] = regionTable[yIndexOffset+0];     
-      }
-
-      for(j = xInterval; j < xInterval*2 ; j++)
-      {
-        imgYVar[i][j] = regionTable[yIndexOffset+1];     
-      }
-
-      for(j = xInterval*2; j < xInterval*3 ; j++)
-      {
-        imgYVar[i][j] = regionTable[yIndexOffset+2];     
-      }
-
-      for(j = xInterval*3; j < imgWidth>>shiftWidth ; j++)
-      {
-        imgYVar[i][j] = regionTable[yIndexOffset+3];     
-      }
-    }
-  }
-
-}
-
-// --------------------------------------------------------------------------------------------------------------------
-// ALF for chroma
-// --------------------------------------------------------------------------------------------------------------------
-
-/** 
- \param pcPicDec    picture before ALF
- \param pcPicRest   picture after  ALF
- \param qh          filter coefficient
- \param iTap        filter tap
- \param iColor      0 for Cb and 1 for Cr
- */
-Void TComAdaptiveLoopFilter::filterChroma(Pel *pImgRes, Pel *pImgPad, Int stride, 
-                                          Int ypos, Int yposEnd, Int xpos, Int xposEnd, 
-                                          Int filtNo, Int* coef)
-{
-  static Int numBitsMinus1= (Int)ALF_NUM_BIT_SHIFT;
-  static Int offset       = (1<<( (Int)ALF_NUM_BIT_SHIFT-1));
-
-  Pel *pImgPad1,*pImgPad2,*pImgPad3,*pImgPad4;
-  Int i, j, pixelInt;
-
-  pImgPad    += (ypos*stride);
-  pImgRes    += (ypos*stride);
-
-  Int imgHeightChroma = m_img_height>>1;
-  Int yLineInLCU;
-  Int paddingline;
-  Int newCenterCoeff[4];
-
-  ::memset(newCenterCoeff, 0, sizeof(Int)*4);
-#if ALF_SINGLE_FILTER_SHAPE
-  if(filtNo == ALF_CROSS9x7_SQUARE3x3)
-#else
-  if (filtNo == ALF_CROSS9x9)
-#endif
-  {
-    //VB line 1
-    newCenterCoeff[0] = coef[8] + ((coef[0] + coef[1] + coef[2] + coef[3])<<1);
-    //VB line 2 
-    newCenterCoeff[1] = coef[8] + ((coef[0] + coef[1] + coef[2])<<1);
-    //VB line 3 
-    newCenterCoeff[2] = coef[8] + ((coef[0] + coef[1])<<1);
-    //VB line 4 
-    newCenterCoeff[3] = coef[8] + ((coef[0])<<1);
-  }
-
-  switch(filtNo)
-  {
-#if !ALF_SINGLE_FILTER_SHAPE
-  case ALF_STAR5x5:
-    {
-      for(i= ypos; i<= yposEnd; i++)
-      {
-        yLineInLCU = i % m_lcuHeightChroma;
-
-        if (yLineInLCU < m_lineIdxPadBotChroma || i-yLineInLCU+m_lcuHeightChroma >= imgHeightChroma )
-        {
-          pImgPad1 = pImgPad + stride;
-          pImgPad2 = pImgPad - stride;
-          pImgPad3 = pImgPad + 2*stride;
-          pImgPad4 = pImgPad - 2*stride;
-        }
-        else if (yLineInLCU < m_lineIdxPadTopChroma)
-        {
-          paddingline = - yLineInLCU + m_lineIdxPadTopChroma - 1;
-          pImgPad1 = pImgPad + min(paddingline, 1)*stride;
-          pImgPad2 = pImgPad - stride;
-          pImgPad3 = pImgPad + min(paddingline, 2)*stride;
-          pImgPad4 = pImgPad - 2*stride;
-        }
-        else
-        {
-          paddingline = yLineInLCU - m_lineIdxPadTopChroma ;
-          pImgPad1 = pImgPad + stride;
-          pImgPad2 = pImgPad - min(paddingline, 1)*stride;
-          pImgPad3 = pImgPad + 2*stride;
-          pImgPad4 = pImgPad - min(paddingline, 2)*stride;
-        }
-
-        if ( (yLineInLCU == m_lineIdxPadTopChroma || yLineInLCU == m_lineIdxPadTopChroma-1) && i-yLineInLCU+m_lcuHeightChroma < imgHeightChroma ) 
-        {
-          for(j= xpos; j<= xposEnd ; j++)
-          {
-            pImgRes[j] = pImgPad[j];
-          }
-        }
-        else if ( (yLineInLCU == m_lineIdxPadTopChroma+1 || yLineInLCU == m_lineIdxPadTopChroma-2) && i-yLineInLCU+m_lcuHeightChroma < imgHeightChroma ) 
-        {
-          for(j= xpos; j<= xposEnd ; j++)
-          {
-            pixelInt  = 0;
-
-            pixelInt += coef[0]* (pImgPad3[j+2]+pImgPad4[j-2]);
-            pixelInt += coef[1]* (pImgPad3[j  ]+pImgPad4[j  ]);
-            pixelInt += coef[2]* (pImgPad3[j-2]+pImgPad4[j+2]);
-
-            pixelInt += coef[3]* (pImgPad1[j+1]+pImgPad2[j-1]);
-            pixelInt += coef[4]* (pImgPad1[j  ]+pImgPad2[j  ]);
-            pixelInt += coef[5]* (pImgPad1[j-1]+pImgPad2[j+1]);
-
-            pixelInt += coef[6]* (pImgPad[j+2]+pImgPad[j-2]);
-            pixelInt += coef[7]* (pImgPad[j+1]+pImgPad[j-1]);
-            pixelInt += coef[8]* (pImgPad[j  ]);
-
-            pixelInt=(Int)((pixelInt+offset) >> numBitsMinus1);
-
-            pImgRes[j] = (Clip( pixelInt ) + pImgPad[j]) >> 1;
-          }
-        }
-        else
-        {
-
-        for(j= xpos; j<= xposEnd ; j++)
-        {
-          pixelInt  = 0;
-
-          pixelInt += coef[0]* (pImgPad3[j+2]+pImgPad4[j-2]);
-          pixelInt += coef[1]* (pImgPad3[j  ]+pImgPad4[j  ]);
-          pixelInt += coef[2]* (pImgPad3[j-2]+pImgPad4[j+2]);
-
-          pixelInt += coef[3]* (pImgPad1[j+1]+pImgPad2[j-1]);
-          pixelInt += coef[4]* (pImgPad1[j  ]+pImgPad2[j  ]);
-          pixelInt += coef[5]* (pImgPad1[j-1]+pImgPad2[j+1]);
-
-          pixelInt += coef[6]* (pImgPad[j+2]+pImgPad[j-2]);
-          pixelInt += coef[7]* (pImgPad[j+1]+pImgPad[j-1]);
-          pixelInt += coef[8]* (pImgPad[j  ]);
-
-          pixelInt=(Int)((pixelInt+offset) >> numBitsMinus1);
-
-          pImgRes[j] = Clip( pixelInt );
-        }
-
-        }
-        pImgPad += stride;
-        pImgRes += stride;
-      }
-    }
-    break;
-  case ALF_CROSS9x9:
-    {
-      Pel *pImgPad5, *pImgPad6, *pImgPad7, *pImgPad8;
-#else
-  case ALF_CROSS9x7_SQUARE3x3:
-    {
-      Pel *pImgPad5, *pImgPad6;
-#endif
-      for(i= ypos; i<= yposEnd; i++)
-      {
-        yLineInLCU = i % m_lcuHeightChroma;
-#if ALF_SINGLE_FILTER_SHAPE
-        if (yLineInLCU<2 && i> 2)
-#else
-        if (yLineInLCU<2)
-#endif 
-        {
-          paddingline = yLineInLCU + 2 ;
-          pImgPad1 = pImgPad + stride;
-          pImgPad2 = pImgPad - stride;
-          pImgPad3 = pImgPad + 2*stride;
-          pImgPad4 = pImgPad - 2*stride;
-#if ALF_SINGLE_FILTER_SHAPE
-          pImgPad5 = (paddingline < 3) ? pImgPad : pImgPad + 3*stride;
-          pImgPad6 = (paddingline < 3) ? pImgPad : pImgPad - min(paddingline, 3)*stride; 
-#else
-          pImgPad5 = pImgPad + 3*stride;
-          pImgPad6 = pImgPad - min(paddingline, 3)*stride;
-          pImgPad7 = pImgPad + 4*stride;
-          pImgPad8 = pImgPad - min(paddingline, 4)*stride;
-#endif
-        }
-        else if (yLineInLCU < m_lineIdxPadBotChroma || i-yLineInLCU+m_lcuHeightChroma >= imgHeightChroma )
-        {
-          pImgPad1 = pImgPad + stride;
-          pImgPad2 = pImgPad - stride;
-          pImgPad3 = pImgPad + 2*stride;
-          pImgPad4 = pImgPad - 2*stride;
-          pImgPad5 = pImgPad + 3*stride;
-          pImgPad6 = pImgPad - 3*stride;
-#if !ALF_SINGLE_FILTER_SHAPE
-          pImgPad7 = pImgPad + 4*stride;
-          pImgPad8 = pImgPad - 4*stride;
-#endif
-        }
-        else if (yLineInLCU < m_lineIdxPadTopChroma)
-        {
-          paddingline = - yLineInLCU + m_lineIdxPadTopChroma - 1;
-#if ALF_SINGLE_FILTER_SHAPE
-          pImgPad1 = (paddingline < 1) ? pImgPad : pImgPad + min(paddingline, 1)*stride;
-          pImgPad2 = (paddingline < 1) ? pImgPad : pImgPad -   stride;
-          pImgPad3 = (paddingline < 2) ? pImgPad : pImgPad + min(paddingline, 2)*stride;
-          pImgPad4 = (paddingline < 2) ? pImgPad : pImgPad - 2*stride;
-          pImgPad5 = (paddingline < 3) ? pImgPad : pImgPad + min(paddingline, 3)*stride;
-          pImgPad6 = (paddingline < 3) ? pImgPad : pImgPad - 3*stride;
-#else
-          pImgPad1 = pImgPad + min(paddingline, 1)*stride;
-          pImgPad2 = pImgPad - stride;
-          pImgPad3 = pImgPad + min(paddingline, 2)*stride;
-          pImgPad4 = pImgPad - 2*stride;
-          pImgPad5 = pImgPad + min(paddingline, 3)*stride;
-          pImgPad6 = pImgPad - 3*stride;
-          pImgPad7 = pImgPad + min(paddingline, 4)*stride;
-          pImgPad8 = pImgPad - 4*stride;
-#endif
-        }
-        else
-        {
-          paddingline = yLineInLCU - m_lineIdxPadTopChroma ;
-#if ALF_SINGLE_FILTER_SHAPE
-          pImgPad1 = (paddingline < 1) ? pImgPad : pImgPad +   stride;
-          pImgPad2 = (paddingline < 1) ? pImgPad : pImgPad - min(paddingline, 1)*stride;
-          pImgPad3 = (paddingline < 2) ? pImgPad : pImgPad + 2*stride;
-          pImgPad4 = (paddingline < 2) ? pImgPad : pImgPad - min(paddingline, 2)*stride;
-          pImgPad5 = (paddingline < 3) ? pImgPad : pImgPad + 3*stride;
-          pImgPad6 = (paddingline < 3) ? pImgPad : pImgPad - min(paddingline, 3)*stride;
-#else
-          pImgPad1 = pImgPad + stride;
-          pImgPad2 = pImgPad - min(paddingline, 1)*stride;
-          pImgPad3 = pImgPad + 2*stride;
-          pImgPad4 = pImgPad - min(paddingline, 2)*stride;
-          pImgPad5 = pImgPad + 3*stride;
-          pImgPad6 = pImgPad - min(paddingline, 3)*stride;
-          pImgPad7 = pImgPad + 4*stride;
-          pImgPad8 = pImgPad - min(paddingline, 4)*stride;
-#endif
-        }
-
-#if ALF_SINGLE_FILTER_SHAPE
-          for(j= xpos; j<= xposEnd ; j++)
-          {
-            pixelInt  = 0;
-
-            pixelInt += coef[0]* (pImgPad5[j]+pImgPad6[j]);
-            pixelInt += coef[1]* (pImgPad3[j]+pImgPad4[j]);
-            pixelInt += coef[2]* (pImgPad1[j-1]+pImgPad2[j+1]);
-            pixelInt += coef[3]* (pImgPad1[j]+pImgPad2[j]);
-            pixelInt += coef[4]* (pImgPad1[j+1]+pImgPad2[j-1]);
-            pixelInt += coef[5]* (pImgPad[j+4]+pImgPad[j-4]);
-            pixelInt += coef[6]* (pImgPad[j+3]+pImgPad[j-3]);
-            pixelInt += coef[7]* (pImgPad[j+2]+pImgPad[j-2]);
-            pixelInt += coef[8]* (pImgPad[j+1]+pImgPad[j-1]);
-            pixelInt += coef[9]* (pImgPad[j  ]);
-
-            pixelInt=(Int)((pixelInt+offset) >> numBitsMinus1);
-
-            pImgRes[j] = Clip( pixelInt );
-          }
-#else
-        if ( (yLineInLCU == m_lineIdxPadTopChroma || yLineInLCU == m_lineIdxPadTopChroma-1) && i-yLineInLCU+m_lcuHeightChroma < imgHeightChroma ) 
-        {
-          for(j= xpos; j<= xposEnd ; j++)
-          {
-            pixelInt  = 0;
-
-            pixelInt += coef[4]* (pImgPad[j+4]+pImgPad[j-4]);
-            pixelInt += coef[5]* (pImgPad[j+3]+pImgPad[j-3]);
-            pixelInt += coef[6]* (pImgPad[j+2]+pImgPad[j-2]);
-            pixelInt += coef[7]* (pImgPad[j+1]+pImgPad[j-1]);
-            pixelInt += newCenterCoeff[0]* (pImgPad[j  ]);
-
-            pixelInt=(Int)((pixelInt+offset) >> numBitsMinus1);
-
-            pImgRes[j] = Clip( pixelInt );
-          }
-        }
-        else if ( (yLineInLCU == m_lineIdxPadTopChroma+1 || yLineInLCU == m_lineIdxPadTopChroma-2) && i-yLineInLCU+m_lcuHeightChroma < imgHeightChroma ) 
-        {
-          for(j= xpos; j<= xposEnd ; j++)
-          {
-            pixelInt  = 0;
-            
-            pixelInt += coef[3]* (pImgPad1[j]+pImgPad2[j]);
-
-            pixelInt += coef[4]* (pImgPad[j+4]+pImgPad[j-4]);
-            pixelInt += coef[5]* (pImgPad[j+3]+pImgPad[j-3]);
-            pixelInt += coef[6]* (pImgPad[j+2]+pImgPad[j-2]);
-            pixelInt += coef[7]* (pImgPad[j+1]+pImgPad[j-1]);
-            pixelInt += newCenterCoeff[1]* (pImgPad[j  ]);
-
-            pixelInt=(Int)((pixelInt+offset) >> numBitsMinus1);
-
-            pImgRes[j] = Clip( pixelInt );
-          }
-        }
-        else if ( (yLineInLCU == 0 && i>0) || (yLineInLCU == m_lineIdxPadTopChroma-3 && i-yLineInLCU+m_lcuHeightChroma < imgHeightChroma) )
-        {
-          for(j= xpos; j<= xposEnd ; j++)
-          {
-            pixelInt  = 0;
-
-            pixelInt += coef[2]* (pImgPad3[j]+pImgPad4[j]);
-
-            pixelInt += coef[3]* (pImgPad1[j]+pImgPad2[j]);
-
-            pixelInt += coef[4]* (pImgPad[j+4]+pImgPad[j-4]);
-            pixelInt += coef[5]* (pImgPad[j+3]+pImgPad[j-3]);
-            pixelInt += coef[6]* (pImgPad[j+2]+pImgPad[j-2]);
-            pixelInt += coef[7]* (pImgPad[j+1]+pImgPad[j-1]);
-            pixelInt += newCenterCoeff[2]* (pImgPad[j  ]);
-
-            pixelInt=(Int)((pixelInt+offset) >> numBitsMinus1);
-
-            pImgRes[j] = Clip( pixelInt );
-          }
-        }
-        else if ( (yLineInLCU == 1 && i>1) || (yLineInLCU == m_lineIdxPadTopChroma-4 && i-yLineInLCU+m_lcuHeightChroma < imgHeightChroma) ) 
-        {
-          for(j= xpos; j<= xposEnd ; j++)
-          {
-            pixelInt  = 0;
-
-            pixelInt += coef[1]* (pImgPad5[j]+pImgPad6[j]);
-
-            pixelInt += coef[2]* (pImgPad3[j]+pImgPad4[j]);
-
-            pixelInt += coef[3]* (pImgPad1[j]+pImgPad2[j]);
-
-            pixelInt += coef[4]* (pImgPad[j+4]+pImgPad[j-4]);
-            pixelInt += coef[5]* (pImgPad[j+3]+pImgPad[j-3]);
-            pixelInt += coef[6]* (pImgPad[j+2]+pImgPad[j-2]);
-            pixelInt += coef[7]* (pImgPad[j+1]+pImgPad[j-1]);
-            pixelInt += newCenterCoeff[3]* (pImgPad[j  ]);
-
-            pixelInt=(Int)((pixelInt+offset) >> numBitsMinus1);
-
-            pImgRes[j] = Clip( pixelInt );
-          }
-        }
-        else
-        {          
-          for(j= xpos; j<= xposEnd ; j++)
-          {
-            pixelInt  = 0;
-
-            pixelInt += coef[0]* (pImgPad7[j]+pImgPad8[j]);
-
-            pixelInt += coef[1]* (pImgPad5[j]+pImgPad6[j]);
-
-            pixelInt += coef[2]* (pImgPad3[j]+pImgPad4[j]);
-
-            pixelInt += coef[3]* (pImgPad1[j]+pImgPad2[j]);
-
-            pixelInt += coef[4]* (pImgPad[j+4]+pImgPad[j-4]);
-            pixelInt += coef[5]* (pImgPad[j+3]+pImgPad[j-3]);
-            pixelInt += coef[6]* (pImgPad[j+2]+pImgPad[j-2]);
-            pixelInt += coef[7]* (pImgPad[j+1]+pImgPad[j-1]);
-            pixelInt += coef[8]* (pImgPad[j  ]);
-
-            pixelInt=(Int)((pixelInt+offset) >> numBitsMinus1);
-
-            pImgRes[j] = Clip( pixelInt );
-          }
-        }
-#endif
-        pImgPad += stride;
-        pImgRes += stride;
-
-      }
-    }
-
-    break;
-  default:
-    {
-      printf("Not a supported filter shape\n");
-      assert(0);
-      exit(1);
-    }
-  }
-
-}
-
-/** Chroma filtering for multi-slice picture
- * \param componentID slice parameters
- * \param pcPicDecYuv original picture
- * \param pcPicRestYuv picture before filtering
- * \param coeff filter coefficients
- * \param filtNo  filter shape
- * \param chromaFormatShift size adjustment for chroma (1 for 4:2:0 format)
- */
-Void TComAdaptiveLoopFilter::xFilterChromaSlices(Int componentID, TComPicYuv* pcPicDecYuv, TComPicYuv* pcPicRestYuv, Int *coeff, Int filtNo, Int chromaFormatShift)
-{
-  Pel* pPicDec   = (componentID == ALF_Cb)?(    pcPicDecYuv->getCbAddr()):(    pcPicDecYuv->getCrAddr());
-  Pel* pPicSlice = (componentID == ALF_Cb)?(m_pcSliceYuvTmp->getCbAddr()):(m_pcSliceYuvTmp->getCrAddr());
-  Pel* pRest     = (componentID == ALF_Cb)?(   pcPicRestYuv->getCbAddr()):(   pcPicRestYuv->getCrAddr());
-  Int  stride    = pcPicDecYuv->getCStride();
-
-  for(UInt s=0; s< m_uiNumSlicesInPic; s++)
-  {
-    if(!m_pcPic->getValidSlice(s))
-    {
-      continue;
-    }
-    std::vector< std::vector<AlfLCUInfo*> > & vpSliceTileAlfLCU = m_pvpSliceTileAlfLCU[s];
-
-    for(Int t=0; t< (Int)vpSliceTileAlfLCU.size(); t++)
-    {
-      std::vector<AlfLCUInfo*> & vpAlfLCU = vpSliceTileAlfLCU[t];
-
-      copyRegion(vpAlfLCU, pPicSlice, pPicDec, stride, chromaFormatShift);
-      extendRegionBorder(vpAlfLCU, pPicSlice, stride, chromaFormatShift);
-      filterChromaRegion(vpAlfLCU, pPicSlice, pRest, stride, coeff, filtNo, chromaFormatShift);
-    }
-  }
-}
-
-/** Chroma filtering for one component in multi-slice picture
- * \param componentID slice parameters
- * \param pcPicDecYuv original picture
- * \param pcPicRestYuv picture before filtering
- * \param shape  filter shape
- * \param pCoeff filter coefficients
- */
-Void TComAdaptiveLoopFilter::xFilterChromaOneCmp(Int componentID, TComPicYuv *pDecYuv, TComPicYuv *pRestYuv, Int shape, Int *pCoeff)
-{
-  Int chromaFormatShift = 1;
-  if(!m_bUseNonCrossALF)
-  {
-    Pel* pDec    = (componentID == ALF_Cb)?(pDecYuv->getCbAddr()): (pDecYuv->getCrAddr());
-    Pel* pRest   = (componentID == ALF_Cb)?(pRestYuv->getCbAddr()):(pRestYuv->getCrAddr());
-    Int  iStride = pDecYuv->getCStride();
-    filterChroma(pRest, pDec, iStride, 0, (Int)(m_img_height>>1) -1, 0, (Int)(m_img_width>>1)-1, shape, pCoeff);
-  }
-  else
-  {
-    xFilterChromaSlices(componentID, pDecYuv, pRestYuv, pCoeff, shape, chromaFormatShift);
-  }
-}
-
-/** Chroma filtering for  multi-slice picture
- * \param pcAlfParam ALF parameters
- * \param pcPicDec to-be-filtered picture buffer 
- * \param pcPicRest filtered picture buffer
- */
-Void TComAdaptiveLoopFilter::xALFChroma(ALFParam* pcAlfParam, TComPicYuv* pcPicDec, TComPicYuv* pcPicRest)
-{
-  if((pcAlfParam->chroma_idc>>1)&0x01)
-  {
-    xFilterChromaOneCmp(ALF_Cb, pcPicDec, pcPicRest, pcAlfParam->filter_shape_chroma, pcAlfParam->coeff_chroma);
-  }
-
-  if(pcAlfParam->chroma_idc&0x01)
-  {
-    xFilterChromaOneCmp(ALF_Cr, pcPicDec, pcPicRest, pcAlfParam->filter_shape_chroma, pcAlfParam->coeff_chroma);
-  }
-}
-
-#endif
 
 Void TComAdaptiveLoopFilter::setAlfCtrlFlags(AlfCUCtrlInfo* pAlfParam, TComDataCU *pcCU, UInt uiAbsPartIdx, UInt uiDepth, UInt &idx)
@@ -2498 +1009 @@
  * \param numSlicesInPic number of slices in picture
  */
-#if LCU_SYNTAX_ALF
 Void TComAdaptiveLoopFilter::createPicAlfInfo(TComPic* pcPic, Int numSlicesInPic, Int alfQP)
-#else
-Void TComAdaptiveLoopFilter::createPicAlfInfo(TComPic* pcPic, Int numSlicesInPic)
-#endif
 {
   m_uiNumSlicesInPic = numSlicesInPic;
@@ -2510 +1017 @@
   m_pcPic = pcPic;
 
-#if LCU_SYNTAX_ALF
   m_isNonCrossSlice = pcPic->getIndependentSliceBoundaryForNDBFilter(); 
   m_suWidth = pcPic->getMinCUWidth();
   m_suHeight= pcPic->getMinCUHeight();
   m_alfQP = alfQP; 
-#endif
-#if !LCU_SYNTAX_ALF  
-  if(m_uiNumSlicesInPic > 1 || m_bUseNonCrossALF)
-  {
-#endif
     m_ppSliceAlfLCUs = new AlfLCUInfo*[m_uiNumSlicesInPic];
     m_pvpAlfLCU = new std::vector< AlfLCUInfo* >[m_uiNumSlicesInPic];
@@ -2584 +1085 @@
       m_pcSliceYuvTmp = pcPic->getYuvPicBufferForIndependentBoundaryProcessing();
     }
-#if !LCU_SYNTAX_ALF
-  }
-#endif
 
 }
@@ -2594 +1092 @@
 Void TComAdaptiveLoopFilter::destroyPicAlfInfo()
 {
-#if !LCU_SYNTAX_ALF
-  if(m_bUseNonCrossALF)
-  {
-#endif
     for(Int s=0; s< m_uiNumSlicesInPic; s++)
     {
@@ -2614 +1108 @@
     delete[] m_pvpSliceTileAlfLCU;
     m_pvpSliceTileAlfLCU = NULL;
-#if !LCU_SYNTAX_ALF
-  }
-#endif
-}
-
-#if !LCU_SYNTAX_ALF
-/** ALF for cu-on/off-controlled region
- * \param vpAlfLCU ALF LCU information container
- * \param imgDec to-be-filtered picture buffer
- * \param imgRest filtered picture buffer
- * \param stride picture buffer stride size
- * \param filtNo filter shape
- * \param filterCoeff filter coefficients
- * \param mergeTable merge table for filter set
- * \param varImg BA index 
- */
-Void TComAdaptiveLoopFilter::xCUAdaptiveRegion(std::vector<AlfLCUInfo*> &vpAlfLCU, Pel* imgDec, Pel* imgRest, Int stride, Int filtNo, Int** filterCoeff, Int* mergeTable, Pel** varImg)
-{
-  UInt SUWidth   = m_pcPic->getMinCUWidth();
-  UInt SUHeight  = m_pcPic->getMinCUHeight();
-  UInt idx, startSU, endSU, currSU, LCUX, LCUY, LPelX, TPelY;
-  TComDataCU* pcCU;
-
-  for(idx=0; idx< vpAlfLCU.size(); idx++)
-  {
-    AlfLCUInfo&    rAlfLCU = *(vpAlfLCU[idx]);
-    pcCU                   = rAlfLCU.pcCU;
-    startSU              = rAlfLCU.startSU;
-    endSU                = rAlfLCU.endSU;
-    LCUX                 = pcCU->getCUPelX();
-    LCUY                 = pcCU->getCUPelY();
-
-    for(currSU= startSU; currSU<= endSU; currSU++)
-    {
-      LPelX   = LCUX + g_auiRasterToPelX[ g_auiZscanToRaster[currSU] ];
-      TPelY   = LCUY + g_auiRasterToPelY[ g_auiZscanToRaster[currSU] ];
-      if( !( LPelX < m_img_width )  || !( TPelY < m_img_height )  )
-      {
-        continue;
-      }
-      if(pcCU->getAlfCtrlFlag(currSU))
-      {
-        filterLuma(imgRest, imgDec, stride, TPelY, TPelY+ SUHeight-1, LPelX, LPelX+ SUWidth-1,  filtNo, m_filterCoeffSym, m_varIndTab, m_varImg);
-      }
-    }
-  }
-
-}
-
-/** ALF for "non" cu-on/off-controlled region
- * \param vpAlfLCU ALF LCU information container
- * \param imgDec to-be-filtered picture buffer
- * \param imgRest filtered picture buffer
- * \param stride picture buffer stride size
- * \param filtNo filter shape
- * \param filterCoeff filter coefficients
- * \param mergeTable merge table for filter set
- * \param varImg BA index 
- */
-Void TComAdaptiveLoopFilter::filterLumaRegion(std::vector<AlfLCUInfo*> &vpAlfLCU, Pel* imgDec, Pel* imgRest, Int stride, Int filtNo, Int** filterCoeff, Int* mergeTable, Pel** varImg)
-{
-
-  Int height, width;
-  Int ypos, xpos;
-
-  for(Int i=0; i< vpAlfLCU.size(); i++)
-  {
-    AlfLCUInfo& rAlfLCU = *(vpAlfLCU[i]); 
-    for(UInt j=0; j< rAlfLCU.numSGU; j++)
-    {
-      ypos   = (Int)(rAlfLCU[j].posY  );
-      xpos   = (Int)(rAlfLCU[j].posX  );
-      height = (Int)(rAlfLCU[j].height);
-      width  = (Int)(rAlfLCU[j].width );
-
-      filterLuma(imgRest, imgDec, stride, ypos, ypos+ height-1, xpos, xpos+ width-1,  filtNo, filterCoeff, mergeTable, varImg);
-    }
-  }
-}
-
-
-/** Perform ALF for one chroma region
- * \param vpAlfLCU ALF LCU data container
- * \param pDec to-be-filtered picture buffer
- * \param pRest filtered picture buffer
- * \param stride picture buffer stride
- * \param coeff  filter coefficients
- * \param filtNo filter shape
- * \param chromaFormatShift chroma component size adjustment (1 for 4:2:0)
- */
-Void TComAdaptiveLoopFilter::filterChromaRegion(std::vector<AlfLCUInfo*> &vpAlfLCU, Pel* pDec, Pel* pRest, Int stride, Int *coeff, Int filtNo, Int chromaFormatShift)
-{
-  Int height, width;
-  Int ypos, xpos;
-
-  for(Int i=0; i< vpAlfLCU.size(); i++)
-  {
-    AlfLCUInfo& cAlfLCU = *(vpAlfLCU[i]);
-    for(Int j=0; j< cAlfLCU.numSGU; j++)
-    {
-      ypos   = (Int)(cAlfLCU[j].posY   >> chromaFormatShift);
-      xpos   = (Int)(cAlfLCU[j].posX   >> chromaFormatShift);
-      height = (Int)(cAlfLCU[j].height >> chromaFormatShift);
-      width  = (Int)(cAlfLCU[j].width  >> chromaFormatShift);
-
-      filterChroma(pRest, pDec, stride, ypos, ypos+ height -1, xpos, xpos+ width-1, filtNo, coeff);
-    }
-  }
-}
-
-#endif
+}
+
 
 /** Copy ALF CU control flags from ALF parameters for slices
@@ -2846 +1231 @@
     {
       NDBFBlockInfo& rSGU = rAlfLCU[n];
-#if LCU_SYNTAX_ALF
       if(rSGU.allBordersAvailable)
       {
         continue;
       }
-#endif
       posX     = rSGU.posX >> formatShift;
       posY     = rSGU.posY >> formatShift;
@@ -3127 +1510 @@
 }
 
-#if LCU_SYNTAX_ALF
 /** reconstruct ALF luma coefficient
  * \param [in] alfLCUParam ALF parameters 
@@ -3232 +1614 @@
   coeffPred = (1<<ALF_NUM_BIT_SHIFT) - sum;
 #endif
-#if ALF_CHROMA_COEF_PRED_HARMONIZATION
   filterCoeff[0][alfLCUParam->num_coeff-1] = coeffPred + alfLCUParam->coeffmulti[0][alfLCUParam->num_coeff-1];
-#else
-  filterCoeff[0][alfLCUParam->num_coeff-1] = coeffPred - alfLCUParam->coeffmulti[0][alfLCUParam->num_coeff-1];
-#endif
 }
 
@@ -3444 +1822 @@
   Int pred = (1<<ALF_NUM_BIT_SHIFT) - (sum);
 #endif
-#if ALF_CHROMA_COEF_PRED_HARMONIZATION
   coeff[numCoef-1] = coeff[numCoef-1] - pred;
-#else
-  coeff[numCoef-1] = pred- coeff[numCoef-1];
-#endif
-}
-
-#if ALF_SINGLE_FILTER_SHAPE 
+}
+
 /** filtering pixels
  * \param [out] imgRes filtered picture
@@ -3576 +1949 @@
   }  
 }
-#endif
 
 #if LCUALF_QP_DEPENDENT_BITS
@@ -3623 +1995 @@
   static Int shiftW = (Int)(log((double)VAR_SIZE_W)/log(2.0));
   static Int varMax = (Int)NO_VAR_BINS-1;  
-#if ALF_16_BA_GROUPS
   static Int th[NO_VAR_BINS] = {0, 1, 2, 2, 3, 3, 3, 4, 4, 4, 4, 5, 5, 5, 5, 5}; 
   static Int avgVarTab[3][6] = { {0,  1,  2,  3,  4,  5,},
   {0,  6,  7,  8,  9, 10,},
   {0, 11, 12, 13, 14, 15}   };
-#else
-  static Int step   = (Int)((Int)(NO_VAR_BINS)/3) - 1;  
-  static Int th[NO_VAR_BINS] = {0, 1, 2, 2, 2, 3, 3, 3, 3, 3, 4, 4, 4, 4, 4, 4}; 
-#endif
 
   Int i, j, avgVar, vertical, horizontal, direction, yOffset;
@@ -3683 +2050 @@
       avgVar = (Pel) Clip_post( varMax, avgVar>>(g_uiBitIncrement+1) );
       avgVar = th[avgVar];
-#if ALF_16_BA_GROUPS
       avgVar = avgVarTab[direction][avgVar];
-#else      
-      avgVar = Clip_post(step, (Int)avgVar) + (step+1)*direction;
-#endif
       imgYvar[i>>shiftH][j>>shiftW] = avgVar;
     }
@@ -3767 +2130 @@
   return pBuf;
 }
-#endif
 
 

branches/HTM-5.1-dev0/source/Lib/TLibCommon/TComAdaptiveLoopFilter.h

@@ -49 +49 @@
 // ====================================================================================================================
 
-#if LCU_SYNTAX_ALF
   #define LCUALF_QP_DEPENDENT_BITS    1  
-#endif
-
-#if ALF_SINGLE_FILTER_SHAPE
+
 #define ALF_FILTER_LEN       10
 #define ALF_MAX_NUM_COEF     ALF_FILTER_LEN    //!< maximum number of filter coefficients
-#else
-#define ALF_MAX_NUM_COEF      9                                       //!< maximum number of filter coefficients
-#endif
 #define MAX_SQR_FILT_LENGTH   41                                      //!< ((max_horizontal_tap * max_vertical_tap) / 2 + 1) = ((11 * 5) / 2 + 1)
 
-#if LCU_SYNTAX_ALF && LCUALF_QP_DEPENDENT_BITS
+#if LCUALF_QP_DEPENDENT_BITS
 #define ALF_QP1               28 
 #define ALF_QP2               34 
@@ -78 +72 @@
 
 
-#if LCU_SYNTAX_ALF
 /// Luma/Chroma component ID
 enum ALFComponentID
@@ -96 +89 @@
   NUM_ALF_MERGE_TYPE
 };
-#else
-///
-/// Chroma component ID
-///
-enum AlfChromaID
-{
-  ALF_Cb = 0,
-  ALF_Cr = 1
-};
-
-
-///
-/// Adaptation mode ID
-///
-enum ALFClassficationMethod
-{
-  ALF_BA =0,
-  ALF_RA,
-  NUM_ALF_CLASS_METHOD
-};
-#endif
 ///
 /// Filter shape
@@ -122 +94 @@
 enum ALFFilterShape
 {
-#if ALF_SINGLE_FILTER_SHAPE
   ALF_CROSS9x7_SQUARE3x3 = 0,
-#else
-  ALF_STAR5x5 = 0,
-  ALF_CROSS9x9,
-#endif
   NUM_ALF_FILTER_SHAPE
 };
 
-#if LCU_SYNTAX_ALF
 extern Int* kTableTabShapes[NUM_ALF_FILTER_SHAPE];
-#endif
-#if ALF_SINGLE_FILTER_SHAPE
 extern Int depthIntShape1Sym[ALF_MAX_NUM_COEF+1];
-#else
-extern Int depthIntShape0Sym[10];
-extern Int depthIntShape1Sym[10];
-#endif
 extern Int *pDepthIntTabShapes[NUM_ALF_FILTER_SHAPE];
 
@@ -156 +116 @@
   const AlfCUCtrlInfo& operator= (const AlfCUCtrlInfo& src);  //!< "=" operator
   AlfCUCtrlInfo():cu_control_flag(0), num_alf_cu_flag(0), alf_max_depth(0) {} //!< constructor
-#if LCU_SYNTAX_ALF
   Void reset();
-#endif
 };
 
@@ -190 +148 @@
 
   // filter shape information
-#if ALF_SINGLE_FILTER_SHAPE
   static Int weightsShape1Sym[ALF_MAX_NUM_COEF+1];
-#else
-  static Int weightsShape0Sym[10];
-  static Int weightsShape1Sym[10];
-#endif
   static Int *weightsTabShapes[NUM_ALF_FILTER_SHAPE];
   static Int m_sqrFiltLengthTab[NUM_ALF_FILTER_SHAPE];
@@ -209 +162 @@
   //classification
   Int      m_varIndTab[NO_VAR_BINS];
-#if !LCU_SYNTAX_ALF
-  UInt     m_uiVarGenMethod;
-  Pel** m_varImgMethods[NUM_ALF_CLASS_METHOD];
-#endif
   Pel** m_varImg;
 
@@ -237 +186 @@
   std::vector< std::vector< AlfLCUInfo* > > *m_pvpSliceTileAlfLCU;
 
-#if LCU_SYNTAX_ALF
   Int m_suWidth;
   Int m_suHeight;
@@ -245 +193 @@
   Bool m_isNonCrossSlice;
   Int m_alfQP;
-#endif
 
 private: //private member variables
@@ -252 +199 @@
 protected: //protected methods
 
-#if LCU_SYNTAX_ALF
   Void createLCUAlfInfo();
   Void destroyLCUAlfInfo();
@@ -266 +212 @@
   Bool isEnabledComponent(ALFParam** alfLCUParam);
   Int  getAlfPrecisionBit(Int qp);
-#if ALF_SINGLE_FILTER_SHAPE 
   Void filterOneCompRegion(Pel *imgRes, Pel *imgPad, Int stride, Bool isChroma, Int yPos, Int yPosEnd, Int xPos, Int xPosEnd, Int** filterSet, Int* mergeTable, Pel** varImg);  
-#endif
   Void calcOneRegionVar(Pel **imgYvar, Pel *imgYpad, Int stride, Bool isOnlyOneGroup, Int yPos, Int yPosEnd, Int xPos, Int xPosEnd);
-#endif 
 
 
   Void InitAlfLCUInfo(AlfLCUInfo& rAlfLCU, Int sliceID, Int tileID, TComDataCU* pcCU, UInt maxNumSUInLCU);
-#if !LCU_SYNTAX_ALF
-  Void createRegionIndexMap(Pel **imgY_var, Int img_width, Int img_height); //!< create RA index for regions
-  Void calcVar(Pel **imgYvar, Pel *imgYpad, Int stride, Int adaptationMode); //!< Calculate ALF grouping indices for block-based (BA) mode
-  Void filterLuma(Pel *pImgYRes, Pel *pImgYPad, Int stride, Int ypos, Int yposEnd, Int xpos, Int xposEnd, Int filtNo, Int** filterSet, Int* mergeTable, Pel** ppVarImg); //!< filtering operation for luma region
-  Void filterChroma(Pel *pImgRes, Pel *pImgPad, Int stride, Int ypos, Int yposEnd, Int xpos, Int xposEnd, Int filtNo, Int* coef);
-  Void filterChromaRegion(std::vector<AlfLCUInfo*> &vpAlfLCU, Pel* pDec, Pel* pRest, Int stride, Int *coeff, Int filtNo, Int chromaFormatShift); //!< filtering operation for chroma region
-  Void xCUAdaptive   (TComPic* pcPic, Int filtNo, Pel *imgYFilt, Pel *imgYRec, Int Stride);
-  Void xSubCUAdaptive(TComDataCU* pcCU, Int filtNo, Pel *imgYFilt, Pel *imgYRec, UInt uiAbsPartIdx, UInt uiDepth, Int Stride);
-  Void reconstructFilterCoeffs(ALFParam* pcAlfParam,int **pfilterCoeffSym);
-  Void predictALFCoeffLuma  ( ALFParam* pAlfParam );                    //!< prediction of luma ALF coefficients
-#endif
   Void checkFilterCoeffValue( Int *filter, Int filterLength, Bool isChroma );
-#if !LCU_SYNTAX_ALF
-  Void decodeFilterSet(ALFParam* pcAlfParam, Int* varIndTab, Int** filterCoeff);
-  Void xALFChroma   ( ALFParam* pcAlfParam, TComPicYuv* pcPicDec, TComPicYuv* pcPicRest );
-  Void xFilterChromaSlices(Int componentID, TComPicYuv* pcPicDecYuv, TComPicYuv* pcPicRestYuv, Int *coeff, Int filtNo, Int chromaFormatShift);
-  Void xFilterChromaOneCmp(Int componentID, TComPicYuv *pDecYuv, TComPicYuv *pRestYuv, Int shape, Int *pCoeff);
-  Void xALFLuma( TComPic* pcPic, ALFParam* pcAlfParam, std::vector<AlfCUCtrlInfo>& vAlfCUCtrlParam, TComPicYuv* pcPicDec, TComPicYuv* pcPicRest );
-#endif
   Void setAlfCtrlFlags(AlfCUCtrlInfo* pAlfParam, TComDataCU *pcCU, UInt uiAbsPartIdx, UInt uiDepth, UInt &idx);
   Void transferCtrlFlagsFromAlfParam(std::vector<AlfCUCtrlInfo>& vAlfParamSlices); //!< Copy ALF CU control flags from ALF parameters for slices  
@@ -299 +224 @@
   Void copyRegion(std::vector<AlfLCUInfo*> &vpAlfLCU, Pel* pPicDst, Pel* pPicSrc, Int stride, Int formatShift = 0);
   Void extendRegionBorder(std::vector<AlfLCUInfo*> &vpAlfLCU, Pel* pPelSrc, Int stride, Int formatShift = 0);
-#if !LCU_SYNTAX_ALF  
-  Void filterLumaRegion (std::vector<AlfLCUInfo*> &vpAlfLCU, Pel* imgDec, Pel* imgRest, Int stride, Int filtNo, Int** filterCoeff, Int* mergeTable, Pel** varImg);
-  Void xCUAdaptiveRegion(std::vector<AlfLCUInfo*> &vpAlfLCU, Pel* imgDec, Pel* imgRest, Int stride, Int filtNo, Int** filterCoeff, Int* mergeTable, Pel** varImg);
-#endif
   Int  getCtrlFlagsFromAlfParam(AlfLCUInfo* pcAlfLCU, Int iAlfDepth, UInt* puiFlags);
 
@@ -317 +238 @@
   Void destroy ();
 
-#if LCU_SYNTAX_ALF
   Void ALFProcess          (TComPic* pcPic, std::vector<AlfCUCtrlInfo>& vAlfCUCtrlParam, Bool isAlfCoefInSlice);
   Void resetLCUAlfInfo     ();
@@ -324 +244 @@
 
   ALFParam*** getAlfLCUParam() {return m_alfFiltInfo;}
-#else
-  Void predictALFCoeffChroma  ( ALFParam* pAlfParam );                  //!< prediction of chroma ALF coefficients
-#if ALF_CHROMA_COEF_PRED_HARMONIZATION
-  Void reconstructALFCoeffChroma( ALFParam* pAlfParam );
-#endif
-  Void ALFProcess             ( TComPic* pcPic, ALFParam* pcAlfParam, std::vector<AlfCUCtrlInfo>& vAlfCUCtrlParam ); ///< interface function for ALF process
-
-  Void allocALFParam  ( ALFParam* pAlfParam ); //!< allocate ALF parameters
-  Void freeALFParam   ( ALFParam* pAlfParam ); //!< free ALF parameters
-  Void copyALFParam   ( ALFParam* pDesAlfParam, ALFParam* pSrcAlfParam ); //!< copy ALF parameters
-#endif
   Int  getNumCUsInPic()  {return m_uiNumCUsInFrame;} //!< get number of LCU in picture for ALF process
-#if LCU_SYNTAX_ALF
   Void createPicAlfInfo (TComPic* pcPic, Int uiNumSlicesInPic = 1, Int alfQP = 26);
-#else
-  Void createPicAlfInfo (TComPic* pcPic, Int numSlicesInPic = 1);
-#endif
   Void destroyPicAlfInfo();
 

branches/HTM-5.1-dev0/source/Lib/TLibCommon/TComBitStream.cpp

@@ -73 +73 @@
   m_puiTileMarkerLocation     = new UInt[MAX_MARKER_PER_NALU];
   m_uiTileMarkerLocationCount = 0;
-#if TILES_WPP_ENTRY_POINT_SIGNALLING
   m_numBitsRead = 0;
-#endif
 }
 
@@ -212 +210 @@
   assert( uiNumberOfBits <= 32 );
   
-#if TILES_WPP_ENTRY_POINT_SIGNALLING
   m_numBitsRead += uiNumberOfBits;
-#endif
 
   /* NB, bits are extracted from the MSB of each byte. */
@@ -334 +330 @@
     buf->push_back(uiByte);
   }
-#if OL_FLUSH && !OL_FLUSH_ALIGN
+#if !OL_FLUSH_ALIGN
   buf->push_back(0); // The final chunk might not start byte aligned.
 #endif

branches/HTM-5.1-dev0/source/Lib/TLibCommon/TComBitStream.h

@@ -176 +176 @@
   UInt m_uiTileMarkerLocationCount;
   UInt *m_puiTileMarkerLocation;
-#if TILES_WPP_ENTRY_POINT_SIGNALLING
   UInt  m_numBitsRead;
-#endif
 
 public:
@@ -192 +190 @@
   Void        pseudoRead      ( UInt uiNumberOfBits, UInt& ruiBits );
   Void        read            ( UInt uiNumberOfBits, UInt& ruiBits );
-#if OL_FLUSH && !OL_FLUSH_ALIGN
+#if !OL_FLUSH_ALIGN
   Void        readByte        ( UInt &ruiBits )
   {
@@ -228 +226 @@
   Void                backupByte() { m_fifo_idx--; }
 #endif
-#if TILES_WPP_ENTRY_POINT_SIGNALLING
   UInt  getNumBitsRead() { return m_numBitsRead; }
+};
+
+//! \}
+
 #endif
-};
-
-//! \}
-
-#endif

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

@@ -105 +105 @@
           }
           iVSPIndexTrue[idx] = iCount;
-#if SIMP_MRG_PRUN
           if ( mrgCandIdx == iCount )
           {
             return false;
           }
-#endif
           iCount ++;
         }
@@ -257 +255 @@
   if ( !bDecSubCu )
   {
-#if H0736_AVC_STYLE_QP_RANGE
     m_phQP               = (Char*     )xMalloc(Char,     uiNumPartition);
-#else
-    m_phQP               = (UChar*    )xMalloc(UChar,    uiNumPartition);
-#endif
     m_puhDepth           = (UChar*    )xMalloc(UChar,    uiNumPartition);
 #if HHI_MPI
@@ -550 +544 @@
   this->height = src.height;
   ::memcpy(this->isBorderAvailable, src.isBorderAvailable, sizeof(Bool)*((Int)NUM_SGU_BORDER));
-#if LCU_SYNTAX_ALF
   this->allBordersAvailable = src.allBordersAvailable;
-#endif
 
   return *this;
@@ -587 +579 @@
   m_uiTotalBins        = 0;
   m_uiNumPartition     = pcPic->getNumPartInCU();
-#if BURST_IPCM
   m_numSucIPCM       = 0;
   m_lastCUSucIPCMFlag   = false;
-#endif
 
   for(int i=0; i<pcPic->getNumPartInCU(); i++) 
@@ -816 +806 @@
 }
 
-#if H0736_AVC_STYLE_QP_RANGE
 /** initialize prediction data with enabling sub-LCU-level delta QP
 *\param  uiDepth  depth of the current CU
@@ -825 +814 @@
 */
 Void TComDataCU::initEstData( UInt uiDepth, Int qp )
-#else
-/** initialize prediction data with enabling sub-LCU-level delta QP
-*\param  uiDepth  depth of the current CU
-*\param  uiQP     QP for the current CU
-*- set CU width and CU height according to depth
-*- set QP value according to input QP 
-*- set last-coded QP value according to input last-coded QP 
-*/
-Void TComDataCU::initEstData( UInt uiDepth, UInt uiQP )
-#endif
 {
   m_dTotalCost         = MAX_DOUBLE;
@@ -866 +845 @@
       m_pePredMode[ui] = MODE_NONE;
       m_pbIPCMFlag[ui] = 0;
-#if H0736_AVC_STYLE_QP_RANGE
       m_phQP[ui] = qp;
-#else
-      m_phQP[ui] = uiQP;
-#endif
       m_puiAlfCtrlFlag[ui]= false;
       m_pbMergeFlag[ui] = 0;
@@ -947 +922 @@
 
 // initialize Sub partition
-#if H0736_AVC_STYLE_QP_RANGE
 Void TComDataCU::initSubCU( TComDataCU* pcCU, UInt uiPartUnitIdx, UInt uiDepth, Int qp )
-#else
-Void TComDataCU::initSubCU( TComDataCU* pcCU, UInt uiPartUnitIdx, UInt uiDepth, UInt uiQP )
-#endif
 {
   assert( uiPartUnitIdx<4 );
@@ -971 +942 @@
   m_uiNumPartition     = pcCU->getTotalNumPart() >> 2;
 
-#if BURST_IPCM
   m_numSucIPCM       = 0;
   m_lastCUSucIPCMFlag   = false;
-#endif
 
   Int iSizeInUchar = sizeof( UChar  ) * m_uiNumPartition;
@@ -982 +951 @@
 #endif
 
-#if H0736_AVC_STYLE_QP_RANGE
   Int sizeInChar = sizeof( Char  ) * m_uiNumPartition;
   memset( m_phQP,              qp,  sizeInChar );
-#else
-  memset( m_phQP,              uiQP, iSizeInUchar );
-#endif
 
   memset( m_puiAlfCtrlFlag,     0, iSizeInBool );
@@ -1418 +1383 @@
 #endif
   
-#if H0736_AVC_STYLE_QP_RANGE
   Int sizeInChar  = sizeof( Char ) * uiNumPartition;
   memcpy( m_phQP       + uiOffset, pcCU->getQP(),             sizeInChar                        );
-#else
-  memcpy( m_phQP       + uiOffset, pcCU->getQP(),             iSizeInUchar                        );
-#endif
   memcpy( m_pePartSize + uiOffset, pcCU->getPartitionSize(),  sizeof( *m_pePartSize ) * uiNumPartition );
   memcpy( m_pePredMode + uiOffset, pcCU->getPredictionMode(), sizeof( *m_pePredMode ) * uiNumPartition );
@@ -1558 +1519 @@
 #endif
   
-#if H0736_AVC_STYLE_QP_RANGE
   Int sizeInChar  = sizeof( Char ) * m_uiNumPartition;
   memcpy( rpcCU->getQP() + m_uiAbsIdxInLCU, m_phQP, sizeInChar  );
-#else
-  memcpy( rpcCU->getQP() + m_uiAbsIdxInLCU, m_phQP, iSizeInUchar );
-#endif
 
   memcpy( rpcCU->getPartitionSize()  + m_uiAbsIdxInLCU, m_pePartSize, sizeof( *m_pePartSize ) * m_uiNumPartition );
@@ -1695 +1652 @@
 #endif
   
-#if H0736_AVC_STYLE_QP_RANGE
   Int sizeInChar  = sizeof( Char ) * uiQNumPart;
   memcpy( rpcCU->getQP() + uiPartOffset, m_phQP, sizeInChar );
-#else
-  memcpy( rpcCU->getQP() + uiPartOffset, m_phQP, iSizeInUchar );
-#endif  
   memcpy( rpcCU->getPartitionSize()  + uiPartOffset, m_pePartSize, sizeof( *m_pePartSize ) * uiQNumPart );
 #if HHI_INTERVIEW_SKIP
@@ -1857 +1810 @@
        (bEnforceEntropySliceRestriction && (m_pcCULeft==NULL || m_pcCULeft->getSlice()==NULL || m_pcCULeft->getSCUAddr()+uiLPartUnitIdx < m_pcPic->getCU( getAddr() )->getEntropySliceStartCU(uiCurrPartUnitIdx)))
       ||
-#if !REMOVE_TILE_DEPENDENCE
-       (bEnforceTileRestriction && ( m_pcCULeft==NULL || m_pcCULeft->getSlice()==NULL || (m_pcPic->getPicSym()->getTileBoundaryIndependenceIdr() && m_pcPic->getPicSym()->getTileIdxMap( m_pcCULeft->getAddr() ) != m_pcPic->getPicSym()->getTileIdxMap(getAddr()))  )  )
-#else
        (bEnforceTileRestriction && ( m_pcCULeft==NULL || m_pcCULeft->getSlice()==NULL || (m_pcPic->getPicSym()->getTileIdxMap( m_pcCULeft->getAddr() ) != m_pcPic->getPicSym()->getTileIdxMap(getAddr()))  )  )
-#endif
       )
   {
@@ -1919 +1868 @@
        (bEnforceEntropySliceRestriction && (m_pcCUAbove==NULL || m_pcCUAbove->getSlice()==NULL || m_pcCUAbove->getSCUAddr()+uiAPartUnitIdx < m_pcPic->getCU( getAddr() )->getEntropySliceStartCU(uiCurrPartUnitIdx)))
       ||
-#if !REMOVE_TILE_DEPENDENCE
-       (bEnforceTileRestriction &&(m_pcCUAbove==NULL || m_pcCUAbove->getSlice()==NULL || (m_pcPic->getPicSym()->getTileBoundaryIndependenceIdr() && m_pcPic->getPicSym()->getTileIdxMap( m_pcCUAbove->getAddr() ) != m_pcPic->getPicSym()->getTileIdxMap(getAddr()))))
-#else
        (bEnforceTileRestriction &&(m_pcCUAbove==NULL || m_pcCUAbove->getSlice()==NULL || (m_pcPic->getPicSym()->getTileIdxMap( m_pcCUAbove->getAddr() ) != m_pcPic->getPicSym()->getTileIdxMap(getAddr()))))
-#endif
       )
   {
@@ -1970 +1915 @@
   if ( (bEnforceSliceRestriction && (m_pcCUAbove==NULL || m_pcCUAbove->getSlice()==NULL || 
        m_pcCUAbove->getSCUAddr()+uiALPartUnitIdx < m_pcPic->getCU( getAddr() )->getSliceStartCU(uiCurrPartUnitIdx)||
-#if !REMOVE_TILE_DEPENDENCE
-       (m_pcPic->getPicSym()->getTileBoundaryIndependenceIdr() && m_pcPic->getPicSym()->getTileIdxMap( m_pcCUAbove->getAddr() ) != m_pcPic->getPicSym()->getTileIdxMap(getAddr()))
-#else
        (m_pcPic->getPicSym()->getTileIdxMap( m_pcCUAbove->getAddr() ) != m_pcPic->getPicSym()->getTileIdxMap(getAddr()))
-#endif
        ))||
        (bEnforceEntropySliceRestriction && (m_pcCUAbove==NULL || m_pcCUAbove->getSlice()==NULL || 
        m_pcCUAbove->getSCUAddr()+uiALPartUnitIdx < m_pcPic->getCU( getAddr() )->getEntropySliceStartCU(uiCurrPartUnitIdx)||
-#if !REMOVE_TILE_DEPENDENCE
-       (m_pcPic->getPicSym()->getTileBoundaryIndependenceIdr() && m_pcPic->getPicSym()->getTileIdxMap( m_pcCUAbove->getAddr() ) != m_pcPic->getPicSym()->getTileIdxMap(getAddr()))
-#else
        (m_pcPic->getPicSym()->getTileIdxMap( m_pcCUAbove->getAddr() ) != m_pcPic->getPicSym()->getTileIdxMap(getAddr()))
-#endif
        ))
      )
@@ -1996 +1933 @@
   if ( (bEnforceSliceRestriction && (m_pcCULeft==NULL || m_pcCULeft->getSlice()==NULL || 
        m_pcCULeft->getSCUAddr()+uiALPartUnitIdx < m_pcPic->getCU( getAddr() )->getSliceStartCU(uiCurrPartUnitIdx)||
-#if !REMOVE_TILE_DEPENDENCE
-       (m_pcPic->getPicSym()->getTileBoundaryIndependenceIdr() && m_pcPic->getPicSym()->getTileIdxMap( m_pcCULeft->getAddr() ) != m_pcPic->getPicSym()->getTileIdxMap(getAddr()))
-#else
        (m_pcPic->getPicSym()->getTileIdxMap( m_pcCULeft->getAddr() ) != m_pcPic->getPicSym()->getTileIdxMap(getAddr()))
-#endif
        ))||
        (bEnforceEntropySliceRestriction && (m_pcCULeft==NULL || m_pcCULeft->getSlice()==NULL || 
        m_pcCULeft->getSCUAddr()+uiALPartUnitIdx < m_pcPic->getCU( getAddr() )->getEntropySliceStartCU(uiCurrPartUnitIdx)||
-#if !REMOVE_TILE_DEPENDENCE
-       (m_pcPic->getPicSym()->getTileBoundaryIndependenceIdr() && m_pcPic->getPicSym()->getTileIdxMap( m_pcCULeft->getAddr() ) != m_pcPic->getPicSym()->getTileIdxMap(getAddr()))
-#else
        (m_pcPic->getPicSym()->getTileIdxMap( m_pcCULeft->getAddr() ) != m_pcPic->getPicSym()->getTileIdxMap(getAddr()))
-#endif
        ))
      )
@@ -2024 +1953 @@
   if ( (bEnforceSliceRestriction && (m_pcCUAboveLeft==NULL || m_pcCUAboveLeft->getSlice()==NULL || 
        m_pcCUAboveLeft->getSCUAddr()+uiALPartUnitIdx < m_pcPic->getCU( getAddr() )->getSliceStartCU(uiCurrPartUnitIdx)||
-#if !REMOVE_TILE_DEPENDENCE
-       (m_pcPic->getPicSym()->getTileBoundaryIndependenceIdr() && m_pcPic->getPicSym()->getTileIdxMap( m_pcCUAboveLeft->getAddr() ) != m_pcPic->getPicSym()->getTileIdxMap(getAddr()))
-#else
        (m_pcPic->getPicSym()->getTileIdxMap( m_pcCUAboveLeft->getAddr() ) != m_pcPic->getPicSym()->getTileIdxMap(getAddr()))
-#endif
        ))||
        (bEnforceEntropySliceRestriction && (m_pcCUAboveLeft==NULL || m_pcCUAboveLeft->getSlice()==NULL || 
        m_pcCUAboveLeft->getSCUAddr()+uiALPartUnitIdx < m_pcPic->getCU( getAddr() )->getEntropySliceStartCU(uiCurrPartUnitIdx)||
-#if !REMOVE_TILE_DEPENDENCE
-       (m_pcPic->getPicSym()->getTileBoundaryIndependenceIdr() && m_pcPic->getPicSym()->getTileIdxMap( m_pcCUAboveLeft->getAddr() ) != m_pcPic->getPicSym()->getTileIdxMap(getAddr()))
-#else
        (m_pcPic->getPicSym()->getTileIdxMap( m_pcCUAboveLeft->getAddr() ) != m_pcPic->getPicSym()->getTileIdxMap(getAddr()))
-#endif
        ))
      )
@@ -2096 +2017 @@
   if ( (bEnforceSliceRestriction && (m_pcCUAbove==NULL || m_pcCUAbove->getSlice()==NULL || 
        m_pcCUAbove->getSCUAddr()+uiARPartUnitIdx < m_pcPic->getCU( getAddr() )->getSliceStartCU(uiCurrPartUnitIdx)||
-#if !REMOVE_TILE_DEPENDENCE
-       (m_pcPic->getPicSym()->getTileBoundaryIndependenceIdr() && m_pcPic->getPicSym()->getTileIdxMap( m_pcCUAbove->getAddr() ) != m_pcPic->getPicSym()->getTileIdxMap(getAddr()))
-#else
        (m_pcPic->getPicSym()->getTileIdxMap( m_pcCUAbove->getAddr() ) != m_pcPic->getPicSym()->getTileIdxMap(getAddr()))
-#endif
        ))||
        (bEnforceEntropySliceRestriction && (m_pcCUAbove==NULL || m_pcCUAbove->getSlice()==NULL || 
        m_pcCUAbove->getSCUAddr()+uiARPartUnitIdx < m_pcPic->getCU( getAddr() )->getEntropySliceStartCU(uiCurrPartUnitIdx)||
-#if !REMOVE_TILE_DEPENDENCE
-       (m_pcPic->getPicSym()->getTileBoundaryIndependenceIdr() && m_pcPic->getPicSym()->getTileIdxMap( m_pcCUAbove->getAddr() ) != m_pcPic->getPicSym()->getTileIdxMap(getAddr()))
-#else
        (m_pcPic->getPicSym()->getTileIdxMap( m_pcCUAbove->getAddr() ) != m_pcPic->getPicSym()->getTileIdxMap(getAddr()))
-#endif
        ))
      )
@@ -2131 +2044 @@
        m_pcPic->getPicSym()->getInverseCUOrderMap( m_pcCUAboveRight->getAddr()) > m_pcPic->getPicSym()->getInverseCUOrderMap( getAddr()) ||
        m_pcCUAboveRight->getSCUAddr()+uiARPartUnitIdx < m_pcPic->getCU( getAddr() )->getSliceStartCU(uiCurrPartUnitIdx)||
-#if !REMOVE_TILE_DEPENDENCE
-       (m_pcPic->getPicSym()->getTileBoundaryIndependenceIdr() && m_pcPic->getPicSym()->getTileIdxMap( m_pcCUAboveRight->getAddr() ) != m_pcPic->getPicSym()->getTileIdxMap(getAddr()))
-#else
        (m_pcPic->getPicSym()->getTileIdxMap( m_pcCUAboveRight->getAddr() ) != m_pcPic->getPicSym()->getTileIdxMap(getAddr()))
-#endif
        ))||
        (bEnforceEntropySliceRestriction && (m_pcCUAboveRight==NULL || m_pcCUAboveRight->getSlice()==NULL || 
        m_pcPic->getPicSym()->getInverseCUOrderMap( m_pcCUAboveRight->getAddr()) > m_pcPic->getPicSym()->getInverseCUOrderMap( getAddr()) ||
        m_pcCUAboveRight->getSCUAddr()+uiARPartUnitIdx < m_pcPic->getCU( getAddr() )->getEntropySliceStartCU(uiCurrPartUnitIdx)||
-#if !REMOVE_TILE_DEPENDENCE
-       (m_pcPic->getPicSym()->getTileBoundaryIndependenceIdr() && m_pcPic->getPicSym()->getTileIdxMap( m_pcCUAboveRight->getAddr() ) != m_pcPic->getPicSym()->getTileIdxMap(getAddr()))
-#else
        (m_pcPic->getPicSym()->getTileIdxMap( m_pcCUAboveRight->getAddr() ) != m_pcPic->getPicSym()->getTileIdxMap(getAddr()))
-#endif
        ))
      )
@@ -2199 +2104 @@
   if ( (bEnforceSliceRestriction && (m_pcCULeft==NULL || m_pcCULeft->getSlice()==NULL || 
        m_pcCULeft->getSCUAddr()+uiBLPartUnitIdx < m_pcPic->getCU( getAddr() )->getSliceStartCU(uiCurrPartUnitIdx)||
-#if !REMOVE_TILE_DEPENDENCE
-       (m_pcPic->getPicSym()->getTileBoundaryIndependenceIdr() && m_pcPic->getPicSym()->getTileIdxMap( m_pcCULeft->getAddr() ) != m_pcPic->getPicSym()->getTileIdxMap(getAddr()))
-#else
        (m_pcPic->getPicSym()->getTileIdxMap( m_pcCULeft->getAddr() ) != m_pcPic->getPicSym()->getTileIdxMap(getAddr()))
-#endif
        ))||
        (bEnforceEntropySliceRestriction && (m_pcCULeft==NULL || m_pcCULeft->getSlice()==NULL || 
        m_pcCULeft->getSCUAddr()+uiBLPartUnitIdx < m_pcPic->getCU( getAddr() )->getEntropySliceStartCU(uiCurrPartUnitIdx)||
-#if !REMOVE_TILE_DEPENDENCE
-       (m_pcPic->getPicSym()->getTileBoundaryIndependenceIdr() && m_pcPic->getPicSym()->getTileIdxMap( m_pcCULeft->getAddr() ) != m_pcPic->getPicSym()->getTileIdxMap(getAddr()))
-#else
        (m_pcPic->getPicSym()->getTileIdxMap( m_pcCULeft->getAddr() ) != m_pcPic->getPicSym()->getTileIdxMap(getAddr()))
-#endif
        ))
      )
@@ -2270 +2167 @@
   if ( (bEnforceSliceRestriction && (m_pcCULeft==NULL || m_pcCULeft->getSlice()==NULL || 
        m_pcCULeft->getSCUAddr()+uiBLPartUnitIdx < m_pcPic->getCU( getAddr() )->getSliceStartCU(uiCurrPartUnitIdx)||
-#if !REMOVE_TILE_DEPENDENCE
-       (m_pcPic->getPicSym()->getTileBoundaryIndependenceIdr() && m_pcPic->getPicSym()->getTileIdxMap( m_pcCULeft->getAddr() ) != m_pcPic->getPicSym()->getTileIdxMap(getAddr()))
-#else
        (m_pcPic->getPicSym()->getTileIdxMap( m_pcCULeft->getAddr() ) != m_pcPic->getPicSym()->getTileIdxMap(getAddr()))
-#endif
        ))||
        (bEnforceEntropySliceRestriction && (m_pcCULeft==NULL || m_pcCULeft->getSlice()==NULL || 
        m_pcCULeft->getSCUAddr()+uiBLPartUnitIdx < m_pcPic->getCU( getAddr() )->getEntropySliceStartCU(uiCurrPartUnitIdx)||
-#if !REMOVE_TILE_DEPENDENCE
-       (m_pcPic->getPicSym()->getTileBoundaryIndependenceIdr() && m_pcPic->getPicSym()->getTileIdxMap( m_pcCULeft->getAddr() ) != m_pcPic->getPicSym()->getTileIdxMap(getAddr()))
-#else
        (m_pcPic->getPicSym()->getTileIdxMap( m_pcCULeft->getAddr() ) != m_pcPic->getPicSym()->getTileIdxMap(getAddr()))
-#endif
        ))
      )
@@ -2342 +2231 @@
   if ( (bEnforceSliceRestriction && (m_pcCUAbove==NULL || m_pcCUAbove->getSlice()==NULL || 
        m_pcCUAbove->getSCUAddr()+uiARPartUnitIdx < m_pcPic->getCU( getAddr() )->getSliceStartCU(uiCurrPartUnitIdx)||
-#if !REMOVE_TILE_DEPENDENCE
-       (m_pcPic->getPicSym()->getTileBoundaryIndependenceIdr() && m_pcPic->getPicSym()->getTileIdxMap( m_pcCUAbove->getAddr() ) != m_pcPic->getPicSym()->getTileIdxMap(getAddr()))
-#else
        (m_pcPic->getPicSym()->getTileIdxMap( m_pcCUAbove->getAddr() ) != m_pcPic->getPicSym()->getTileIdxMap(getAddr()))
-#endif
        ))||
        (bEnforceEntropySliceRestriction && (m_pcCUAbove==NULL || m_pcCUAbove->getSlice()==NULL || 
        m_pcCUAbove->getSCUAddr()+uiARPartUnitIdx < m_pcPic->getCU( getAddr() )->getEntropySliceStartCU(uiCurrPartUnitIdx)||
-#if !REMOVE_TILE_DEPENDENCE
-       (m_pcPic->getPicSym()->getTileBoundaryIndependenceIdr() && m_pcPic->getPicSym()->getTileIdxMap( m_pcCUAbove->getAddr() ) != m_pcPic->getPicSym()->getTileIdxMap(getAddr()))
-#else
        (m_pcPic->getPicSym()->getTileIdxMap( m_pcCUAbove->getAddr() ) != m_pcPic->getPicSym()->getTileIdxMap(getAddr()))
-#endif
        ))
      )
@@ -2373 +2254 @@
        m_pcPic->getPicSym()->getInverseCUOrderMap( m_pcCUAboveRight->getAddr()) > m_pcPic->getPicSym()->getInverseCUOrderMap( getAddr()) ||
        m_pcCUAboveRight->getSCUAddr()+uiARPartUnitIdx < m_pcPic->getCU( getAddr() )->getSliceStartCU(uiCurrPartUnitIdx)||
-#if !REMOVE_TILE_DEPENDENCE
-       (m_pcPic->getPicSym()->getTileBoundaryIndependenceIdr() && m_pcPic->getPicSym()->getTileIdxMap( m_pcCUAboveRight->getAddr() ) != m_pcPic->getPicSym()->getTileIdxMap(getAddr()))
-#else
        (m_pcPic->getPicSym()->getTileIdxMap( m_pcCUAboveRight->getAddr() ) != m_pcPic->getPicSym()->getTileIdxMap(getAddr()))
-#endif
        ))||
        (bEnforceEntropySliceRestriction && (m_pcCUAboveRight==NULL || m_pcCUAboveRight->getSlice()==NULL || 
        m_pcPic->getPicSym()->getInverseCUOrderMap( m_pcCUAboveRight->getAddr()) > m_pcPic->getPicSym()->getInverseCUOrderMap( getAddr()) ||
        m_pcCUAboveRight->getSCUAddr()+uiARPartUnitIdx < m_pcPic->getCU( getAddr() )->getEntropySliceStartCU(uiCurrPartUnitIdx)||
-#if !REMOVE_TILE_DEPENDENCE
-       (m_pcPic->getPicSym()->getTileBoundaryIndependenceIdr() && m_pcPic->getPicSym()->getTileIdxMap( m_pcCUAboveRight->getAddr() ) != m_pcPic->getPicSym()->getTileIdxMap(getAddr()))
-#else
        (m_pcPic->getPicSym()->getTileIdxMap( m_pcCUAboveRight->getAddr() ) != m_pcPic->getPicSym()->getTileIdxMap(getAddr()))
-#endif
        ))
      )
@@ -2433 +2306 @@
   if ( (bEnforceSliceRestriction && (m_pcCULeft==NULL || m_pcCULeft->getSlice()==NULL || 
        m_pcCULeft->getSCUAddr()+uiLPartUnitIdx < m_pcPic->getCU( getAddr() )->getSliceStartCU(uiAbsZorderQpMinCUIdx)||
-#if !REMOVE_TILE_DEPENDENCE
-       (m_pcPic->getPicSym()->getTileBoundaryIndependenceIdr() && m_pcPic->getPicSym()->getTileIdxMap( m_pcCULeft->getAddr() ) != m_pcPic->getPicSym()->getTileIdxMap(getAddr()))
-#else
        (m_pcPic->getPicSym()->getTileIdxMap( m_pcCULeft->getAddr() ) != m_pcPic->getPicSym()->getTileIdxMap(getAddr()))
-#endif
        ))||
        (bEnforceEntropySliceRestriction && (m_pcCULeft==NULL || m_pcCULeft->getSlice()==NULL || 
        m_pcCULeft->getSCUAddr()+uiLPartUnitIdx < m_pcPic->getCU( getAddr() )->getEntropySliceStartCU(uiAbsZorderQpMinCUIdx)||
-#if !REMOVE_TILE_DEPENDENCE
-       (m_pcPic->getPicSym()->getTileBoundaryIndependenceIdr() && m_pcPic->getPicSym()->getTileIdxMap( m_pcCULeft->getAddr() ) != m_pcPic->getPicSym()->getTileIdxMap(getAddr()))
-#else
        (m_pcPic->getPicSym()->getTileIdxMap( m_pcCULeft->getAddr() ) != m_pcPic->getPicSym()->getTileIdxMap(getAddr()))
-#endif
        ))
      )
@@ -2452 +2317 @@
   }
 
-#if H0204_QP_PREDICTION
   if ( m_pcCULeft && m_pcCULeft->getAddr() != getAddr() )
   {
     return NULL;
   }
-#endif
 
   return m_pcCULeft;
 }
 
-#if H0204_QP_PREDICTION
 /** Get Above QpMinCu
 *\param   aPartUnitIdx
@@ -2500 +2362 @@
   if ( (enforceSliceRestriction && (m_pcCUAbove==NULL || m_pcCUAbove->getSlice()==NULL || 
        m_pcCUAbove->getSCUAddr()+aPartUnitIdx < m_pcPic->getCU( getAddr() )->getSliceStartCU(absZorderQpMinCUIdx)||
-#if !REMOVE_TILE_DEPENDENCE
-       (m_pcPic->getPicSym()->getTileBoundaryIndependenceIdr() && m_pcPic->getPicSym()->getTileIdxMap( m_pcCUAbove->getAddr() ) != m_pcPic->getPicSym()->getTileIdxMap(getAddr()))
-#else
        (m_pcPic->getPicSym()->getTileIdxMap( m_pcCUAbove->getAddr() ) != m_pcPic->getPicSym()->getTileIdxMap(getAddr()))
-#endif
        ))||
        (enforceEntropySliceRestriction && (m_pcCUAbove==NULL || m_pcCUAbove->getSlice()==NULL || 
        m_pcCUAbove->getSCUAddr()+aPartUnitIdx < m_pcPic->getCU( getAddr() )->getEntropySliceStartCU(absZorderQpMinCUIdx)||
-#if !REMOVE_TILE_DEPENDENCE
-       (m_pcPic->getPicSym()->getTileBoundaryIndependenceIdr() && m_pcPic->getPicSym()->getTileIdxMap( m_pcCUAbove->getAddr() ) != m_pcPic->getPicSym()->getTileIdxMap(getAddr()))
-#else
        (m_pcPic->getPicSym()->getTileIdxMap( m_pcCUAbove->getAddr() ) != m_pcPic->getPicSym()->getTileIdxMap(getAddr()))
-#endif
        ))
      )
@@ -2526 +2380 @@
   return m_pcCUAbove;
 }
-#endif
-
-#if H0736_AVC_STYLE_QP_RANGE
+
 /** Get reference QP from left QpMinCu or latest coded QP
 *\param   uiCurrAbsIdxInLCU
@@ -2534 +2386 @@
 */
 Char TComDataCU::getRefQP( UInt uiCurrAbsIdxInLCU )
-#else
-/** Get reference QP from left QpMinCu or latest coded QP
-*\param   uiCurrAbsIdxInLCU
-*\returns UChar   reference QP value
-*/
-UChar TComDataCU::getRefQP( UInt uiCurrAbsIdxInLCU )
-#endif
-{
-#if H0204_QP_PREDICTION
+{
   UInt        lPartIdx, aPartIdx;
   lPartIdx = 0; 
@@ -2549 +2393 @@
   TComDataCU* cUAbove = getQpMinCuAbove( aPartIdx, m_uiAbsIdxInLCU + uiCurrAbsIdxInLCU );
   return (((cULeft? cULeft->getQP( lPartIdx ): getLastCodedQP( uiCurrAbsIdxInLCU )) + (cUAbove? cUAbove->getQP( aPartIdx ): getLastCodedQP( uiCurrAbsIdxInLCU )) + 1) >> 1);
-#else
-  // Left CU
-  TComDataCU* pcCULeft;
-  UInt        uiLPartIdx;
-  pcCULeft = getQpMinCuLeft( uiLPartIdx, m_uiAbsIdxInLCU + uiCurrAbsIdxInLCU );
-  if ( pcCULeft )
-  {
-    return pcCULeft->getQP(uiLPartIdx);
-  }
-  // Last QP
-  return getLastCodedQP( uiCurrAbsIdxInLCU );
-#endif
 }
 
@@ -2575 +2407 @@
 }
 
-#if H0736_AVC_STYLE_QP_RANGE
 Char TComDataCU::getLastCodedQP( UInt uiAbsPartIdx )
-#else
-UChar TComDataCU::getLastCodedQP( UInt uiAbsPartIdx )
-#endif
 {
   UInt uiQUPartIdxMask = ~((1<<(8-(getSlice()->getPPS()->getMaxCuDQPDepth()<<1)))-1);
@@ -2616 +2444 @@
 Bool TComDataCU::isLosslessCoded(UInt absPartIdx)
 {
-#if H0736_AVC_STYLE_QP_RANGE
   return ( getSlice()->getSPS()->getUseLossless() && ((getQP(absPartIdx) + getSlice()->getSPS()->getQpBDOffsetY()) == 0) );
-#else
-  return ( getSlice()->getSPS()->getUseLossless() && (getQP(absPartPIdx)  == 0) );
-#endif
 }
 #endif
@@ -2633 +2457 @@
 {
   uiModeList[0] = PLANAR_IDX;
-#if LOGI_INTRA_NAME_3MPM
   uiModeList[1] = VER_IDX;
   uiModeList[2] = HOR_IDX;
-#else
-  uiModeList[1] = 1;
-  uiModeList[2] = 2;
-#endif
   uiModeList[3] = DC_IDX;
   uiModeList[4] = LM_CHROMA_IDX;
@@ -2653 +2472 @@
     if( uiLumaMode == uiModeList[i] )
     {
-#if LOGI_INTRA_NAME_3MPM
       uiModeList[i] = 34; // VER+8 mode
-#else
-      uiModeList[i] = 7; // VER+8 mode
-#endif
       break;
     }
@@ -2679 +2494 @@
   pcTempCU = getPULeft( uiTempPartIdx, m_uiAbsIdxInLCU + uiAbsPartIdx );
   
-#if DEFAULT_DC
   iLeftIntraDir  = pcTempCU ? ( pcTempCU->isIntra( uiTempPartIdx ) ? pcTempCU->getLumaIntraDir( uiTempPartIdx ) : DC_IDX ) : DC_IDX;
-#else
-  iLeftIntraDir  = pcTempCU ? ( pcTempCU->isIntra( uiTempPartIdx ) ? pcTempCU->getLumaIntraDir( uiTempPartIdx ) : PLANAR_IDX ) : PLANAR_IDX;
-#endif
 #if HHI_DMM_WEDGE_INTRA || HHI_DMM_PRED_TEX
   mapDMMtoIntraMode( iLeftIntraDir );
@@ -2694 +2505 @@
   pcTempCU = getPUAbove( uiTempPartIdx, m_uiAbsIdxInLCU + uiAbsPartIdx, true, true, false, true );
   
-#if DEFAULT_DC
   iAboveIntraDir = pcTempCU ? ( pcTempCU->isIntra( uiTempPartIdx ) ? pcTempCU->getLumaIntraDir( uiTempPartIdx ) : DC_IDX ) : DC_IDX;
-#else
-  iAboveIntraDir = pcTempCU ? ( pcTempCU->isIntra( uiTempPartIdx ) ? pcTempCU->getLumaIntraDir( uiTempPartIdx ) : PLANAR_IDX ) : PLANAR_IDX;
-#endif
 #if HHI_DMM_WEDGE_INTRA || HHI_DMM_PRED_TEX
   mapDMMtoIntraMode( iAboveIntraDir );
@@ -2706 +2513 @@
 #endif
   
-#if LOGI_INTRA_NAME_3MPM
   uiPredNum = 3;
   if(iLeftIntraDir == iAboveIntraDir)
@@ -2746 +2552 @@
     }
   }
-#else
-  Int iIdx  = getIntraSizeIdx(uiAbsPartIdx);
-  
-  
-  if ( iLeftIntraDir >= g_aucIntraModeNumAng[iIdx] ) 
-  {
-    iLeftIntraDir = PLANAR_IDX;
-  }
-  
-  
-  if ( iAboveIntraDir >= g_aucIntraModeNumAng[iIdx] ) 
-  {
-    iAboveIntraDir = PLANAR_IDX;
-  }
-  
-  if(iLeftIntraDir == iAboveIntraDir)
-  {
-    uiPredNum = 2;
-    
-    if( piMode )
-    {
-      *piMode = iLeftIntraDir;
-    }
-    
-    iAboveIntraDir = iLeftIntraDir == PLANAR_IDX ? DC_IDX : PLANAR_IDX; // DC or Planar
-    
-    assert( iLeftIntraDir != iAboveIntraDir );
-    
-    uiIntraDirPred[0] = min(iLeftIntraDir, iAboveIntraDir);
-    uiIntraDirPred[1] = max(iLeftIntraDir, iAboveIntraDir);
-  }
-  else
-  {
-    uiPredNum = 2;
-    uiIntraDirPred[0] = min(iLeftIntraDir, iAboveIntraDir);
-    uiIntraDirPred[1] = max(iLeftIntraDir, iAboveIntraDir);
-  }
-#endif
   
   return uiPredNum;
@@ -2833 +2601 @@
   UInt quadtreeTUMaxDepth = getPredictionMode( absPartIdx ) == MODE_INTRA ? m_pcSlice->getSPS()->getQuadtreeTUMaxDepthIntra() : m_pcSlice->getSPS()->getQuadtreeTUMaxDepthInter(); 
   Int intraSplitFlag = ( getPredictionMode( absPartIdx ) == MODE_INTRA && partSize == SIZE_NxN ) ? 1 : 0;
-#if G519_TU_AMP_NSQT_HARMONIZATION
   Int interSplitFlag = ((quadtreeTUMaxDepth == 1) && (getPredictionMode( absPartIdx ) == MODE_INTER) && (partSize != SIZE_2Nx2N) );
-#else
-  Int interSplitFlag = ((quadtreeTUMaxDepth == 1) && (getPredictionMode( absPartIdx ) == MODE_INTER) && (partSize == SIZE_Nx2N || partSize == SIZE_2NxN) );
-#endif
   
   UInt log2MinTUSizeInCU = 0;
@@ -3006 +2770 @@
 }
 
-#if H0736_AVC_STYLE_QP_RANGE
 Void TComDataCU::setQPSubParts( Int qp, UInt uiAbsPartIdx, UInt uiDepth )
-#else
-Void TComDataCU::setQPSubParts( UInt uiQP, UInt uiAbsPartIdx, UInt uiDepth )
-#endif
 {
   UInt uiCurrPartNumb = m_pcPic->getNumPartInCU() >> (uiDepth << 1);
@@ -3019 +2779 @@
     if( m_pcPic->getCU( getAddr() )->getEntropySliceStartCU(uiSCUIdx+getZorderIdxInCU()) == pcSlice->getEntropySliceCurStartCUAddr() )
     {
-#if H0736_AVC_STYLE_QP_RANGE
       m_phQP[uiSCUIdx] = qp;
-#else
-      m_phQP[uiSCUIdx] = uiQP;
-#endif
     }
   }
@@ -3832 +3588 @@
  * \param numValidMergeCand
  */
-#if SIMP_MRG_PRUN
 #if MERL_VSP_C0152
 Void TComDataCU::getInterMergeCandidates( UInt uiAbsPartIdx, UInt uiPUIdx, UInt uiDepth, TComMvField* pcMvFieldNeighbours, UChar* puhInterDirNeighbours, Int& numValidMergeCand, Int* iVSPIndexTrue, Int mrgCandIdx )
 #else
 Void TComDataCU::getInterMergeCandidates( UInt uiAbsPartIdx, UInt uiPUIdx, UInt uiDepth, TComMvField* pcMvFieldNeighbours, UChar* puhInterDirNeighbours, Int& numValidMergeCand, Int mrgCandIdx )
-#endif
-#else
-Void TComDataCU::getInterMergeCandidates( UInt uiAbsPartIdx, UInt uiPUIdx, UInt uiDepth, TComMvField* pcMvFieldNeighbours, UChar* puhInterDirNeighbours, Int& numValidMergeCand )
 #endif
 {
@@ -3863 +3615 @@
   }
   // compute the location of the current PU
-#if PARALLEL_MERGE
   Int xP, yP, nPSW, nPSH;
   this->getPartPosition(uiPUIdx, xP, yP, nPSW, nPSH);
-#endif
 
 #if MERL_VSP_C0152
@@ -3915 +3665 @@
       xInheritVspMode( pcTextureCU, uiPartIdxCenter, bVspMvZeroDone, iCount, iVSPIndexTrue, pcMvFieldNeighbours, &cDisInfo ) ;
 #endif
-#if SIMP_MRG_PRUN
       if ( mrgCandIdx == iCount )
       {
         return;
       }
-#endif
       iCount ++;
     }
@@ -4002 +3750 @@
       xInheritVspMode( pcTextureCU, uiPartIdxCenter, bVspMvZeroDone, iCount, iVSPIndexTrue, pcMvFieldNeighbours, &cDisInfo ) ;
 #endif
-#if SIMP_MRG_PRUN
       if ( mrgCandIdx == iCount )
       {
         return;
       }
-#endif
       iCount ++;
     }
@@ -4059 +3805 @@
     }
 #endif
-#if SIMP_MRG_PRUN
     if ( mrgCandIdx == iCount )
     {
       return;
     }
-#endif
     iCount ++;
   }
@@ -4087 +3831 @@
       pcMvFieldNeighbours[(iCount<<1)+1].getMv().m_bDvMcp = false;
 #endif
-#if SIMP_MRG_PRUN
       if ( mrgCandIdx == iCount )
           return;
-#endif
       iCount ++;
     }    
@@ -4106 +3848 @@
   UInt uiLeftPartIdx = 0;
   TComDataCU* pcCULeft = 0;
-#if MVP_AT_ENTROPYSLICE_BOUNDARY
   pcCULeft = getPULeft( uiLeftPartIdx, uiPartIdxLB, true, false );
-#else
-  pcCULeft = getPULeft( uiLeftPartIdx, uiPartIdxLB );
-#endif
-#if PARALLEL_MERGE
   if (pcCULeft) 
   {
@@ -4119 +3856 @@
     }
   }
-#endif
   PartSize partSize = getPartitionSize( uiAbsPartIdx );
   if (!(uiPUIdx == 1 && (partSize == SIZE_Nx2N || partSize == SIZE_nLx2N || partSize == SIZE_nRx2N)))
@@ -4175 +3911 @@
         xInheritVspMode( pcCULeft, uiLeftPartIdx, bVspMvZeroDone, iCount, iVSPIndexTrue, pcMvFieldNeighbours, &cDisInfo ) ;
 #endif
-#if SIMP_MRG_PRUN
         if ( mrgCandIdx == iCount )
         {
           return;
         }
-#endif
         iCount ++;
 #if H3D_IVMP
@@ -4213 +3947 @@
     }
 #endif
-#if SIMP_MRG_PRUN
     if ( mrgCandIdx == iCount )
     {
       return;
     }
-#endif
     iCount ++;
   }
@@ -4231 +3963 @@
 
   // above
-#if !SIMP_MRG_PRUN
-  partSize = getPartitionSize( uiAbsPartIdx );
-  if (!(uiPUIdx == 1 && (partSize == SIZE_2NxN || partSize == SIZE_2NxnU || partSize == SIZE_2NxnD)))
-  {
-#endif
   UInt uiAbovePartIdx = 0;
   TComDataCU* pcCUAbove = 0;
-#if MVP_AT_ENTROPYSLICE_BOUNDARY
   pcCUAbove = getPUAbove( uiAbovePartIdx, uiPartIdxRT, true, false, true );
-#else
-  pcCUAbove = getPUAbove( uiAbovePartIdx, uiPartIdxRT, true, true, true );
-#endif
-#if PARALLEL_MERGE
     if (pcCUAbove) 
     {
@@ -4251 +3973 @@
       }
     }
-#endif
-#if SIMP_MRG_PRUN
   if ( pcCUAbove && !pcCUAbove->isIntra( uiAbovePartIdx ) 
 #if MERL_VSP_C0152
@@ -4259 +3979 @@
     && !(uiPUIdx == 1 && (cCurPS == SIZE_2NxN || cCurPS == SIZE_2NxnU || cCurPS == SIZE_2NxnD))
     && ( !pcCULeft || pcCULeft->isIntra( uiLeftPartIdx ) || !pcCULeft->hasEqualMotion( uiLeftPartIdx, pcCUAbove, uiAbovePartIdx ) ) )
-#else
-  if ( pcCUAbove && !pcCUAbove->isIntra( uiAbovePartIdx ) )
-#endif
   {
     abCandIsInter[iCount] = true;
@@ -4307 +4024 @@
      xInheritVspMode( pcCUAbove, uiAbovePartIdx, bVspMvZeroDone, iCount, iVSPIndexTrue, pcMvFieldNeighbours, &cDisInfo ) ;
 #endif
-#if SIMP_MRG_PRUN
     if ( mrgCandIdx == iCount )
     {
       return;
     }
-#endif
     iCount ++;
 #if H3D_IVMP
@@ -4318 +4033 @@
 #endif
   }
-#if !SIMP_MRG_PRUN
-  }
-#endif
 
 #if H3D_IVMP
@@ -4347 +4059 @@
     }
 #endif
-#if SIMP_MRG_PRUN
     if ( mrgCandIdx == iCount )
     {
       return;
     }
-#endif
     iCount ++;
   }
@@ -4367 +4077 @@
   UInt uiAboveRightPartIdx = 0;
   TComDataCU* pcCUAboveRight = 0;
-#if MVP_AT_ENTROPYSLICE_BOUNDARY
   pcCUAboveRight = getPUAboveRight( uiAboveRightPartIdx, uiPartIdxRT, true, false, true );
-#else
-  pcCUAboveRight = getPUAboveRight( uiAboveRightPartIdx, uiPartIdxRT, true, true, true);
-#endif
-#if PARALLEL_MERGE
   if (pcCUAboveRight) 
   {
@@ -4380 +4085 @@
     }
   }
-#endif
-#if SIMP_MRG_PRUN
   if ( pcCUAboveRight && !pcCUAboveRight->isIntra( uiAboveRightPartIdx ) 
 #if MERL_VSP_C0152
@@ -4387 +4090 @@
 #endif
     && ( !pcCUAbove || pcCUAbove->isIntra( uiAbovePartIdx ) || !pcCUAbove->hasEqualMotion( uiAbovePartIdx, pcCUAboveRight, uiAboveRightPartIdx ) ) )
-#else
-  if ( pcCUAboveRight && !pcCUAboveRight->isIntra( uiAboveRightPartIdx ) )
-#endif
   {
     abCandIsInter[iCount] = true;
@@ -4413 +4113 @@
     xInheritVspMode( pcCUAboveRight, uiAboveRightPartIdx, bVspMvZeroDone, iCount, iVSPIndexTrue, pcMvFieldNeighbours, &cDisInfo ) ;
 #endif
-#if SIMP_MRG_PRUN
     if ( mrgCandIdx == iCount )
     {
       return;
     }
-#endif
     iCount ++;
   }
@@ -4447 +4145 @@
     }
 #endif
-#if SIMP_MRG_PRUN
     if ( mrgCandIdx == iCount )
     {
       return;
     }
-#endif
     iCount ++;
   }
@@ -4495 +4191 @@
         pcMvFieldNeighbours[(iCount<<1)+1].getMv().m_bDvMcp = false;
 #endif
-#if SIMP_MRG_PRUN
         if ( mrgCandIdx == iCount )
           return;
-#endif
         iCount ++;
       }
@@ -4526 +4220 @@
   UInt uiLeftBottomPartIdx = 0;
   TComDataCU* pcCULeftBottom = 0;
-#if MVP_AT_ENTROPYSLICE_BOUNDARY
   pcCULeftBottom = this->getPUBelowLeft( uiLeftBottomPartIdx, uiPartIdxLB, true, false );
-#else
-  pcCULeftBottom = this->getPUBelowLeft( uiLeftBottomPartIdx, uiPartIdxLB );
-#endif
-#if PARALLEL_MERGE
   if (pcCULeftBottom)
   {
@@ -4539 +4228 @@
     }
   }
-#endif
-#if SIMP_MRG_PRUN
   if ( pcCULeftBottom && !pcCULeftBottom->isIntra( uiLeftBottomPartIdx ) 
 #if MERL_VSP_C0152
@@ -4546 +4233 @@
 #endif
     && ( !pcCULeft || pcCULeft->isIntra( uiLeftPartIdx ) || !pcCULeft->hasEqualMotion( uiLeftPartIdx, pcCULeftBottom, uiLeftBottomPartIdx ) ) )
-#else
-  if ( pcCULeftBottom && !pcCULeftBottom->isIntra( uiLeftBottomPartIdx ) )
-#endif
   {
     abCandIsInter[iCount] = true;
@@ -4572 +4256 @@
      xInheritVspMode( pcCULeftBottom, uiLeftBottomPartIdx, bVspMvZeroDone, iCount, iVSPIndexTrue, pcMvFieldNeighbours, &cDisInfo ) ;
 #endif
-#if SIMP_MRG_PRUN
     if ( mrgCandIdx == iCount )
     {
       return;
     }
-#endif
     iCount ++;
   }
@@ -4611 +4293 @@
     }
 #endif
-#if SIMP_MRG_PRUN
     if ( mrgCandIdx == iCount )
     {
       return;
     }
-#endif
     iCount ++;
   }
@@ -4637 +4317 @@
     UInt uiAboveLeftPartIdx = 0;
     TComDataCU* pcCUAboveLeft = 0;
-#if MVP_AT_ENTROPYSLICE_BOUNDARY
     pcCUAboveLeft = getPUAboveLeft( uiAboveLeftPartIdx, uiAbsPartAddr, true, false, true );
-#else
-    pcCUAboveLeft = getPUAboveLeft( uiAboveLeftPartIdx, uiAbsPartAddr, true, true, true );
-#endif
-#if PARALLEL_MERGE
     if (pcCUAboveLeft) 
     {
@@ -4650 +4325 @@
       }
     }
-#endif
-#if SIMP_MRG_PRUN
     if( pcCUAboveLeft && !pcCUAboveLeft->isIntra( uiAboveLeftPartIdx )
 #if MERL_VSP_C0152
@@ -4659 +4332 @@
      && ( !pcCUAbove || pcCUAbove->isIntra( uiAbovePartIdx ) || !pcCUAbove->hasEqualMotion( uiAbovePartIdx, pcCUAboveLeft, uiAboveLeftPartIdx ) )
      )
-#else
-    if( pcCUAboveLeft && !pcCUAboveLeft->isIntra( uiAboveLeftPartIdx ) )
-#endif
     {
       abCandIsInter[iCount] = true;
@@ -4685 +4355 @@
      xInheritVspMode( pcCUAboveLeft, uiAboveLeftPartIdx, bVspMvZeroDone, iCount, iVSPIndexTrue, pcMvFieldNeighbours, &cDisInfo ) ;
 #endif
-#if SIMP_MRG_PRUN
       if ( mrgCandIdx == iCount )
       {
         return;
       }
-#endif
       iCount ++;
     }
@@ -4714 +4382 @@
     {
       RefPicList  eRefPicList = ( i==1 ? REF_PIC_LIST_1 : REF_PIC_LIST_0 );
-#if SET_MERGE_TMVP_REFIDX
       Int iRefIdxTmp;
       if ( uiPUIdx != 0 )
@@ -4724 +4391 @@
         iRefIdxTmp = (pcCULeft != NULL) ? pcCULeft->getCUMvField(eRefPicList)->getRefIdx(uiLeftPartIdx) : -1;
       }
-#else      
-      Int iRefIdxTmp = (pcCULeft != NULL) ? pcCULeft->getCUMvField(eRefPicList)->getRefIdx(uiLeftPartIdx) : -1;
-#endif
       iRefIdxSkip[i] = (iRefIdxTmp != -1) ? iRefIdxTmp : 0;
     }
@@ -4858 +4522 @@
       pcMvFieldNeighbours[(uiArrayAddr<<1)+1].getMv().m_bDvMcp = false;
 #endif
-#if SIMP_MRG_PRUN
       if ( mrgCandIdx == iCount )
       {
@@ -4864 +4527 @@
       }
       iCount++;
-#endif
     }
     uiIdx++;
@@ -4870 +4532 @@
   }
 
-#if SIMP_MRG_PRUN
   UInt uiArrayAddr = iCount;
-#else
-#if H3D_IVMP
-  for( UInt uiOuter = 0; uiOuter < MRG_MAX_NUM_CANDS_MEM; uiOuter++ )
-#else
-  for( UInt uiOuter = 0; uiOuter < MRG_MAX_NUM_CANDS; uiOuter++ )
-#endif
-  {
-    if( abCandIsInter[ uiOuter ] )
-    {
-#if H3D_IVMP
-      for( UInt uiIter = uiOuter + 1; uiIter < MRG_MAX_NUM_CANDS_MEM; uiIter++ )
-#else
-      for( UInt uiIter = uiOuter + 1; uiIter < MRG_MAX_NUM_CANDS; uiIter++ )
-#endif
-      {
-        UInt uiMvFieldNeighIdxCurr = uiOuter << 1;
-        UInt uiMvFieldNeighIdxComp = uiIter << 1;
-        if( getSlice()->isInterB() )
-        {
-          if( puhInterDirNeighbours[ uiOuter ] == 3 )
-          {
-            if( pcMvFieldNeighbours[ uiMvFieldNeighIdxCurr ].getRefIdx() == pcMvFieldNeighbours[ uiMvFieldNeighIdxComp ].getRefIdx() && pcMvFieldNeighbours[ uiMvFieldNeighIdxCurr + 1 ].getRefIdx() == pcMvFieldNeighbours[ uiMvFieldNeighIdxComp + 1 ].getRefIdx() &&
-              pcMvFieldNeighbours[ uiMvFieldNeighIdxCurr ].getMv() == pcMvFieldNeighbours[ uiMvFieldNeighIdxComp ].getMv() && pcMvFieldNeighbours[ uiMvFieldNeighIdxCurr + 1 ].getMv() == pcMvFieldNeighbours[ uiMvFieldNeighIdxComp + 1 ].getMv() &&
-              puhInterDirNeighbours[ uiOuter ] == puhInterDirNeighbours[ uiIter ] )
-            {
-              abCandIsInter[ uiIter ] = false;
-            }
-          }
-          else if( puhInterDirNeighbours[ uiOuter ] == 2 )
-          {
-            if( pcMvFieldNeighbours[ uiMvFieldNeighIdxCurr + 1 ].getRefIdx() == pcMvFieldNeighbours[ uiMvFieldNeighIdxComp + 1 ].getRefIdx() &&
-              pcMvFieldNeighbours[ uiMvFieldNeighIdxCurr + 1 ].getMv() == pcMvFieldNeighbours[ uiMvFieldNeighIdxComp + 1 ].getMv() &&
-              puhInterDirNeighbours[ uiOuter ] == puhInterDirNeighbours[ uiIter ] )
-            {
-              abCandIsInter[ uiIter ] = false;
-            }
-          }
-          else
-          {
-            if( pcMvFieldNeighbours[ uiMvFieldNeighIdxCurr ].getRefIdx() == pcMvFieldNeighbours[ uiMvFieldNeighIdxComp ].getRefIdx() &&
-              pcMvFieldNeighbours[ uiMvFieldNeighIdxCurr ].getMv() == pcMvFieldNeighbours[ uiMvFieldNeighIdxComp ].getMv() &&
-              puhInterDirNeighbours[ uiOuter ] == puhInterDirNeighbours[ uiIter ] )
-            {
-              abCandIsInter[ uiIter ] = false;
-            }
-          }
-        }
-        else
-        {
-          if( pcMvFieldNeighbours[ uiMvFieldNeighIdxCurr ].getRefIdx() == pcMvFieldNeighbours[ uiMvFieldNeighIdxComp ].getRefIdx() && 
-              pcMvFieldNeighbours[ uiMvFieldNeighIdxCurr ].getMv() == pcMvFieldNeighbours[ uiMvFieldNeighIdxComp ].getMv() )
-          {
-            assert( puhInterDirNeighbours[ uiOuter ] == puhInterDirNeighbours[ uiIter ] );
-            abCandIsInter[ uiIter ] = false;
-          }
-        }
-      }
-    }
-  }
-
-#if H3D_IVMP
-  bool abCandIsInterFlag[MRG_MAX_NUM_CANDS_MEM];
-  for (int i=0; i<MRG_MAX_NUM_CANDS_MEM; i++)
-#else
-  bool abCandIsInterFlag[MRG_MAX_NUM_CANDS];
-  for (int i=0; i<MRG_MAX_NUM_CANDS; i++)
-#endif
-  {
-    abCandIsInterFlag[i] = abCandIsInter[ i ];
-    abCandIsInter[ i ] = false;
-  }
-
-  UInt uiArrayAddr = 0;
-    
-#if H3D_IVMP
-  for (int i=0; i<MRG_MAX_NUM_CANDS_MEM; i++)
-#else
-  for (int i=0; i<MRG_MAX_NUM_CANDS; i++)
-#endif
-  {
-    if (abCandIsInterFlag[i])
-    {
-      abCandIsInter[uiArrayAddr] = true;
-      puhInterDirNeighbours[uiArrayAddr] = puhInterDirNeighbours[i];
-      pcMvFieldNeighbours[uiArrayAddr<<1].setMvField(pcMvFieldNeighbours[i<<1].getMv(), pcMvFieldNeighbours[i<<1].getRefIdx());
-      pcMvFieldNeighbours[(uiArrayAddr<<1)+1].setMvField(pcMvFieldNeighbours[(i<<1)+1].getMv(), pcMvFieldNeighbours[(i<<1)+1].getRefIdx());
-      ++uiArrayAddr;
-    }
-  }
-
-#if H3D_IVMP
-  for (int i=uiArrayAddr; i<MRG_MAX_NUM_CANDS_MEM; i++)
-#else
-  for (int i=uiArrayAddr; i<MRG_MAX_NUM_CANDS; i++)
-#endif
-  {
-    puhInterDirNeighbours[i] = (getSlice()->isInterB()) ? 3 : 1;
-    abCandIsInter[i] = false;
-    TComMv tmpMv;
-    tmpMv.set(0,0);
-    pcMvFieldNeighbours[i<<1].setMvField(tmpMv, 0);
-    if ( getSlice()->isInterB() )
-    {
-      pcMvFieldNeighbours[(i<<1)+1].setMvField(tmpMv, 0);
-    }
-  }
-#endif
   UInt uiCutoff = uiArrayAddr;
     
@@ -5033 +4587 @@
       }
     }
-#if !REMOVE_NON_SCALED  
-    Int iScaledCount = 0;
-#if H3D_IVMP
-    for (int i=0; i<uiCutoff && uiArrayAddr!=MRG_MAX_NUM_CANDS_MEM && iScaledCount<1; i++)
-#else
-    for (int i=0; i<uiCutoff && uiArrayAddr!=MRG_MAX_NUM_CANDS && iScaledCount<1; i++)
-#endif
-    {
-#if H3D_IVMP
-      for (int j=0; j<2 && uiArrayAddr!=MRG_MAX_NUM_CANDS_MEM && iScaledCount<1; j++)
-#else
-      for (int j=0; j<2 && uiArrayAddr!=MRG_MAX_NUM_CANDS && iScaledCount<1; j++)
-#endif
-      {
-        if (abCandIsInter[i] && pcMvFieldNeighbours[(i<<1)+j].getRefIdx()>=0 && pcMvFieldNeighbours[(i<<1)+j].getRefIdx() < m_pcSlice->getNumRefIdx((j==0)?REF_PIC_LIST_1:REF_PIC_LIST_0))
-        {
-          Int iCurrPOC = m_pcSlice->getPOC();
-          Int iCurrRefPOC1 = m_pcSlice->getRefPOC( (j==0)?REF_PIC_LIST_1:REF_PIC_LIST_0, pcMvFieldNeighbours[(i<<1)+j].getRefIdx() );
-          Int iCurrRefPOC2 = m_pcSlice->getRefPOC( (j==0)?REF_PIC_LIST_0:REF_PIC_LIST_1, pcMvFieldNeighbours[(i<<1)+j].getRefIdx() );
-
-          if (iCurrRefPOC1 != iCurrRefPOC2 && abs(iCurrPOC-iCurrRefPOC1) == abs(iCurrPOC-iCurrRefPOC2))
-          {
-            abCandIsInter[uiArrayAddr] = true;
-            puhInterDirNeighbours[uiArrayAddr] = 3;
-            
-            TComMv cMvPred = pcMvFieldNeighbours[(i<<1)+j].getMv();
-            TComMv rcMv;
-
-            rcMv.set(-1*cMvPred.getHor(), -1*cMvPred.getVer());
-
-            if (j==0)
-            {
-              pcMvFieldNeighbours[uiArrayAddr << 1].setMvField(pcMvFieldNeighbours[(i<<1)].getMv(), pcMvFieldNeighbours[(i<<1)].getRefIdx());
-              pcMvFieldNeighbours[( uiArrayAddr << 1 ) + 1].setMvField(rcMv, pcMvFieldNeighbours[(i<<1)].getRefIdx());
-            }
-            else
-            {
-              pcMvFieldNeighbours[uiArrayAddr << 1].setMvField(rcMv, pcMvFieldNeighbours[(i<<1)+1].getRefIdx());
-              pcMvFieldNeighbours[( uiArrayAddr << 1 ) + 1].setMvField(pcMvFieldNeighbours[(i<<1)+1].getMv(), pcMvFieldNeighbours[(i<<1)+1].getRefIdx());
-            }
-
-            uiArrayAddr++;
-            iScaledCount++;
-          }
-        }
-      }
-    }
-#endif
   }
 
@@ -5258 +4764 @@
   }
 }
-#if PARALLEL_MERGE
 /** Check whether the current PU and a spatial neighboring PU are in a same ME region.
  * \param xN, xN   location of the upper-left corner pixel of a neighboring PU
@@ -5345 +4850 @@
 }
 
-#endif
 AMVP_MODE TComDataCU::getAMVPMode(UInt uiIdx)
 {
@@ -5367 +4871 @@
 
   UInt uiIdx = 0;
-#if MVP_AT_ENTROPYSLICE_BOUNDARY
     pcTmpCU = getPULeft(uiIdx, uiPartIdxLB, true, false);
-#else
-    pcTmpCU = getPULeft(uiIdx, uiPartIdxLB);
-#endif
   if(pcTmpCU != NULL && !pcTmpCU->isIntra( uiIdx ) )
 #if MERL_VSP_C0152
@@ -5395 +4895 @@
     }
   }
-#if MVP_AT_ENTROPYSLICE_BOUNDARY
       pcTmpCU = getPUAbove(uiIdx, uiPartIdxRT, true, false, true);
-#else
-    pcTmpCU = getPUAbove(uiIdx, uiPartIdxRT);
-#endif
 
   if(pcTmpCU != NULL && !pcTmpCU->isIntra( uiIdx ))
@@ -5425 +4921 @@
   }
 
-#if MVP_AT_ENTROPYSLICE_BOUNDARY
       pcTmpCU = getPUAboveRight(uiIdx, uiPartIdxRT, true, false, true);
-#else
-      pcTmpCU = getPUAboveRight(uiIdx, uiPartIdxRT, true, true, true);
-#endif
   if(pcTmpCU != NULL && !pcTmpCU->isIntra( uiIdx ) )
 #if MERL_VSP_C0152
@@ -5453 +4945 @@
     }
   }
-#if MVP_AT_ENTROPYSLICE_BOUNDARY
       pcTmpCU = getPUBelowLeft(uiIdx, uiPartIdxLB, true, false);
-#else
-      pcTmpCU = getPUBelowLeft(uiIdx, uiPartIdxLB);
-#endif
   if(pcTmpCU != NULL && !pcTmpCU->isIntra( uiIdx ))
 #if MERL_VSP_C0152
@@ -5483 +4971 @@
 
   // Above predictor search
-#if MVP_AT_ENTROPYSLICE_BOUNDARY
       pcTmpCU = getPUAboveLeft(uiIdx, (m_uiAbsIdxInLCU + uiPartAddr), true, false, true);
     assert(uiPartIdxLT == (m_uiAbsIdxInLCU + uiPartAddr));
-#else
-      pcTmpCU = getPUAboveLeft(uiIdx, uiPartIdxLT, true, true, true);
-#endif
   if(pcTmpCU != NULL && !pcTmpCU->isIntra( uiIdx ))
 #if MERL_VSP_C0152
@@ -5993 +5477 @@
 #endif
   UInt uiIdx = 0;
-#if MVP_AT_ENTROPYSLICE_BOUNDARY
   pcTmpCU = getPULeft(uiIdx, uiPartIdxLB, true, false);
-#else
-  pcTmpCU = getPULeft(uiIdx, uiPartIdxLB);
-#endif
   if ( uiPartIdx == 1 && (eCUMode == SIZE_Nx2N || eCUMode == SIZE_nLx2N || eCUMode == SIZE_nRx2N) )
   {
@@ -6078 +5558 @@
   }
 
-#if MVP_AT_ENTROPYSLICE_BOUNDARY
   pcTmpCU = getPUAbove(uiIdx, uiPartIdxRT, true, false, true);
-#else
-  pcTmpCU = getPUAbove(uiIdx, uiPartIdxRT);
-#endif
   if ( uiPartIdx == 1 && (eCUMode == SIZE_2NxN || eCUMode == SIZE_2NxnU || eCUMode == SIZE_2NxnD) )
   {
@@ -6164 +5640 @@
   }
 
-#if MVP_AT_ENTROPYSLICE_BOUNDARY
   pcTmpCU = getPUAboveRight(uiIdx, uiPartIdxRT, true, false, true);
-#else
-  pcTmpCU = getPUAboveRight(uiIdx, uiPartIdxRT, true, true, true);
-#endif
 
   if (pcTmpCU && bParMerge) 
@@ -6246 +5718 @@
   }
 
-#if MVP_AT_ENTROPYSLICE_BOUNDARY
   pcTmpCU = getPUBelowLeft(uiIdx, uiPartIdxLB, true, false);
-#else
-  pcTmpCU = getPUBelowLeft(uiIdx, uiPartIdxLB);
-#endif
 
   if (pcTmpCU && bParMerge)
@@ -6328 +5796 @@
 
   // Above predictor search
-#if MVP_AT_ENTROPYSLICE_BOUNDARY
   pcTmpCU = getPUAboveLeft(uiIdx, (m_uiAbsIdxInLCU + uiPartAddr), true, false, true);
   assert(uiPartIdxLT == (m_uiAbsIdxInLCU + uiPartAddr));
-#else
-  pcTmpCU = getPUAboveLeft(uiIdx, uiPartIdxLT, true, true, true);
-#endif
 
   if (pcTmpCU && bParMerge) 
@@ -6741 +6205 @@
   TComDataCU* tmpCU = NULL;
   UInt idx;
-#if MVP_AT_ENTROPYSLICE_BOUNDARY
   tmpCU = getPUBelowLeft(idx, uiPartIdxLB, true, false);
-#else
-  tmpCU = getPUBelowLeft(idx, uiPartIdxLB);
-#endif
   bAddedSmvp = (tmpCU != NULL) && (tmpCU->getPredictionMode(idx) != MODE_INTRA);
 
   if (!bAddedSmvp)
   {
-#if MVP_AT_ENTROPYSLICE_BOUNDARY
     tmpCU = getPULeft(idx, uiPartIdxLB, true, false);
-#else
-    tmpCU = getPULeft(idx, uiPartIdxLB);
-#endif
     bAddedSmvp = (tmpCU != NULL) && (tmpCU->getPredictionMode(idx) != MODE_INTRA);
   }
@@ -6811 +6267 @@
 
 
-#if AMVP_PRUNING_SIMPLIFICATION
   if ( pInfo->iN == 2 )
   {
@@ -6822 +6277 @@
     }
   }
-#endif
 
   if ( getSlice()->getPPS()->getEnableTMVPFlag() )
@@ -6894 +6348 @@
   }
 
-#if !AMVP_PRUNING_SIMPLIFICATION
-  // Check No MV Candidate
-  xUniqueMVPCand( pInfo );
-#endif
 
   if (pInfo->iN > AMVP_MAX_NUM_CANDS)
@@ -6905 +6355 @@
   else if (pInfo->iN < AMVP_MAX_NUM_CANDS)
   {
-#if !AMVP_ZERO_CHECKING_REMOVAL
-    int j;
-    for (j=0; j<pInfo->iN; j++)
-    {
-      if (pInfo->m_acMvCand[j].getHor() == 0 && pInfo->m_acMvCand[j].getVer() == 0)
-      {
-        break;
-      }
-    }
-    if (j == pInfo->iN)
-    {
-#endif
       pInfo->m_acMvCand[pInfo->iN].set(0,0);
       pInfo->iN++;
-#if !AMVP_ZERO_CHECKING_REMOVAL
-    }
-#endif
   }
   return ;
@@ -7011 +6446 @@
     case MD_LEFT:
     {
-#if MVP_AT_ENTROPYSLICE_BOUNDARY
       pcTmpCU = getPULeft(uiIdx, uiPartUnitIdx, true, false);
-#else
-      pcTmpCU = getPULeft(uiIdx, uiPartUnitIdx);
-#endif
       break;
     }
     case MD_ABOVE:
     {
-#if MVP_AT_ENTROPYSLICE_BOUNDARY
       pcTmpCU = getPUAbove(uiIdx, uiPartUnitIdx, true, false, true);
-#else
-      pcTmpCU = getPUAbove(uiIdx, uiPartUnitIdx, true, true, true);
-#endif
       break;
     }
     case MD_ABOVE_RIGHT:
     {
-#if MVP_AT_ENTROPYSLICE_BOUNDARY
       pcTmpCU = getPUAboveRight(uiIdx, uiPartUnitIdx, true, false, true);
-#else
-      pcTmpCU = getPUAboveRight(uiIdx, uiPartUnitIdx, true, true, true);
-#endif
       break;
     }
     case MD_BELOW_LEFT:
     {
-#if MVP_AT_ENTROPYSLICE_BOUNDARY
       pcTmpCU = getPUBelowLeft(uiIdx, uiPartUnitIdx, true, false);
-#else
-      pcTmpCU = getPUBelowLeft(uiIdx, uiPartUnitIdx);
-#endif
       break;
     }
     case MD_ABOVE_LEFT:
     {
-#if MVP_AT_ENTROPYSLICE_BOUNDARY
       pcTmpCU = getPUAboveLeft(uiIdx, uiPartUnitIdx, true, false, true);
-#else
-      pcTmpCU = getPUAboveLeft(uiIdx, uiPartUnitIdx, true, true, true);
-#endif
       break;
     }
@@ -7124 +6539 @@
 }
 
-#if !AMVP_PRUNING_SIMPLIFICATION
-/**
- * Reduce list of motion vector predictors to a set of unique predictors
- * \param pInfo list of motion vector predictors
- */
-Void TComDataCU::xUniqueMVPCand(AMVPInfo* pInfo)
-{
-  Int n = 1;
-  if ( pInfo->iN == 0 )
-  {
-#if AMVP_ZERO_CHECKING_REMOVAL
-    return;
-#else
-    // Add a zero candidate is none is available
-    pInfo->m_acMvCand[ 0 ].setZero();
-#endif
-  }
-  else
-  {
-    for (Int i = 1; i < pInfo->iN; i++)
-    {
-      Int j;
-      for (j = n - 1; j >= 0; j--)
-      {
-        if ( pInfo->m_acMvCand[ i ] == pInfo->m_acMvCand[ j ] )
-        {
-          break;
-        }
-      }
-      if ( j < 0 )
-      {
-        pInfo->m_acMvCand[ n++ ] = pInfo->m_acMvCand[ i ];
-      }
-    }
-  }
-  pInfo->iN = n;
-}
-#endif
 
 /** 
@@ -7180 +6557 @@
   case MD_LEFT:
     {
-#if MVP_AT_ENTROPYSLICE_BOUNDARY
       pcTmpCU = getPULeft(uiIdx, uiPartUnitIdx, true, false);
-#else
-      pcTmpCU = getPULeft(uiIdx, uiPartUnitIdx);
-#endif
       break;
     }
   case MD_ABOVE:
     {
-#if MVP_AT_ENTROPYSLICE_BOUNDARY
       pcTmpCU = getPUAbove(uiIdx, uiPartUnitIdx, true, false, true);
-#else
-      pcTmpCU = getPUAbove(uiIdx, uiPartUnitIdx, true, true, true);
-#endif
       break;
     }
   case MD_ABOVE_RIGHT:
     {
-#if MVP_AT_ENTROPYSLICE_BOUNDARY
       pcTmpCU = getPUAboveRight(uiIdx, uiPartUnitIdx, true, false, true);
-#else
-      pcTmpCU = getPUAboveRight(uiIdx, uiPartUnitIdx, true, true, true);
-#endif
       break;
     }
   case MD_BELOW_LEFT:
     {
-#if MVP_AT_ENTROPYSLICE_BOUNDARY
       pcTmpCU = getPUBelowLeft(uiIdx, uiPartUnitIdx, true, false);
-#else
-      pcTmpCU = getPUBelowLeft(uiIdx, uiPartUnitIdx);
-#endif
       break;
     }
   case MD_ABOVE_LEFT:
     {
-#if MVP_AT_ENTROPYSLICE_BOUNDARY
       pcTmpCU = getPUAboveLeft(uiIdx, uiPartUnitIdx, true, false, true);
-#else
-      pcTmpCU = getPUAboveLeft(uiIdx, uiPartUnitIdx, true, true, true);
-#endif
       break;
     }
@@ -7781 +7138 @@
 UInt TComDataCU::getCoefScanIdx(UInt uiAbsPartIdx, UInt uiWidth, Bool bIsLuma, Bool bIsIntra)
 {
-#if !LOGI_INTRA_NAME_3MPM  
-  static const UChar aucIntraDirToScanIdx[MAX_CU_DEPTH][NUM_INTRA_MODE] =
-  {
-    {0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0
-    },
-    {0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0
-    },
-    {0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0
-    },
-    {0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0
-    },
-    {0, 1, 2, 0, 0, 1, 1, 0, 2, 2, 0, 0, 1, 1, 0, 0, 2, 2, 0, 0, 0, 1, 1, 1, 1, 0, 0, 0, 0, 2, 2, 2, 2, 0, 0, 0
-    },
-    {0, 1, 2, 0, 0, 1, 1, 0, 2, 2, 0, 0, 1, 1, 0, 0, 2, 2, 0, 0, 0, 1, 1, 1, 1, 0, 0, 0, 0, 2, 2, 2, 2, 0, 0, 0
-    },
-    {0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0
-    },
-  };
-#endif
   
   UInt uiCTXIdx;
@@ -7829 +7167 @@
 #endif
 
-#if LOGI_INTRA_NAME_3MPM
     uiScanIdx = SCAN_ZIGZAG;
     if (uiCTXIdx >3 && uiCTXIdx < 6) //if multiple scans supported for PU size
@@ -7835 +7172 @@
       uiScanIdx = abs((Int) uiDirMode - VER_IDX) < 5 ? 1 : (abs((Int)uiDirMode - HOR_IDX) < 5 ? 2 : 0);
     }
-#else
-    uiScanIdx = aucIntraDirToScanIdx[uiCTXIdx][uiDirMode];
-#endif
   }
   else
@@ -7854 +7188 @@
 #endif
     }
-#if LOGI_INTRA_NAME_3MPM
     uiScanIdx = SCAN_ZIGZAG;
     if (uiCTXIdx >4 && uiCTXIdx < 7) //if multiple scans supported for PU size
@@ -7860 +7193 @@
       uiScanIdx = abs((Int) uiDirMode - VER_IDX) < 5 ? 1 : (abs((Int)uiDirMode - HOR_IDX) < 5 ? 2 : 0);
     }
-#else
-    uiScanIdx = aucIntraDirToScanIdx[max<Int>(uiCTXIdx-1,0)][uiDirMode];
-#endif
   }
 
@@ -8354 +7684 @@
       }
     }
-#if LCU_SYNTAX_ALF
     rSGU.allBordersAvailable = true;
     for(Int b=0; b< NUM_SGU_BORDER; b++)
@@ -8364 +7693 @@
       }
     }
-#endif
 
   }

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

@@ -91 +91 @@
   UInt  height;   //!< number of pixels in height
   Bool  isBorderAvailable[NUM_SGU_BORDER];  //!< the border availabilities
-#if LCU_SYNTAX_ALF
   Bool  allBordersAvailable;
-#endif
 
   NDBFBlockInfo():tileID(0), sliceID(0), startSU(0), endSU(0) {} //!< constructor
@@ -143 +141 @@
 #endif
   Char*         m_pePredMode;         ///< array of prediction modes
-#if H0736_AVC_STYLE_QP_RANGE
   Char*         m_phQP;               ///< array of QP values
-#else
-  UChar*        m_phQP;               ///< array of QP values
-#endif
   UChar*        m_puhTrIdx;           ///< array of transform indices
   UChar*        m_nsqtPartIdx;        ///< array of absPartIdx mapping table, map zigzag to NSQT
@@ -214 +208 @@
   Bool*         m_pbIPCMFlag;         ///< array of intra_pcm flags
 
-#if BURST_IPCM
   Int           m_numSucIPCM;         ///< the number of succesive IPCM blocks associated with the current log2CUSize
   Bool          m_lastCUSucIPCMFlag;  ///< True indicates that the last CU is IPCM and shares the same root as the current CU.  
-#endif
 #if HHI_INTER_VIEW_RESIDUAL_PRED
   Bool*         m_pbResPredAvailable; ///< array of residual prediction available flags
@@ -298 +290 @@
 #endif 
   
-#if !AMVP_PRUNING_SIMPLIFICATION
-  /// remove redundant candidates
-  Void          xUniqueMVPCand        ( AMVPInfo* pInfo );
-#endif
 
   Void xCheckCornerCand( TComDataCU* pcCorner, UInt uiCornerIdx, UInt uiIter, Bool& rbValidCand );
@@ -316 +304 @@
   Void xCheckDuplicateCand(TComMvField* pcMvFieldNeighbours, UChar* puhInterDirNeighbours, bool* pbCandIsInter, UInt& ruiArrayAddr);
 
-#if !BURST_IPCM
-  Int           getLastValidPartIdx   ( Int iAbsPartIdx );
-#endif
 
 public:
@@ -336 +321 @@
   
   Void          initCU                ( TComPic* pcPic, UInt uiCUAddr );
-#if H0736_AVC_STYLE_QP_RANGE
   Void          initEstData           ( UInt uiDepth, Int qp );
   Void          initSubCU             ( TComDataCU* pcCU, UInt uiPartUnitIdx, UInt uiDepth, Int qp );
-#else
-  Void          initEstData           ( UInt uiDepth, UInt uiQP );
-  Void          initSubCU             ( TComDataCU* pcCU, UInt uiPartUnitIdx, UInt uiDepth, UInt uiQP );
-#endif
   Void          setOutsideCUPart      ( UInt uiAbsPartIdx, UInt uiDepth );
 
@@ -410 +390 @@
   Void          setSizeSubParts       ( UInt uiWidth, UInt uiHeight, UInt uiAbsPartIdx, UInt uiDepth );
   
-#if H0736_AVC_STYLE_QP_RANGE
   Char*         getQP                 ()                        { return m_phQP;              }
   Char          getQP                 ( UInt uiIdx )            { return m_phQP[uiIdx];       }
   Void          setQP                 ( UInt uiIdx, Char value ){ m_phQP[uiIdx] =  value;     }
   Void          setQPSubParts         ( Int qp,   UInt uiAbsPartIdx, UInt uiDepth );
-#if BURST_IPCM
   Int           getLastValidPartIdx   ( Int iAbsPartIdx );
-#endif
   Char          getLastCodedQP        ( UInt uiAbsPartIdx );
-#else
-  UChar*        getQP                 ()                        { return m_phQP;              }
-  UChar         getQP                 ( UInt uiIdx )            { return m_phQP[uiIdx];       }
-  Void          setQP                 ( UInt uiIdx, UChar  uh ) { m_phQP[uiIdx] = uh;         }
-  Void          setQPSubParts         ( UInt uiQP,   UInt uiAbsPartIdx, UInt uiDepth );
-#if BURST_IPCM
-  Int           getLastValidPartIdx   ( Int iAbsPartIdx );
-#endif
-  UChar         getLastCodedQP        ( UInt uiAbsPartIdx );
-#endif
 
 #if LOSSLESS_CODING
@@ -541 +508 @@
   Void          setIPCMFlagSubParts   (Bool bIpcmFlag, UInt uiAbsPartIdx, UInt uiDepth);
 
-#if BURST_IPCM
   Int           getNumSucIPCM         ()                        { return m_numSucIPCM;             }
   Void          setNumSucIPCM         ( Int num )               { m_numSucIPCM = num;              }
   Bool          getLastCUSucIPCMFlag  ()                        { return m_lastCUSucIPCMFlag;        }
   Void          setLastCUSucIPCMFlag  ( Bool flg )              { m_lastCUSucIPCMFlag = flg;         }
-#endif
 
   /// get slice ID for SU
@@ -637 +602 @@
   Void          fillMvpCand           ( UInt uiPartIdx, UInt uiPartAddr, RefPicList eRefPicList, Int iRefIdx, AMVPInfo* pInfo , Int iMVPIdx=-1);
 #endif
-#if PARALLEL_MERGE 
   Bool          isDiffMER             ( Int xN, Int yN, Int xP, Int yP);
   Void          getPartPosition       ( UInt partIdx, Int& xP, Int& yP, Int& nPSW, Int& nPSH);
-#endif 
   Void          setMVPIdx             ( RefPicList eRefPicList, UInt uiIdx, Int iMVPIdx)  { m_apiMVPIdx[eRefPicList][uiIdx] = iMVPIdx;  }
   Int           getMVPIdx             ( RefPicList eRefPicList, UInt uiIdx)               { return m_apiMVPIdx[eRefPicList][uiIdx];     }
@@ -684 +647 @@
 
   TComDataCU*   getQpMinCuLeft              ( UInt&  uiLPartUnitIdx , UInt uiCurrAbsIdxInLCU, Bool bEnforceSliceRestriction=true, Bool bEnforceEntropySliceRestriction=true );
-#if H0204_QP_PREDICTION
   TComDataCU*   getQpMinCuAbove             ( UInt&  aPartUnitIdx , UInt currAbsIdxInLCU, Bool enforceSliceRestriction=true, Bool enforceEntropySliceRestriction=true );
-#endif
-#if H0736_AVC_STYLE_QP_RANGE
   Char          getRefQP                    ( UInt   uiCurrAbsIdxInLCU                       );
-#else
-  UChar         getRefQP                    ( UInt   uiCurrAbsIdxInLCU                       );
-#endif
 
   TComDataCU*   getPUAboveRightAdi          ( UInt&  uiARPartUnitIdx, UInt uiPuWidth, UInt uiCurrPartUnitIdx, UInt uiPartUnitOffset = 1, Bool bEnforceSliceRestriction=true, Bool bEnforceEntropySliceRestriction=true );
@@ -703 +660 @@
   
   Bool          hasEqualMotion              ( UInt uiAbsPartIdx, TComDataCU* pcCandCU, UInt uiCandAbsPartIdx );
-#if SIMP_MRG_PRUN
 #if MERL_VSP_C0152
   Void          getInterMergeCandidates     ( UInt uiAbsPartIdx, UInt uiPUIdx, UInt uiDepth, TComMvField* pcMFieldNeighbours, UChar* puhInterDirNeighbours, Int& numValidMergeCand, Int* uiVSPIndexTrue, Int mrgCandIdx = -1 );
 #else
   Void          getInterMergeCandidates     ( UInt uiAbsPartIdx, UInt uiPUIdx, UInt uiDepth, TComMvField* pcMFieldNeighbours, UChar* puhInterDirNeighbours, Int& numValidMergeCand, Int mrgCandIdx = -1 );
-#endif
-#else
-  Void          getInterMergeCandidates     ( UInt uiAbsPartIdx, UInt uiPUIdx, UInt uiDepth, TComMvField* pcMFieldNeighbours, UChar* puhInterDirNeighbours, Int& numValidMergeCand );
 #endif
   Void          deriveLeftRightTopIdxGeneral( PartSize eCUMode, UInt uiAbsPartIdx, UInt uiPartIdx, UInt& ruiPartIdxLT, UInt& ruiPartIdxRT );

branches/HTM-5.1-dev0/source/Lib/TLibCommon/TComLoopFilter.cpp

@@ -85 +85 @@
 // Public member functions
 // ====================================================================================================================
-#if DBL_CONTROL
 Void TComLoopFilter::setCfg( Bool DeblockingFilterControlPresent, UInt uiDisableDblkIdc, Int iBetaOffset_div2, Int iTcOffset_div2, Bool bLFCrossTileBoundary)
-#else
-Void TComLoopFilter::setCfg( UInt uiDisableDblkIdc, Int iBetaOffset_div2, Int iTcOffset_div2, Bool bLFCrossTileBoundary)
-#endif
-{
-#if !DBL_CONTROL
-  m_uiDisableDeblockingFilterIdc  = uiDisableDblkIdc;
-#endif
+{
   m_bLFCrossTileBoundary = bLFCrossTileBoundary;
 
-#if DBL_CONTROL
   if (DeblockingFilterControlPresent)
   {
@@ -109 +101 @@
     m_tcOffsetDiv2 = 0;
   }
-#else
-  m_betaOffsetDiv2 = iBetaOffset_div2;
-  m_tcOffsetDiv2 = iTcOffset_div2;
-#endif
 }
 
@@ -455 +443 @@
   )
   {
-#if NSQT_LFFIX
     UInt nsPartQ = uiPartQ;
     UInt nsPartP = uiPartP;
@@ -468 +455 @@
 
     if ( m_aapucBS[iDir][uiAbsPartIdx] && (pcCUQ->getCbf( nsPartQ, TEXT_LUMA, pcCUQ->getTransformIdx(nsPartQ)) != 0 || pcCUP->getCbf( nsPartP, TEXT_LUMA, pcCUP->getTransformIdx(nsPartP) ) != 0) )
-#else
-    if ( m_aapucBS[iDir][uiAbsPartIdx] && (pcCUQ->getCbf( uiPartQ, TEXT_LUMA, pcCUQ->getTransformIdx(uiPartQ)) != 0 || pcCUP->getCbf( uiPartP, TEXT_LUMA, pcCUP->getTransformIdx(uiPartP) ) != 0) )
-#endif
     {
       uiBs = 1;
@@ -574 +558 @@
   
   UInt  uiPelsInPart = g_uiMaxCUWidth >> g_uiMaxCUDepth;
-#if !DBL_H0473_PART_1
-  UInt  PartIdxIncr = DEBLOCK_SMALLEST_BLOCK / uiPelsInPart ? DEBLOCK_SMALLEST_BLOCK / uiPelsInPart : 1;
-  UInt  uiBlocksInPart = uiPelsInPart / DEBLOCK_SMALLEST_BLOCK ? uiPelsInPart / DEBLOCK_SMALLEST_BLOCK : 1;
-#endif
   UInt  uiBsAbsIdx = 0, uiBs = 0;
   Int   iOffset, iSrcStep;
@@ -602 +582 @@
   }
   
-#if !DBL_H0473_PART_1
-  for ( UInt iIdx = 0; iIdx < uiNumParts; iIdx+=PartIdxIncr )
-  {
-    uiBs = 0;
-    for (UInt iIdxInside = 0; iIdxInside<PartIdxIncr; iIdxInside++)
-    {
-      uiBsAbsIdx = xCalcBsIdx( pcCU, uiAbsZorderIdx, iDir, iEdge, iIdx+iIdxInside);
-      if (uiBs < m_aapucBS[iDir][uiBsAbsIdx])
-      {
-        uiBs = m_aapucBS[iDir][uiBsAbsIdx];
-      }
-    }
-    
-#else
   for ( UInt iIdx = 0; iIdx < uiNumParts; iIdx++ )
   {
     uiBsAbsIdx = xCalcBsIdx( pcCU, uiAbsZorderIdx, iDir, iEdge, iIdx);
     uiBs = m_aapucBS[iDir][uiBsAbsIdx];
-#endif
     if ( uiBs )
     {
@@ -658 +623 @@
       
       
-#if !DBL_H0473_PART_1      
-      for (UInt iBlkIdx = 0; iBlkIdx< uiBlocksInPart; iBlkIdx ++)
-      {
-        Int dp0 = xCalcDP( piTmpSrc+iSrcStep*(iIdx*uiPelsInPart+iBlkIdx*DEBLOCK_SMALLEST_BLOCK+0), iOffset);
-        Int dq0 = xCalcDQ( piTmpSrc+iSrcStep*(iIdx*uiPelsInPart+iBlkIdx*DEBLOCK_SMALLEST_BLOCK+0), iOffset);
-        Int dp3 = xCalcDP( piTmpSrc+iSrcStep*(iIdx*uiPelsInPart+iBlkIdx*DEBLOCK_SMALLEST_BLOCK+3), iOffset);
-        Int dq3 = xCalcDQ( piTmpSrc+iSrcStep*(iIdx*uiPelsInPart+iBlkIdx*DEBLOCK_SMALLEST_BLOCK+3), iOffset);
-        Int d0 = dp0 + dq0;
-        Int d3 = dp3 + dq3;
-        
-        Int dp4 = xCalcDP( piTmpSrc+iSrcStep*(iIdx*uiPelsInPart+iBlkIdx*DEBLOCK_SMALLEST_BLOCK+4), iOffset);
-        Int dq4 = xCalcDQ( piTmpSrc+iSrcStep*(iIdx*uiPelsInPart+iBlkIdx*DEBLOCK_SMALLEST_BLOCK+4), iOffset);
-        Int dp7 = xCalcDP( piTmpSrc+iSrcStep*(iIdx*uiPelsInPart+iBlkIdx*DEBLOCK_SMALLEST_BLOCK+7), iOffset);
-        Int dq7 = xCalcDQ( piTmpSrc+iSrcStep*(iIdx*uiPelsInPart+iBlkIdx*DEBLOCK_SMALLEST_BLOCK+7), iOffset);
-        Int d4 = dp4 + dq4;
-        Int d7 = dp7 + dq7;
-#else
         Int dp0 = xCalcDP( piTmpSrc+iSrcStep*(iIdx*uiPelsInPart+0), iOffset);
         Int dq0 = xCalcDQ( piTmpSrc+iSrcStep*(iIdx*uiPelsInPart+0), iOffset);
@@ -685 +633 @@
         Int dq = dq0 + dq3;
         Int d =  d0 + d3;
-#endif
         
         if (bPCMFilter)
@@ -698 +645 @@
         bPartQNoFilter = bPartQNoFilter || (pcCU->isLosslessCoded(uiAbsZorderIdx) );
 #endif 
-#if !DBL_H0473_PART_1          
-        if (d0+d3 < iBeta)
-        {
-          Bool bFilterP = (dp0+dp3 < iSideThreshold);
-          Bool bFilterQ = (dq0+dq3 < iSideThreshold);
-          
-          Bool sw =  xUseStrongFiltering( iOffset, 2*d0, iBeta, iTc , piTmpSrc+iSrcStep*(iIdx*uiPelsInPart+iBlkIdx*DEBLOCK_SMALLEST_BLOCK+0))
-          && xUseStrongFiltering( iOffset, 2*d3, iBeta, iTc , piTmpSrc+iSrcStep*(iIdx*uiPelsInPart+iBlkIdx*DEBLOCK_SMALLEST_BLOCK+3));
-          
-#else
         if (d < iBeta)
         { 
@@ -715 +652 @@
           Bool sw =  xUseStrongFiltering( iOffset, 2*d0, iBeta, iTc, piTmpSrc+iSrcStep*(iIdx*uiPelsInPart+0))
                   && xUseStrongFiltering( iOffset, 2*d3, iBeta, iTc, piTmpSrc+iSrcStep*(iIdx*uiPelsInPart+3));
-#endif
 
           for ( Int i = 0; i < DEBLOCK_SMALLEST_BLOCK/2; i++)
           {
-#if !DBL_H0473_PART_1          
-            xPelFilterLuma( piTmpSrc+iSrcStep*(iIdx*uiPelsInPart+iBlkIdx*DEBLOCK_SMALLEST_BLOCK+i), iOffset, d0+d3, iBeta, iTc, sw, bPartPNoFilter, bPartQNoFilter, iThrCut, bFilterP, bFilterQ);
-#else
             xPelFilterLuma( piTmpSrc+iSrcStep*(iIdx*uiPelsInPart+i), iOffset, d, iBeta, iTc, sw, bPartPNoFilter, bPartQNoFilter, iThrCut, bFilterP, bFilterQ);
-#endif
 
           }
         }
-#if !DBL_H0473_PART_1              
-        if (d4+d7 < iBeta)
-        {
-          Bool bFilterP = (dp4+dp7 < iSideThreshold);
-          Bool bFilterQ = (dq4+dq7 < iSideThreshold);
-          
-          Bool sw =  xUseStrongFiltering( iOffset, 2*d4, iBeta, iTc , piTmpSrc+iSrcStep*(iIdx*uiPelsInPart+iBlkIdx*DEBLOCK_SMALLEST_BLOCK+4))
-          && xUseStrongFiltering( iOffset, 2*d7, iBeta, iTc , piTmpSrc+iSrcStep*(iIdx*uiPelsInPart+iBlkIdx*DEBLOCK_SMALLEST_BLOCK+7));
-          for ( Int i = DEBLOCK_SMALLEST_BLOCK/2; i < DEBLOCK_SMALLEST_BLOCK; i++)
-          {
-            xPelFilterLuma( piTmpSrc+iSrcStep*(iIdx*uiPelsInPart+iBlkIdx*DEBLOCK_SMALLEST_BLOCK+i), iOffset, d4+d7, iBeta, iTc, sw, bPartPNoFilter, bPartQNoFilter, iThrCut, bFilterP, bFilterQ);
-          }
-        }
-      }
-#endif
     }
   }
@@ -893 +810 @@
   if (sw)
   {
-#if DBL_STRONG_FILTER_CLIP
     piSrc[-iOffset]   = Clip3(m3-2*tc, m3+2*tc, ((m1 + 2*m2 + 2*m3 + 2*m4 + m5 + 4) >> 3));
     piSrc[0]          = Clip3(m4-2*tc, m4+2*tc, ((m2 + 2*m3 + 2*m4 + 2*m5 + m6 + 4) >> 3));
@@ -900 +816 @@
     piSrc[-iOffset*3] = Clip3(m1-2*tc, m1+2*tc, ((2*m0 + 3*m1 + m2 + m3 + m4 + 4 )>>3));
     piSrc[ iOffset*2] = Clip3(m6-2*tc, m6+2*tc, ((m3 + m4 + m5 + 3*m6 + 2*m7 +4 )>>3));
-#else
-    piSrc[-iOffset] = ( m1 + 2*m2 + 2*m3 + 2*m4 + m5 + 4) >> 3;
-    piSrc[0] = ( m2 + 2*m3 + 2*m4 + 2*m5 + m6 + 4) >> 3;
-    
-    piSrc[-iOffset*2] = ( m1 + m2 + m3 + m4 + 2)>>2;
-    piSrc[ iOffset] = ( m3 + m4 + m5 + m6 + 2)>>2;
-    
-    piSrc[-iOffset*3] = ( 2*m0 + 3*m1 + m2 + m3 + m4 + 4 )>>3;
-    piSrc[ iOffset*2] = ( m3 + m4 + m5 + 3*m6 + 2*m7 +4 )>>3;
-#endif
   }
   else

branches/HTM-5.1-dev0/source/Lib/TLibCommon/TComLoopFilter.h

@@ -107 +107 @@
   
   /// set configuration
-#if DBL_CONTROL
   Void setCfg( Bool DeblockingFilterControlPresent, UInt uiDisableDblkIdc, Int betaOffsetDiv2, Int tcOffsetDiv2, Bool bLFCrossTileBoundary);
-#else
-  Void setCfg( UInt uiDisableDblkIdc, Int betaOffsetDiv2, Int tcOffsetDiv2, Bool bLFCrossTileBoundary);
-#endif
   
   /// picture-level deblocking filter

branches/HTM-5.1-dev0/source/Lib/TLibCommon/TComMv.h

@@ -167 +167 @@
   const TComMv scaleMv( Int iScale ) const
   {
-#if CLIPSCALEDMVP
     Int mvx = Clip3( -32768, 32767, (iScale * getHor() + 127 + (iScale * getHor() < 0)) >> 8 );
     Int mvy = Clip3( -32768, 32767, (iScale * getVer() + 127 + (iScale * getVer() < 0)) >> 8 );
     return TComMv( mvx, mvy );
-#else
-    return TComMv( (iScale * getHor() + 127 + (iScale * getHor() < 0)) >> 8, (iScale * getVer() + 127 + (iScale * getVer() < 0)) >> 8);
-#endif
   }
 };// END CLASS DEFINITION TComMV

branches/HTM-5.1-dev0/source/Lib/TLibCommon/TComPattern.cpp

@@ -47 +47 @@
 // ====================================================================================================================
 
-#if LOGI_INTRA_NAME_3MPM
 const UChar TComPattern::m_aucIntraFilter[5] =
 {
@@ -56 +55 @@
   10, //64x64
 };
-#else
-const UChar TComPattern::m_aucIntraFilter[5][NUM_INTRA_MODE] =
-{
-  {0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0
-  }, //4x4
-  {1, 0, 0, 0, 1, 0, 0, 1, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0
-  }, //8x8
-  {1, 0, 0, 0, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 0, 0, 1, 1, 1, 1, 1, 1, 0, 0, 1, 1, 1, 0
-  }, //16x16
-  {1, 0, 0, 0, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 0
-  }, //32x32
-  {0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0
-  }, //64x64
-};
-#endif
 
 // ====================================================================================================================
@@ -682 +666 @@
   mapDMMtoIntraMode( uiDirMode );
 #endif
-#if LOGI_INTRA_NAME_3MPM
   Int diff = min<Int>(abs((Int) uiDirMode - HOR_IDX), abs((Int)uiDirMode - VER_IDX));
   UChar ucFiltIdx = diff > m_aucIntraFilter[log2BlkSize - 2] ? 1 : 0;
@@ -689 +672 @@
     ucFiltIdx = 0; //no smoothing for DC or LM chroma
   }
-#else
-  UChar ucFiltIdx = m_aucIntraFilter[log2BlkSize - 2][uiDirMode];
-#endif
 
   assert( ucFiltIdx <= 1 );

branches/HTM-5.1-dev0/source/Lib/TLibCommon/TComPattern.h

@@ -115 +115 @@
 #endif
 
-#if LOGI_INTRA_NAME_3MPM
   static const UChar m_aucIntraFilter[5];
-#else
-  static const UChar m_aucIntraFilter[5][NUM_INTRA_MODE];
-#endif
   
 public:

branches/HTM-5.1-dev0/source/Lib/TLibCommon/TComPic.cpp

@@ -316 +316 @@
     m_pbValidSlice[s] = true;
   }
-#if !LCU_SYNTAX_ALF
-  if( pSliceStartAddress == NULL || (numSlices == 1 && numTiles == 1) )
-  {
-    return;
-  }
-#endif
   m_pSliceSUMap = new Int[maxNumSUInLCU * numLCUInPic];
 

branches/HTM-5.1-dev0/source/Lib/TLibCommon/TComPicSym.h

@@ -133 +133 @@
   UInt        getNumPartInWidth()       { return m_uiNumPartInWidth;            }
   UInt        getNumPartInHeight()      { return m_uiNumPartInHeight;           }
-#if !REMOVE_TILE_DEPENDENCE
-  Void         setTileBoundaryIndependenceIdr( Int i )               { m_iTileBoundaryIndependenceIdr = i; }
-  Int          getTileBoundaryIndependenceIdr()                      { return m_iTileBoundaryIndependenceIdr; }
-#endif
   Void         setNumColumnsMinus1( Int i )                          { m_iNumColumnsMinus1 = i; }
   Int          getNumColumnsMinus1()                                 { return m_iNumColumnsMinus1; }  

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

@@ -203 +203 @@
 
   // Map the mode index to main prediction direction and angle
-#if LOGI_INTRA_NAME_3MPM
   assert( dirMode > 0 ); //no planar
   Bool modeDC        = dirMode < 2;
@@ -209 +208 @@
   Bool modeVer       = !modeDC && !modeHor;
   Int intraPredAngle = modeVer ? (Int)dirMode - VER_IDX : modeHor ? -((Int)dirMode - HOR_IDX) : 0;
-#else
-  Bool modeDC        = dirMode == 0;
-  Bool modeVer       = !modeDC && (dirMode < 18);
-  Bool modeHor       = !modeDC && !modeVer;
-  Int intraPredAngle = modeVer ? dirMode - 9 : modeHor ? dirMode - 25 : 0;
-#endif
   Int absAng         = abs(intraPredAngle);
   Int signAng        = intraPredAngle < 0 ? -1 : 1;
@@ -297 +290 @@
         for (k=0;k<blkSize;k++)
         {
-#if REMOVE_DIV_OPERATION
           pDst[k*dstStride] = Clip ( pDst[k*dstStride] + (( refSide[k+1] - refSide[0] ) >> 1) );
-#else
-          pDst[k*dstStride] = Clip ( pDst[k*dstStride] + ( refSide[k+1] - refSide[0] ) / 2 );
-#endif
         }
       }
@@ -376 +365 @@
   else
   {
-#if LOGI_INTRA_NAME_3MPM
     xPredIntraAng( ptrSrc+sw+1, sw, pDst, uiStride, iWidth, iHeight, uiDirMode, bAbove, bLeft, true );
-#else
-    xPredIntraAng( ptrSrc+sw+1, sw, pDst, uiStride, iWidth, iHeight, g_aucAngIntraModeOrder[ uiDirMode ], bAbove, bLeft, true );
-#endif
 
     if( (uiDirMode == DC_IDX ) && bAbove && bLeft )
@@ -405 +390 @@
   {
     // Create the prediction
-#if LOGI_INTRA_NAME_3MPM
     xPredIntraAng( ptrSrc+sw+1, sw, pDst, uiStride, iWidth, iHeight, uiDirMode, bAbove, bLeft, false );
-#else
-    xPredIntraAng( ptrSrc+sw+1, sw, pDst, uiStride, iWidth, iHeight, g_aucAngIntraModeOrder[ uiDirMode ], bAbove, bLeft, false );
-#endif
   }
 }
@@ -3390 +3371 @@
 
   // 2nd step: derive wedge direction
-#if LOGI_INTRA_NAME_3MPM
   Int uiPreds[3] = {-1, -1, -1};
-#else
-  Int uiPreds[2] = {-1, -1};
-#endif
   Int iMode = -1;
   Int iPredNum = pcCU->getIntraDirLumaPredictor( uiAbsPartIdx, uiPreds, &iMode );  
 
   UInt uiDirMode = 0;
-#if LOGI_INTRA_NAME_3MPM
   if( iMode >= 0 ) { iPredNum = iMode; }
   if( iPredNum == 1 ) { uiDirMode = uiPreds[0]; }
@@ -3409 +3385 @@
   Bool modeVer       = !modeHor;
   Int intraPredAngle = modeVer ? (Int)uiDirMode - VER_IDX : modeHor ? -((Int)uiDirMode - HOR_IDX) : 0;
-#else
-  if( iPredNum == 1 ) { uiDirMode = g_aucAngIntraModeOrder[uiPreds[0]]; }
-  if( iPredNum == 2 ) { uiDirMode = g_aucAngIntraModeOrder[uiPreds[1]]; }
-
-  if( uiDirMode == 0 ) {  return false; } // no DC
-
-  Bool modeVer       = (uiDirMode < 18);
-  Bool modeHor       = !modeVer;
-  Int intraPredAngle = modeVer ? uiDirMode - 9 : modeHor ? uiDirMode - 25 : 0;
-#endif
   Int absAng         = abs(intraPredAngle);
   Int signAng        = intraPredAngle < 0 ? -1 : 1;
@@ -3737 +3703 @@
   Int*  ptrSrc  = pcTComPattern->getAdiOrgBuf( iWidth, iHeight, m_piYuvExt );
   Int   sw      = ( iWidth<<1 ) + 1;
-#if !LOGI_INTRA_NAME_3MPM
-  uiDirMode     = g_aucAngIntraModeOrder[ uiDirMode ];
-#endif
   xPredIntraAngDepth( ptrSrc+sw+1, sw, pDst, uiStride, iWidth, iHeight, uiDirMode );
 }

branches/HTM-5.1-dev0/source/Lib/TLibCommon/TComResidualGenerator.cpp

@@ -415 +415 @@
 #endif
   pcCU->convertTransIdx             ( 0, pcCU->getTransformIdx( 0 ), uiLumaTrMode, uiChromaTrMode );
-#if H0736_AVC_STYLE_QP_RANGE
     m_pcTrQuant->setQPforQuant      ( pcCU->getQP( 0 ), !pcCU->getSlice()->getDepth(), pcCU->getSlice()->getSliceType(), TEXT_LUMA, pcCU->getSlice()->getSPS()->getQpBDOffsetY(), 0 );
-#else
-    m_pcTrQuant->setQPforQuant      ( pcCU->getQP( 0 ), !pcCU->getSlice()->getDepth(), pcCU->getSlice()->getSliceType(), TEXT_LUMA, 0 );
-#endif
   m_pcTrQuant->invRecurTransformNxN ( pcCU, 0, TEXT_LUMA, pRes, 0, pcCUResidual->getStride(), uiWidth, uiHeight, uiLumaTrMode, 0, piCoeff );
   // chroma Cb
@@ -426 +422 @@
   piCoeff     = pcCU->getCoeffCb();
   pRes        = pcCUResidual->getCbAddr();
-#if H0736_AVC_STYLE_QP_RANGE
     m_pcTrQuant->setQPforQuant      ( pcCU->getQP( 0 ), !pcCU->getSlice()->getDepth(), pcCU->getSlice()->getSliceType(), TEXT_CHROMA, pcCU->getSlice()->getSPS()->getQpBDOffsetC(), pcCU->getSlice()->getPPS()->getChromaQpOffset() );
-#else
-    m_pcTrQuant->setQPforQuant      ( pcCU->getQP( 0 ), !pcCU->getSlice()->getDepth(), pcCU->getSlice()->getSliceType(), TEXT_CHROMA, pcCU->getSlice()->getSPS()->getQpBDOffsetC() );
-#endif
   m_pcTrQuant->invRecurTransformNxN ( pcCU, 0, TEXT_CHROMA_U, pRes, 0, pcCUResidual->getCStride(), uiWidth, uiHeight, uiChromaTrMode, 0, piCoeff );
   // chroma Cr

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

@@ -417 +417 @@
 };
 
-#if !LOGI_INTRA_NAME_3MPM
-// Mapping each Unified Directional Intra prediction direction to DCT/DST transform 
-// 0 implies use DCT, 1 implies DST
-
-#if HHI_DMM_WEDGE_INTRA || HHI_DMM_PRED_TEX
-const UChar g_aucDCTDSTMode_Vert[NUM_INTRA_MODE+NUM_DMM_MODE] =
-#else
-const UChar g_aucDCTDSTMode_Vert[NUM_INTRA_MODE] =
-#endif
-{ //0  1  2  3  4  5  6  7  8  9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35
-  1, 1, 0, 0, 1, 1, 1, 1, 1, 0, 0, 1, 1, 1, 1, 1, 1, 0, 0, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 0, 0, 0, 0, 0
-#if HHI_DMM_WEDGE_INTRA && HHI_DMM_PRED_TEX
-  , 0, 0, 0, 0, 0, 0, 0, 0
-#elif HHI_DMM_WEDGE_INTRA || HHI_DMM_PRED_TEX
-  , 0, 0, 0, 0
-#endif
-};
-#if HHI_DMM_WEDGE_INTRA || HHI_DMM_PRED_TEX
-const UChar g_aucDCTDSTMode_Hor[NUM_INTRA_MODE+NUM_DMM_MODE] =
-#else
-const UChar g_aucDCTDSTMode_Hor[NUM_INTRA_MODE] =
-#endif
-{ //0  1  2  3  4  5  6  7  8  9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35
-  1, 0, 1, 0, 1, 1, 0, 0, 1, 1, 1, 1, 1, 0, 0, 1, 1, 1, 1, 1, 1, 1, 1, 0, 0, 0, 0, 1, 1, 1, 1, 1, 1, 1, 1, 0
-#if HHI_DMM_WEDGE_INTRA && HHI_DMM_PRED_TEX
-  , 0, 0, 0, 0, 0, 0, 0, 0
-#elif HHI_DMM_WEDGE_INTRA || HHI_DMM_PRED_TEX
-  , 0, 0, 0, 0
-#endif
-};
-#endif
 
 
@@ -482 +451 @@
 const UChar g_aucConvertTxtTypeToIdx[4] = { 0, 1, 1, 2 };
 
-#if !LOGI_INTRA_NAME_3MPM
-// ====================================================================================================================
-// Angular Intra prediction
-// ====================================================================================================================
-
-// g_aucAngIntraModeOrder
-//   Indexing this array with the mode indicated in the bitstream
-//   gives a logical index used in the prediction functions.
-const UChar g_aucAngIntraModeOrder[NUM_INTRA_MODE] =
-{     //  ModeOrder LogicalOrderInPredFunctions
-  34, //  PLANAR_IDX PLANAR PLANAR
-  9,  //  0 VER     DC
-  25, //  1 HOR     VER-8 (diagonal from top-left to bottom-right = HOR-8)
-  0,  //  2 DC      VER-7
-  1,  //  4 VER-8   VER-6
-  5,  //  5 VER-4   VER-5
-  13, //  6 VER+4   VER-4
-  17, //  7 VER+8   VER-3
-  21, //  8 HOR-4   VER-2
-  29, //  9 HOR+4   VER-1
-  33, // 10 HOR+8   VER
-  3,  // 11 VER-6   VER+1
-  7,  // 12 VER-2   VER+2
-  11, // 13 VER+2   VER+3
-  15, // 14 VER+6   VER+4
-  19, // 15 HOR-6   VER+5
-  23, // 16 HOR-2   VER+6
-  27, // 17 HOR+2   VER+7
-  31, // 18 HOR+6   VER+8
-  2,  // 19 VER-7   HOR-7
-  4,  // 20 VER-5   HOR-6
-  6,  // 21 VER-3   HOR-5
-  8,  // 22 VER-1   HOR-4
-  10, // 23 VER+1   HOR-3
-  12, // 24 VER+3   HOR-2
-  14, // 25 VER+5   HOR-1
-  16, // 26 VER+7   HOR
-  18, // 27 HOR-7   HOR+1
-  20, // 28 HOR-5   HOR+2
-  22, // 29 HOR-3   HOR+3
-  24, // 30 HOR-1   HOR+4
-  26, // 31 HOR+1   HOR+5
-  28, // 32 HOR+3   HOR+6
-  30, // 33 HOR+5   HOR+7
-  32, // 34 HOR+7   HOR+8
-  0, // LM_CHROMA_IDX 
-};
-
-const UChar g_aucIntraModeNumAng[7] =
-{
-  4,  //   2x2
-  18,  //   4x4
-  35,  //   8x8
-  35,  //  16x16
-  35,  //  32x32
-  35,  //  64x64
-  6   // 128x128
-};
-
-const UChar g_aucIntraModeBitsAng[7] =
-{
-  2,  //   2x2     3   1+1
-  5,  //   4x4    17   4+1
-  6,  //   8x8    34   5+esc
-  6,  //  16x16   34   5+esc
-  6,  //  32x32   34   5+esc
-  6,  //  64x64   34   5+esc
-  3   // 128x128   5   2+1
-};
-#endif
 
 // ====================================================================================================================
@@ -647 +546 @@
 };
 
-#if MULTILEVEL_SIGMAP_EXT
 const UInt g_sigLastScan8x8[ 4 ][ 4 ] =
 {
@@ -656 +554 @@
 };
 UInt g_sigLastScanCG32x32[ 64 ];
-#endif
 
 UInt* g_auiNonSquareSigLastScan[ 4 ];
@@ -662 +559 @@
 const UInt g_uiMinInGroup[ 10 ] = {0,1,2,3,4,6,8,12,16,24};
 const UInt g_uiGroupIdx[ 32 ]   = {0,1,2,3,4,4,5,5,6,6,6,6,7,7,7,7,8,8,8,8,8,8,8,8,9,9,9,9,9,9,9,9};
-#if LAST_CTX_REDUCTION
 const UInt g_uiLastCtx[ 28 ]    = 
 {
@@ -670 +566 @@
   10, 11, 12, 12, 13, 13, 14, 14, 2, 2    // 32x32  10
 };
-#else
-const UInt g_uiLastCtx[ 28 ]    = 
-{
-  0,   1,  2,  2,                         // 4x4    4
-  3,   4,  5,  5, 6,  6,                  // 8x8    6  
-  7,   8,  9,  9, 10, 10, 11, 11,         // 16x16  8
-  12, 13, 14, 14, 15, 15, 16, 16, 17, 17  // 32x32  10
-};
-#endif
 
 // Rice parameters for absolute transform levels
-#if EIGHT_BITS_RICE_CODE
 const UInt g_auiGoRiceRange[5] =
 {
@@ -691 +577 @@
   8, 7, 6, 5, 4
 };
-#else
-const UInt g_auiGoRiceRange[4] =
-{
-  7, 20, 42, 70
-};
-
-const UInt g_auiGoRicePrefixLen[4] =
-{
-  8, 10, 10, 8
-};
-#endif
-
-#if EIGHT_BITS_RICE_CODE
+
 const UInt g_aauiGoRiceUpdate[5][24] =
 {
-#if RESTRICT_GR1GR2FLAG_NUMBER
   {
     0, 0, 0, 1, 1, 1, 2, 2, 2, 2, 2, 2, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 4
@@ -722 +595 @@
     4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4
   }
-#else
-  {
-    0, 0, 1, 1, 1, 2, 2, 2, 2, 2, 2, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 4
-  },
-  {
-    1, 1, 1, 1, 1, 2, 2, 2, 2, 2, 2, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 4
-  },
-  {
-    2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 4
-  },
-  {
-    3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 4
-  },
-  {
-    4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4
-  }
-#endif
-};
-#else
-const UInt g_aauiGoRiceUpdate[4][16] =
-{
-#if RESTRICT_GR1GR2FLAG_NUMBER
-  {
-    0, 0, 0, 1, 1, 1, 2, 2, 2, 2, 2, 2, 3, 3, 3, 3,
-  },
-  { 
-    1, 1, 1, 1, 1, 1, 2, 2, 2, 2, 2, 2, 3, 3, 3, 3,
-  },
-  { 
-    2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 3, 3, 3, 3,
-  },
-  { 
-    3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 
-  }
-#else  
-  {
-    0, 0, 1, 1, 1, 2, 2, 2, 2, 2, 2, 3, 3, 3, 3, 3
-  },
-  {
-    1, 1, 1, 1, 1, 2, 2, 2, 2, 2, 2, 3, 3, 3, 3, 3
-  },
-  {
-    2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 3, 3, 3, 3, 3
-  },
-  {
-    3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3
-  }
-#endif
-};
-#endif
+};
 
 // initialize g_auiFrameScanXY
@@ -825 +649 @@
   if( iWidth < 16 )
   {
-#if MULTILEVEL_SIGMAP_EXT
   UInt* pBuffTemp = pBuffD;
   if( iWidth == 8 )
@@ -831 +654 @@
     pBuffTemp = g_sigLastScanCG32x32;
   }
-#endif
   for( UInt uiScanLine = 0; uiNextScanPos < uiNumScanPos; uiScanLine++ )
   {
@@ -843 +665 @@
     while( iPrimDim >= 0 && iScndDim < iWidth )
     {
-#if MULTILEVEL_SIGMAP_EXT
       pBuffTemp[ uiNextScanPos ] = iPrimDim * iWidth + iScndDim ;
-#else
-      pBuffD[ uiNextScanPos ] = iPrimDim * iWidth + iScndDim ;
-#endif
       uiNextScanPos++;
       iScndDim++;
@@ -854 +672 @@
   }
   }
-#if MULTILEVEL_SIGMAP_EXT
   if( iWidth > 4 )
-#else
-  else
-#endif
   {
     UInt uiNumBlkSide = iWidth >> 2;
@@ -868 +682 @@
       uiNextScanPos   = 0;
       UInt initBlkPos = g_auiSigLastScan[ SCAN_DIAG ][ log2Blk ][ uiBlk ];
-#if MULTILEVEL_SIGMAP_EXT
       if( iWidth == 32 )
       {
         initBlkPos = g_sigLastScanCG32x32[ uiBlk ];
       }
-#endif
       UInt offsetY    = initBlkPos / uiNumBlkSide;
       UInt offsetX    = initBlkPos - offsetY * uiNumBlkSide;
@@ -1000 +812 @@
 }
 
-#if SCALING_LIST
 Int g_quantIntraDefault4x4[16] =
 {
@@ -1039 +850 @@
   24,25,28,33,41,54,71,91
 };
-#else
-Int g_quantIntraDefault4x4[16] =
-{
-   6,13,20,28,
-  13,20,28,32,
-  20,28,32,37,
-  28,32,37,42
-};
-Int g_quantInterDefault4x4[16] =
-{
-  10,14,20,24,
-  14,20,24,27,
-  20,24,27,30,
-  24,27,30,34
-};
-
-Int g_quantIntraDefault8x8[64] =
-{
-   6,10,13,16,18,23,25,27,
-  10,11,16,18,23,25,27,29,
-  13,16,18,23,25,27,29,31,
-  16,18,23,25,27,29,31,33,
-  18,23,25,27,29,31,33,36,
-  23,25,27,29,31,33,36,38,
-  25,27,29,31,33,36,38,40,
-  27,29,31,33,36,38,40,42
-};
-
-Int g_quantInterDefault8x8[64] =
-{
-   9,13,15,17,19,21,22,24,
-  13,13,17,19,21,22,24,25,
-  15,17,19,21,22,24,25,27,
-  17,19,21,22,24,25,27,28,
-  19,21,22,24,25,27,28,30,
-  21,22,24,25,27,28,30,32,
-  22,24,25,27,28,30,32,33,
-  24,25,27,28,30,32,33,35
-};
-
-Int g_quantIntraDefault16x16[256] =
-{
-  16,16,16,16,16,16,16,16,17,17,18,19,21,22,24,27,
-  16,16,16,16,16,16,16,16,17,18,18,20,21,23,25,27,
-  16,16,16,16,16,16,16,17,17,18,19,20,22,23,25,28,
-  16,16,16,16,16,16,17,17,18,19,20,21,23,25,27,29,
-  16,16,16,16,17,17,18,19,20,21,22,23,25,27,29,31,
-  16,16,16,16,17,18,19,20,22,23,24,26,27,29,32,34,
-  16,16,16,17,18,19,21,23,24,25,27,29,31,33,36,39,
-  16,16,17,17,19,20,23,25,27,29,31,33,35,38,41,44,
-  17,17,17,18,20,22,24,27,30,32,35,38,41,44,47,51,
-  17,18,18,19,21,23,25,29,32,36,40,43,47,51,55,60,
-  18,18,19,20,22,24,27,31,35,40,44,49,54,59,65,70,
-  19,20,20,21,23,26,29,33,38,43,49,56,62,69,75,82,
-  21,21,22,23,25,27,31,35,41,47,54,62,70,79,88,97,
-  22,23,23,25,27,29,33,38,44,51,59,69,79,90,101,113,
-  24,25,25,27,29,32,36,41,47,55,65,75,88,101,115,130,
-  27,27,28,29,31,34,39,44,51,60,70,82,97,113,130,149
-};
-
-Int g_quantInterDefault16x16[256] =
-{
-  16,16,16,16,16,16,16,16,17,17,18,19,20,21,22,27,
-  16,16,16,16,16,16,16,17,17,18,19,20,21,22,27,27,
-  16,16,16,16,16,16,17,17,18,19,20,21,22,27,27,28,
-  16,16,16,16,16,17,17,18,19,20,21,22,27,27,28,29,
-  16,16,16,16,17,17,18,19,20,21,22,27,27,28,29,30,
-  16,16,16,17,17,18,19,20,21,22,27,27,28,29,30,32,
-  16,16,17,17,18,19,20,21,22,27,27,28,29,30,32,36,
-  16,17,17,18,19,20,21,22,27,27,28,29,30,32,36,40,
-  17,17,18,19,20,21,22,27,27,28,29,30,32,36,40,45,
-  17,18,19,20,21,22,27,27,28,29,30,32,36,40,45,52,
-  18,19,20,21,22,27,27,28,29,30,32,36,40,45,52,59,
-  19,20,21,22,27,27,28,29,30,32,36,40,45,52,59,68,
-  20,21,22,27,27,28,29,30,32,36,40,45,52,59,68,79,
-  21,22,27,27,28,29,30,32,36,40,45,52,59,68,79,91,
-  22,27,27,28,29,30,32,36,40,45,52,59,68,79,91,103,
-  27,27,28,29,30,32,36,40,45,52,59,68,79,91,103,117
-};
-
-Int g_quantIntraDefault32x32[1024] =
-{
-  16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,17,17,17,18,18,19,19,20,21,22,22,23,24,25,27,28,
-  16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,17,17,17,18,18,19,19,20,21,22,23,23,24,25,27,28,
-  16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,17,17,17,18,18,18,19,20,20,21,22,23,24,25,26,27,28,
-  16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,17,17,17,18,18,19,19,20,21,21,22,23,24,25,26,27,28,
-  16,16,16,16,16,16,16,16,16,16,16,16,16,16,17,17,17,18,18,19,19,20,20,21,22,23,23,24,25,26,28,29,
-  16,16,16,16,16,16,16,16,16,16,16,16,16,17,17,17,18,18,18,19,19,20,21,21,22,23,24,25,26,27,28,30,
-  16,16,16,16,16,16,16,16,16,16,16,17,17,17,17,18,18,19,19,20,20,21,21,22,23,24,25,26,27,28,29,30,
-  16,16,16,16,16,16,16,16,16,17,17,17,17,18,18,18,19,19,20,20,21,21,22,23,24,25,26,27,28,29,30,31,
-  16,16,16,16,16,16,16,16,17,17,17,18,18,18,19,19,20,20,21,21,22,22,23,24,25,26,27,28,29,30,31,33,
-  16,16,16,16,16,16,16,17,17,17,18,18,19,19,20,20,20,21,22,22,23,23,24,25,26,27,28,29,30,31,33,34,
-  16,16,16,16,16,16,16,17,17,18,18,19,19,20,20,21,22,22,23,23,24,25,26,26,27,28,29,30,32,33,34,36,
-  16,16,16,16,16,16,17,17,18,18,19,20,20,21,21,22,23,23,24,25,25,26,27,28,29,30,31,32,33,35,36,38,
-  16,16,16,16,16,16,17,17,18,19,19,20,21,22,23,23,24,25,25,26,27,28,29,30,31,32,33,34,36,37,39,40,
-  16,16,16,16,16,17,17,18,18,19,20,21,22,23,24,24,25,26,27,28,29,30,31,32,33,34,35,37,38,39,41,43,
-  16,16,16,16,17,17,17,18,19,20,20,21,23,24,25,26,27,28,29,30,31,32,33,34,35,36,38,39,41,42,44,46,
-  16,16,17,17,17,17,18,18,19,20,21,22,23,24,26,27,28,29,31,32,33,34,35,37,38,39,41,42,44,45,47,49,
-  17,17,17,17,17,18,18,19,20,20,22,23,24,25,27,28,30,31,32,34,35,36,38,39,41,42,44,45,47,49,51,53,
-  17,17,17,17,18,18,19,19,20,21,22,23,25,26,28,29,31,33,34,36,37,39,41,42,44,45,47,49,51,53,55,57,
-  17,17,18,18,18,18,19,20,21,22,23,24,25,27,29,31,32,34,36,38,40,42,43,45,47,49,51,53,55,57,60,62,
-  18,18,18,18,19,19,20,20,21,22,23,25,26,28,30,32,34,36,38,40,42,44,46,48,51,53,55,57,60,62,65,67,
-  18,18,18,19,19,19,20,21,22,23,24,25,27,29,31,33,35,37,40,42,44,47,49,52,54,57,59,62,65,67,70,73,
-  19,19,19,19,20,20,21,21,22,23,25,26,28,30,32,34,36,39,42,44,47,50,52,55,58,61,64,67,70,73,76,79,
-  19,19,20,20,20,21,21,22,23,24,26,27,29,31,33,35,38,41,43,46,49,52,56,59,62,65,69,72,75,79,82,86,
-  20,20,20,21,21,21,22,23,24,25,26,28,30,32,34,37,39,42,45,48,52,55,59,62,66,70,74,77,81,85,89,93,
-  21,21,21,21,22,22,23,24,25,26,27,29,31,33,35,38,41,44,47,51,54,58,62,66,70,74,79,83,88,92,97,101,
-  22,22,22,22,23,23,24,25,26,27,28,30,32,34,36,39,42,45,49,53,57,61,65,70,74,79,84,89,94,99,104,110,
-  22,23,23,23,23,24,25,26,27,28,29,31,33,35,38,41,44,47,51,55,59,64,69,74,79,84,90,95,101,107,113,119,
-  23,23,24,24,24,25,26,27,28,29,30,32,34,37,39,42,45,49,53,57,62,67,72,77,83,89,95,101,108,114,121,128,
-  24,24,25,25,25,26,27,28,29,30,32,33,36,38,41,44,47,51,55,60,65,70,75,81,88,94,101,108,115,122,130,138,
-  25,25,26,26,26,27,28,29,30,31,33,35,37,39,42,45,49,53,57,62,67,73,79,85,92,99,107,114,122,131,139,148,
-  27,27,27,27,28,28,29,30,31,33,34,36,39,41,44,47,51,55,60,65,70,76,82,89,97,104,113,121,130,139,149,159,
-  28,28,28,28,29,30,30,31,33,34,36,38,40,43,46,49,53,57,62,67,73,79,86,93,101,110,119,128,138,148,159,170
-};
-
-Int g_quantInterDefault32x32[1024] =
-{
-  16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,17,17,17,18,18,19,19,20,21,22,22,23,24,25,26,28,
-  16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,17,17,17,18,18,19,19,20,21,22,22,23,24,25,26,28,28,
-  16,16,16,16,16,16,16,16,16,16,16,16,16,16,17,17,17,18,18,19,19,20,21,22,22,23,24,25,26,28,28,28,
-  16,16,16,16,16,16,16,16,16,16,16,16,16,17,17,17,18,18,19,19,20,21,22,22,23,24,25,26,28,28,28,28,
-  16,16,16,16,16,16,16,16,16,16,16,16,17,17,17,18,18,19,19,20,21,22,22,23,24,25,26,28,28,28,28,29,
-  16,16,16,16,16,16,16,16,16,16,16,17,17,17,18,18,19,19,20,21,22,22,23,24,25,26,28,28,28,28,29,30,
-  16,16,16,16,16,16,16,16,16,16,17,17,17,18,18,19,19,20,21,22,22,23,24,25,26,28,28,28,28,29,30,30,
-  16,16,16,16,16,16,16,16,16,17,17,17,18,18,19,19,20,21,22,22,23,24,25,26,28,28,28,28,29,30,30,31,
-  16,16,16,16,16,16,16,16,17,17,17,18,18,19,19,20,21,22,22,23,24,25,26,28,28,28,28,29,30,30,31,32,
-  16,16,16,16,16,16,16,17,17,17,18,18,19,19,20,21,22,22,23,24,25,26,28,28,28,28,29,30,30,31,32,33,
-  16,16,16,16,16,16,17,17,17,18,18,19,19,20,21,22,22,23,24,25,26,28,28,28,28,29,30,30,31,32,33,34,
-  16,16,16,16,16,17,17,17,18,18,19,19,20,21,22,22,23,24,25,26,28,28,28,28,29,30,30,31,32,33,34,35,
-  16,16,16,16,17,17,17,18,18,19,19,20,21,22,22,23,24,25,26,28,28,28,28,29,30,30,31,32,33,34,35,36,
-  16,16,16,17,17,17,18,18,19,19,20,21,22,22,23,24,25,26,28,28,28,28,29,30,30,31,32,33,34,35,36,38,
-  16,16,17,17,17,18,18,19,19,20,21,22,22,23,24,25,26,28,28,28,28,29,30,30,31,32,33,34,35,36,38,40,
-  16,17,17,17,18,18,19,19,20,21,22,22,23,24,25,26,28,28,28,28,29,30,30,31,32,33,34,35,36,38,40,42,
-  17,17,17,18,18,19,19,20,21,22,22,23,24,25,26,28,28,28,28,29,30,30,31,32,33,34,35,36,38,40,42,45,
-  17,17,18,18,19,19,20,21,22,22,23,24,25,26,28,28,28,28,29,30,30,31,32,33,34,35,36,38,40,42,45,48,
-  17,18,18,19,19,20,21,22,22,23,24,25,26,28,28,28,28,29,30,30,31,32,33,34,35,36,38,40,42,45,48,52,
-  18,18,19,19,20,21,22,22,23,24,25,26,28,28,28,28,29,30,30,31,32,33,34,35,36,38,40,42,45,48,52,56,
-  18,19,19,20,21,22,22,23,24,25,26,28,28,28,28,29,30,30,31,32,33,34,35,36,38,40,42,45,48,52,56,60,
-  19,19,20,21,22,22,23,24,25,26,28,28,28,28,29,30,30,31,32,33,34,35,36,38,40,42,45,48,52,56,60,64,
-  19,20,21,22,22,23,24,25,26,28,28,28,28,29,30,30,31,32,33,34,35,36,38,40,42,45,48,52,56,60,64,69,
-  20,21,22,22,23,24,25,26,28,28,28,28,29,30,30,31,32,33,34,35,36,38,40,42,45,48,52,56,60,64,69,74,
-  21,22,22,23,24,25,26,28,28,28,28,29,30,30,31,32,33,34,35,36,38,40,42,45,48,52,56,60,64,69,74,80,
-  22,22,23,24,25,26,28,28,28,28,29,30,30,31,32,33,34,35,36,38,40,42,45,48,52,56,60,64,69,74,80,87,
-  22,23,24,25,26,28,28,28,28,29,30,30,31,32,33,34,35,36,38,40,42,45,48,52,56,60,64,69,74,80,87,94,
-  23,24,25,26,28,28,28,28,29,30,30,31,32,33,34,35,36,38,40,42,45,48,52,56,60,64,69,74,80,87,94,101,
-  24,25,26,28,28,28,28,29,30,30,31,32,33,34,35,36,38,40,42,45,48,52,56,60,64,69,74,80,87,94,101,108,
-  25,26,28,28,28,28,29,30,30,31,32,33,34,35,36,38,40,42,45,48,52,56,60,64,69,74,80,87,94,101,108,115,
-  26,28,28,28,28,29,30,30,31,32,33,34,35,36,38,40,42,45,48,52,56,60,64,69,74,80,87,94,101,108,115,123,
-  28,28,28,28,29,30,30,31,32,33,34,35,36,38,40,42,45,48,52,56,60,64,69,74,80,87,94,101,108,115,123,131
-};
-#endif
 UInt g_scalingListSize   [4] = {16,64,256,1024}; 
 UInt g_scalingListSizeX  [4] = { 4, 8, 16,  32};

branches/HTM-5.1-dev0/source/Lib/TLibCommon/TComRom.h

@@ -135 +135 @@
 extern const UInt   g_uiLastCtx[ 28 ];
 
-#if EIGHT_BITS_RICE_CODE
 extern const UInt   g_auiGoRiceRange[5];                  //!< maximum value coded with Rice codes
 extern const UInt   g_auiGoRicePrefixLen[5];              //!< prefix length for each maximum value
 extern const UInt   g_aauiGoRiceUpdate[5][24];            //!< parameter update rules for Rice codes
-#else
-extern const UInt   g_auiGoRiceRange[4];                  //!< maximum value coded with Rice codes
-extern const UInt   g_auiGoRicePrefixLen[4];              //!< prefix length for each maximum value
-extern const UInt   g_aauiGoRiceUpdate[4][16];            //!< parameter update rules for Rice codes
-#endif
   
-#if MULTILEVEL_SIGMAP_EXT
 extern const UInt   g_sigLastScan8x8[ 4 ][ 4 ];           //!< coefficient group scan order for 8x8 TUs
 extern       UInt   g_sigLastScanCG32x32[ 64 ];
-#endif
 
 // ====================================================================================================================
@@ -214 +206 @@
 Void addWedgeletToList( TComWedgelet cWedgelet, std::vector<TComWedgelet> &racWedgeList, std::vector<TComWedgeRef> &racWedgeRefList );
 
-#if DEFAULT_DC
 __inline Void mapDMMtoIntraMode(  UInt& dirMode ) { dirMode = (dirMode >= NUM_INTRA_MODE) ? DC_IDX : dirMode; }
 __inline Void mapDMMtoIntraMode(   Int& dirMode ) { dirMode = (dirMode >= NUM_INTRA_MODE) ? DC_IDX : dirMode; }
-#else
-__inline Void mapDMMtoIntraMode(  UInt& dirMode ) { dirMode = (dirMode >= NUM_INTRA_MODE) ? PLANAR_IDX : dirMode; }
-__inline Void mapDMMtoIntraMode(   Int& dirMode ) { dirMode = (dirMode >= NUM_INTRA_MODE) ? PLANAR_IDX : dirMode; }
-#endif
 #endif
 
@@ -287 +274 @@
 #define MAX_MATRIX_COEF_NUM 64     ///< max coefficient number for quantization matrix
 #define MAX_MATRIX_SIZE_NUM 8      ///< max size number for quantization matrix
-#if SCALING_LIST
 #define SCALING_LIST_DC 16         ///< default DC value
-#endif
 enum ScalingListDIR
 {
@@ -336 +321 @@
   },
 };
-#if SCALING_LIST
 static const char MatrixType_DC[4][12][22] =
 {
@@ -356 +340 @@
   },
 };
-#endif
 extern Int g_quantIntraDefault4x4[16];
 extern Int g_quantIntraDefault8x8[64];

branches/HTM-5.1-dev0/source/Lib/TLibCommon/TComSampleAdaptiveOffset.cpp

@@ -66 +66 @@
   m_pClipTable = NULL;
   m_pClipTableBase = NULL;
-#if SAO_UNIT_INTERLEAVING
   m_lumaTableBo = NULL;
-#else
-  m_ppLumaTableBo0 = NULL;
-  m_ppLumaTableBo1 = NULL;
-#endif
   m_iUpBuff1 = NULL;
   m_iUpBuff2 = NULL;
@@ -136 +131 @@
   2,
   2,
-#if !SAO_UNIT_INTERLEAVING
-  1,
-#endif
   1
 };
@@ -161 +153 @@
   SAO_EO_LEN,
   SAO_EO_LEN,
-#if !SAO_UNIT_INTERLEAVING
-  SAO_BO_LEN,
-#endif
   SAO_BO_LEN
 };
@@ -259 +248 @@
    * m_iNumTotalParts must allow for sufficient storage in any allocated arrays */
   m_iNumTotalParts  = max(3,m_aiNumCulPartsLevel[m_uiMaxSplitLevel]);
-#if !SAO_UNIT_INTERLEAVING
-  UInt auiTable[2][LUMA_GROUP_NUM] = 
-  {{0, 0, 0, 0, 0, 0, 0, 0,
-  1, 2, 3, 4, 5, 6, 7, 8,
-  9,10,11,12,13,14,15,16,
-  0, 0, 0, 0, 0, 0, 0, 0},
-
-  {1, 2, 3, 4, 5, 6, 7, 8,
-  0, 0, 0, 0, 0, 0, 0, 0,
-  0, 0, 0, 0, 0, 0, 0, 0,
-  9,10,11,12,13,14,15,16}};
-#endif
 
   UInt uiInternalBitDepth = g_uiBitDepth+g_uiBitIncrement;
@@ -276 +253 @@
   UInt uiBoRangeShift = uiInternalBitDepth - SAO_BO_BITS;
 
-#if SAO_UNIT_INTERLEAVING
   m_lumaTableBo = new Pel [uiPixelRange];
   for (Int k2=0; k2<uiPixelRange; k2++)
@@ -282 +258 @@
     m_lumaTableBo[k2] = 1 + (k2>>uiBoRangeShift);
   }
-#else
-  m_ppLumaTableBo0 = new Pel [uiPixelRange];
-  m_ppLumaTableBo1 = new Pel [uiPixelRange];
-  for (Int k2=0; k2<uiPixelRange; k2++)
-  {
-    m_ppLumaTableBo0[k2] = auiTable[0][k2>>uiBoRangeShift];
-    m_ppLumaTableBo1[k2] = auiTable[1][k2>>uiBoRangeShift];
-  }
-#endif
   m_iUpBuff1 = new Int[m_iPicWidth+2];
   m_iUpBuff2 = new Int[m_iPicWidth+2];
@@ -345 +312 @@
     delete [] m_iOffsetBo; m_iOffsetBo = NULL;
   }
-#if SAO_UNIT_INTERLEAVING
   if (m_lumaTableBo)
   {
     delete[] m_lumaTableBo; m_lumaTableBo = NULL;
   }
-#else
-  if (m_ppLumaTableBo0)
-  {
-    delete[] m_ppLumaTableBo0; m_ppLumaTableBo0 = NULL;
-  }
-  if (m_ppLumaTableBo1)
-  {
-    delete[] m_ppLumaTableBo1; m_ppLumaTableBo1 = NULL;
-  }
-#endif
 
 
@@ -416 +372 @@
     pcSaoParam->iNumClass[j] = m_iNumClass[j];
   }
-#if SAO_UNIT_INTERLEAVING
   pcSaoParam->numCuInWidth  = m_iNumCuInWidth;
   pcSaoParam->numCuInHeight = m_iNumCuInHeight;
@@ -422 +377 @@
   pcSaoParam->saoLcuParam[1] = new SaoLcuParam [m_iNumCuInHeight*m_iNumCuInWidth];
   pcSaoParam->saoLcuParam[2] = new SaoLcuParam [m_iNumCuInHeight*m_iNumCuInWidth];
-#endif
 }
 
@@ -448 +402 @@
 
   pSaoPart->UpPartIdx = iParentPartIdx;
-#if !SAO_UNIT_INTERLEAVING
-  pSaoPart->bEnableFlag =  0;
-#endif
   pSaoPart->iBestType   = -1;
   pSaoPart->iLength     =  0;
 
-#if SAO_UNIT_INTERLEAVING
   pSaoPart->bandPosition = 0;
 
   for (j=0;j<MAX_NUM_SAO_OFFSETS;j++)
-#else
-  for (j=0;j<MAX_NUM_SAO_CLASS;j++)
-#endif
   {
     pSaoPart->iOffset[j] = 0;
@@ -545 +492 @@
   pcSaoParam->psSaoPart[1] = 0;
   pcSaoParam->psSaoPart[2] = 0;
-#if SAO_UNIT_INTERLEAVING
   if( pcSaoParam->saoLcuParam[0]) 
   {
@@ -558 +504 @@
     delete [] pcSaoParam->saoLcuParam[2]; pcSaoParam->saoLcuParam[2] = NULL;
   }
-#endif
 } 
 
@@ -572 +517 @@
     for(Int i=0; i< m_aiNumCulPartsLevel[m_uiMaxSplitLevel]; i++)
     {
-#if !SAO_UNIT_INTERLEAVING
-      pcSaoParam->psSaoPart[c][i].bEnableFlag   =  0;
-#endif
       pcSaoParam->psSaoPart[c][i].iBestType     = -1;
       pcSaoParam->psSaoPart[c][i].iLength       =  0;
@@ -582 +524 @@
       pcSaoParam->psSaoPart[c][i].iMinDist      = MAX_INT;
       pcSaoParam->psSaoPart[c][i].iMinRate      = MAX_INT;
-#if SAO_UNIT_INTERLEAVING
       pcSaoParam->psSaoPart[c][i].bandPosition = 0;
       for (Int j=0;j<MAX_NUM_SAO_OFFSETS;j++)
-#else
-      for (Int j=0;j<MAX_NUM_SAO_CLASS;j++)
-#endif
       {
         pcSaoParam->psSaoPart[c][i].iOffset[j] = 0;
@@ -594 +532 @@
       }
     }
-#if SAO_UNIT_INTERLEAVING
     pcSaoParam->oneUnitFlag[0]   = 0;
     pcSaoParam->oneUnitFlag[1]   = 0;
@@ -601 +538 @@
     resetLcuPart(pcSaoParam->saoLcuParam[1]);
     resetLcuPart(pcSaoParam->saoLcuParam[2]);
-#endif
   }
 }
@@ -882 +818 @@
       break;
     }   
-#if SAO_UNIT_INTERLEAVING
   case SAO_BO:
-#else
-  case SAO_BO_0:
-  case SAO_BO_1:
-#endif
     {
       for (y=0; y< height; y++)
@@ -1108 +1039 @@
       break;
     }   
-#if SAO_UNIT_INTERLEAVING
   case SAO_BO:
-#else
-  case SAO_BO_0:
-  case SAO_BO_1:
-#endif
     {
       for (y=0; y<iLcuHeight; y++)
@@ -1134 +1060 @@
   }
 }
-#if !SAO_UNIT_INTERLEAVING
-/** sample adaptive offset process for one partition
- * \param   *psQTPart,  uiPartIdx,  iYCbCr
- */
-Void TComSampleAdaptiveOffset::processSaoOnePart(SAOQTPart *psQTPart, UInt uiPartIdx, Int iYCbCr)
-{
-  int  i;
-  UInt uiEdgeType, uiTypeIdx;
-  Pel* ppLumaTable = NULL;
-  SAOQTPart*  pOnePart= &(psQTPart[uiPartIdx]);
-
-  static Int iOffset[LUMA_GROUP_NUM];
-  Int LcuIdxX;
-  Int LcuIdxY;
-  Int iAddr;
-  Int iFrameWidthInCU = m_pcPic->getFrameWidthInCU();
-
-  if(pOnePart->bEnableFlag)
-  {
-    uiTypeIdx = pOnePart->iBestType;
-    if (uiTypeIdx == SAO_BO_0 || uiTypeIdx == SAO_BO_1)
-    {
-      for (i=0;i<pOnePart->iLength;i++)
-        iOffset[i+1] = pOnePart->iOffset[i] << m_uiSaoBitIncrease;
-
-      if (uiTypeIdx == SAO_BO_0 )
-      {
-        ppLumaTable = m_ppLumaTableBo0;
-      }
-      if (uiTypeIdx == SAO_BO_1 )
-      {
-        ppLumaTable = m_ppLumaTableBo1;
-      }
-
-#if FULL_NBIT
-      for (i=0;i<(1<<(g_uiBitDepth));i++)
-#else
-      for (i=0;i<(1<<(g_uiBitIncrement+8));i++)
-#endif
-      {
-        m_iOffsetBo[i] = m_pClipTable[i + iOffset[ppLumaTable[i]]];
-      }
-
-    }
-    if (uiTypeIdx == SAO_EO_0 || uiTypeIdx == SAO_EO_1 || uiTypeIdx == SAO_EO_2 || uiTypeIdx == SAO_EO_3)
-    {
-      for (i=0;i<pOnePart->iLength;i++)
-      {
-        iOffset[i+1] = pOnePart->iOffset[i] << m_uiSaoBitIncrease;
-      }
-      for (uiEdgeType=0;uiEdgeType<6;uiEdgeType++)
-      {
-        m_iOffsetEo[uiEdgeType]= iOffset[m_auiEoTable[uiEdgeType]];
-      }
-    }
-    for (LcuIdxY = pOnePart->StartCUY; LcuIdxY<= pOnePart->EndCUY; LcuIdxY++)
-    {
-      for (LcuIdxX = pOnePart->StartCUX; LcuIdxX<= pOnePart->EndCUX; LcuIdxX++)
-      {
-        iAddr = LcuIdxY * iFrameWidthInCU + LcuIdxX;
-        processSaoCu(iAddr, uiTypeIdx, iYCbCr);
-      }
-    }
-  }
-}
-
-/** Process quadtree sample adaptive offset
- * \param  psQTPart, uiPartIdx, iYCbCr
- */
-Void TComSampleAdaptiveOffset::processSaoQuadTree(SAOQTPart *psQTPart, UInt uiPartIdx, Int iYCbCr)
-{
-  SAOQTPart*  pSaoPart= &(psQTPart[uiPartIdx]);
-
-  if (uiPartIdx == 0)
-  {
-    initTmpSaoQuadTree(psQTPart, iYCbCr);
-    xSaoAllPart(psQTPart, iYCbCr);
-    return;
-  }
-
-  if (!pSaoPart->bSplit)
-  {
-    if (pSaoPart->bEnableFlag)
-    {
-      processSaoOnePart(psQTPart, uiPartIdx, iYCbCr);
-    }
-    return;
-  }
-
-  if (pSaoPart->PartLevel < m_uiMaxSplitLevel)
-  {
-    processSaoQuadTree(psQTPart, pSaoPart->DownPartsIdx[0], iYCbCr);
-    processSaoQuadTree(psQTPart, pSaoPart->DownPartsIdx[1], iYCbCr);
-    processSaoQuadTree(psQTPart, pSaoPart->DownPartsIdx[2], iYCbCr);
-    processSaoQuadTree(psQTPart, pSaoPart->DownPartsIdx[3], iYCbCr);
-  }
-}
-
-/** run SAO processing in LCU order
- * \param *psQTPart,  iYCbCr 
- */
-Void TComSampleAdaptiveOffset::xSaoAllPart(SAOQTPart *psQTPart, Int iYCbCr)
-{
-  int  i;
-  UInt uiEdgeType;
-  Pel* ppLumaTable = NULL;
-  Int  iTypeIdx;
-
-  static Int iOffset[LUMA_GROUP_NUM];
-  Int LcuIdxX;
-  Int LcuIdxY;
-  Int iAddr;
-  Int iFrameWidthInCU = m_pcPic->getFrameWidthInCU();
-  Int iFrameHeightInCU = m_pcPic->getFrameHeightInCU();
-  Int iPartIdx;
-  Pel *pRec;
-  Int iPicWidthTmp;
-  Int iStride;
-  Pel *pTmpUSwap;
-  Int iIsChroma = (iYCbCr == 0) ? 0:1;
-
-  SAOQTPart*  pOnePart;
-
-  for (LcuIdxY = 0; LcuIdxY< iFrameHeightInCU; LcuIdxY++)
-  { 
-    iAddr = LcuIdxY * iFrameWidthInCU;
-    if (iYCbCr == 0)
-    {
-      pRec  = m_pcPic->getPicYuvRec()->getLumaAddr(iAddr);
-      iStride = m_pcPic->getStride();
-      iPicWidthTmp = m_iPicWidth;
-    }
-    else if (iYCbCr == 1)
-    {
-      pRec  = m_pcPic->getPicYuvRec()->getCbAddr(iAddr);
-      iStride = m_pcPic->getCStride();
-      iPicWidthTmp = m_iPicWidth>>1;
-    }
-    else
-    {
-      pRec  = m_pcPic->getPicYuvRec()->getCrAddr(iAddr);
-      iStride = m_pcPic->getCStride();
-      iPicWidthTmp = m_iPicWidth>>1;
-    }
-
-//     pRec += iStride*(m_uiMaxCUHeight-1);
-    for (i=0;i<(m_uiMaxCUHeight>>iIsChroma)+1;i++)
-    {
-      m_pTmpL1[i] = pRec[0];
-      pRec+=iStride;
-    }
-    pRec-=(iStride<<1);
-
-    memcpy(m_pTmpU2, pRec, sizeof(Pel)*iPicWidthTmp);
-
-    for (LcuIdxX = 0; LcuIdxX< iFrameWidthInCU; LcuIdxX++)
-    {
-      iAddr = LcuIdxY * iFrameWidthInCU + LcuIdxX;
-      iPartIdx = m_iLcuPartIdx[iAddr];
-      if (iPartIdx>=0)
-      {
-        pOnePart = &(psQTPart[iPartIdx]);
-        iTypeIdx = pOnePart->iBestType;
-        if (iTypeIdx>=0)
-        {
-          if (iTypeIdx == SAO_BO_0 || iTypeIdx == SAO_BO_1)
-          {
-            for (i=0;i<pOnePart->iLength;i++)
-              iOffset[i+1] = pOnePart->iOffset[i] << m_uiSaoBitIncrease;
-
-            if (iTypeIdx == SAO_BO_0 )
-            {
-              ppLumaTable = m_ppLumaTableBo0;
-            }
-            if (iTypeIdx == SAO_BO_1 )
-            {
-              ppLumaTable = m_ppLumaTableBo1;
-            }
-
-#if FULL_NBIT
-            for (i=0;i<(1<<(g_uiBitDepth));i++)
-#else
-            for (i=0;i<(1<<(g_uiBitIncrement+8));i++)
-#endif
-            {
-              m_iOffsetBo[i] = m_pClipTable[i + iOffset[ppLumaTable[i]]];
-            }
-
-          }
-          if (iTypeIdx == SAO_EO_0 || iTypeIdx == SAO_EO_1 || iTypeIdx == SAO_EO_2 || iTypeIdx == SAO_EO_3)
-          {
-            for (i=0;i<pOnePart->iLength;i++)
-            {
-              iOffset[i+1] = pOnePart->iOffset[i] << m_uiSaoBitIncrease;
-            }
-            for (uiEdgeType=0;uiEdgeType<6;uiEdgeType++)
-            {
-              m_iOffsetEo[uiEdgeType]= iOffset[m_auiEoTable[uiEdgeType]];
-            }
-          }
-          processSaoCu(iAddr, iTypeIdx, iYCbCr);
-        }
-      }
-      else
-      {
-        if (LcuIdxX != (iFrameWidthInCU-1))
-        {
-          if( m_iLcuPartIdx[iAddr+1] >=0) 
-          {
-            if (iYCbCr == 0)
-            {
-              pRec  = m_pcPic->getPicYuvRec()->getLumaAddr(iAddr);
-              iStride = m_pcPic->getStride();
-            }
-            else if (iYCbCr == 1)
-            {
-              pRec  = m_pcPic->getPicYuvRec()->getCbAddr(iAddr);
-              iStride = m_pcPic->getCStride();
-            }
-            else
-            {
-              pRec  = m_pcPic->getPicYuvRec()->getCrAddr(iAddr);
-              iStride = m_pcPic->getCStride();
-            }
-            Int iWidthShift = m_uiMaxCUWidth>>iIsChroma;
-            for (i=0;i<(m_uiMaxCUHeight>>iIsChroma)+1;i++)
-            {
-              m_pTmpL1[i] = pRec[iWidthShift-1];
-              pRec+=iStride;
-            }
-          }
-        }
-      }
-    }
-    pTmpUSwap = m_pTmpU1;
-    m_pTmpU1  = m_pTmpU2;
-    m_pTmpU2  = pTmpUSwap;
-  }
-}
-
-/** initialize buffer for quadtree boundary
- * \param *psQTPart,  iYCbCr 
- */
-Void TComSampleAdaptiveOffset::initTmpSaoQuadTree(SAOQTPart *psQTPart, Int iYCbCr)
-{
-  Pel *pRec;
-  Int iPicWidthTmp;
-  
-
-  memset(m_iLcuPartIdx,-1, sizeof(Int)*m_iNumCuInWidth*m_iNumCuInHeight);
-  convertSaoQt2Lcu(psQTPart, 0);
-
-  if (iYCbCr == 0)
-  {
-    pRec       = m_pcPic->getPicYuvRec()->getLumaAddr();
-    iPicWidthTmp = m_iPicWidth;
-  } 
-  else if (iYCbCr == 1)
-  {
-    pRec       = m_pcPic->getPicYuvRec()->getCbAddr();
-    iPicWidthTmp =  m_iPicWidth>>1;
-  }
-  else 
-  {
-    pRec       = m_pcPic->getPicYuvRec()->getCrAddr();
-    iPicWidthTmp =  m_iPicWidth>>1;
-  }
-
-  memcpy(m_pTmpU1, pRec, sizeof(Pel)*iPicWidthTmp);
-}
-
-/** recursive covert quadtree partition index to each LCU 
- * \param psQTPart, uiPartIdx  
- */
-Void TComSampleAdaptiveOffset::convertSaoQt2Lcu(SAOQTPart *psQTPart,UInt uiPartIdx)
-{
-
-  SAOQTPart*  pSaoPart= &(psQTPart[uiPartIdx]);
-
-  if (!pSaoPart->bSplit)
-  {
-    xSaoQt2Lcu(psQTPart, uiPartIdx);
-    return;
-  }
-
-  if (pSaoPart->PartLevel < m_uiMaxSplitLevel)
-  {
-    convertSaoQt2Lcu(psQTPart, pSaoPart->DownPartsIdx[0]);
-    convertSaoQt2Lcu(psQTPart, pSaoPart->DownPartsIdx[1]);
-    convertSaoQt2Lcu(psQTPart, pSaoPart->DownPartsIdx[2]);
-    convertSaoQt2Lcu(psQTPart, pSaoPart->DownPartsIdx[3]);
-  }
-}
-
-/** assign quadtree partition index to each LCU 
- * \param psQTPart, uiPartIdx  
- */
-
-Void TComSampleAdaptiveOffset::xSaoQt2Lcu(SAOQTPart *psQTPart,UInt uiPartIdx)
-{
-  Int LcuIdxX;
-  Int LcuIdxY;
-  Int iAddr;
-  Int iFrameWidthInCU = m_iNumCuInWidth;
-
-  for (LcuIdxY = psQTPart[uiPartIdx].StartCUY; LcuIdxY<= psQTPart[uiPartIdx].EndCUY; LcuIdxY++)
-  {
-    for (LcuIdxX = psQTPart[uiPartIdx].StartCUX; LcuIdxX<= psQTPart[uiPartIdx].EndCUX; LcuIdxX++)
-    {
-      iAddr = LcuIdxY * iFrameWidthInCU + LcuIdxX;
-      if (psQTPart[uiPartIdx].bEnableFlag)
-      {
-        m_iLcuPartIdx[iAddr] = (Int)uiPartIdx; 
-      }
-      else
-      {
-        m_iLcuPartIdx[iAddr] = -1;
-      } 
-    }
-  }
-}
-#endif
 /** Sample adaptive offset process
  * \param pcPic, pcSaoParam  
@@ -1474 +1078 @@
     }
 
-#if SAO_UNIT_INTERLEAVING
     if (m_saoInterleavingFlag)
     {
@@ -1496 +1099 @@
 
 
-#else
-    Int iY  = 0;
-    processSaoQuadTree( pcSaoParam->psSaoPart[iY], 0 , iY);
-
-    Int iCb = 1;
-    Int iCr = 2;
-    if (pcSaoParam->bSaoFlag[iCb])
-    {
-      processSaoQuadTree( pcSaoParam->psSaoPart[iCb], 0 , iCb);
-    }
-    if (pcSaoParam->bSaoFlag[iCr])
-    {
-      processSaoQuadTree( pcSaoParam->psSaoPart[iCr], 0 , iCr);
-    }
-#endif
     m_pcPic = NULL;
   }
@@ -1533 +1121 @@
   }
 }
-#if SAO_UNIT_INTERLEAVING
 /** Process SAO all units 
  * \param saoLcuParam SAO LCU parameters
@@ -1789 +1376 @@
 
 
-#endif
 
 //! \}

branches/HTM-5.1-dev0/source/Lib/TLibCommon/TComSampleAdaptiveOffset.h

@@ -52 +52 @@
 #define SAO_BO_BITS                   5
 #define LUMA_GROUP_NUM                (1<<SAO_BO_BITS)
-#if SAO_UNIT_INTERLEAVING
 #define MAX_NUM_SAO_OFFSETS           4
 #define MAX_NUM_SAO_CLASS             33
-#else
-#define MAX_NUM_SAO_CLASS             32
-#endif
 // ====================================================================================================================
 // Class definition
@@ -95 +91 @@
   Pel   *m_pClipTable;
   Pel   *m_pClipTableBase;
-#if SAO_UNIT_INTERLEAVING
   Pel   *m_lumaTableBo;
-#else
-  Pel   *m_ppLumaTableBo0;
-  Pel   *m_ppLumaTableBo1;
-#endif
   Int   *m_iUpBuff1;
   Int   *m_iUpBuff2;
@@ -115 +106 @@
   Pel* m_pTmpL2;
   Int* m_iLcuPartIdx;
-#if SAO_UNIT_INTERLEAVING
   Int     m_maxNumOffsetsPerPic;
   Bool    m_saoInterleavingFlag;
-#else
-  Void initTmpSaoQuadTree(SAOQTPart *psQTPart, Int iYCbCr);
-  Void disableSaoOnePart(SAOQTPart *psQTPart, UInt uiPartIdx, Int iYCbCr);
-  Void xSaoQt2Lcu(SAOQTPart *psQTPart,UInt uiPartIdx);
-  Void convertSaoQt2Lcu(SAOQTPart *psQTPart,UInt uiPartIdx);
-  Void xSaoAllPart(SAOQTPart *psQTPart, Int iYCbCr);
-#endif
 public:
   TComSampleAdaptiveOffset         ();
@@ -151 +134 @@
   Void processSaoBlock(Pel* pDec, Pel* pRest, Int stride, Int iSaoType, UInt xPos, UInt yPos, UInt width, UInt height, Bool* pbBorderAvail);
 
-#if SAO_UNIT_INTERLEAVING
   Void resetLcuPart(SaoLcuParam* saoLcuParam);
   Void convertQT2SaoUnit(SAOParam* saoParam, UInt partIdx, Int yCbCr);
@@ -158 +140 @@
   Void setSaoInterleavingFlag (Bool bVal)  {m_saoInterleavingFlag = bVal;}
   Bool getSaoInterleavingFlag ()           {return m_saoInterleavingFlag;}
-#endif
 };
 

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

@@ -110 +110 @@
 , m_cabacInitIdc                 ( -1 )
 #endif
-#if TILES_WPP_ENTRY_POINT_SIGNALLING
 , m_numEntryPointOffsets          ( 0 )
-#endif
 #if LGE_ILLUCOMP_B0045
 , m_bApplyIC                      ( false )
@@ -197 +195 @@
   m_cabacInitFlag        = false;
 #endif
-#if TILES_WPP_ENTRY_POINT_SIGNALLING
   m_numEntryPointOffsets = 0;
-#endif
 #if QC_TMVP_MRG_REFIDX_C0047
   m_aiNewRefIdx[0]                  = -1;
@@ -646 +642 @@
     }
   }
-#if H0566_TLA
   if( getNalUnitTypeBaseViewMvc() == NAL_UNIT_CODED_SLICE_CRA ) // CRA picture found
-#else
-  if( getNalUnitTypeBaseViewMvc() == NAL_UNIT_CODED_SLICE_CDR ) // CDR picture found
-#endif
   {
     pocCRA = getPOC();
@@ -703 +695 @@
       bRefreshPending = false; 
     }
-#if H0566_TLA
     if( getNalUnitTypeBaseViewMvc() == NAL_UNIT_CODED_SLICE_CRA ) // CRA picture found
-#else
-    if( getNalUnitTypeBaseViewMvc() == NAL_UNIT_CODED_SLICE_CDR ) // CDR picture found
-#endif
     {
       bRefreshPending = true; 
@@ -830 +818 @@
 
   m_saoEnabledFlag = pSrc->m_saoEnabledFlag; 
-#if SAO_UNIT_INTERLEAVING
   m_saoInterleavingFlag = pSrc->m_saoInterleavingFlag;
   m_saoEnabledFlagCb = pSrc->m_saoEnabledFlagCb;
   m_saoEnabledFlagCr = pSrc->m_saoEnabledFlagCr; 
-#endif 
 #if CABAC_INIT_FLAG
   m_cabacInitFlag                = pSrc->m_cabacInitFlag;
 #endif
-#if TILES_WPP_ENTRY_POINT_SIGNALLING
   m_numEntryPointOffsets  = pSrc->m_numEntryPointOffsets;
-#endif
-
-#if H0111_MVD_L1_ZERO
+
   m_bLMvdL1Zero = pSrc->m_bLMvdL1Zero;
-#endif
 }
 
@@ -856 +838 @@
 Void TComSlice::setTLayerInfo( UInt uiTLayer )
 {
-#if !H0566_TLA
-  // If temporal_id_nesting_flag == 1, then num_temporal_layer_switching_point_flags shall be inferred to be 0 and temporal_layer_switching_point_flag shall be inferred to be 1 for all temporal layers
-  if ( m_pcSPS->getTemporalIdNestingFlag() ) 
-  {
-    m_pcPPS->setNumTLayerSwitchingFlags( 0 );
-    for ( UInt i = 0; i < MAX_TLAYER; i++ )
-    {
-      m_pcPPS->setTLayerSwitchingFlag( i, true );
-    }
-  }
-  else 
-  {
-    for ( UInt i = m_pcPPS->getNumTLayerSwitchingFlags(); i < MAX_TLAYER; i++ )
-    {
-      m_pcPPS->setTLayerSwitchingFlag( i, false );
-    }
-  }
-#endif
 
   m_uiTLayer = uiTLayer;
-#if !H0566_TLA
-  m_bTLayerSwitchingFlag = m_pcPPS->getTLayerSwitchingFlag( uiTLayer );
-#endif
-}
-
-#if H0566_TLA && H0566_TLA_SET_FOR_SWITCHING_POINTS
+}
+
+#if H0566_TLA_SET_FOR_SWITCHING_POINTS
 /** Function for checking if this is a switching-point
 */
@@ -959 +920 @@
 /** Function for applying picture marking based on the Reference Picture Set in pReferencePictureSet.
 */
-#if START_DECODING_AT_CRA
 Int TComSlice::checkThatAllRefPicsAreAvailable( TComList<TComPic*>& rcListPic, TComReferencePictureSet *pReferencePictureSet, Bool outputFlag, Int pocRandomAccess)
-#else
-Int TComSlice::checkThatAllRefPicsAreAvailable( TComList<TComPic*>& rcListPic, TComReferencePictureSet *pReferencePictureSet, Bool outputFlag)
-#endif
 {
   TComPic* rpcPic;
@@ -1009 +966 @@
     if(isAvailable == 0)    
     {            
-#if START_DECODING_AT_CRA
       if (this->getPOC() + pReferencePictureSet->getDeltaPOC(i) >= pocRandomAccess)
       {
-#endif
         if(!pReferencePictureSet->getUsed(i) )
         {
@@ -1026 +981 @@
           iPocLost=this->getPOC() + pReferencePictureSet->getDeltaPOC(i);
         }
-#if START_DECODING_AT_CRA
-      }
-#endif
+      }
     }
   }  
@@ -1053 +1006 @@
     if(isAvailable == 0)    
     {            
-#if START_DECODING_AT_CRA
       if (this->getPOC() + pReferencePictureSet->getDeltaPOC(i) >= pocRandomAccess)
       {
-#endif
         if(!pReferencePictureSet->getUsed(i) )
         {
@@ -1070 +1021 @@
           iPocLost=this->getPOC() + pReferencePictureSet->getDeltaPOC(i);
         }
-#if START_DECODING_AT_CRA
-      }
-#endif
+      }
     }
   }    
@@ -1138 +1087 @@
     Int rIdx =  this->getRPSidx() - pReferencePictureSet->getDeltaRIdxMinus1() - 1;
     Int deltaRPS = pReferencePictureSet->getDeltaRPS();
-#if RPS_IN_SPS
     TComReferencePictureSet* pcRefRPS = this->getSPS()->getRPSList()->getReferencePictureSet(rIdx);
-#else
-    TComReferencePictureSet* pcRefRPS = this->getPPS()->getRPSList()->getReferencePictureSet(rIdx);
-#endif
     Int iRefPics = pcRefRPS->getNumberOfPictures();
     Int iNewIdc=0;
@@ -1169 +1114 @@
     pcRPS->setNumRefIdc(iNewIdc);
     pcRPS->setDeltaRPS(deltaRPS); 
-#if RPS_IN_SPS
     pcRPS->setDeltaRIdxMinus1(pReferencePictureSet->getDeltaRIdxMinus1() + this->getSPS()->getRPSList()->getNumberOfReferencePictureSets() - this->getRPSidx());
-#else
-    pcRPS->setDeltaRIdxMinus1(pReferencePictureSet->getDeltaRIdxMinus1() + this->getPPS()->getRPSList()->getNumberOfReferencePictureSets() - this->getRPSidx());
-#endif
   }
 
@@ -1539 +1480 @@
 , m_picWidthInLumaSamples     (352)
 , m_picHeightInLumaSamples    (288)
-#if PIC_CROPPING
 , m_picCroppingFlag           (false)
 , m_picCropLeftOffset         (  0)
@@ -1545 +1485 @@
 , m_picCropTopOffset          (  0)
 , m_picCropBottomOffset       (  0) 
-#endif
 , m_uiMaxCUWidth              ( 32)
 , m_uiMaxCUHeight             ( 32)
@@ -1551 +1490 @@
 , m_uiMinTrDepth              (  0)
 , m_uiMaxTrDepth              (  1)
-#if RPS_IN_SPS
 , m_bLongTermRefsPresent      (false)
-#endif
-#if !H0567_DPB_PARAMETERS_PER_TEMPORAL_LAYER
-, m_numReorderFrames          (  0)
-#endif
 , m_iNumberOfUsableInterViewRefs( 0 )
 , m_uiQuadtreeTULog2MaxSize   (  0)
@@ -1568 +1502 @@
 , m_bDisInter4x4              (  1)
 , m_bUseALF                   (false)
-#if LCU_SYNTAX_ALF
 , m_bALFCoefInSlice           (false)
-#endif
-#if !PIC_CROPPING
-, m_bUsePAD                   (false)
-#endif
 , m_bUseLMChroma              (false)
 , m_bUseLComb                 (false)
 , m_bLCMod                    (false)
-#if H0412_REF_PIC_LIST_RESTRICTION
 #if QC_MVHEVC_B0046
 , m_restrictedRefPicListsFlag   (  0)
@@ -1584 +1512 @@
 #endif
 , m_listsModificationPresentFlag(  0)
-#endif
 , m_uiBitDepth                (  8)
 , m_uiBitIncrement            (  0)
-#if H0736_AVC_STYLE_QP_RANGE
 , m_qpBDOffsetY               (  0)
 , m_qpBDOffsetC               (  0)
-#endif
 #if LOSSLESS_CODING
 , m_useLossless               (false)
@@ -1613 +1538 @@
 , m_bTemporalIdNestingFlag    (false)
 , m_scalingListEnabledFlag    (false)
-#if !H0567_DPB_PARAMETERS_PER_TEMPORAL_LAYER
-, m_uiMaxDecFrameBuffering    (  0)
-, m_uiMaxLatencyIncrease      (  0)
-#endif
-#if TILES_WPP_ENTRY_POINT_SIGNALLING
 ,  m_tilesOrEntropyCodingSyncIdc( 0 )
 ,  m_numSubstreams              ( 0 )
-#endif
 #if HHI_DMM_WEDGE_INTRA || HHI_DMM_PRED_TEX
 , m_bUseDMM                   (false)
@@ -1633 +1552 @@
   // AMVP parameter
   ::memset( m_aeAMVPMode, 0, sizeof( m_aeAMVPMode ) );
-#if H0567_DPB_PARAMETERS_PER_TEMPORAL_LAYER
   for ( Int i = 0; i < MAX_TLAYER; i++ )
   {
@@ -1640 +1558 @@
     m_numReorderPics[i]       = 0;
   }
-#endif
 
   m_uiViewId              = 0;
@@ -1778 +1695 @@
 , m_iChromaQpOffset             (0)
 , m_iChromaQpOffset2nd          (0)
-#if !RPS_IN_SPS
-, m_bLongTermRefsPresent        (false)
-#endif
-#if !H0566_TLA
-, m_uiNumTlayerSwitchingFlags   (0)
-#endif
 , m_iSliceGranularity           (0)
 , m_iTileBehaviorControlPresentFlag (0)
@@ -1789 +1700 @@
 , m_iColumnRowInfoPresent        (0)
 , m_iUniformSpacingIdr           (0)
-#if !REMOVE_TILE_DEPENDENCE
-, m_iTileBoundaryIndependenceIdr (0)
-#endif
 , m_iNumColumnsMinus1            (0)
 , m_puiColumnWidth               (NULL)
 , m_iNumRowsMinus1               (0)
 , m_puiRowHeight                 (NULL)
-#if !WPP_SIMPLIFICATION
-,  m_iEntropyCodingSynchro      (0)
-,  m_bCabacIstateReset          (false)
-#endif
 ,  m_iNumSubstreams             (1)
-#if MULTIBITS_DATA_HIDING
 , m_signHideFlag(0)
 , m_signHidingThreshold(0)
-#endif
 #if CABAC_INIT_FLAG
 , m_cabacInitPresentFlag        (false)
@@ -1813 +1715 @@
 #endif
 {
-#if !H0566_TLA
-  for ( UInt i = 0; i < MAX_TLAYER; i++ )
-  {
-    m_abTLayerSwitchingFlag[i] = false;
-  }
-#endif
 }
 
@@ -2086 +1982 @@
 : m_bRefPicListModificationFlagL0 (false)
 , m_bRefPicListModificationFlagL1 (false)
-#if !H0137_0138_LIST_MODIFICATION
-, m_uiNumberOfRefPicListModificationsL0 (0)
-, m_uiNumberOfRefPicListModificationsL1 (0)
-#endif
-{
-#if !H0137_0138_LIST_MODIFICATION
-  ::memset( m_ListIdcL0, 0, sizeof(m_ListIdcL0) );
-#endif
+{
   ::memset( m_RefPicSetIdxL0, 0, sizeof(m_RefPicSetIdxL0) );
-#if !H0137_0138_LIST_MODIFICATION
-  ::memset( m_ListIdcL1, 0, sizeof(m_ListIdcL1) );
-#endif
   ::memset( m_RefPicSetIdxL1, 0, sizeof(m_RefPicSetIdxL1) );
 }
@@ -2111 +1997 @@
   m_bSaoEnabled = false;
   m_pSaoParam = NULL;
-#if LCU_SYNTAX_ALF
   m_alfParamSet = NULL;
-#else
-  m_pAlfParam = NULL;
-#endif
   m_scalingList = NULL;
   m_scalingListEnabled = false;
@@ -2135 +2017 @@
   m_bSaoEnabled = src.m_bSaoEnabled;
   m_pSaoParam   = src.m_pSaoParam; 
-#if LCU_SYNTAX_ALF
   m_alfParamSet    = src.m_alfParamSet;
-#else
-  m_pAlfParam   = src.m_pAlfParam; 
-#endif
   m_scalingList = src.m_scalingList;
   m_scalingListEnabled = src.m_scalingListEnabled;
-#if SAO_UNIT_INTERLEAVING
   m_saoInterleavingFlag = src.m_saoInterleavingFlag;
-#endif
 
   return *this;
@@ -2165 +2041 @@
 Void TComAPS::createAlfParam()
 {
-#if LCU_SYNTAX_ALF
   m_alfParamSet = new AlfParamSet;
-#else
-  m_pAlfParam = new ALFParam;
-#endif
 }
 Void TComAPS::destroyAlfParam()
 {
-#if LCU_SYNTAX_ALF
   if(m_alfParamSet != NULL)
   {
@@ -2179 +2050 @@
     m_alfParamSet = NULL;
   }
-#else
-  if(m_pAlfParam != NULL)
-  {
-    delete m_pAlfParam;
-    m_pAlfParam = NULL;
-  }
-#endif
 }
 
@@ -2221 +2085 @@
  * \returns true if use default quantization matrix in all size
 */
-#if SCALING_LIST
 Bool TComSlice::checkDefaultScalingList()
 {
@@ -2238 +2101 @@
   return (defaultCounter == (SCALING_LIST_NUM * SCALING_LIST_SIZE_NUM - 4)) ? true : false; // -4 for 32x32
 }
-#else
-Bool TComSlice::checkDefaultScalingList()
-{
-  UInt i;
-  Int *dst=0;
-  Int *src=0;
-  UInt defaultCounter=0;
-
-  //4x4
-  for(i=0;i<SCALING_LIST_NUM;i++)
-  {
-    src = (i<3) ? g_quantIntraDefault4x4 : g_quantInterDefault4x4;
-    dst = getScalingList()->getScalingListAddress(SCALING_LIST_4x4,i);
-    if(::memcmp(dst,src,sizeof(UInt)*16) == 0) defaultCounter++;
-  }
-
-  //8x8
-  for(i=0;i<SCALING_LIST_NUM;i++)
-  {
-    src = (i<3) ? g_quantIntraDefault8x8 : g_quantInterDefault8x8;
-    dst = getScalingList()->getScalingListAddress(SCALING_LIST_8x8,i);
-    if(::memcmp(dst,src,sizeof(UInt)*64) == 0) defaultCounter++;
-  }
-  //16x16
-  for(i=0;i<SCALING_LIST_NUM;i++)
-  {
-    src = (i<3) ? g_quantIntraDefault16x16 : g_quantInterDefault16x16;
-    dst = getScalingList()->getScalingListAddress(SCALING_LIST_16x16,i);
-    if(::memcmp(dst,src,sizeof(UInt)*256) == 0) defaultCounter++;
-  }
-  //32x32
-  for(i=0;i<SCALING_LIST_NUM_32x32;i++)
-  {
-    src = (i<1) ? g_quantIntraDefault32x32 : g_quantInterDefault32x32;
-    dst = getScalingList()->getScalingListAddress(SCALING_LIST_32x32,i*3);
-    if(::memcmp(dst,src,sizeof(UInt)*1024) == 0) defaultCounter++;
-  }
-  return (defaultCounter == (SCALING_LIST_NUM * SCALING_LIST_SIZE_NUM - 4)) ? true : false; // -4 for 32x32
-}
-#endif
 /** get scaling matrix from RefMatrixID
  * \param sizeId size index
@@ -2285 +2108 @@
 Void TComScalingList::processRefMatrix( UInt sizeId, UInt listId , UInt refListId )
 {
-#if SCALING_LIST
   ::memcpy(getScalingListAddress(sizeId, listId),getScalingListAddress(sizeId, refListId),sizeof(Int)*min(MAX_MATRIX_COEF_NUM,(Int)g_scalingListSize[sizeId]));
-#else
-  ::memcpy(getScalingListAddress(sizeId, listId),getScalingListAddress(sizeId, refListId),sizeof(Int)*g_scalingListSize[sizeId]);
-#endif
 }
 /** parse syntax infomation 
@@ -2313 +2132 @@
   for(sizeIdc = 0; sizeIdc < SCALING_LIST_SIZE_NUM; sizeIdc++)
   {
-#if SCALING_LIST
     size = min(MAX_MATRIX_COEF_NUM,(Int)g_scalingListSize[sizeIdc]);
-#else
-    size = g_scalingListSize[sizeIdc];
-#endif
     for(listIdc = 0; listIdc < g_scalingListNum[sizeIdc]; listIdc++)
     {
@@ -2343 +2158 @@
         src[i] = data;
       }
-#if SCALING_LIST
       //set DC value for default matrix check
       setScalingListDC(sizeIdc,listIdc,src[0]);
@@ -2369 +2183 @@
           setScalingListDC(sizeIdc,listIdc,data);
       }
-#endif
     }
   }
@@ -2384 +2197 @@
     for(UInt listId = 0; listId < g_scalingListNum[sizeId]; listId++)
     {
-#if SCALING_LIST
       m_scalingListCoef[sizeId][listId] = new Int [min(MAX_MATRIX_COEF_NUM,(Int)g_scalingListSize[sizeId])];
-#else
-      m_scalingListCoef[sizeId][listId] = new Int [g_scalingListSize[sizeId]];
-#endif
     }
   }
@@ -2421 +2230 @@
       src = (listId<3) ? g_quantIntraDefault8x8 : g_quantInterDefault8x8;
       break;
-#if SCALING_LIST
     case SCALING_LIST_16x16:
       src = (listId<3) ? g_quantIntraDefault8x8 : g_quantInterDefault8x8;
@@ -2428 +2236 @@
       src = (listId<1) ? g_quantIntraDefault8x8 : g_quantInterDefault8x8;
       break;
-#else
-    case SCALING_LIST_16x16:
-      src = (listId<3) ? g_quantIntraDefault16x16 : g_quantInterDefault16x16;
-      break;
-    case SCALING_LIST_32x32:
-      src = (listId<1) ? g_quantIntraDefault32x32 : g_quantInterDefault32x32;
-      break;
-#endif
     default:
       assert(0);
@@ -2449 +2249 @@
 Void TComScalingList::processDefaultMarix(UInt sizeId, UInt listId)
 {
-#if SCALING_LIST
   ::memcpy(getScalingListAddress(sizeId, listId),getScalingListDefaultAddress(sizeId,listId),sizeof(Int)*min(MAX_MATRIX_COEF_NUM,(Int)g_scalingListSize[sizeId]));
   setUseDefaultScalingMatrixFlag(sizeId,listId,true);
   setScalingListDC(sizeId,listId,SCALING_LIST_DC);
-#else
-  ::memcpy(getScalingListAddress(sizeId, listId),getScalingListDefaultAddress(sizeId,listId),sizeof(Int)*(Int)g_scalingListSize[sizeId]);
-#endif
-}
-#if SCALING_LIST
+}
 /** check DC value of matrix for default matrix signaling
  */
@@ -2475 +2270 @@
   }
 }
-#endif
 
 ParameterSetManager::ParameterSetManager()

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

@@ -68 +68 @@
 // ====================================================================================================================
 
-#if RPS_IN_SPS
 /// Reference Picture Set class
 class TComReferencePictureSet
@@ -142 +141 @@
   Void setNumberOfReferencePictureSets(Int numberOfReferencePictureSets);
 };
-#endif
 
 #if VIDYO_VPS_INTEGRATION|QC_MVHEVC_B0046
@@ -276 +274 @@
   UInt        m_picWidthInLumaSamples;
   UInt        m_picHeightInLumaSamples;
-#if PIC_CROPPING
   Bool        m_picCroppingFlag;
   Int         m_picCropLeftOffset;
@@ -282 +279 @@
   Int         m_picCropTopOffset;
   Int         m_picCropBottomOffset;
-#else
-  Int         m_aiPad[2];
-#endif
   UInt        m_uiMaxCUWidth;
   UInt        m_uiMaxCUHeight;
@@ -290 +284 @@
   UInt        m_uiMinTrDepth;
   UInt        m_uiMaxTrDepth;
-#if RPS_IN_SPS
   TComRPSList* m_RPSList;
   Bool        m_bLongTermRefsPresent;
-#endif
-#if H0567_DPB_PARAMETERS_PER_TEMPORAL_LAYER
   Int         m_numReorderPics[MAX_TLAYER];
-#else
-  Int         m_maxNumberOfReferencePictures;
-  Int         m_numReorderFrames;
-#endif
   
   Int         m_iNumberOfUsableInterViewRefs;
@@ -315 +302 @@
   Bool        m_useAMP;
   Bool        m_bUseALF;
-#if LCU_SYNTAX_ALF
   Bool        m_bALFCoefInSlice;
-#endif
-#if !PIC_CROPPING
-  Bool        m_bUsePAD;
-#endif
   Bool        m_bUseLMChroma; // JL:
 
@@ -327 +309 @@
   Bool        m_useNSQT;
   
-#if H0412_REF_PIC_LIST_RESTRICTION
   Bool        m_restrictedRefPicListsFlag;
   Bool        m_listsModificationPresentFlag;
-#endif
 
   // Parameter
@@ -336 +316 @@
   UInt        m_uiBitDepth;
   UInt        m_uiBitIncrement;
-#if H0736_AVC_STYLE_QP_RANGE
   Int         m_qpBDOffsetY;
   Int         m_qpBDOffsetC;
-#endif
 
 #if LOSSLESS_CODING
@@ -381 +359 @@
 
   Bool        m_scalingListEnabledFlag;
-#if H0567_DPB_PARAMETERS_PER_TEMPORAL_LAYER
   UInt        m_uiMaxDecPicBuffering[MAX_TLAYER]; 
   UInt        m_uiMaxLatencyIncrease[MAX_TLAYER];
-#else
-  UInt        m_uiMaxDecFrameBuffering; 
-  UInt        m_uiMaxLatencyIncrease;
-#endif
 
   Bool        m_useDF;
 
-#if TILES_WPP_ENTRY_POINT_SIGNALLING
   UInt        m_tilesOrEntropyCodingSyncIdc;
   Int         m_numSubstreams;
-#endif
 
 #if HHI_DMM_WEDGE_INTRA || HHI_DMM_PRED_TEX
@@ -452 +423 @@
   UInt getPicHeightInLumaSamples      ()         { return  m_picHeightInLumaSamples;   }
 
-#if PIC_CROPPING
   Bool getPicCroppingFlag() const          { return m_picCroppingFlag; }
   Void setPicCroppingFlag(Bool val)        { m_picCroppingFlag = val; }
@@ -463 +433 @@
   Int  getPicCropBottomOffset() const      { return m_picCropBottomOffset; }
   Void setPicCropBottomOffset(Int val)     { m_picCropBottomOffset = val; }
-#endif
 
   Void setMaxCUWidth  ( UInt u ) { m_uiMaxCUWidth = u;      }
@@ -495 +464 @@
   UInt getQuadtreeTUMaxDepthInter()         { return m_uiQuadtreeTUMaxDepthInter; }
   UInt getQuadtreeTUMaxDepthIntra()         { return m_uiQuadtreeTUMaxDepthIntra; }
-#if !PIC_CROPPING
-  Void setPad         (Int iPad[2]) { m_aiPad[0] = iPad[0]; m_aiPad[1] = iPad[1]; }
-#endif
-#if H0567_DPB_PARAMETERS_PER_TEMPORAL_LAYER
   Void setNumReorderPics(Int i, UInt tlayer)              { m_numReorderPics[tlayer] = i;    }
   Int  getNumReorderPics(UInt tlayer)                     { return m_numReorderPics[tlayer]; }
-#else
-  Void setMaxNumberOfReferencePictures( Int u )  { m_maxNumberOfReferencePictures = u;    }
-  Int  getMaxNumberOfReferencePictures()         { return m_maxNumberOfReferencePictures; }
-  Void setNumReorderFrames( Int i )              { m_numReorderFrames = i;    }
-  Int  getNumReorderFrames()                     { return m_numReorderFrames; }
-#endif
-#if RPS_IN_SPS
   Void      setRPSList( TComRPSList* RPSList )   { m_RPSList = RPSList;       }
   TComRPSList* getRPSList()                      { return m_RPSList;          }
   Bool      getLongTermRefsPresent()         { return m_bLongTermRefsPresent; }
   Void      setLongTermRefsPresent(Bool b)   { m_bLongTermRefsPresent=b;      }
-#endif
 
   Void setNumberOfUsableInterViewRefs( Int number )      { m_iNumberOfUsableInterViewRefs = number;    }
@@ -519 +476 @@
   Int  getUsableInterViewRef( Int pos )                  { return m_aiUsableInterViewRefs[pos];        }
 
-#if !PIC_CROPPING
-  Void setPadX        ( Int  u ) { m_aiPad[0] = u; }
-  Void setPadY        ( Int  u ) { m_aiPad[1] = u; }
-  Int  getPad         ( Int  u ) { assert(u < 2); return m_aiPad[u];}
-  Int* getPad         ( )        { return m_aiPad; }
-#endif
   
   // physical transform
@@ -532 +483 @@
   // Tool list
   Bool getUseALF      ()         { return m_bUseALF;        }
-#if LCU_SYNTAX_ALF
   Void setUseALFCoefInSlice(Bool b) {m_bALFCoefInSlice = b;}
   Bool getUseALFCoefInSlice()    {return m_bALFCoefInSlice;}
-#endif
-
-#if !PIC_CROPPING
-  Bool getUsePAD      ()         { return m_bUsePAD;        }
-  Void setUsePAD      ( Bool b ) { m_bUsePAD   = b;         }
-#endif
+
   Void setUseALF      ( Bool b ) { m_bUseALF  = b;          }
   Void setUseLComb    (Bool b)   { m_bUseLComb = b;         }
@@ -557 +502 @@
   Void setUseNSQT( Bool b ) { m_useNSQT = b; }
   
-#if H0412_REF_PIC_LIST_RESTRICTION
   Bool getRestrictedRefPicListsFlag    ()          { return m_restrictedRefPicListsFlag;   }
   Void setRestrictedRefPicListsFlag    ( Bool b )  { m_restrictedRefPicListsFlag = b;      }
   Bool getListsModificationPresentFlag ()          { return m_listsModificationPresentFlag; }
   Void setListsModificationPresentFlag ( Bool b )  { m_listsModificationPresentFlag = b;    }
-#endif
 
   // AMVP mode (for each depth)
@@ -577 +520 @@
   UInt      getBitIncrement ()         { return m_uiBitIncrement; }
   Void      setBitIncrement ( UInt u ) { m_uiBitIncrement = u;    }
-#if H0736_AVC_STYLE_QP_RANGE
   Int       getQpBDOffsetY  ()             { return m_qpBDOffsetY;   }
   Void      setQpBDOffsetY  ( Int value  ) { m_qpBDOffsetY = value;  }
   Int       getQpBDOffsetC  ()             { return m_qpBDOffsetC;   }
   Void      setQpBDOffsetC  ( Int value  ) { m_qpBDOffsetC = value;  }
-#endif
 
   Void      setLFCrossSliceBoundaryFlag     ( Bool   bValue  )    { m_bLFCrossSliceBoundaryFlag = bValue; }
@@ -625 +566 @@
   Void     setUniformSpacingIdr             ( Int i )           { m_iUniformSpacingIdr = i; }
   Int      getUniformSpacingIdr             ()                  { return m_iUniformSpacingIdr; }
-#if !REMOVE_TILE_DEPENDENCE
-  Void     setTileBoundaryIndependenceIdr   ( Int i )           { m_iTileBoundaryIndependenceIdr = i; }
-  Int      getTileBoundaryIndependenceIdr   ()                  { return m_iTileBoundaryIndependenceIdr; }
-#endif
   Void     setNumColumnsMinus1              ( Int i )           { m_iNumColumnsMinus1 = i; }
   Int      getNumColumnsMinus1              ()                  { return m_iNumColumnsMinus1; }
@@ -661 +598 @@
   Bool getScalingListFlag       ()         { return m_scalingListEnabledFlag;     }
   Void setScalingListFlag       ( Bool b ) { m_scalingListEnabledFlag  = b;       }
-#if H0567_DPB_PARAMETERS_PER_TEMPORAL_LAYER
   UInt getMaxDecPicBuffering  (UInt tlayer)            { return m_uiMaxDecPicBuffering[tlayer]; }
   Void setMaxDecPicBuffering  ( UInt ui, UInt tlayer ) { m_uiMaxDecPicBuffering[tlayer] = ui;   }
   UInt getMaxLatencyIncrease  (UInt tlayer)            { return m_uiMaxLatencyIncrease[tlayer];   }
   Void setMaxLatencyIncrease  ( UInt ui , UInt tlayer) { m_uiMaxLatencyIncrease[tlayer] = ui;      }
-#else
-  UInt getMaxDecFrameBuffering  ()            { return m_uiMaxDecFrameBuffering; }
-  Void setMaxDecFrameBuffering  ( UInt ui )   { m_uiMaxDecFrameBuffering = ui;   }
-  UInt getMaxLatencyIncrease    ()            { return m_uiMaxLatencyIncrease;   }
-  Void setMaxLatencyIncrease    ( UInt ui )   { m_uiMaxLatencyIncrease= ui;      }
-#endif
-#if TILES_WPP_ENTRY_POINT_SIGNALLING
   UInt getTilesOrEntropyCodingSyncIdc ()                    { return m_tilesOrEntropyCodingSyncIdc;   }
   Void setTilesOrEntropyCodingSyncIdc ( UInt val )          { m_tilesOrEntropyCodingSyncIdc = val;    }
   Int  getNumSubstreams               ()                    { return m_numSubstreams;                 }
   Void setNumSubstreams               ( Int numSubstreams ) { m_numSubstreams = numSubstreams;        }
-#endif
 
 #if HHI_DMM_WEDGE_INTRA || HHI_DMM_PRED_TEX
@@ -739 +667 @@
 };
 
-#if !RPS_IN_SPS
-/// Reference Picture Set class
-class TComReferencePictureSet
-{
-private:
-  Int m_numberOfPictures;
-  Int m_numberOfNegativePictures;
-  Int m_numberOfPositivePictures;
-  Int m_numberOfLongtermPictures;
-  Int  m_deltaPOC[MAX_NUM_REF_PICS];
-  Int  m_POC[MAX_NUM_REF_PICS];
-  Bool m_used[MAX_NUM_REF_PICS];
-  Bool m_interRPSPrediction;
-  Int  m_deltaRIdxMinus1;   
-  Int  m_deltaRPS; 
-  Int  m_numRefIdc; 
-  Int  m_refIdc[MAX_NUM_REF_PICS+1];
-
-public:
-  TComReferencePictureSet();
-  virtual ~TComReferencePictureSet();
-
-  Void setUsed(Int bufferNum, Bool used);
-  Void setDeltaPOC(Int bufferNum, Int deltaPOC);
-  Void setPOC(Int bufferNum, Int deltaPOC);
-  Void setNumberOfPictures(Int numberOfPictures);
-
-  Int  getUsed(Int bufferNum);
-  Int  getDeltaPOC(Int bufferNum);
-  Int  getPOC(Int bufferNum);
-  Int  getNumberOfPictures();
-
-  Void setNumberOfNegativePictures(Int number)  { m_numberOfNegativePictures = number; }
-  Int  getNumberOfNegativePictures()            { return m_numberOfNegativePictures; }
-  Void setNumberOfPositivePictures(Int number)  { m_numberOfPositivePictures = number; }
-  Int  getNumberOfPositivePictures()            { return m_numberOfPositivePictures; }
-  Void setNumberOfLongtermPictures(Int number)  { m_numberOfLongtermPictures = number; }
-  Int  getNumberOfLongtermPictures()            { return m_numberOfLongtermPictures; }
-
-  Void setInterRPSPrediction(Bool flag)         { m_interRPSPrediction = flag; }
-  Bool getInterRPSPrediction()                  { return m_interRPSPrediction; }
-  Void setDeltaRIdxMinus1(Int x)                { m_deltaRIdxMinus1 = x; }
-  Int  getDeltaRIdxMinus1()                     { return m_deltaRIdxMinus1; }
-  Void setDeltaRPS(Int x)                       { m_deltaRPS = x; }
-  Int  getDeltaRPS()                            { return m_deltaRPS; }
-  Void setNumRefIdc(Int x)                      { m_numRefIdc = x; }
-  Int  getNumRefIdc()                           { return m_numRefIdc; }
-
-  Void setRefIdc(Int bufferNum, Int refIdc);
-  Int  getRefIdc(Int bufferNum);
-
-  Void sortDeltaPOC();
-  Void printDeltaPOC();
-};
-
-/// Reference Picture Set set class
-class TComRPSList
-{
-private:
-  Int  m_numberOfReferencePictureSets;
-  TComReferencePictureSet* m_referencePictureSets;
-  
-public:
-  TComRPSList();
-  virtual ~TComRPSList();
-  
-  Void  create  (Int numberOfEntries);
-  Void  destroy ();
-
-
-  TComReferencePictureSet* getReferencePictureSet(Int referencePictureSetNum);
-  Int getNumberOfReferencePictureSets();
-  Void setNumberOfReferencePictureSets(Int numberOfReferencePictureSets);
-};
-#endif
 
 /// Reference Picture Lists class
@@ -821 +674 @@
   UInt      m_bRefPicListModificationFlagL0;  
   UInt      m_bRefPicListModificationFlagL1;  
-#if !H0137_0138_LIST_MODIFICATION
-  UInt      m_uiNumberOfRefPicListModificationsL0;
-  UInt      m_uiNumberOfRefPicListModificationsL1;
-  UInt      m_ListIdcL0[32];
-#endif
   UInt      m_RefPicSetIdxL0[32];
-#if !H0137_0138_LIST_MODIFICATION
-  UInt      m_ListIdcL1[32];
-#endif
   UInt      m_RefPicSetIdxL1[32];
     
@@ -843 +688 @@
   Bool       getRefPicListModificationFlagL1() { return m_bRefPicListModificationFlagL1; }
   Void       setRefPicListModificationFlagL1(Bool flag) { m_bRefPicListModificationFlagL1 = flag; }
-#if !H0137_0138_LIST_MODIFICATION
-  UInt       getNumberOfRefPicListModificationsL0() { return m_uiNumberOfRefPicListModificationsL0; }
-  Void       setNumberOfRefPicListModificationsL0(UInt nr) { m_uiNumberOfRefPicListModificationsL0 = nr; }
-  UInt       getNumberOfRefPicListModificationsL1() { return m_uiNumberOfRefPicListModificationsL1; }
-  Void       setNumberOfRefPicListModificationsL1(UInt nr) { m_uiNumberOfRefPicListModificationsL1 = nr; }
-  Void       setListIdcL0(UInt idx, UInt idc) { m_ListIdcL0[idx] = idc; }
-  UInt       getListIdcL0(UInt idx) { return m_ListIdcL0[idx]; }
-#endif
   Void       setRefPicSetIdxL0(UInt idx, UInt refPicSetIdx) { m_RefPicSetIdxL0[idx] = refPicSetIdx; }
   UInt       getRefPicSetIdxL0(UInt idx) { return m_RefPicSetIdxL0[idx]; }
-#if !H0137_0138_LIST_MODIFICATION
-  Void       setListIdcL1(UInt idx, UInt idc) { m_ListIdcL1[idx] = idc; }
-  UInt       getListIdcL1(UInt idx) { return m_ListIdcL1[idx]; }
-#endif
   Void       setRefPicSetIdxL1(UInt idx, UInt refPicSetIdx) { m_RefPicSetIdxL1[idx] = refPicSetIdx; }
   UInt       getRefPicSetIdxL1(UInt idx) { return m_RefPicSetIdxL1[idx]; }
@@ -873 +706 @@
   // access channel
   TComSPS*    m_pcSPS;
-#if !RPS_IN_SPS
-  TComRPSList* m_RPSList;
-#endif
   UInt        m_uiMaxCuDQPDepth;
   UInt        m_uiMinCuDQPSize;
@@ -882 +712 @@
   Int        m_iChromaQpOffset2nd;
 
-#if !RPS_IN_SPS
-  Bool        m_bLongTermRefsPresent;
-#endif
-
-#if !H0566_TLA
-  UInt        m_uiNumTlayerSwitchingFlags;            // num_temporal_layer_switching_point_flags
-  Bool        m_abTLayerSwitchingFlag[ MAX_TLAYER ];  // temporal_layer_switching_point_flag
-#endif
+
 
   Int         m_iSliceGranularity;
@@ -896 +719 @@
   UInt        m_uiBiPredIdc;              // Use of Weighting Bi-Prediction (B_SLICE)
 
-#if H0388
   Bool        m_OutputFlagPresentFlag;   // Indicates the presence of output_flag in slice header
-#endif
 
   Int      m_iTileBehaviorControlPresentFlag;
@@ -904 +725 @@
   Int      m_iColumnRowInfoPresent;
   Int      m_iUniformSpacingIdr;
-#if !REMOVE_TILE_DEPENDENCE
-  Int      m_iTileBoundaryIndependenceIdr;
-#endif
   Int      m_iNumColumnsMinus1;
   UInt*    m_puiColumnWidth;
@@ -913 +731 @@
   
   Int      m_iEntropyCodingMode; // !!! in PPS now, but also remains in slice header!
-#if !WPP_SIMPLIFICATION  
-  Int      m_iEntropyCodingSynchro;
-  Bool     m_bCabacIstateReset;
-#endif
   Int      m_iNumSubstreams;
 
   Bool     m_enableTMVPFlag;
 
-#if MULTIBITS_DATA_HIDING
   Int      m_signHideFlag;
   Int      m_signHidingThreshold;
-#endif
 
 #if CABAC_INIT_FLAG
@@ -933 +745 @@
 #endif
 #endif
-#if DBL_CONTROL
   Bool     m_DeblockingFilterControlPresent;
-#endif
-#if PARALLEL_MERGE
   UInt m_log2ParallelMergeLevelMinus2;
-#endif
 public:
   TComPPS();
@@ -957 +765 @@
   Void      setConstrainedIntraPred ( Bool b ) { m_bConstrainedIntraPred = b;     }
 
-#if !H0566_TLA
-  UInt      getNumTLayerSwitchingFlags()                                  { return m_uiNumTlayerSwitchingFlags; }
-  Void      setNumTLayerSwitchingFlags( UInt uiNumTlayerSwitchingFlags )  { assert( uiNumTlayerSwitchingFlags < MAX_TLAYER ); m_uiNumTlayerSwitchingFlags = uiNumTlayerSwitchingFlags; }
-
-  Bool      getTLayerSwitchingFlag( UInt uiTLayer )                       { assert( uiTLayer < MAX_TLAYER ); return m_abTLayerSwitchingFlag[ uiTLayer ]; }
-  Void      setTLayerSwitchingFlag( UInt uiTLayer, Bool bValue )          { m_abTLayerSwitchingFlag[ uiTLayer ] = bValue; }
-#endif
-
-#if !RPS_IN_SPS
-  Bool      getLongTermRefsPresent()         { return m_bLongTermRefsPresent; }
-  Void      setLongTermRefsPresent(Bool b)   { m_bLongTermRefsPresent=b;      }
-#endif
+
   Void      setSPS              ( TComSPS* pcSPS ) { m_pcSPS = pcSPS; }
   TComSPS*  getSPS              ()         { return m_pcSPS;          }
-#if !RPS_IN_SPS
-  Void      setRPSList          ( TComRPSList* RPSList ) { m_RPSList = RPSList; }
-  TComRPSList* getRPSList       ()         { return m_RPSList;        }
-#endif
   Void      setMaxCuDQPDepth    ( UInt u ) { m_uiMaxCuDQPDepth = u;   }
   UInt      getMaxCuDQPDepth    ()         { return m_uiMaxCuDQPDepth;}
@@ -991 +784 @@
   Void setWPBiPredIdc               ( UInt u )  { m_uiBiPredIdc = u;        }
 
-#if H0388
   Void      setOutputFlagPresentFlag( Bool b )  { m_OutputFlagPresentFlag = b;    }
   Bool      getOutputFlagPresentFlag()          { return m_OutputFlagPresentFlag; }
-#endif 
 
   Void    setTileBehaviorControlPresentFlag        ( Int i )             { m_iTileBehaviorControlPresentFlag = i;    }
@@ -1004 +795 @@
   Void     setUniformSpacingIdr             ( Int i )           { m_iUniformSpacingIdr = i; }
   Int      getUniformSpacingIdr             ()                  { return m_iUniformSpacingIdr; }
-#if !REMOVE_TILE_DEPENDENCE
-  Void     setTileBoundaryIndependenceIdr   ( Int i )           { m_iTileBoundaryIndependenceIdr = i; }
-  Int      getTileBoundaryIndependenceIdr   ()                  { return m_iTileBoundaryIndependenceIdr; }
-#endif
   Void     setNumColumnsMinus1              ( Int i )           { m_iNumColumnsMinus1 = i; }
   Int      getNumColumnsMinus1              ()                  { return m_iNumColumnsMinus1; }
@@ -1040 +827 @@
   Void     setEntropyCodingMode(Int iEntropyCodingMode)       { m_iEntropyCodingMode = iEntropyCodingMode; }
   Int      getEntropyCodingMode()                             { return m_iEntropyCodingMode; }
-#if !WPP_SIMPLIFICATION
-  Void     setEntropyCodingSynchro(Int iEntropyCodingSynchro) { m_iEntropyCodingSynchro = iEntropyCodingSynchro; }
-  Int      getEntropyCodingSynchro()                          { return m_iEntropyCodingSynchro; }
-  Void     setCabacIstateReset(Bool bCabacIstateReset)        { m_bCabacIstateReset = bCabacIstateReset; }
-  Bool     getCabacIstateReset()                              { return m_bCabacIstateReset; }
-#endif
   Void     setNumSubstreams(Int iNumSubstreams)               { m_iNumSubstreams = iNumSubstreams; }
   Int      getNumSubstreams()                                 { return m_iNumSubstreams; }
 
-#if MULTIBITS_DATA_HIDING
   Void      setSignHideFlag( Int signHideFlag ) { m_signHideFlag = signHideFlag; }
   Void      setTSIG( Int tsig )                 { m_signHidingThreshold = tsig; }
   Int       getSignHideFlag()                    { return m_signHideFlag; }
   Int       getTSIG()                            { return m_signHidingThreshold; }
-#endif
 
   Void     setEnableTMVPFlag( Bool b )  { m_enableTMVPFlag = b;    }
@@ -1069 +848 @@
 #endif
 #endif
-#if DBL_CONTROL
   Void setDeblockingFilterControlPresent    ( Bool bValue )       { m_DeblockingFilterControlPresent = bValue; }
   Bool getDeblockingFilterControlPresent    ()                    { return m_DeblockingFilterControlPresent; }
-#endif
-#if PARALLEL_MERGE
   UInt getLog2ParallelMergeLevelMinus2      ()                    { return m_log2ParallelMergeLevelMinus2; }
   Void setLog2ParallelMergeLevelMinus2      (UInt mrgLevel)       { m_log2ParallelMergeLevelMinus2 = mrgLevel; }
-#endif
 };
 
@@ -1093 +868 @@
   Int*     getScalingListDefaultAddress   (UInt sizeId, UInt listId);                                                        //!< get default matrix coefficient
   Void     processDefaultMarix            (UInt sizeId, UInt listId);
-#if SCALING_LIST
   Void     setScalingListDC               (UInt sizeId, UInt listId, UInt u)   { m_scalingListDC[sizeId][listId] = u; }      //!< set DC value
   Int      getScalingListDC               (UInt sizeId, UInt listId)           { return m_scalingListDC[sizeId][listId]; }   //!< get DC value
@@ -1099 +873 @@
   Void     setUseDefaultScalingMatrixFlag (UInt sizeId, UInt listId, Bool b)   { m_useDefaultScalingMatrixFlag[sizeId][listId] = b;    } //!< set default matrix enabled/disabled in each matrix
   Bool     getUseDefaultScalingMatrixFlag (UInt sizeId, UInt listId)           { return m_useDefaultScalingMatrixFlag[sizeId][listId]; } //!< get default matrix enabled/disabled in each matrix
-#endif
   Void     processRefMatrix               (UInt sizeId, UInt listId , UInt refListId );
   Bool     xParseScalingList              (char* pchFile);
@@ -1106 +879 @@
   Void     init                    ();
   Void     destroy                 ();
-#if SCALING_LIST
   Int      m_scalingListDC               [SCALING_LIST_SIZE_NUM][SCALING_LIST_NUM]; //!< the DC value of the matrix coefficient for 16x16
   Bool     m_useDefaultScalingMatrixFlag [SCALING_LIST_SIZE_NUM][SCALING_LIST_NUM]; //!< UseDefaultScalingMatrixFlag
-#endif
   UInt     m_refMatrixId                 [SCALING_LIST_SIZE_NUM][SCALING_LIST_NUM]; //!< RefMatrixID
   Bool     m_scalingListPresentFlag;                                                //!< flag for using default matrix
@@ -1130 +901 @@
   Bool      getAlfEnabled ()          {return m_bAlfEnabled;     }  //!< get ALF enabled/disabled in APS
 
-#if LCU_SYNTAX_ALF
   AlfParamSet* getAlfParam   ()          {return m_alfParamSet;}
-#else
-  ALFParam* getAlfParam   ()          {return m_pAlfParam;       }  //!< get ALF parameters in APS
-#endif
   SAOParam* getSaoParam   ()          {return m_pSaoParam;       }  //!< get SAO parameters in APS
 
@@ -1157 +924 @@
   Bool      getScalingListEnabled ()          { return m_scalingListEnabled; }  //!< get ScalingList enabled/disabled in APS
   TComScalingList* getScalingList ()          { return m_scalingList; }         //!< get ScalingList class pointer in APS
-#if SAO_UNIT_INTERLEAVING
   Bool     getSaoInterleavingFlag() {return m_saoInterleavingFlag;}             //!< get SAO interleaving flag in APS
   Void     setSaoInterleavingFlag(Bool bVal) {m_saoInterleavingFlag = bVal;}    //!< set SAO interleaving flag in APS
-#endif
 
 private:
@@ -1167 +932 @@
   Bool        m_bAlfEnabled;  //!< ALF enabled/disabled in APS (true for enabled)
   SAOParam*   m_pSaoParam;    //!< SAO parameter object pointer 
-#if LCU_SYNTAX_ALF
   AlfParamSet*   m_alfParamSet;
-#else
-  ALFParam*   m_pAlfParam;    //!< ALF parameter object pointer
-#endif
   Bool        m_loopFilterOffsetInAPS;       //< offset for deblocking filter in 0 = slice header, 1 = APS
   Bool        m_loopFilterDisable;           //< Deblocking filter enabled/disabled in APS
@@ -1178 +939 @@
   Bool        m_scalingListEnabled;     //!< ScalingList enabled/disabled in APS (true for enabled)
   TComScalingList*     m_scalingList;   //!< ScalingList class pointer
-#if SAO_UNIT_INTERLEAVING
   Bool        m_saoInterleavingFlag;    //!< SAO interleaving flag
-#endif
 
 public:
@@ -1212 +971 @@
   bool       m_alfEnabledFlag;
   bool       m_saoEnabledFlag;
-#if SAO_UNIT_INTERLEAVING
   bool       m_saoInterleavingFlag;   ///< SAO interleaving flag
   bool       m_saoEnabledFlagCb;      ///< SAO Cb enabled flag
   bool       m_saoEnabledFlagCr;      ///< SAO Cr enabled flag
-#endif
   Int         m_iPPSId;               ///< picture parameter set ID
-#if H0388
   Bool        m_PicOutputFlag;        ///< pic_output_flag 
-#endif
   Int         m_iPOC;
   Int         m_iLastIDR;
@@ -1337 +1092 @@
 #endif
 
-#if H0111_MVD_L1_ZERO
   Bool       m_bLMvdL1Zero;
-#endif
-#if TILES_WPP_ENTRY_POINT_SIGNALLING
   Int         m_numEntryPointOffsets;
-#endif
 
   Int        m_viewId;
@@ -1397 +1148 @@
   Void      setAPSId        ( Int Id)          { m_iAPSId =Id;    } //!< set APS ID
   Int       getAPSId        ()                 { return m_iAPSId; } //!< get APS ID
-#if H0388
   Void      setPicOutputFlag( Bool b )         { m_PicOutputFlag = b;    }
   Bool      getPicOutputFlag()                 { return m_PicOutputFlag; }
-#endif
   Void      setAlfEnabledFlag(Bool s) {m_alfEnabledFlag =s; }
   Bool      getAlfEnabledFlag() { return m_alfEnabledFlag; }
   Void      setSaoEnabledFlag(Bool s) {m_saoEnabledFlag =s; }
   Bool      getSaoEnabledFlag() { return m_saoEnabledFlag; }
-#if SAO_UNIT_INTERLEAVING
   Void      setSaoInterleavingFlag(Bool s) {m_saoInterleavingFlag =s; } //!< set SAO interleaving flag
   Bool      getSaoInterleavingFlag() { return m_saoInterleavingFlag;  } //!< get SAO interleaving flag
@@ -1412 +1160 @@
   Void      setSaoEnabledFlagCr(Bool s) {m_saoEnabledFlagCr =s; }       //!< set SAO Cr enabled flag
   Bool      getSaoEnabledFlagCr() { return m_saoEnabledFlagCr; }        //!< get SAO Cr enabled flag
-#endif
   Void      setRPS          ( TComReferencePictureSet *pcRPS ) { m_pcRPS = pcRPS; }
   TComReferencePictureSet*  getRPS          () { return m_pcRPS; }
@@ -1454 +1201 @@
 #endif
   Bool      getCheckLDC     ()                                  { return m_bCheckLDC; }
-#if H0111_MVD_L1_ZERO
   Bool      getMvdL1ZeroFlag ()                                  { return m_bLMvdL1Zero;    }
-#endif
   Int       getRefIdxOfLC       (RefPicList e, Int iRefIdx)     { return m_iRefIdxOfLC[e][iRefIdx];           }
   Int       getListIdFromIdxOfLC(Int iRefIdx)                   { return m_eListIdFromIdxOfLC[iRefIdx];       }
@@ -1510 +1255 @@
 #endif
   Void      setCheckLDC         ( Bool b )                      { m_bCheckLDC = b; }
-#if H0111_MVD_L1_ZERO
   Void      setMvdL1ZeroFlag     ( Bool b)                       { m_bLMvdL1Zero = b; }
-#endif  
 
   Bool      isIntra         ()                          { return  m_eSliceType == I_SLICE;  }
@@ -1550 +1293 @@
   Void setTLayer             ( UInt uiTLayer )             { m_uiTLayer = uiTLayer;                  }
 
-#if !H0566_TLA
-  Bool getTLayerSwitchingFlag()                            { return m_bTLayerSwitchingFlag;          }
-  Void setTLayerSwitchingFlag( Bool bValue )               { m_bTLayerSwitchingFlag = bValue;        }
-#endif
 
   Void setTLayerInfo( UInt uiTLayer );
   Void decodingMarking( TComList<TComPic*>& rcListPic, Int iGOPSIze, Int& iMaxRefPicNum ); 
   Void applyReferencePictureSet( TComList<TComPic*>& rcListPic, TComReferencePictureSet *RPSList);
-#if H0566_TLA && H0566_TLA_SET_FOR_SWITCHING_POINTS
+#if H0566_TLA_SET_FOR_SWITCHING_POINTS
   Bool isTemporalLayerSwitchingPoint( TComList<TComPic*>& rcListPic, TComReferencePictureSet *RPSList);
 #endif
-#if START_DECODING_AT_CRA
   Int       checkThatAllRefPicsAreAvailable( TComList<TComPic*>& rcListPic, TComReferencePictureSet *pReferencePictureSet, Bool outputFlag, Int pocRandomAccess = 0);
-#else
-  Int       checkThatAllRefPicsAreAvailable( TComList<TComPic*>& rcListPic, TComReferencePictureSet *pReferencePictureSet, Bool outputFlag);
-#endif
   Void      createExplicitReferencePictureSetFromReference( TComList<TComPic*>& rcListPic, TComReferencePictureSet *pReferencePictureSet);
 
@@ -1639 +1374 @@
   Int       getCABACinitIDC()         {return m_cabacInitIdc;    }  //!< get CABAC initial IDC number 
 #endif
-#if TILES_WPP_ENTRY_POINT_SIGNALLING
   Void      setNumEntryPointOffsets(Int val)  { m_numEntryPointOffsets = val;     }
   Int       getNumEntryPointOffsets()         { return m_numEntryPointOffsets;    }
-#endif
 
   Void setViewId( Int viewId )       { m_viewId = viewId;   }

branches/HTM-5.1-dev0/source/Lib/TLibCommon/TComTrQuant.cpp

@@ -180 +180 @@
 
 
-#if H0736_AVC_STYLE_QP_RANGE
 /** Set qP for Quantization.
  * \param qpy QPy
@@ -214 +213 @@
   m_cQP.setQpParam( qpScaled, bLowpass, eSliceType );
 }
-#else
-/// Including Chroma QP Parameter setting
-Void TComTrQuant::setQPforQuant( Int iQP, Bool bLowpass, SliceType eSliceType, TextType eTxtType, Int Shift)
-{
-  iQP = Clip3( MIN_QP, MAX_QP, iQP + Shift );
-  
-  if(eTxtType != TEXT_LUMA) //Chroma
-  {
-    iQP  = g_aucChromaScale[ iQP ];
-  }
-  
-  m_cQP.setQpParam( iQP, bLowpass, eSliceType );
-}
-#endif
 
 #if MATRIX_MULT
@@ -421 +406 @@
  *  \param shift specifies right shift after 1D transform
  */
-#if !UNIFIED_TRANSFORM
-void partialButterfly4(short src[4][4],short dst[4][4],int shift)
-{
-  int j;  
-  int E[2],O[2];
-  int add = 1<<(shift-1);
-
-  for (j=0; j<4; j++)
-  {    
-    /* E and O */
-    E[0] = src[j][0] + src[j][3];
-    O[0] = src[j][0] - src[j][3];
-    E[1] = src[j][1] + src[j][2];
-    O[1] = src[j][1] - src[j][2];
-
-    dst[0][j] = (g_aiT4[0][0]*E[0] + g_aiT4[0][1]*E[1] + add)>>shift;
-    dst[2][j] = (g_aiT4[2][0]*E[0] + g_aiT4[2][1]*E[1] + add)>>shift;
-    dst[1][j] = (g_aiT4[1][0]*O[0] + g_aiT4[1][1]*O[1] + add)>>shift;
-    dst[3][j] = (g_aiT4[3][0]*O[0] + g_aiT4[3][1]*O[1] + add)>>shift;
-  }
-}
-#endif
 
 void partialButterfly4(short *src,short *dst,int shift, int line)
@@ -470 +433 @@
 // Fast DST Algorithm. Full matrix multiplication for DST and Fast DST algorithm 
 // give identical results
-#if UNIFIED_TRANSFORM
 void fastForwardDst(short *block,short *coeff,int shift)  // input block, output coeff
-#else
-void fastForwardDst(short block[4][4],short coeff[4][4],int shift)  // input block, output coeff
-#endif
 {
   int i, c[4];
@@ -481 +440 @@
   {
     // Intermediate Variables
-#if UNIFIED_TRANSFORM
     c[0] = block[4*i+0] + block[4*i+3];
     c[1] = block[4*i+1] + block[4*i+3];
@@ -491 +449 @@
     coeff[ 8+i] =  ( 29 * c[2] + 55 * c[0]         - c[3]               + rnd_factor ) >> shift;
     coeff[12+i] =  ( 55 * c[2] - 29 * c[1]         + c[3]               + rnd_factor ) >> shift;
-#else
-    c[0] = block[i][0] + block[i][3];
-    c[1] = block[i][1] + block[i][3];
-    c[2] = block[i][0] - block[i][1];
-    c[3] = 74* block[i][2];
-    
-    coeff[0][i] =  ( 29 * c[0] + 55 * c[1]         + c[3]               + rnd_factor ) >> shift;
-    coeff[1][i] =  ( 74 * (block[i][0]+ block[i][1] - block[i][3])      + rnd_factor ) >> shift;
-    coeff[2][i] =  ( 29 * c[2] + 55 * c[0]         - c[3]               + rnd_factor ) >> shift;
-    coeff[3][i] =  ( 55 * c[2] - 29 * c[1]         + c[3]               + rnd_factor ) >> shift;
-#endif
-  }
-}
-
-#if UNIFIED_TRANSFORM
+  }
+}
+
 void fastInverseDst(short *tmp,short *block,int shift)  // input tmp, output block
-#else
-void fastInverseDst(short tmp[4][4],short block[4][4],int shift)  // input tmp, output block
-#endif
 {
   int i, c[4];
@@ -516 +459 @@
   {  
     // Intermediate Variables
-#if UNIFIED_TRANSFORM
     c[0] = tmp[  i] + tmp[ 8+i];
     c[1] = tmp[8+i] + tmp[12+i];
@@ -526 +468 @@
     block[4*i+2] = Clip3( -32768, 32767, ( 74 * (tmp[i] - tmp[8+i]  + tmp[12+i])      + rnd_factor ) >> shift );
     block[4*i+3] = Clip3( -32768, 32767, ( 55 * c[0] + 29 * c[2]     - c[3]               + rnd_factor ) >> shift );
-#else
-    c[0] = tmp[0][i] + tmp[2][i];
-    c[1] = tmp[2][i] + tmp[3][i];
-    c[2] = tmp[0][i] - tmp[3][i];
-    c[3] = 74* tmp[1][i];
-
-    block[i][0] = Clip3( -32768, 32767, ( 29 * c[0] + 55 * c[1]     + c[3]               + rnd_factor ) >> shift );
-    block[i][1] = Clip3( -32768, 32767, ( 55 * c[2] - 29 * c[1]     + c[3]               + rnd_factor ) >> shift );
-    block[i][2] = Clip3( -32768, 32767, ( 74 * (tmp[0][i] - tmp[2][i]  + tmp[3][i])      + rnd_factor ) >> shift );
-    block[i][3] = Clip3( -32768, 32767, ( 55 * c[0] + 29 * c[2]     - c[3]               + rnd_factor ) >> shift );
-#endif
-  }
-}
-#if !UNIFIED_TRANSFORM
-/** 4x4 forward transform (2D)
- *  \param block input data (residual)
- *  \param coeff output data (transform coefficients)
- *  \param uiMode is Intra Prediction mode used in Mode-Dependent DCT/DST only
- */
-void xTr4(short block[4][4],short coeff[4][4],UInt uiMode)
-{
-#if FULL_NBIT
-  int shift_1st = 1 + g_uiBitDepth - 8; // log2(4) - 1 + g_uiBitDepth - 8
-#else
-  int shift_1st = 1 + g_uiBitIncrement; // log2(4) - 1 + g_uiBitIncrement
-#endif
-  int shift_2nd = 8;                    // log2(4) + 6
-  short tmp[4][4]; 
-#if LOGI_INTRA_NAME_3MPM
-  if (uiMode != REG_DCT && (!uiMode || (uiMode>=2 && uiMode <= 25)))    // Check for DCT or DST
-#else
-  if (uiMode != REG_DCT && g_aucDCTDSTMode_Hor[uiMode])// Check for DCT or DST
-#endif
-  {
-    fastForwardDst(block,tmp,shift_1st); // Forward DST BY FAST ALGORITHM, block input, tmp output
-  }
-  else  
-  {
-    partialButterfly4(block,tmp,shift_1st);
-  }
-
-#if LOGI_INTRA_NAME_3MPM
-  if (uiMode != REG_DCT && (!uiMode || (uiMode>=11 && uiMode <= 34)))    // Check for DCT or DST
-#else
-  if (uiMode != REG_DCT && g_aucDCTDSTMode_Vert[uiMode] )   // Check for DCT or DST
-#endif
-  {
-    fastForwardDst(tmp,coeff,shift_2nd); // Forward DST BY FAST ALGORITHM, tmp input, coeff output
-  }
-  else  
-  {
-    partialButterfly4(tmp,coeff,shift_2nd);
-  }   
-}
-
-/** 4x4 inverse transform implemented using partial butterfly structure (1D)
- *  \param src   input data (transform coefficients)
- *  \param dst   output data (residual)
- *  \param shift specifies right shift after 1D transform
- */
-void partialButterflyInverse4(short src[4][4],short dst[4][4],int shift)
-{
-  int j;    
-  int E[2],O[2];
-  int add = 1<<(shift-1);
-
-  for (j=0; j<4; j++)
-  {    
-    /* Utilizing symmetry properties to the maximum to minimize the number of multiplications */    
-    O[0] = g_aiT4[1][0]*src[1][j] + g_aiT4[3][0]*src[3][j];
-    O[1] = g_aiT4[1][1]*src[1][j] + g_aiT4[3][1]*src[3][j];
-    E[0] = g_aiT4[0][0]*src[0][j] + g_aiT4[2][0]*src[2][j];
-    E[1] = g_aiT4[0][1]*src[0][j] + g_aiT4[2][1]*src[2][j];
-    
-    /* Combining even and odd terms at each hierarchy levels to calculate the final spatial domain vector */
-    dst[j][0] = Clip3( -32768, 32767, (E[0] + O[0] + add)>>shift );
-    dst[j][1] = Clip3( -32768, 32767, (E[1] + O[1] + add)>>shift );
-    dst[j][2] = Clip3( -32768, 32767, (E[1] - O[1] + add)>>shift );
-    dst[j][3] = Clip3( -32768, 32767, (E[0] - O[0] + add)>>shift );
-  }
-}
-#endif
+  }
+}
 
 void partialButterflyInverse4(short *src,short *dst,int shift, int line)
@@ -634 +496 @@
 }
 
-#if !UNIFIED_TRANSFORM
-/** 4x4 inverse transform (2D)
- *  \param coeff input data (transform coefficients)
- *  \param block output data (residual)
- *  \param uiMode is Intra Prediction mode used in Mode-Dependent DCT/DST only
- */
-void xITr4(short coeff[4][4],short block[4][4], UInt uiMode)
-{
-  int shift_1st = SHIFT_INV_1ST;
-#if FULL_NBIT
-  int shift_2nd = SHIFT_INV_2ND - ((short)g_uiBitDepth - 8);
-#else
-  int shift_2nd = SHIFT_INV_2ND - g_uiBitIncrement;
-#endif
-  short tmp[4][4];
-  
-#if LOGI_INTRA_NAME_3MPM
-  if (uiMode != REG_DCT && (!uiMode || (uiMode>=11 && uiMode <= 34)))    // Check for DCT or DST
-#else
-  if (uiMode != REG_DCT && g_aucDCTDSTMode_Vert[uiMode] )    // Check for DCT or DST
-#endif
-  {
-    fastInverseDst(coeff,tmp,shift_1st);    // Inverse DST by FAST Algorithm, coeff input, tmp output
-  }
-  else
-  {
-    partialButterflyInverse4(coeff,tmp,shift_1st);    
-  } 
-#if LOGI_INTRA_NAME_3MPM
-  if (uiMode != REG_DCT && (!uiMode || (uiMode>=2 && uiMode <= 25)))    // Check for DCT or DST
-#else
-  if (uiMode != REG_DCT && g_aucDCTDSTMode_Hor[uiMode] )    // Check for DCT or DST
-#endif
-  {
-    fastInverseDst(tmp,block,shift_2nd); // Inverse DST by FAST Algorithm, tmp input, coeff output
-  }
-  else
-  {
-    partialButterflyInverse4(tmp,block,shift_2nd);
-  }   
-}
-
-/** 8x8 forward transform implemented using partial butterfly structure (1D)
- *  \param src   input data (residual)
- *  \param dst   output data (transform coefficients)
- *  \param shift specifies right shift after 1D transform
- */
-void partialButterfly8(short src[8][8],short dst[8][8],int shift)
-{
-  int j,k;  
-  int E[4],O[4];
-  int EE[2],EO[2];
-  int add = 1<<(shift-1);
-
-  for (j=0; j<8; j++)
-  {    
-    /* E and O*/
-    for (k=0;k<4;k++)
-    {
-      E[k] = src[j][k] + src[j][7-k];
-      O[k] = src[j][k] - src[j][7-k];
-    }    
-    /* EE and EO */
-    EE[0] = E[0] + E[3];    
-    EO[0] = E[0] - E[3];
-    EE[1] = E[1] + E[2];
-    EO[1] = E[1] - E[2];
-
-    dst[0][j] = (g_aiT8[0][0]*EE[0] + g_aiT8[0][1]*EE[1] + add)>>shift;
-    dst[4][j] = (g_aiT8[4][0]*EE[0] + g_aiT8[4][1]*EE[1] + add)>>shift; 
-    dst[2][j] = (g_aiT8[2][0]*EO[0] + g_aiT8[2][1]*EO[1] + add)>>shift;
-    dst[6][j] = (g_aiT8[6][0]*EO[0] + g_aiT8[6][1]*EO[1] + add)>>shift; 
-
-    dst[1][j] = (g_aiT8[1][0]*O[0] + g_aiT8[1][1]*O[1] + g_aiT8[1][2]*O[2] + g_aiT8[1][3]*O[3] + add)>>shift;
-    dst[3][j] = (g_aiT8[3][0]*O[0] + g_aiT8[3][1]*O[1] + g_aiT8[3][2]*O[2] + g_aiT8[3][3]*O[3] + add)>>shift;
-    dst[5][j] = (g_aiT8[5][0]*O[0] + g_aiT8[5][1]*O[1] + g_aiT8[5][2]*O[2] + g_aiT8[5][3]*O[3] + add)>>shift;
-    dst[7][j] = (g_aiT8[7][0]*O[0] + g_aiT8[7][1]*O[1] + g_aiT8[7][2]*O[2] + g_aiT8[7][3]*O[3] + add)>>shift;
-  }
-}
-#endif
 
 void partialButterfly8(short *src,short *dst,int shift, int line)
@@ -751 +533 @@
 }
 
-#if !UNIFIED_TRANSFORM
-/** 8x8 forward transform (2D)
- *  \param block input data (residual)
- *  \param coeff  output data (transform coefficients)
- */
-void xTr8(short block[8][8],short coeff[8][8])
-{
-#if FULL_NBIT
-  int shift_1st = 2 + g_uiBitDepth - 8; // log2(8) - 1 + g_uiBitDepth - 8
-#else
-  int shift_1st = 2 + g_uiBitIncrement; // log2(8) - 1 + g_uiBitIncrement
-#endif
-  int shift_2nd = 9;                    // log2(8) + 6
-  short tmp[8][8]; 
-
-  partialButterfly8(block,tmp,shift_1st);
-  partialButterfly8(tmp,coeff,shift_2nd);
-}
-
-/** 8x8 inverse transform implemented using partial butterfly structure (1D)
- *  \param src   input data (transform coefficients)
- *  \param dst   output data (residual)
- *  \param shift specifies right shift after 1D transform
- */
-void partialButterflyInverse8(short src[8][8],short dst[8][8],int shift)
+
+void partialButterflyInverse8(short *src,short *dst,int shift, int line)
 {
   int j,k;    
@@ -782 +541 @@
   int add = 1<<(shift-1);
 
-  for (j=0; j<8; j++)
+  for (j=0; j<line; j++) 
   {    
     /* Utilizing symmetry properties to the maximum to minimize the number of multiplications */
     for (k=0;k<4;k++)
     {
-      O[k] = g_aiT8[ 1][k]*src[ 1][j] + g_aiT8[ 3][k]*src[ 3][j] + g_aiT8[ 5][k]*src[ 5][j] + g_aiT8[ 7][k]*src[ 7][j];
-    }
-   
-    EO[0] = g_aiT8[2][0]*src[2][j] + g_aiT8[6][0]*src[6][j];
-    EO[1] = g_aiT8[2][1]*src[2][j] + g_aiT8[6][1]*src[6][j];
-    EE[0] = g_aiT8[0][0]*src[0][j] + g_aiT8[4][0]*src[4][j];
-    EE[1] = g_aiT8[0][1]*src[0][j] + g_aiT8[4][1]*src[4][j];
+      O[k] = g_aiT8[ 1][k]*src[line] + g_aiT8[ 3][k]*src[3*line] + g_aiT8[ 5][k]*src[5*line] + g_aiT8[ 7][k]*src[7*line];
+    }
+
+    EO[0] = g_aiT8[2][0]*src[ 2*line ] + g_aiT8[6][0]*src[ 6*line ];
+    EO[1] = g_aiT8[2][1]*src[ 2*line ] + g_aiT8[6][1]*src[ 6*line ];
+    EE[0] = g_aiT8[0][0]*src[ 0      ] + g_aiT8[4][0]*src[ 4*line ];
+    EE[1] = g_aiT8[0][1]*src[ 0      ] + g_aiT8[4][1]*src[ 4*line ];
 
     /* Combining even and odd terms at each hierarchy levels to calculate the final spatial domain vector */ 
@@ -802 +561 @@
     for (k=0;k<4;k++)
     {
-      dst[j][k]   = Clip3( -32768, 32767, (E[k] + O[k] + add)>>shift );
-      dst[j][k+4] = Clip3( -32768, 32767, (E[3-k] - O[3-k] + add)>>shift );
-    }        
-  }
-}
-#endif
-
-void partialButterflyInverse8(short *src,short *dst,int shift, int line)
-{
-  int j,k;    
-  int E[4],O[4];
-  int EE[2],EO[2];
-  int add = 1<<(shift-1);
-
-  for (j=0; j<line; j++) 
-  {    
-    /* Utilizing symmetry properties to the maximum to minimize the number of multiplications */
-    for (k=0;k<4;k++)
-    {
-      O[k] = g_aiT8[ 1][k]*src[line] + g_aiT8[ 3][k]*src[3*line] + g_aiT8[ 5][k]*src[5*line] + g_aiT8[ 7][k]*src[7*line];
-    }
-
-    EO[0] = g_aiT8[2][0]*src[ 2*line ] + g_aiT8[6][0]*src[ 6*line ];
-    EO[1] = g_aiT8[2][1]*src[ 2*line ] + g_aiT8[6][1]*src[ 6*line ];
-    EE[0] = g_aiT8[0][0]*src[ 0      ] + g_aiT8[4][0]*src[ 4*line ];
-    EE[1] = g_aiT8[0][1]*src[ 0      ] + g_aiT8[4][1]*src[ 4*line ];
-
-    /* Combining even and odd terms at each hierarchy levels to calculate the final spatial domain vector */ 
-    E[0] = EE[0] + EO[0];
-    E[3] = EE[0] - EO[0];
-    E[1] = EE[1] + EO[1];
-    E[2] = EE[1] - EO[1];
-    for (k=0;k<4;k++)
-    {
       dst[ k   ] = Clip3( -32768, 32767, (E[k] + O[k] + add)>>shift );
       dst[ k+4 ] = Clip3( -32768, 32767, (E[3-k] - O[3-k] + add)>>shift );
@@ -844 +569 @@
 }
 
-#if !UNIFIED_TRANSFORM
-/** 8x8 inverse transform (2D)
- *  \param coeff input data (transform coefficients)
- *  \param block output data (residual)
- */
-void xITr8(short coeff[8][8],short block[8][8])
+
+void partialButterfly16(short *src,short *dst,int shift, int line)
+{
+  int j,k;
+  int E[8],O[8];
+  int EE[4],EO[4];
+  int EEE[2],EEO[2];
+  int add = 1<<(shift-1);
+
+  for (j=0; j<line; j++) 
+  {    
+    /* E and O*/
+    for (k=0;k<8;k++)
+    {
+      E[k] = src[k] + src[15-k];
+      O[k] = src[k] - src[15-k];
+    } 
+    /* EE and EO */
+    for (k=0;k<4;k++)
+    {
+      EE[k] = E[k] + E[7-k];
+      EO[k] = E[k] - E[7-k];
+    }
+    /* EEE and EEO */
+    EEE[0] = EE[0] + EE[3];    
+    EEO[0] = EE[0] - EE[3];
+    EEE[1] = EE[1] + EE[2];
+    EEO[1] = EE[1] - EE[2];
+
+    dst[ 0      ] = (g_aiT16[ 0][0]*EEE[0] + g_aiT16[ 0][1]*EEE[1] + add)>>shift;        
+    dst[ 8*line ] = (g_aiT16[ 8][0]*EEE[0] + g_aiT16[ 8][1]*EEE[1] + add)>>shift;    
+    dst[ 4*line ] = (g_aiT16[ 4][0]*EEO[0] + g_aiT16[ 4][1]*EEO[1] + add)>>shift;        
+    dst[ 12*line] = (g_aiT16[12][0]*EEO[0] + g_aiT16[12][1]*EEO[1] + add)>>shift;
+
+    for (k=2;k<16;k+=4)
+    {
+      dst[ k*line ] = (g_aiT16[k][0]*EO[0] + g_aiT16[k][1]*EO[1] + g_aiT16[k][2]*EO[2] + g_aiT16[k][3]*EO[3] + add)>>shift;      
+    }
+
+    for (k=1;k<16;k+=2)
+    {
+      dst[ k*line ] = (g_aiT16[k][0]*O[0] + g_aiT16[k][1]*O[1] + g_aiT16[k][2]*O[2] + g_aiT16[k][3]*O[3] + 
+        g_aiT16[k][4]*O[4] + g_aiT16[k][5]*O[5] + g_aiT16[k][6]*O[6] + g_aiT16[k][7]*O[7] + add)>>shift;
+    }
+
+    src += 16;
+    dst ++; 
+
+  }
+}
+
+
+void partialButterflyInverse16(short *src,short *dst,int shift, int line)
+{
+  int j,k;  
+  int E[8],O[8];
+  int EE[4],EO[4];
+  int EEE[2],EEO[2];
+  int add = 1<<(shift-1);
+
+  for (j=0; j<line; j++)
+  {    
+    /* Utilizing symmetry properties to the maximum to minimize the number of multiplications */
+    for (k=0;k<8;k++)
+    {
+      O[k] = g_aiT16[ 1][k]*src[ line] + g_aiT16[ 3][k]*src[ 3*line] + g_aiT16[ 5][k]*src[ 5*line] + g_aiT16[ 7][k]*src[ 7*line] + 
+        g_aiT16[ 9][k]*src[ 9*line] + g_aiT16[11][k]*src[11*line] + g_aiT16[13][k]*src[13*line] + g_aiT16[15][k]*src[15*line];
+    }
+    for (k=0;k<4;k++)
+    {
+      EO[k] = g_aiT16[ 2][k]*src[ 2*line] + g_aiT16[ 6][k]*src[ 6*line] + g_aiT16[10][k]*src[10*line] + g_aiT16[14][k]*src[14*line];
+    }
+    EEO[0] = g_aiT16[4][0]*src[ 4*line ] + g_aiT16[12][0]*src[ 12*line ];
+    EEE[0] = g_aiT16[0][0]*src[ 0      ] + g_aiT16[ 8][0]*src[ 8*line  ];
+    EEO[1] = g_aiT16[4][1]*src[ 4*line ] + g_aiT16[12][1]*src[ 12*line ];
+    EEE[1] = g_aiT16[0][1]*src[ 0      ] + g_aiT16[ 8][1]*src[ 8*line  ];
+
+    /* Combining even and odd terms at each hierarchy levels to calculate the final spatial domain vector */ 
+    for (k=0;k<2;k++)
+    {
+      EE[k] = EEE[k] + EEO[k];
+      EE[k+2] = EEE[1-k] - EEO[1-k];
+    }    
+    for (k=0;k<4;k++)
+    {
+      E[k] = EE[k] + EO[k];
+      E[k+4] = EE[3-k] - EO[3-k];
+    }    
+    for (k=0;k<8;k++)
+    {
+      dst[k]   = Clip3( -32768, 32767, (E[k] + O[k] + add)>>shift );
+      dst[k+8] = Clip3( -32768, 32767, (E[7-k] - O[7-k] + add)>>shift );
+    }   
+    src ++; 
+    dst += 16;
+  }
+}
+
+
+void partialButterfly32(short *src,short *dst,int shift, int line)
+{
+  int j,k;
+  int E[16],O[16];
+  int EE[8],EO[8];
+  int EEE[4],EEO[4];
+  int EEEE[2],EEEO[2];
+  int add = 1<<(shift-1);
+
+  for (j=0; j<line; j++)
+  {    
+    /* E and O*/
+    for (k=0;k<16;k++)
+    {
+      E[k] = src[k] + src[31-k];
+      O[k] = src[k] - src[31-k];
+    } 
+    /* EE and EO */
+    for (k=0;k<8;k++)
+    {
+      EE[k] = E[k] + E[15-k];
+      EO[k] = E[k] - E[15-k];
+    }
+    /* EEE and EEO */
+    for (k=0;k<4;k++)
+    {
+      EEE[k] = EE[k] + EE[7-k];
+      EEO[k] = EE[k] - EE[7-k];
+    }
+    /* EEEE and EEEO */
+    EEEE[0] = EEE[0] + EEE[3];    
+    EEEO[0] = EEE[0] - EEE[3];
+    EEEE[1] = EEE[1] + EEE[2];
+    EEEO[1] = EEE[1] - EEE[2];
+
+    dst[ 0       ] = (g_aiT32[ 0][0]*EEEE[0] + g_aiT32[ 0][1]*EEEE[1] + add)>>shift;
+    dst[ 16*line ] = (g_aiT32[16][0]*EEEE[0] + g_aiT32[16][1]*EEEE[1] + add)>>shift;
+    dst[ 8*line  ] = (g_aiT32[ 8][0]*EEEO[0] + g_aiT32[ 8][1]*EEEO[1] + add)>>shift; 
+    dst[ 24*line ] = (g_aiT32[24][0]*EEEO[0] + g_aiT32[24][1]*EEEO[1] + add)>>shift;
+    for (k=4;k<32;k+=8)
+    {
+      dst[ k*line ] = (g_aiT32[k][0]*EEO[0] + g_aiT32[k][1]*EEO[1] + g_aiT32[k][2]*EEO[2] + g_aiT32[k][3]*EEO[3] + add)>>shift;
+    }       
+    for (k=2;k<32;k+=4)
+    {
+      dst[ k*line ] = (g_aiT32[k][0]*EO[0] + g_aiT32[k][1]*EO[1] + g_aiT32[k][2]*EO[2] + g_aiT32[k][3]*EO[3] + 
+        g_aiT32[k][4]*EO[4] + g_aiT32[k][5]*EO[5] + g_aiT32[k][6]*EO[6] + g_aiT32[k][7]*EO[7] + add)>>shift;
+    }       
+    for (k=1;k<32;k+=2)
+    {
+      dst[ k*line ] = (g_aiT32[k][ 0]*O[ 0] + g_aiT32[k][ 1]*O[ 1] + g_aiT32[k][ 2]*O[ 2] + g_aiT32[k][ 3]*O[ 3] + 
+        g_aiT32[k][ 4]*O[ 4] + g_aiT32[k][ 5]*O[ 5] + g_aiT32[k][ 6]*O[ 6] + g_aiT32[k][ 7]*O[ 7] +
+        g_aiT32[k][ 8]*O[ 8] + g_aiT32[k][ 9]*O[ 9] + g_aiT32[k][10]*O[10] + g_aiT32[k][11]*O[11] + 
+        g_aiT32[k][12]*O[12] + g_aiT32[k][13]*O[13] + g_aiT32[k][14]*O[14] + g_aiT32[k][15]*O[15] + add)>>shift;
+    }
+    src += 32;
+    dst ++;
+  }
+}
+
+
+void partialButterflyInverse32(short *src,short *dst,int shift, int line)
+{
+  int j,k;  
+  int E[16],O[16];
+  int EE[8],EO[8];
+  int EEE[4],EEO[4];
+  int EEEE[2],EEEO[2];
+  int add = 1<<(shift-1);
+
+  for (j=0; j<line; j++)
+  {    
+    /* Utilizing symmetry properties to the maximum to minimize the number of multiplications */
+    for (k=0;k<16;k++)
+    {
+      O[k] = g_aiT32[ 1][k]*src[ line  ] + g_aiT32[ 3][k]*src[ 3*line  ] + g_aiT32[ 5][k]*src[ 5*line  ] + g_aiT32[ 7][k]*src[ 7*line  ] + 
+        g_aiT32[ 9][k]*src[ 9*line  ] + g_aiT32[11][k]*src[ 11*line ] + g_aiT32[13][k]*src[ 13*line ] + g_aiT32[15][k]*src[ 15*line ] + 
+        g_aiT32[17][k]*src[ 17*line ] + g_aiT32[19][k]*src[ 19*line ] + g_aiT32[21][k]*src[ 21*line ] + g_aiT32[23][k]*src[ 23*line ] + 
+        g_aiT32[25][k]*src[ 25*line ] + g_aiT32[27][k]*src[ 27*line ] + g_aiT32[29][k]*src[ 29*line ] + g_aiT32[31][k]*src[ 31*line ];
+    }
+    for (k=0;k<8;k++)
+    {
+      EO[k] = g_aiT32[ 2][k]*src[ 2*line  ] + g_aiT32[ 6][k]*src[ 6*line  ] + g_aiT32[10][k]*src[ 10*line ] + g_aiT32[14][k]*src[ 14*line ] + 
+        g_aiT32[18][k]*src[ 18*line ] + g_aiT32[22][k]*src[ 22*line ] + g_aiT32[26][k]*src[ 26*line ] + g_aiT32[30][k]*src[ 30*line ];
+    }
+    for (k=0;k<4;k++)
+    {
+      EEO[k] = g_aiT32[4][k]*src[ 4*line ] + g_aiT32[12][k]*src[ 12*line ] + g_aiT32[20][k]*src[ 20*line ] + g_aiT32[28][k]*src[ 28*line ];
+    }
+    EEEO[0] = g_aiT32[8][0]*src[ 8*line ] + g_aiT32[24][0]*src[ 24*line ];
+    EEEO[1] = g_aiT32[8][1]*src[ 8*line ] + g_aiT32[24][1]*src[ 24*line ];
+    EEEE[0] = g_aiT32[0][0]*src[ 0      ] + g_aiT32[16][0]*src[ 16*line ];    
+    EEEE[1] = g_aiT32[0][1]*src[ 0      ] + g_aiT32[16][1]*src[ 16*line ];
+
+    /* Combining even and odd terms at each hierarchy levels to calculate the final spatial domain vector */
+    EEE[0] = EEEE[0] + EEEO[0];
+    EEE[3] = EEEE[0] - EEEO[0];
+    EEE[1] = EEEE[1] + EEEO[1];
+    EEE[2] = EEEE[1] - EEEO[1];    
+    for (k=0;k<4;k++)
+    {
+      EE[k] = EEE[k] + EEO[k];
+      EE[k+4] = EEE[3-k] - EEO[3-k];
+    }    
+    for (k=0;k<8;k++)
+    {
+      E[k] = EE[k] + EO[k];
+      E[k+8] = EE[7-k] - EO[7-k];
+    }    
+    for (k=0;k<16;k++)
+    {
+      dst[k]    = Clip3( -32768, 32767, (E[k] + O[k] + add)>>shift );
+      dst[k+16] = Clip3( -32768, 32767, (E[15-k] - O[15-k] + add)>>shift );
+    }
+    src ++;
+    dst += 32;
+  }
+}
+
+
+/** MxN forward transform (2D)
+*  \param block input data (residual)
+*  \param coeff output data (transform coefficients)
+*  \param iWidth input data (width of transform)
+*  \param iHeight input data (height of transform)
+*/
+void xTrMxN(short *block,short *coeff, int iWidth, int iHeight, UInt uiMode)
+{
+#if FULL_NBIT
+  int shift_1st = g_aucConvertToBit[iWidth]  + 1 + g_uiBitDepth - 8; // log2(iWidth) - 1 + g_uiBitDepth - 8
+#else
+  int shift_1st = g_aucConvertToBit[iWidth]  + 1 + g_uiBitIncrement; // log2(iWidth) - 1 + g_uiBitIncrement
+#endif
+  int shift_2nd = g_aucConvertToBit[iHeight]  + 8;                   // log2(iHeight) + 6
+
+  short tmp[ 64 * 64 ];
+
+  if( iWidth == 16 && iHeight == 4)
+  {
+    partialButterfly16( block, tmp, shift_1st, iHeight );
+    partialButterfly4( tmp, coeff, shift_2nd, iWidth );
+  }
+  else if( iWidth == 32 && iHeight == 8 )
+  {
+    partialButterfly32( block, tmp, shift_1st, iHeight );
+    partialButterfly8( tmp, coeff, shift_2nd, iWidth );
+  }
+  else if( iWidth == 4 && iHeight == 16)
+  {
+    partialButterfly4( block, tmp, shift_1st, iHeight );
+    partialButterfly16( tmp, coeff, shift_2nd, iWidth );
+  }
+  else if( iWidth == 8 && iHeight == 32 )
+  {
+    partialButterfly8( block, tmp, shift_1st, iHeight );
+    partialButterfly32( tmp, coeff, shift_2nd, iWidth );
+  }
+  else if( iWidth == 4 && iHeight == 4)
+  {
+    if (uiMode != REG_DCT && (!uiMode || (uiMode>=2 && uiMode <= 25)))    // Check for DCT or DST
+    {
+      fastForwardDst(block,tmp,shift_1st); // Forward DST BY FAST ALGORITHM, block input, tmp output
+    }
+    else  
+    {
+      partialButterfly4(block, tmp, shift_1st, iHeight);
+    }
+    if (uiMode != REG_DCT && (!uiMode || (uiMode>=11 && uiMode <= 34)))    // Check for DCT or DST
+    {
+      fastForwardDst(tmp,coeff,shift_2nd); // Forward DST BY FAST ALGORITHM, tmp input, coeff output
+    }
+    else  
+    {
+      partialButterfly4(tmp, coeff, shift_2nd, iWidth);
+    }   
+  }
+  else if( iWidth == 8 && iHeight == 8)
+  {
+    partialButterfly8( block, tmp, shift_1st, iHeight );
+    partialButterfly8( tmp, coeff, shift_2nd, iWidth );
+  }
+  else if( iWidth == 16 && iHeight == 16)
+  {
+    partialButterfly16( block, tmp, shift_1st, iHeight );
+    partialButterfly16( tmp, coeff, shift_2nd, iWidth );
+  }
+  else if( iWidth == 32 && iHeight == 32)
+  {
+    partialButterfly32( block, tmp, shift_1st, iHeight );
+    partialButterfly32( tmp, coeff, shift_2nd, iWidth );
+  }
+}
+/** MxN inverse transform (2D)
+*  \param coeff input data (transform coefficients)
+*  \param block output data (residual)
+*  \param iWidth input data (width of transform)
+*  \param iHeight input data (height of transform)
+*/
+void xITrMxN(short *coeff,short *block, int iWidth, int iHeight, UInt uiMode)
 {
   int shift_1st = SHIFT_INV_1ST;
@@ -857 +874 @@
   int shift_2nd = SHIFT_INV_2ND - g_uiBitIncrement;
 #endif
-  short tmp[8][8];
-  
-  partialButterflyInverse8(coeff,tmp,shift_1st);
-  partialButterflyInverse8(tmp,block,shift_2nd);
-}
-
-/** 16x16 forward transform implemented using partial butterfly structure (1D)
- *  \param src   input data (residual)
- *  \param dst   output data (transform coefficients)
- *  \param shift specifies right shift after 1D transform
- */
-void partialButterfly16(short src[16][16],short dst[16][16],int shift)
-{
-  int j,k;
-  int E[8],O[8];
-  int EE[4],EO[4];
-  int EEE[2],EEO[2];
-  int add = 1<<(shift-1);
-
-  for (j=0; j<16; j++)
-  {    
-    /* E and O*/
-    for (k=0;k<8;k++)
-    {
-      E[k] = src[j][k] + src[j][15-k];
-      O[k] = src[j][k] - src[j][15-k];
-    } 
-    /* EE and EO */
-    for (k=0;k<4;k++)
-    {
-      EE[k] = E[k] + E[7-k];
-      EO[k] = E[k] - E[7-k];
-    }
-    /* EEE and EEO */
-    EEE[0] = EE[0] + EE[3];    
-    EEO[0] = EE[0] - EE[3];
-    EEE[1] = EE[1] + EE[2];
-    EEO[1] = EE[1] - EE[2];
-
-    dst[ 0][j] = (g_aiT16[ 0][0]*EEE[0] + g_aiT16[ 0][1]*EEE[1] + add)>>shift;        
-    dst[ 8][j] = (g_aiT16[ 8][0]*EEE[0] + g_aiT16[ 8][1]*EEE[1] + add)>>shift;    
-    dst[ 4][j] = (g_aiT16[ 4][0]*EEO[0] + g_aiT16[ 4][1]*EEO[1] + add)>>shift;        
-    dst[12][j] = (g_aiT16[12][0]*EEO[0] + g_aiT16[12][1]*EEO[1] + add)>>shift;
-
-    for (k=2;k<16;k+=4)
-    {
-      dst[k][j] = (g_aiT16[k][0]*EO[0] + g_aiT16[k][1]*EO[1] + g_aiT16[k][2]*EO[2] + g_aiT16[k][3]*EO[3] + add)>>shift;      
-    }
-    
-    for (k=1;k<16;k+=2)
-    {
-      dst[k][j] = (g_aiT16[k][0]*O[0] + g_aiT16[k][1]*O[1] + g_aiT16[k][2]*O[2] + g_aiT16[k][3]*O[3] + 
-                     g_aiT16[k][4]*O[4] + g_aiT16[k][5]*O[5] + g_aiT16[k][6]*O[6] + g_aiT16[k][7]*O[7] + add)>>shift;
-    }
-
-  }
-}
-#endif
-
-void partialButterfly16(short *src,short *dst,int shift, int line)
-{
-  int j,k;
-  int E[8],O[8];
-  int EE[4],EO[4];
-  int EEE[2],EEO[2];
-  int add = 1<<(shift-1);
-
-  for (j=0; j<line; j++) 
-  {    
-    /* E and O*/
-    for (k=0;k<8;k++)
-    {
-      E[k] = src[k] + src[15-k];
-      O[k] = src[k] - src[15-k];
-    } 
-    /* EE and EO */
-    for (k=0;k<4;k++)
-    {
-      EE[k] = E[k] + E[7-k];
-      EO[k] = E[k] - E[7-k];
-    }
-    /* EEE and EEO */
-    EEE[0] = EE[0] + EE[3];    
-    EEO[0] = EE[0] - EE[3];
-    EEE[1] = EE[1] + EE[2];
-    EEO[1] = EE[1] - EE[2];
-
-    dst[ 0      ] = (g_aiT16[ 0][0]*EEE[0] + g_aiT16[ 0][1]*EEE[1] + add)>>shift;        
-    dst[ 8*line ] = (g_aiT16[ 8][0]*EEE[0] + g_aiT16[ 8][1]*EEE[1] + add)>>shift;    
-    dst[ 4*line ] = (g_aiT16[ 4][0]*EEO[0] + g_aiT16[ 4][1]*EEO[1] + add)>>shift;        
-    dst[ 12*line] = (g_aiT16[12][0]*EEO[0] + g_aiT16[12][1]*EEO[1] + add)>>shift;
-
-    for (k=2;k<16;k+=4)
-    {
-      dst[ k*line ] = (g_aiT16[k][0]*EO[0] + g_aiT16[k][1]*EO[1] + g_aiT16[k][2]*EO[2] + g_aiT16[k][3]*EO[3] + add)>>shift;      
-    }
-
-    for (k=1;k<16;k+=2)
-    {
-      dst[ k*line ] = (g_aiT16[k][0]*O[0] + g_aiT16[k][1]*O[1] + g_aiT16[k][2]*O[2] + g_aiT16[k][3]*O[3] + 
-        g_aiT16[k][4]*O[4] + g_aiT16[k][5]*O[5] + g_aiT16[k][6]*O[6] + g_aiT16[k][7]*O[7] + add)>>shift;
-    }
-
-    src += 16;
-    dst ++; 
-
-  }
-}
-
-#if !UNIFIED_TRANSFORM
-/** 16x16 forward transform (2D)
- *  \param block input data (residual)
- *  \param coeff output data (transform coefficients)
- */
-void xTr16(short block[16][16],short coeff[16][16])
-{
- #if FULL_NBIT
-  int shift_1st = 3 + g_uiBitDepth - 8; // log2(16) - 1 + g_uiBitDepth - 8
-#else
-  int shift_1st = 3 + g_uiBitIncrement; // log2(16) - 1 + g_uiBitIncrement
-#endif
-  int shift_2nd = 10;                   // log2(16) + 6
-  short tmp[16][16]; 
-
-  partialButterfly16(block,tmp,shift_1st);
-  partialButterfly16(tmp,coeff,shift_2nd);
-}
-
-/** 16x16 inverse transform implemented using partial butterfly structure (1D)
- *  \param src   input data (transform coefficients)
- *  \param dst   output data (residual)
- *  \param shift specifies right shift after 1D transform
- */
-void partialButterflyInverse16(short src[16][16],short dst[16][16],int shift)
-{
-  int j,k;  
-  int E[8],O[8];
-  int EE[4],EO[4];
-  int EEE[2],EEO[2];
-  int add = 1<<(shift-1);
-
-  for (j=0; j<16; j++)
-  {    
-    /* Utilizing symmetry properties to the maximum to minimize the number of multiplications */
-    for (k=0;k<8;k++)
-    {
-      O[k] = g_aiT16[ 1][k]*src[ 1][j] + g_aiT16[ 3][k]*src[ 3][j] + g_aiT16[ 5][k]*src[ 5][j] + g_aiT16[ 7][k]*src[ 7][j] + 
-             g_aiT16[ 9][k]*src[ 9][j] + g_aiT16[11][k]*src[11][j] + g_aiT16[13][k]*src[13][j] + g_aiT16[15][k]*src[15][j];
-    }
-    for (k=0;k<4;k++)
-    {
-      EO[k] = g_aiT16[ 2][k]*src[ 2][j] + g_aiT16[ 6][k]*src[ 6][j] + g_aiT16[10][k]*src[10][j] + g_aiT16[14][k]*src[14][j];
-    }
-    EEO[0] = g_aiT16[4][0]*src[4][j] + g_aiT16[12][0]*src[12][j];
-    EEE[0] = g_aiT16[0][0]*src[0][j] + g_aiT16[ 8][0]*src[ 8][j];
-    EEO[1] = g_aiT16[4][1]*src[4][j] + g_aiT16[12][1]*src[12][j];
-    EEE[1] = g_aiT16[0][1]*src[0][j] + g_aiT16[ 8][1]*src[ 8][j];
-
-    /* Combining even and odd terms at each hierarchy levels to calculate the final spatial domain vector */ 
-    for (k=0;k<2;k++)
-    {
-      EE[k] = EEE[k] + EEO[k];
-      EE[k+2] = EEE[1-k] - EEO[1-k];
-    }    
-    for (k=0;k<4;k++)
-    {
-      E[k] = EE[k] + EO[k];
-      E[k+4] = EE[3-k] - EO[3-k];
-    }    
-    for (k=0;k<8;k++)
-    {
-      dst[j][k]   = Clip3( -32768, 32767, (E[k] + O[k] + add)>>shift );
-      dst[j][k+8] = Clip3( -32768, 32767, (E[7-k] - O[7-k] + add)>>shift );
-    }        
-  }
-}
-#endif
-
-void partialButterflyInverse16(short *src,short *dst,int shift, int line)
-{
-  int j,k;  
-  int E[8],O[8];
-  int EE[4],EO[4];
-  int EEE[2],EEO[2];
-  int add = 1<<(shift-1);
-
-  for (j=0; j<line; j++)
-  {    
-    /* Utilizing symmetry properties to the maximum to minimize the number of multiplications */
-    for (k=0;k<8;k++)
-    {
-      O[k] = g_aiT16[ 1][k]*src[ line] + g_aiT16[ 3][k]*src[ 3*line] + g_aiT16[ 5][k]*src[ 5*line] + g_aiT16[ 7][k]*src[ 7*line] + 
-        g_aiT16[ 9][k]*src[ 9*line] + g_aiT16[11][k]*src[11*line] + g_aiT16[13][k]*src[13*line] + g_aiT16[15][k]*src[15*line];
-    }
-    for (k=0;k<4;k++)
-    {
-      EO[k] = g_aiT16[ 2][k]*src[ 2*line] + g_aiT16[ 6][k]*src[ 6*line] + g_aiT16[10][k]*src[10*line] + g_aiT16[14][k]*src[14*line];
-    }
-    EEO[0] = g_aiT16[4][0]*src[ 4*line ] + g_aiT16[12][0]*src[ 12*line ];
-    EEE[0] = g_aiT16[0][0]*src[ 0      ] + g_aiT16[ 8][0]*src[ 8*line  ];
-    EEO[1] = g_aiT16[4][1]*src[ 4*line ] + g_aiT16[12][1]*src[ 12*line ];
-    EEE[1] = g_aiT16[0][1]*src[ 0      ] + g_aiT16[ 8][1]*src[ 8*line  ];
-
-    /* Combining even and odd terms at each hierarchy levels to calculate the final spatial domain vector */ 
-    for (k=0;k<2;k++)
-    {
-      EE[k] = EEE[k] + EEO[k];
-      EE[k+2] = EEE[1-k] - EEO[1-k];
-    }    
-    for (k=0;k<4;k++)
-    {
-      E[k] = EE[k] + EO[k];
-      E[k+4] = EE[3-k] - EO[3-k];
-    }    
-    for (k=0;k<8;k++)
-    {
-      dst[k]   = Clip3( -32768, 32767, (E[k] + O[k] + add)>>shift );
-      dst[k+8] = Clip3( -32768, 32767, (E[7-k] - O[7-k] + add)>>shift );
-    }   
-    src ++; 
-    dst += 16;
-  }
-}
-
-#if !UNIFIED_TRANSFORM
-/** 16x16 inverse transform (2D)
- *  \param coeff input data (transform coefficients)
- *  \param block output data (residual)
- */
-void xITr16(short coeff[16][16],short block[16][16])
-{
-  int shift_1st = SHIFT_INV_1ST;
-#if FULL_NBIT
-  int shift_2nd = SHIFT_INV_2ND - ((short)g_uiBitDepth - 8);
-#else
-  int shift_2nd = SHIFT_INV_2ND - g_uiBitIncrement;
-#endif
-  short tmp[16][16];
-  
-  partialButterflyInverse16(coeff,tmp,shift_1st);
-  partialButterflyInverse16(tmp,block,shift_2nd);
-}
-
-/** 32x32 forward transform implemented using partial butterfly structure (1D)
- *  \param src   input data (residual)
- *  \param dst   output data (transform coefficients)
- *  \param shift specifies right shift after 1D transform
- */
-void partialButterfly32(short src[32][32],short dst[32][32],int shift)
-{
-  int j,k;
-  int E[16],O[16];
-  int EE[8],EO[8];
-  int EEE[4],EEO[4];
-  int EEEE[2],EEEO[2];
-  int add = 1<<(shift-1);
-
-  for (j=0; j<32; j++)
-  {    
-    /* E and O*/
-    for (k=0;k<16;k++)
-    {
-      E[k] = src[j][k] + src[j][31-k];
-      O[k] = src[j][k] - src[j][31-k];
-    } 
-    /* EE and EO */
-    for (k=0;k<8;k++)
-    {
-      EE[k] = E[k] + E[15-k];
-      EO[k] = E[k] - E[15-k];
-    }
-    /* EEE and EEO */
-    for (k=0;k<4;k++)
-    {
-      EEE[k] = EE[k] + EE[7-k];
-      EEO[k] = EE[k] - EE[7-k];
-    }
-    /* EEEE and EEEO */
-    EEEE[0] = EEE[0] + EEE[3];    
-    EEEO[0] = EEE[0] - EEE[3];
-    EEEE[1] = EEE[1] + EEE[2];
-    EEEO[1] = EEE[1] - EEE[2];
-
-    dst[ 0][j] = (g_aiT32[ 0][0]*EEEE[0] + g_aiT32[ 0][1]*EEEE[1] + add)>>shift;
-    dst[16][j] = (g_aiT32[16][0]*EEEE[0] + g_aiT32[16][1]*EEEE[1] + add)>>shift;
-    dst[ 8][j] = (g_aiT32[ 8][0]*EEEO[0] + g_aiT32[ 8][1]*EEEO[1] + add)>>shift; 
-    dst[24][j] = (g_aiT32[24][0]*EEEO[0] + g_aiT32[24][1]*EEEO[1] + add)>>shift;
-    for (k=4;k<32;k+=8)
-    {
-      dst[k][j] = (g_aiT32[k][0]*EEO[0] + g_aiT32[k][1]*EEO[1] + g_aiT32[k][2]*EEO[2] + g_aiT32[k][3]*EEO[3] + add)>>shift;
-    }       
-    for (k=2;k<32;k+=4)
-    {
-      dst[k][j] = (g_aiT32[k][0]*EO[0] + g_aiT32[k][1]*EO[1] + g_aiT32[k][2]*EO[2] + g_aiT32[k][3]*EO[3] + 
-                     g_aiT32[k][4]*EO[4] + g_aiT32[k][5]*EO[5] + g_aiT32[k][6]*EO[6] + g_aiT32[k][7]*EO[7] + add)>>shift;
-    }       
-    for (k=1;k<32;k+=2)
-    {
-      dst[k][j] = (g_aiT32[k][ 0]*O[ 0] + g_aiT32[k][ 1]*O[ 1] + g_aiT32[k][ 2]*O[ 2] + g_aiT32[k][ 3]*O[ 3] + 
-                     g_aiT32[k][ 4]*O[ 4] + g_aiT32[k][ 5]*O[ 5] + g_aiT32[k][ 6]*O[ 6] + g_aiT32[k][ 7]*O[ 7] +
-                     g_aiT32[k][ 8]*O[ 8] + g_aiT32[k][ 9]*O[ 9] + g_aiT32[k][10]*O[10] + g_aiT32[k][11]*O[11] + 
-                     g_aiT32[k][12]*O[12] + g_aiT32[k][13]*O[13] + g_aiT32[k][14]*O[14] + g_aiT32[k][15]*O[15] + add)>>shift;
-    }
-  }
-}
-#endif
-
-void partialButterfly32(short *src,short *dst,int shift, int line)
-{
-  int j,k;
-  int E[16],O[16];
-  int EE[8],EO[8];
-  int EEE[4],EEO[4];
-  int EEEE[2],EEEO[2];
-  int add = 1<<(shift-1);
-
-  for (j=0; j<line; j++)
-  {    
-    /* E and O*/
-    for (k=0;k<16;k++)
-    {
-      E[k] = src[k] + src[31-k];
-      O[k] = src[k] - src[31-k];
-    } 
-    /* EE and EO */
-    for (k=0;k<8;k++)
-    {
-      EE[k] = E[k] + E[15-k];
-      EO[k] = E[k] - E[15-k];
-    }
-    /* EEE and EEO */
-    for (k=0;k<4;k++)
-    {
-      EEE[k] = EE[k] + EE[7-k];
-      EEO[k] = EE[k] - EE[7-k];
-    }
-    /* EEEE and EEEO */
-    EEEE[0] = EEE[0] + EEE[3];    
-    EEEO[0] = EEE[0] - EEE[3];
-    EEEE[1] = EEE[1] + EEE[2];
-    EEEO[1] = EEE[1] - EEE[2];
-
-    dst[ 0       ] = (g_aiT32[ 0][0]*EEEE[0] + g_aiT32[ 0][1]*EEEE[1] + add)>>shift;
-    dst[ 16*line ] = (g_aiT32[16][0]*EEEE[0] + g_aiT32[16][1]*EEEE[1] + add)>>shift;
-    dst[ 8*line  ] = (g_aiT32[ 8][0]*EEEO[0] + g_aiT32[ 8][1]*EEEO[1] + add)>>shift; 
-    dst[ 24*line ] = (g_aiT32[24][0]*EEEO[0] + g_aiT32[24][1]*EEEO[1] + add)>>shift;
-    for (k=4;k<32;k+=8)
-    {
-      dst[ k*line ] = (g_aiT32[k][0]*EEO[0] + g_aiT32[k][1]*EEO[1] + g_aiT32[k][2]*EEO[2] + g_aiT32[k][3]*EEO[3] + add)>>shift;
-    }       
-    for (k=2;k<32;k+=4)
-    {
-      dst[ k*line ] = (g_aiT32[k][0]*EO[0] + g_aiT32[k][1]*EO[1] + g_aiT32[k][2]*EO[2] + g_aiT32[k][3]*EO[3] + 
-        g_aiT32[k][4]*EO[4] + g_aiT32[k][5]*EO[5] + g_aiT32[k][6]*EO[6] + g_aiT32[k][7]*EO[7] + add)>>shift;
-    }       
-    for (k=1;k<32;k+=2)
-    {
-      dst[ k*line ] = (g_aiT32[k][ 0]*O[ 0] + g_aiT32[k][ 1]*O[ 1] + g_aiT32[k][ 2]*O[ 2] + g_aiT32[k][ 3]*O[ 3] + 
-        g_aiT32[k][ 4]*O[ 4] + g_aiT32[k][ 5]*O[ 5] + g_aiT32[k][ 6]*O[ 6] + g_aiT32[k][ 7]*O[ 7] +
-        g_aiT32[k][ 8]*O[ 8] + g_aiT32[k][ 9]*O[ 9] + g_aiT32[k][10]*O[10] + g_aiT32[k][11]*O[11] + 
-        g_aiT32[k][12]*O[12] + g_aiT32[k][13]*O[13] + g_aiT32[k][14]*O[14] + g_aiT32[k][15]*O[15] + add)>>shift;
-    }
-    src += 32;
-    dst ++;
-  }
-}
-
-#if !UNIFIED_TRANSFORM
-/** 32x32 forward transform (2D)
- *  \param block input data (residual)
- *  \param coeff output data (transform coefficients)
- */
-void xTr32(short block[32][32],short coeff[32][32])
-{
- #if FULL_NBIT
-  int shift_1st = 4 + g_uiBitDepth - 8; // log2(32) - 1 + g_uiBitDepth - 8
-#else
-  int shift_1st = 4 + g_uiBitIncrement; // log2(32) - 1 + g_uiBitIncrement
-#endif
-  int shift_2nd = 11;                   // log2(32) + 6
-  short tmp[32][32]; 
-
-  partialButterfly32(block,tmp,shift_1st);
-  partialButterfly32(tmp,coeff,shift_2nd);
-}
-
-/** 32x32 inverse transform implemented using partial butterfly structure (1D)
- *  \param src   input data (transform coefficients)
- *  \param dst   output data (residual)
- *  \param shift specifies right shift after 1D transform
- */
-void partialButterflyInverse32(short src[32][32],short dst[32][32],int shift)
-{
-  int j,k;  
-  int E[16],O[16];
-  int EE[8],EO[8];
-  int EEE[4],EEO[4];
-  int EEEE[2],EEEO[2];
-  int add = 1<<(shift-1);
-
-  for (j=0; j<32; j++)
-  {    
-    /* Utilizing symmetry properties to the maximum to minimize the number of multiplications */
-    for (k=0;k<16;k++)
-    {
-      O[k] = g_aiT32[ 1][k]*src[ 1][j] + g_aiT32[ 3][k]*src[ 3][j] + g_aiT32[ 5][k]*src[ 5][j] + g_aiT32[ 7][k]*src[ 7][j] + 
-             g_aiT32[ 9][k]*src[ 9][j] + g_aiT32[11][k]*src[11][j] + g_aiT32[13][k]*src[13][j] + g_aiT32[15][k]*src[15][j] + 
-             g_aiT32[17][k]*src[17][j] + g_aiT32[19][k]*src[19][j] + g_aiT32[21][k]*src[21][j] + g_aiT32[23][k]*src[23][j] + 
-             g_aiT32[25][k]*src[25][j] + g_aiT32[27][k]*src[27][j] + g_aiT32[29][k]*src[29][j] + g_aiT32[31][k]*src[31][j];
-    }
-    for (k=0;k<8;k++)
-    {
-      EO[k] = g_aiT32[ 2][k]*src[ 2][j] + g_aiT32[ 6][k]*src[ 6][j] + g_aiT32[10][k]*src[10][j] + g_aiT32[14][k]*src[14][j] + 
-              g_aiT32[18][k]*src[18][j] + g_aiT32[22][k]*src[22][j] + g_aiT32[26][k]*src[26][j] + g_aiT32[30][k]*src[30][j];
-    }
-    for (k=0;k<4;k++)
-    {
-      EEO[k] = g_aiT32[4][k]*src[4][j] + g_aiT32[12][k]*src[12][j] + g_aiT32[20][k]*src[20][j] + g_aiT32[28][k]*src[28][j];
-    }
-    EEEO[0] = g_aiT32[8][0]*src[8][j] + g_aiT32[24][0]*src[24][j];
-    EEEO[1] = g_aiT32[8][1]*src[8][j] + g_aiT32[24][1]*src[24][j];
-    EEEE[0] = g_aiT32[0][0]*src[0][j] + g_aiT32[16][0]*src[16][j];    
-    EEEE[1] = g_aiT32[0][1]*src[0][j] + g_aiT32[16][1]*src[16][j];
-
-    /* Combining even and odd terms at each hierarchy levels to calculate the final spatial domain vector */
-    EEE[0] = EEEE[0] + EEEO[0];
-    EEE[3] = EEEE[0] - EEEO[0];
-    EEE[1] = EEEE[1] + EEEO[1];
-    EEE[2] = EEEE[1] - EEEO[1];    
-    for (k=0;k<4;k++)
-    {
-      EE[k] = EEE[k] + EEO[k];
-      EE[k+4] = EEE[3-k] - EEO[3-k];
-    }    
-    for (k=0;k<8;k++)
-    {
-      E[k] = EE[k] + EO[k];
-      E[k+8] = EE[7-k] - EO[7-k];
-    }    
-    for (k=0;k<16;k++)
-    {
-      dst[j][k]    = Clip3( -32768, 32767, (E[k] + O[k] + add)>>shift );
-      dst[j][k+16] = Clip3( -32768, 32767, (E[15-k] - O[15-k] + add)>>shift );
-    }        
-  }
-}
-#endif
-
-void partialButterflyInverse32(short *src,short *dst,int shift, int line)
-{
-  int j,k;  
-  int E[16],O[16];
-  int EE[8],EO[8];
-  int EEE[4],EEO[4];
-  int EEEE[2],EEEO[2];
-  int add = 1<<(shift-1);
-
-  for (j=0; j<line; j++)
-  {    
-    /* Utilizing symmetry properties to the maximum to minimize the number of multiplications */
-    for (k=0;k<16;k++)
-    {
-      O[k] = g_aiT32[ 1][k]*src[ line  ] + g_aiT32[ 3][k]*src[ 3*line  ] + g_aiT32[ 5][k]*src[ 5*line  ] + g_aiT32[ 7][k]*src[ 7*line  ] + 
-        g_aiT32[ 9][k]*src[ 9*line  ] + g_aiT32[11][k]*src[ 11*line ] + g_aiT32[13][k]*src[ 13*line ] + g_aiT32[15][k]*src[ 15*line ] + 
-        g_aiT32[17][k]*src[ 17*line ] + g_aiT32[19][k]*src[ 19*line ] + g_aiT32[21][k]*src[ 21*line ] + g_aiT32[23][k]*src[ 23*line ] + 
-        g_aiT32[25][k]*src[ 25*line ] + g_aiT32[27][k]*src[ 27*line ] + g_aiT32[29][k]*src[ 29*line ] + g_aiT32[31][k]*src[ 31*line ];
-    }
-    for (k=0;k<8;k++)
-    {
-      EO[k] = g_aiT32[ 2][k]*src[ 2*line  ] + g_aiT32[ 6][k]*src[ 6*line  ] + g_aiT32[10][k]*src[ 10*line ] + g_aiT32[14][k]*src[ 14*line ] + 
-        g_aiT32[18][k]*src[ 18*line ] + g_aiT32[22][k]*src[ 22*line ] + g_aiT32[26][k]*src[ 26*line ] + g_aiT32[30][k]*src[ 30*line ];
-    }
-    for (k=0;k<4;k++)
-    {
-      EEO[k] = g_aiT32[4][k]*src[ 4*line ] + g_aiT32[12][k]*src[ 12*line ] + g_aiT32[20][k]*src[ 20*line ] + g_aiT32[28][k]*src[ 28*line ];
-    }
-    EEEO[0] = g_aiT32[8][0]*src[ 8*line ] + g_aiT32[24][0]*src[ 24*line ];
-    EEEO[1] = g_aiT32[8][1]*src[ 8*line ] + g_aiT32[24][1]*src[ 24*line ];
-    EEEE[0] = g_aiT32[0][0]*src[ 0      ] + g_aiT32[16][0]*src[ 16*line ];    
-    EEEE[1] = g_aiT32[0][1]*src[ 0      ] + g_aiT32[16][1]*src[ 16*line ];
-
-    /* Combining even and odd terms at each hierarchy levels to calculate the final spatial domain vector */
-    EEE[0] = EEEE[0] + EEEO[0];
-    EEE[3] = EEEE[0] - EEEO[0];
-    EEE[1] = EEEE[1] + EEEO[1];
-    EEE[2] = EEEE[1] - EEEO[1];    
-    for (k=0;k<4;k++)
-    {
-      EE[k] = EEE[k] + EEO[k];
-      EE[k+4] = EEE[3-k] - EEO[3-k];
-    }    
-    for (k=0;k<8;k++)
-    {
-      E[k] = EE[k] + EO[k];
-      E[k+8] = EE[7-k] - EO[7-k];
-    }    
-    for (k=0;k<16;k++)
-    {
-      dst[k]    = Clip3( -32768, 32767, (E[k] + O[k] + add)>>shift );
-      dst[k+16] = Clip3( -32768, 32767, (E[15-k] - O[15-k] + add)>>shift );
-    }
-    src ++;
-    dst += 32;
-  }
-}
-
-#if !UNIFIED_TRANSFORM
-/** 32x32 inverse transform (2D)
- *  \param coeff input data (transform coefficients)
- *  \param block output data (residual)
- */
-void xITr32(short coeff[32][32],short block[32][32])
-{
-  int shift_1st = SHIFT_INV_1ST;
-#if FULL_NBIT
-  int shift_2nd = SHIFT_INV_2ND - ((short)g_uiBitDepth - 8);
-#else
-  int shift_2nd = SHIFT_INV_2ND - g_uiBitIncrement;
-#endif
-  short tmp[32][32];
-  
-  partialButterflyInverse32(coeff,tmp,shift_1st);
-  partialButterflyInverse32(tmp,block,shift_2nd);
-}
-#endif
-
-/** MxN forward transform (2D)
-*  \param block input data (residual)
-*  \param coeff output data (transform coefficients)
-*  \param iWidth input data (width of transform)
-*  \param iHeight input data (height of transform)
-*/
-#if UNIFIED_TRANSFORM
-void xTrMxN(short *block,short *coeff, int iWidth, int iHeight, UInt uiMode)
-#else
-void xTrMxN(short *block,short *coeff, int iWidth, int iHeight)
-#endif
-{
-#if FULL_NBIT
-  int shift_1st = g_aucConvertToBit[iWidth]  + 1 + g_uiBitDepth - 8; // log2(iWidth) - 1 + g_uiBitDepth - 8
-#else
-  int shift_1st = g_aucConvertToBit[iWidth]  + 1 + g_uiBitIncrement; // log2(iWidth) - 1 + g_uiBitIncrement
-#endif
-  int shift_2nd = g_aucConvertToBit[iHeight]  + 8;                   // log2(iHeight) + 6
-
-  short tmp[ 64 * 64 ];
-
-  if( iWidth == 16 && iHeight == 4)
-  {
-    partialButterfly16( block, tmp, shift_1st, iHeight );
-    partialButterfly4( tmp, coeff, shift_2nd, iWidth );
-  }
-  else if( iWidth == 32 && iHeight == 8 )
-  {
-    partialButterfly32( block, tmp, shift_1st, iHeight );
-    partialButterfly8( tmp, coeff, shift_2nd, iWidth );
-  }
-  else if( iWidth == 4 && iHeight == 16)
-  {
-    partialButterfly4( block, tmp, shift_1st, iHeight );
-    partialButterfly16( tmp, coeff, shift_2nd, iWidth );
-  }
-  else if( iWidth == 8 && iHeight == 32 )
-  {
-    partialButterfly8( block, tmp, shift_1st, iHeight );
-    partialButterfly32( tmp, coeff, shift_2nd, iWidth );
-  }
-#if UNIFIED_TRANSFORM
-  else if( iWidth == 4 && iHeight == 4)
-  {
-#if LOGI_INTRA_NAME_3MPM
-    if (uiMode != REG_DCT && (!uiMode || (uiMode>=2 && uiMode <= 25)))    // Check for DCT or DST
-#else
-    if (uiMode != REG_DCT && g_aucDCTDSTMode_Hor[uiMode])// Check for DCT or DST
-#endif
-    {
-      fastForwardDst(block,tmp,shift_1st); // Forward DST BY FAST ALGORITHM, block input, tmp output
-    }
-    else  
-    {
-      partialButterfly4(block, tmp, shift_1st, iHeight);
-    }
-#if LOGI_INTRA_NAME_3MPM
-    if (uiMode != REG_DCT && (!uiMode || (uiMode>=11 && uiMode <= 34)))    // Check for DCT or DST
-#else
-    if (uiMode != REG_DCT && g_aucDCTDSTMode_Vert[uiMode] )   // Check for DCT or DST
-#endif
-    {
-      fastForwardDst(tmp,coeff,shift_2nd); // Forward DST BY FAST ALGORITHM, tmp input, coeff output
-    }
-    else  
-    {
-      partialButterfly4(tmp, coeff, shift_2nd, iWidth);
-    }   
-  }
-  else if( iWidth == 8 && iHeight == 8)
-  {
-    partialButterfly8( block, tmp, shift_1st, iHeight );
-    partialButterfly8( tmp, coeff, shift_2nd, iWidth );
-  }
-  else if( iWidth == 16 && iHeight == 16)
-  {
-    partialButterfly16( block, tmp, shift_1st, iHeight );
-    partialButterfly16( tmp, coeff, shift_2nd, iWidth );
-  }
-  else if( iWidth == 32 && iHeight == 32)
-  {
-    partialButterfly32( block, tmp, shift_1st, iHeight );
-    partialButterfly32( tmp, coeff, shift_2nd, iWidth );
-  }
-#endif
-}
-/** MxN inverse transform (2D)
-*  \param coeff input data (transform coefficients)
-*  \param block output data (residual)
-*  \param iWidth input data (width of transform)
-*  \param iHeight input data (height of transform)
-*/
-#if UNIFIED_TRANSFORM
-void xITrMxN(short *coeff,short *block, int iWidth, int iHeight, UInt uiMode)
-#else
-void xITrMxN(short *coeff,short *block, int iWidth, int iHeight)
-#endif
-{
-  int shift_1st = SHIFT_INV_1ST;
-#if FULL_NBIT
-  int shift_2nd = SHIFT_INV_2ND - ((short)g_uiBitDepth - 8);
-#else
-  int shift_2nd = SHIFT_INV_2ND - g_uiBitIncrement;
-#endif
 
   short tmp[ 64*64];
@@ -1509 +896 @@
     partialButterflyInverse8(tmp,block,shift_2nd,iHeight);
   }
-#if UNIFIED_TRANSFORM
   else if( iWidth == 4 && iHeight == 4)
   {
-#if LOGI_INTRA_NAME_3MPM
     if (uiMode != REG_DCT && (!uiMode || (uiMode>=11 && uiMode <= 34)))    // Check for DCT or DST
-#else
-    if (uiMode != REG_DCT && g_aucDCTDSTMode_Vert[uiMode] )    // Check for DCT or DST
-#endif
     {
       fastInverseDst(coeff,tmp,shift_1st);    // Inverse DST by FAST Algorithm, coeff input, tmp output
@@ -1524 +906 @@
       partialButterflyInverse4(coeff,tmp,shift_1st,iWidth);    
     } 
-#if LOGI_INTRA_NAME_3MPM
     if (uiMode != REG_DCT && (!uiMode || (uiMode>=2 && uiMode <= 25)))    // Check for DCT or DST
-#else
-    if (uiMode != REG_DCT && g_aucDCTDSTMode_Hor[uiMode] )    // Check for DCT or DST
-#endif
     {
       fastInverseDst(tmp,block,shift_2nd); // Inverse DST by FAST Algorithm, tmp input, coeff output
@@ -1552 +930 @@
     partialButterflyInverse32(tmp,block,shift_2nd,iHeight);
   }
-#endif
 }
 
 #endif //MATRIX_MULT
 
-#if MULTIBITS_DATA_HIDING
 // To minimize the distortion only. No rate is considered. 
 Void TComTrQuant::signBitHidingHDQ( TComDataCU* pcCU, TCoeff* pQCoef, TCoeff* pCoef, UInt const *scan, Int* deltaU, Int width, Int height )
@@ -1684 +1060 @@
   return;
 }
-#endif
 
 Void TComTrQuant::xQuant( TComDataCU* pcCU, 
@@ -1715 +1090 @@
   else
   {
-#if MULTIBITS_DATA_HIDING
     const UInt   log2BlockSize   = g_aucConvertToBit[ iWidth ] + 2;
 
@@ -1740 +1114 @@
 
     Int deltaU[32*32] ;
-#endif
 
 #if ADAPTIVE_QP_SELECTION
@@ -1746 +1119 @@
     Int iQpBase = pcCU->getSlice()->getSliceQpBase();
 
-#if H0736_AVC_STYLE_QP_RANGE
     Int qpScaled;
     Int qpBDOffset = (eTType == TEXT_LUMA)? pcCU->getSlice()->getSPS()->getQpBDOffsetY() : pcCU->getSlice()->getSPS()->getQpBDOffsetC();
@@ -1768 +1140 @@
     }
     cQpBase.setQpParam(qpScaled, false, pcCU->getSlice()->getSliceType());
-#else
-    if(eTType != TEXT_LUMA)
-    {
-      iQpBase = g_aucChromaScale[iQpBase];
-    }
-    cQpBase.setQpParam(iQpBase, false, pcCU->getSlice()->getSliceType());
-#endif
 #endif
 
@@ -1811 +1176 @@
 #endif
 
-#if MULTIBITS_DATA_HIDING
     Int qBits8 = iQBits-8;
-#endif
     for( Int n = 0; n < iWidth*iHeight; n++ )
     {
@@ -1829 +1192 @@
       }
       iLevel = (Int)((tmpLevel + iAdd ) >> iQBits);
-#if MULTIBITS_DATA_HIDING
       deltaU[uiBlockPos] = (Int)((tmpLevel - (iLevel<<iQBits) )>> qBits8);
-#endif
 #else
       iLevel = ((Int64)abs(iLevel) * piQuantCoeff[uiBlockPos] + iAdd ) >> iQBits;
-#if MULTIBITS_DATA_HIDING
       deltaU[uiBlockPos] = (Int)( ((Int64)abs(iLevel) * piQuantCoeff[uiBlockPos] - (iLevel<<iQBits) )>> qBits8 );
-#endif
 #endif
       uiAcSum += iLevel;
@@ -1842 +1201 @@
       piQCoef[uiBlockPos] = Clip3( -32768, 32767, iLevel );
     } // for n
-#if MULTIBITS_DATA_HIDING
     if( pcCU->getSlice()->getPPS()->getSignHideFlag() )
     {
@@ -1850 +1208 @@
       }
     }
-#endif
   } //if RDOQ
   //return;
@@ -1888 +1245 @@
   iShift = QUANT_IQUANT_SHIFT - QUANT_SHIFT - iTransformShift;
 
-#if DEQUANT_CLIPPING
   TCoeff clipQCoef;
   const Int bitRange = min( 15, ( Int )( 12 + uiLog2TrSize + uiBitDepth - m_cQP.m_iPer) );
   const Int levelLimit = 1 << bitRange;
-#endif
 
   if(getUseScalingList())
@@ -1911 +1266 @@
       for( Int n = 0; n < iWidth*iHeight; n++ )
       {
-#if DEQUANT_CLIPPING
         clipQCoef = Clip3( -32768, 32767, piQCoef[n] );
         iCoeffQ = ((clipQCoef * piDequantCoef[n]) + iAdd ) >> (iShift -  m_cQP.m_iPer);
-#else
-        iCoeffQ = ((piQCoef[n] * piDequantCoef[n]) + iAdd ) >> (iShift -  m_cQP.m_iPer);
-#endif
         piCoef[n] = Clip3(-32768,32767,iCoeffQ);
       }
@@ -1924 +1275 @@
       for( Int n = 0; n < iWidth*iHeight; n++ )
       {
-#if DEQUANT_CLIPPING
         clipQCoef = Clip3( -levelLimit, levelLimit - 1, piQCoef[n] );
         iCoeffQ = (clipQCoef * piDequantCoef[n]) << (m_cQP.m_iPer - iShift);
-#else
-        iCoeffQ = (piQCoef[n] * piDequantCoef[n]) << (m_cQP.m_iPer - iShift);
-#endif
         piCoef[n] = Clip3(-32768,32767,iCoeffQ);
       }
@@ -1941 +1288 @@
     for( Int n = 0; n < iWidth*iHeight; n++ )
     {
-#if DEQUANT_CLIPPING
       clipQCoef = Clip3( -32768, 32767, piQCoef[n] );
       iCoeffQ = ( clipQCoef * scale + iAdd ) >> iShift;
-#else
-      iCoeffQ = ( piQCoef[n] * scale + iAdd ) >> iShift;
-#endif
       piCoef[n] = Clip3(-32768,32767,iCoeffQ);
     }
@@ -2134 +1477 @@
   xTr(piBlkResi,psCoeff,uiStride,(UInt)iSize,uiMode);
 #else
-#if UNIFIED_TRANSFORM
   Int j;
-#else
-  Int iSize = iWidth; 
-  if( iWidth != iHeight)
-#endif
   {
     short block[ 64 * 64 ];
@@ -2149 +1487 @@
       }
     }
-#if UNIFIED_TRANSFORM
     xTrMxN( block, coeff, iWidth, iHeight, uiMode );
-#else
-    xTrMxN( block, coeff, iWidth, iHeight );
-#endif
     for ( j = 0; j < iHeight * iWidth; j++ )
     {    
@@ -2160 +1494 @@
     return ;
   }
-#if !UNIFIED_TRANSFORM
-  if (iSize==4)
-  {   
-    short block[4][4];   
-    short coeff[4][4];
-    for (j=0; j<4; j++)
-    {    
-      memcpy(block[j],piBlkResi+j*uiStride,4*sizeof(short));      
-    }
-    xTr4(block,coeff,uiMode);
-    for (j=0; j<4; j++)
-    {    
-      for (k=0; k<4; k++)
-      {        
-        psCoeff[j*4+k] = coeff[j][k];
-      }    
-    }    
-  }
-  else if (iSize==8)
-  {
-    short block[8][8];
-    short coeff[8][8];
-
-    for (j=0; j<8; j++)
-    {    
-      memcpy(block[j],piBlkResi+j*uiStride,8*sizeof(short));
-    }
-
-    xTr8(block,coeff);       
-    for (j=0; j<8; j++)
-    {    
-      for (k=0; k<8; k++)
-      {        
-        psCoeff[j*8+k] = coeff[j][k];
-      }    
-    }
-  }
-  else if (iSize==16)
-  {   
-    short block[16][16];
-    short coeff[16][16];
-
-    for (j=0; j<16; j++)
-    {    
-      memcpy(block[j],piBlkResi+j*uiStride,16*sizeof(short));
-    }
-    xTr16(block,coeff);       
-    for (j=0; j<16; j++)
-    {    
-      for (k=0; k<16; k++)
-      {        
-        psCoeff[j*16+k] = coeff[j][k];
-      }    
-    }
-  }
-  else if (iSize==32)
-  {   
-    short block[32][32];
-    short coeff[32][32];
-
-    for (j=0; j<32; j++)
-    {    
-      memcpy(block[j],piBlkResi+j*uiStride,32*sizeof(short));
-    }
-    xTr32(block,coeff);       
-    for (j=0; j<32; j++)
-    {    
-      for (k=0; k<32; k++)
-      {        
-        psCoeff[j*32+k] = coeff[j][k];
-      }    
-    }
-  }
-#endif
 #endif  
 }
@@ -2255 +1515 @@
   xITr(plCoef,pResidual,uiStride,(UInt)iSize,uiMode);
 #else
-#if UNIFIED_TRANSFORM
   Int j;
-#else
-  Int j,k;
-  Int iSize = iWidth; 
-  if( iWidth != iHeight )
-#endif
   {
     short block[ 64 * 64 ];
@@ -2269 +1523 @@
       coeff[j] = (short)plCoef[j];
     }
-#if UNIFIED_TRANSFORM
     xITrMxN( coeff, block, iWidth, iHeight, uiMode );
-#else
-    xITrMxN( coeff, block, iWidth, iHeight );
-#endif
     {
       for ( j = 0; j < iHeight; j++ )
@@ -2282 +1532 @@
     return ;
   }
-#if !UNIFIED_TRANSFORM
-  if (iSize==4)
-  {    
-    short block[4][4];
-    short coeff[4][4];
-
-    for (j=0; j<4; j++)
-    {    
-      for (k=0; k<4; k++)
-      {        
-        coeff[j][k] = (short)plCoef[j*4+k];
-      }    
-    }
-    xITr4(coeff,block,uiMode);
-    for (j=0; j<4; j++)
-    {    
-      memcpy(pResidual+j*uiStride,block[j],4*sizeof(short));
-    }    
-  }
-  else if (iSize==8)
-  {
-    short block[8][8];
-    short coeff[8][8];
-
-    for (j=0; j<8; j++)
-    {    
-      for (k=0; k<8; k++)
-      {        
-        coeff[j][k] = (short)plCoef[j*8+k];
-      }    
-    }
-    xITr8(coeff,block);       
-    for (j=0; j<8; j++)
-    {    
-      memcpy(pResidual+j*uiStride,block[j],8*sizeof(short));
-    }
-  }
-  else if (iSize==16)
-  {
-    short block[16][16];
-    short coeff[16][16];
-
-    for (j=0; j<16; j++)
-    {    
-      for (k=0; k<16; k++)
-      {        
-        coeff[j][k] = (short)plCoef[j*16+k];
-      }    
-    }
-    xITr16(coeff,block);       
-    for (j=0; j<16; j++)
-    {    
-      memcpy(pResidual+j*uiStride,block[j],16*sizeof(short));
-    }
-  }
-
-  else if (iSize==32)
-  {
-    short block[32][32];
-    short coeff[32][32];
-
-    for (j=0; j<32; j++)
-    {    
-      for (k=0; k<32; k++)
-      {        
-        coeff[j][k] = (short)plCoef[j*32+k];
-      }    
-    }
-    xITr32(coeff,block);       
-    for (j=0; j<32; j++)
-    {    
-      memcpy(pResidual+j*uiStride,block[j],32*sizeof(short));
-    }   
-  }
-#endif
 #endif  
 }
@@ -2442 +1617 @@
   ::memset( pdCostCoeff, 0, sizeof(Double) *  uiMaxNumCoeff );
   ::memset( pdCostSig,   0, sizeof(Double) *  uiMaxNumCoeff );
-#if MULTIBITS_DATA_HIDING
   Int rateIncUp   [ 32 * 32 ];
   Int rateIncDown [ 32 * 32 ];
@@ -2451 +1625 @@
   ::memset( sigRateDelta, 0, sizeof(Int) *  uiMaxNumCoeff );
   ::memset( deltaU,       0, sizeof(Int) *  uiMaxNumCoeff );
-#endif
 
   const UInt * scanCG;
@@ -2457 +1630 @@
   {
     scanCG = g_auiSigLastScan[ uiScanIdx ][ uiLog2BlkSize > 3 ? uiLog2BlkSize-2-1 : 0  ];
-#if MULTILEVEL_SIGMAP_EXT
     if( uiLog2BlkSize == 3 )
     {
@@ -2466 +1638 @@
       scanCG = g_sigLastScanCG32x32;
     }
-#endif
   }
   else
@@ -2486 +1657 @@
   dTemp                       = dErrScale;
 
-#if RESTRICT_GR1GR2FLAG_NUMBER
   UInt    c1Idx     = 0;
   UInt    c2Idx     = 0;
   Int     baseLevel;
-#endif
 
   const UInt * scan;
@@ -2502 +1671 @@
   }
 
-#if !MULTILEVEL_SIGMAP_EXT
-  if (blockType < 4)
-  {
-  for( Int iScanPos = (Int) uiMaxNumCoeff-1; iScanPos >= 0; iScanPos-- )
-  {
-    //===== quantization =====
-    UInt    uiBlkPos          = scan[iScanPos];
-    // set coeff
-    uiQ  = piQCoef[uiBlkPos];
-    dTemp = pdErrScale[uiBlkPos];
-    Int lLevelDouble          = plSrcCoeff[ uiBlkPos ];
-    lLevelDouble              = (Int)min<Int64>(((Int64)abs(lLevelDouble) * uiQ), MAX_INT-(1 << (iQBits - 1)));
-#if ADAPTIVE_QP_SELECTION
-    if( m_bUseAdaptQpSelect )
-    {
-      piArlDstCoeff[uiBlkPos]   = (Int)(( lLevelDouble + iAddC) >> iQBitsC );
-    }
-#endif
-    UInt uiMaxAbsLevel        = (lLevelDouble + (1 << (iQBits - 1))) >> iQBits;
-    uiMaxAbsLevel=plSrcCoeff[ uiBlkPos ]>=0 ? min<UInt>(uiMaxAbsLevel,32767): min<UInt>(uiMaxAbsLevel,32768);
-    Double dErr               = Double( lLevelDouble );
-    pdCostCoeff0[ iScanPos ]  = dErr * dErr * dTemp;
-    d64BlockUncodedCost      += pdCostCoeff0[ iScanPos ];
-    piDstCoeff[ uiBlkPos ]    = uiMaxAbsLevel;
-
-    if ( uiMaxAbsLevel > 0 && iLastScanPos < 0 )
-    {
-      iLastScanPos            = iScanPos;
-#if LEVEL_CTX_LUMA_RED
-      uiCtxSet                = (iScanPos < SCAN_SET_SIZE || eTType!=TEXT_LUMA) ? 0 : 2;
-#else
-      uiCtxSet                = iScanPos < SCAN_SET_SIZE ? 0 : 3;
-      uiCtxSet                = (iScanPos < SCAN_SET_SIZE || eTType!=TEXT_LUMA) ? 0 : 3;
-#endif
-    }    
-
-    if ( iLastScanPos >= 0 )
-    {
-      //===== coefficient level estimation =====
-      UInt  uiLevel;
-      UInt  uiOneCtx         = 4 * uiCtxSet + c1;
-#if RESTRICT_GR1GR2FLAG_NUMBER
-      UInt  uiAbsCtx         = uiCtxSet + c2;
-#else
-      UInt  uiAbsCtx         = 3 * uiCtxSet + c2;
-#endif
-
-      if( iScanPos == iLastScanPos )
-      {
-#if RESTRICT_GR1GR2FLAG_NUMBER
-        uiLevel              = xGetCodedLevel( pdCostCoeff[ iScanPos ], pdCostCoeff0[ iScanPos ], pdCostSig[ iScanPos ], lLevelDouble, uiMaxAbsLevel, 0, uiOneCtx, uiAbsCtx, uiGoRiceParam, c1Idx, c2Idx, iQBits, dTemp, 1 );
-#else
-        uiLevel              = xGetCodedLevel( pdCostCoeff[ iScanPos ], pdCostCoeff0[ iScanPos ], pdCostSig[ iScanPos ], lLevelDouble, uiMaxAbsLevel, 0, uiOneCtx, uiAbsCtx, uiGoRiceParam, iQBits, dTemp, 1 );
-#endif
-      }
-      else
-      {
-        UInt   uiPosY        = uiBlkPos >> uiLog2BlkSize;
-        UInt   uiPosX        = uiBlkPos - ( uiPosY << uiLog2BlkSize );
-        UShort uiCtxSig      = getSigCtxInc( piDstCoeff, uiPosX, uiPosY, blockType, uiWidth, uiHeight, eTType );
-#if RESTRICT_GR1GR2FLAG_NUMBER
-        uiLevel              = xGetCodedLevel( pdCostCoeff[ iScanPos ], pdCostCoeff0[ iScanPos ], pdCostSig[ iScanPos ], lLevelDouble, uiMaxAbsLevel, uiCtxSig, uiOneCtx, uiAbsCtx, uiGoRiceParam, c1Idx, c2Idx, iQBits, dTemp, 0 );
-#else
-        uiLevel              = xGetCodedLevel( pdCostCoeff[ iScanPos ], pdCostCoeff0[ iScanPos ], pdCostSig[ iScanPos ], lLevelDouble, uiMaxAbsLevel, uiCtxSig, uiOneCtx, uiAbsCtx, uiGoRiceParam, iQBits, dTemp, 0 );
-#endif
-#if MULTIBITS_DATA_HIDING
-        sigRateDelta[ uiBlkPos ] = m_pcEstBitsSbac->significantBits[ uiCtxSig ][ 1 ] - m_pcEstBitsSbac->significantBits[ uiCtxSig ][ 0 ];
-#endif
-      }
-#if MULTIBITS_DATA_HIDING
-      deltaU[ uiBlkPos ]        = (lLevelDouble - ((Int)uiLevel << iQBits)) >> (iQBits-8);
-      if( uiLevel > 0 )
-      {
-#if RESTRICT_GR1GR2FLAG_NUMBER   
-        Int rateNow = xGetICRate( uiLevel, uiOneCtx, uiAbsCtx, uiGoRiceParam, c1Idx, c2Idx );
-        rateIncUp   [ uiBlkPos ] = xGetICRate( uiLevel+1, uiOneCtx, uiAbsCtx, uiGoRiceParam, c1Idx, c2Idx ) - rateNow;
-        rateIncDown [ uiBlkPos ] = xGetICRate( uiLevel-1, uiOneCtx, uiAbsCtx, uiGoRiceParam, c1Idx, c2Idx ) - rateNow;
-#else  
-        Int rateNow = xGetICRate( uiLevel, uiOneCtx, uiAbsCtx, uiGoRiceParam );
-        rateIncUp   [ uiBlkPos ] = xGetICRate( uiLevel+1, uiOneCtx, uiAbsCtx, uiGoRiceParam ) - rateNow;
-        rateIncDown [ uiBlkPos ] = xGetICRate( uiLevel-1, uiOneCtx, uiAbsCtx, uiGoRiceParam ) - rateNow;
-#endif
-      }
-      else // uiLevel == 0
-      {
-        rateIncUp   [ uiBlkPos ] = m_pcEstBitsSbac->m_greaterOneBits[ uiOneCtx ][ 0 ];
-      }
-#endif
-      piDstCoeff[ uiBlkPos ] = uiLevel;
-      d64BaseCost           += pdCostCoeff [ iScanPos ];
-
-#if RESTRICT_GR1GR2FLAG_NUMBER
-      baseLevel = (c1Idx < C1FLAG_NUMBER) ? (2 + (c2Idx < C2FLAG_NUMBER)) : 1;
-      if( uiLevel >= baseLevel )
-      {
-#if EIGHT_BITS_RICE_CODE
-        uiGoRiceParam = g_aauiGoRiceUpdate[ uiGoRiceParam ][ min<UInt>( uiLevel - baseLevel, 23 ) ];
-#else
-        uiGoRiceParam = g_aauiGoRiceUpdate[ uiGoRiceParam ][ min<UInt>( uiLevel - baseLevel, 15 ) ];
-#endif
-      }
-      if ( uiLevel >= 1)
-      {
-        c1Idx ++;
-      }
-#endif
-
-      //===== update bin model =====
-      if( uiLevel > 1 )
-      {
-        c1 = 0; 
-        c2 += (c2 < 2);
-        uiNumOne++;
-#if RESTRICT_GR1GR2FLAG_NUMBER
-        c2Idx ++;
-#else
-        if( uiLevel > 2 )
-        {
-#if EIGHT_BITS_RICE_CODE
-          uiGoRiceParam = g_aauiGoRiceUpdate[ uiGoRiceParam ][ min<UInt>( uiLevel - 3, 23 ) ];
-#else
-          uiGoRiceParam = g_aauiGoRiceUpdate[ uiGoRiceParam ][ min<UInt>( uiLevel - 3, 15 ) ];
-#endif
-        }
-#endif
-      }
-      else if( (c1 < 3) && (c1 > 0) && uiLevel)
-      {
-        c1++;
-      }
-
-      //===== context set update =====
-      if( ( iScanPos % SCAN_SET_SIZE == 0 ) && ( iScanPos > 0 ) )
-      {
-        c1                = 1;
-        c2                = 0;
-        uiGoRiceParam     = 0;
-
-#if RESTRICT_GR1GR2FLAG_NUMBER
-        c1Idx   = 0;
-        c2Idx   = 0; 
-#endif
-#if LEVEL_CTX_LUMA_RED
-        uiCtxSet          = (iScanPos == SCAN_SET_SIZE || eTType!=TEXT_LUMA) ? 0 : 2;
-#else
-        uiCtxSet          = (iScanPos == SCAN_SET_SIZE || eTType!=TEXT_LUMA) ? 0 : 3;
-#endif
-        if( uiNumOne > 0 )
-        {
-          uiCtxSet++;
-#if !LEVEL_CTX_LUMA_RED
-          if(uiNumOne > 3 && eTType==TEXT_LUMA)
-          {
-            uiCtxSet++;
-          }
-#endif
-        }
-        uiNumOne    >>= 1;
-      }
-    }
-    else
-    {
-      d64BaseCost    += pdCostCoeff0[ iScanPos ];
-    }
-  }
-  }
-  else //(uiLog2BlkSize > 3), for 16x16 and 32x32 TU
-  {      
-#endif
     ::memset( pdCostCoeffGroupSig,   0, sizeof(Double) * MLS_GRP_NUM );
     ::memset( uiSigCoeffGroupFlag,   0, sizeof(UInt) * MLS_GRP_NUM );
@@ -2683 +1683 @@
       UInt uiCGPosY   = uiCGBlkPos / uiNumBlkSide;
       UInt uiCGPosX   = uiCGBlkPos - (uiCGPosY * uiNumBlkSide);
-#if MULTILEVEL_SIGMAP_EXT
       if( uiWidth == 8 && uiHeight == 8 && (uiScanIdx == SCAN_HOR || uiScanIdx == SCAN_VER) )
       {
@@ -2689 +1688 @@
         uiCGPosX = (uiScanIdx == SCAN_VER ? uiCGBlkPos : 0);
       }
-#endif
       ::memset( &rdStats, 0, sizeof (coeffGroupRDStats));
         
@@ -2718 +1716 @@
         {
           iLastScanPos            = iScanPos;
-#if LEVEL_CTX_LUMA_RED
           uiCtxSet                = (iScanPos < SCAN_SET_SIZE || eTType!=TEXT_LUMA) ? 0 : 2;
-#else
-          uiCtxSet                = (iScanPos < SCAN_SET_SIZE || eTType!=TEXT_LUMA) ? 0 : 3;
-#endif
           iCGLastScanPos          = iCGScanPos;
         }
@@ -2731 +1725 @@
           UInt  uiLevel;
           UInt  uiOneCtx         = 4 * uiCtxSet + c1;
-#if RESTRICT_GR1GR2FLAG_NUMBER
           UInt  uiAbsCtx         = uiCtxSet + c2;
-#else
-          UInt  uiAbsCtx         = 3 * uiCtxSet + c2;
-#endif
 
           if( iScanPos == iLastScanPos )
           {
-#if RESTRICT_GR1GR2FLAG_NUMBER  
             uiLevel              = xGetCodedLevel( pdCostCoeff[ iScanPos ], pdCostCoeff0[ iScanPos ], pdCostSig[ iScanPos ], 
                                                    lLevelDouble, uiMaxAbsLevel, 0, uiOneCtx, uiAbsCtx, uiGoRiceParam, 
                                                    c1Idx, c2Idx, iQBits, dTemp, 1 );
-#else
-            uiLevel              = xGetCodedLevel( pdCostCoeff[ iScanPos ], pdCostCoeff0[ iScanPos ], pdCostSig[ iScanPos ], 
-                                                   lLevelDouble, uiMaxAbsLevel, 0, uiOneCtx, uiAbsCtx, uiGoRiceParam, 
-                                                   iQBits, dTemp, 1 );
-#endif
           }
           else
@@ -2754 +1738 @@
             UInt   uiPosX        = uiBlkPos - ( uiPosY << uiLog2BlkSize );
             UShort uiCtxSig      = getSigCtxInc( piDstCoeff, uiPosX, uiPosY, blockType, uiWidth, uiHeight, eTType );
-#if RESTRICT_GR1GR2FLAG_NUMBER
             uiLevel              = xGetCodedLevel( pdCostCoeff[ iScanPos ], pdCostCoeff0[ iScanPos ], pdCostSig[ iScanPos ],
                                                    lLevelDouble, uiMaxAbsLevel, uiCtxSig, uiOneCtx, uiAbsCtx, uiGoRiceParam, 
                                                    c1Idx, c2Idx, iQBits, dTemp, 0 );
-#else
-            uiLevel              = xGetCodedLevel( pdCostCoeff[ iScanPos ], pdCostCoeff0[ iScanPos ], pdCostSig[ iScanPos ],
-                                                   lLevelDouble, uiMaxAbsLevel, uiCtxSig, uiOneCtx, uiAbsCtx, uiGoRiceParam, 
-                                                   iQBits, dTemp, 0 );
-#endif
-#if MULTIBITS_DATA_HIDING
             sigRateDelta[ uiBlkPos ] = m_pcEstBitsSbac->significantBits[ uiCtxSig ][ 1 ] - m_pcEstBitsSbac->significantBits[ uiCtxSig ][ 0 ];
-#endif
           }
-#if MULTIBITS_DATA_HIDING
           deltaU[ uiBlkPos ]        = (lLevelDouble - ((Int)uiLevel << iQBits)) >> (iQBits-8);
           if( uiLevel > 0 )
           {
-#if RESTRICT_GR1GR2FLAG_NUMBER   
             Int rateNow = xGetICRate( uiLevel, uiOneCtx, uiAbsCtx, uiGoRiceParam, c1Idx, c2Idx );
             rateIncUp   [ uiBlkPos ] = xGetICRate( uiLevel+1, uiOneCtx, uiAbsCtx, uiGoRiceParam, c1Idx, c2Idx ) - rateNow;
             rateIncDown [ uiBlkPos ] = xGetICRate( uiLevel-1, uiOneCtx, uiAbsCtx, uiGoRiceParam, c1Idx, c2Idx ) - rateNow;
-#else
-            Int rateNow = xGetICRate( uiLevel, uiOneCtx, uiAbsCtx, uiGoRiceParam );
-            rateIncUp   [ uiBlkPos ] = xGetICRate( uiLevel+1, uiOneCtx, uiAbsCtx, uiGoRiceParam ) - rateNow;
-            rateIncDown [ uiBlkPos ] = xGetICRate( uiLevel-1, uiOneCtx, uiAbsCtx, uiGoRiceParam ) - rateNow;
-#endif
           }
           else // uiLevel == 0
@@ -2785 +1754 @@
             rateIncUp   [ uiBlkPos ] = m_pcEstBitsSbac->m_greaterOneBits[ uiOneCtx ][ 0 ];
           }
-#endif
           piDstCoeff[ uiBlkPos ] = uiLevel;
           d64BaseCost           += pdCostCoeff [ iScanPos ];
 
 
-#if RESTRICT_GR1GR2FLAG_NUMBER
           baseLevel = (c1Idx < C1FLAG_NUMBER) ? (2 + (c2Idx < C2FLAG_NUMBER)) : 1;
           if( uiLevel >= baseLevel )
           {
-#if EIGHT_BITS_RICE_CODE
             uiGoRiceParam = g_aauiGoRiceUpdate[ uiGoRiceParam ][ min<UInt>( uiLevel - baseLevel , 23 ) ];
-#else
-            uiGoRiceParam = g_aauiGoRiceUpdate[ uiGoRiceParam ][ min<UInt>( uiLevel - baseLevel, 15 ) ];
-#endif
           }
           if ( uiLevel >= 1)
@@ -2804 +1767 @@
             c1Idx ++;
           }
-#endif
 
           //===== update bin model =====
@@ -2812 +1774 @@
             c2 += (c2 < 2);
             uiNumOne++;
-#if RESTRICT_GR1GR2FLAG_NUMBER
             c2Idx ++;
-#else
-            if( uiLevel > 2 )
-            {
-#if EIGHT_BITS_RICE_CODE
-              uiGoRiceParam = g_aauiGoRiceUpdate[ uiGoRiceParam ][ min<UInt>( uiLevel - 3, 23 ) ];
-#else
-              uiGoRiceParam = g_aauiGoRiceUpdate[ uiGoRiceParam ][ min<UInt>( uiLevel - 3, 15 ) ];
-#endif
-            }
-#endif
           }
           else if( (c1 < 3) && (c1 > 0) && uiLevel)
@@ -2837 +1788 @@
             uiGoRiceParam     = 0;
 
-#if RESTRICT_GR1GR2FLAG_NUMBER
             c1Idx   = 0;
             c2Idx   = 0; 
-#endif
-#if LEVEL_CTX_LUMA_RED
             uiCtxSet          = (iScanPos == SCAN_SET_SIZE || eTType!=TEXT_LUMA) ? 0 : 2;
-#else
-            uiCtxSet          = (iScanPos == SCAN_SET_SIZE || eTType!=TEXT_LUMA) ? 0 : 3;
-#endif
             if( uiNumOne > 0 )
             {
               uiCtxSet++;
-#if !LEVEL_CTX_LUMA_RED
-              if( uiNumOne > 3 && eTType==TEXT_LUMA)
-              {
-                uiCtxSet++;
-              }
-#endif
             }
             uiNumOne    >>= 1;
@@ -2882 +1821 @@
       if (iCGLastScanPos >= 0) 
       {
-#if REMOVE_INFER_SIGGRP
         if( iCGScanPos )
-#else
-#if MULTILEVEL_SIGMAP_EXT
-        if ( !bothCGNeighboursOne( uiSigCoeffGroupFlag, uiCGPosX, uiCGPosY, uiScanIdx, uiWidth, uiHeight ) && (iCGScanPos != 0) )
-#else
-        if ( !bothCGNeighboursOne( uiSigCoeffGroupFlag, uiCGPosX, uiCGPosY, uiWidth, uiHeight ) && (iCGScanPos != 0) )
-#endif
-#endif
         {
           if (uiSigCoeffGroupFlag[ uiCGBlkPos ] == 0)
           {
-#if MULTILEVEL_SIGMAP_EXT
             UInt  uiCtxSig = getSigCoeffGroupCtxInc( uiSigCoeffGroupFlag, uiCGPosX, uiCGPosY, uiScanIdx, uiWidth, uiHeight);
-#else
-            UInt  uiCtxSig = getSigCoeffGroupCtxInc( uiSigCoeffGroupFlag, uiCGPosX, uiCGPosY, uiWidth, uiHeight);
-#endif
             d64BaseCost += xGetRateSigCoeffGroup(0, uiCtxSig) - rdStats.d64SigCost;;  
             pdCostCoeffGroupSig[ iCGScanPos ] = xGetRateSigCoeffGroup(0, uiCtxSig);  
@@ -2915 +1842 @@
 
               // add SigCoeffGroupFlag cost to total cost
-#if MULTILEVEL_SIGMAP_EXT
               UInt  uiCtxSig = getSigCoeffGroupCtxInc( uiSigCoeffGroupFlag, uiCGPosX, uiCGPosY, uiScanIdx, uiWidth, uiHeight);
-#else
-              UInt  uiCtxSig = getSigCoeffGroupCtxInc( uiSigCoeffGroupFlag, uiCGPosX, uiCGPosY, uiWidth, uiHeight);
-#endif
               if (iCGScanPos < iCGLastScanPos)
               {
@@ -2958 +1881 @@
           } // end if if (uiSigCoeffGroupFlag[ uiCGBlkPos ] == 0)
         }
-#if REMOVE_INFER_SIGGRP
         else
         {
           uiSigCoeffGroupFlag[ uiCGBlkPos ] = 1;
         }
-#else
-        else // if ( !bothCGNeighboursOne( uiSigCoeffGroupFlag, uiCGPosX, uiCGPosY ) && (uiCGScanPos != 0) && (uiSigCoeffGroupFlag[ uiCGBlkPos ] != 0) )
-        {
-          uiSigCoeffGroupFlag[ uiCGBlkPos ] = 1;
-        } // end if ( !bothCGNeighboursOne( uiSigCoeffGroupFlag, uiCGPosX, uiCGPosY ) && (uiCGScanPos != 0) && (uiSigCoeffGroupFlag[ uiCGBlkPos ] != 0) )
-#endif 
       }
     } //end for (iCGScanPos)
-#if !MULTILEVEL_SIGMAP_EXT
-  }
-#endif
 
   //===== estimate last position =====
@@ -2998 +1911 @@
   }
 
-#if !MULTILEVEL_SIGMAP_EXT
-  if (blockType < 4)
-  {
-  for( Int iScanPos = iLastScanPos; iScanPos >= 0; iScanPos-- )
-  {
-    UInt   uiBlkPos     = scan[iScanPos];
-    if( piDstCoeff[ uiBlkPos ] )
-    {
-      UInt   uiPosY       = uiBlkPos >> uiLog2BlkSize;
-      UInt   uiPosX       = uiBlkPos - ( uiPosY << uiLog2BlkSize );
-      Double d64CostLast= uiScanIdx == SCAN_VER ? xGetRateLast( uiPosY, uiPosX, uiWidth ) : xGetRateLast( uiPosX, uiPosY, uiWidth );
-      Double totalCost = d64BaseCost + d64CostLast - pdCostSig[ iScanPos ];
-      if( totalCost < d64BestCost )
-      {
-        iBestLastIdxP1  = iScanPos + 1;
-        d64BestCost     = totalCost;
-      }
-      if( piDstCoeff[ uiBlkPos ] > 1 )
-      {
-        break;
-      }
-      d64BaseCost      -= pdCostCoeff[ iScanPos ];
-      d64BaseCost      += pdCostCoeff0[ iScanPos ];
-    }
-    else
-    {
-      d64BaseCost      -= pdCostSig[ iScanPos ];
-    }
-  }
-  }
-  else //if (uiLog2BlkSize < 4)
-  {
-#endif
     Bool bFoundLast = false;
     for (Int iCGScanPos = iCGLastScanPos; iCGScanPos >= 0; iCGScanPos--)
@@ -3041 +1921 @@
         for (Int iScanPosinCG = uiCGSize-1; iScanPosinCG >= 0; iScanPosinCG--)
         {
-#if MULTILEVEL_SIGMAP_EXT
           iScanPos = iCGScanPos*uiCGSize + iScanPosinCG;
-#else
-          Int iScanPos = iCGScanPos*uiCGSize + iScanPosinCG;
-#endif
           if (iScanPos > iLastScanPos) continue;
           UInt   uiBlkPos     = scan[iScanPos];
@@ -3081 +1957 @@
       } // end if (uiSigCoeffGroupFlag[ uiCGBlkPos ])
     } // end for 
-#if !MULTILEVEL_SIGMAP_EXT
-  } //if (uiLog2BlkSize < 4)
-#endif
 
   for ( Int scanPos = 0; scanPos < iBestLastIdxP1; scanPos++ )
@@ -3099 +1972 @@
   }
 
-#if MULTIBITS_DATA_HIDING
   if( pcCU->getSlice()->getPPS()->getSignHideFlag() && uiAbsSum>=2)
   {
@@ -3226 +2098 @@
     }
   }
-#endif
 }
 
@@ -3311 +2182 @@
   const TCoeff *pData = pcCoeff + posX + posY * width;
   
-#if !SIGMAP_CTX_SUBBLOCK
-  Int thred = std::max(height, width) >> 2;
-#endif
   
   Int cnt = 0;
@@ -3341 +2209 @@
 
   cnt = ( cnt + 1 ) >> 1;
-#if SIGMAP_CTX_SUBBLOCK
   return (( textureType == TEXT_LUMA && ((posX>>2) + (posY>>2)) > 0 ) ? 4 : 1) + offset + cnt;
-#else
-  return (( textureType == TEXT_LUMA && posX + posY >= thred ) ? 4 : 1) + offset + cnt;
-#endif
 }
 
@@ -3373 +2237 @@
                                             UShort                          ui16CtxNumAbs,
                                             UShort                          ui16AbsGoRice,
-#if RESTRICT_GR1GR2FLAG_NUMBER
                                             UInt                            c1Idx,
                                             UInt                            c2Idx,
-#endif
                                             Int                             iQBits,
                                             Double                          dTemp,
@@ -3407 +2269 @@
   {
     Double dErr         = Double( lLevelDouble  - ( uiAbsLevel << iQBits ) );
-#if RESTRICT_GR1GR2FLAG_NUMBER
     Double dCurrCost    = dErr * dErr * dTemp + xGetICRateCost( uiAbsLevel, ui16CtxNumOne, ui16CtxNumAbs, ui16AbsGoRice, c1Idx, c2Idx );
-#else
-    Double dCurrCost    = dErr * dErr * dTemp + xGetICRateCost( uiAbsLevel, ui16CtxNumOne, ui16CtxNumAbs, ui16AbsGoRice );
-#endif
     dCurrCost          += dCurrCostSig;
 
@@ -3436 +2294 @@
                                                UShort                          ui16CtxNumAbs,
                                                UShort                          ui16AbsGoRice
-#if RESTRICT_GR1GR2FLAG_NUMBER
                                             ,  UInt                            c1Idx,
                                                UInt                            c2Idx
-#endif
                                                ) const
 {
   Double iRate = xGetIEPRate();
-#if RESTRICT_GR1GR2FLAG_NUMBER
   UInt baseLevel  =  (c1Idx < C1FLAG_NUMBER)? (2 + (c2Idx < C2FLAG_NUMBER)) : 1;
 
@@ -3476 +2331 @@
   }
   else
-#endif
   if( uiAbsLevel == 1 )
   {
@@ -3488 +2342 @@
   else
   {
-#if RESTRICT_GR1GR2FLAG_NUMBER
     assert (0);
-#else
-    UInt uiSymbol     = uiAbsLevel - 3;
+  }
+  return xGetICost( iRate );
+}
+
+__inline Int TComTrQuant::xGetICRate  ( UInt                            uiAbsLevel,
+                                       UShort                          ui16CtxNumOne,
+                                       UShort                          ui16CtxNumAbs,
+                                       UShort                          ui16AbsGoRice
+                                     , UInt                            c1Idx,
+                                       UInt                            c2Idx
+                                       ) const
+{
+  Int iRate = 0;
+  UInt baseLevel  =  (c1Idx < C1FLAG_NUMBER)? (2 + (c2Idx < C2FLAG_NUMBER)) : 1;
+
+  if ( uiAbsLevel >= baseLevel )
+  {
+    UInt uiSymbol     = uiAbsLevel - baseLevel;
     UInt uiMaxVlc     = g_auiGoRiceRange[ ui16AbsGoRice ];
     Bool bExpGolomb   = ( uiSymbol > uiMaxVlc );
@@ -3507 +2376 @@
 
     iRate += ui16NumBins << 15;
-    iRate += m_pcEstBitsSbac->m_greaterOneBits[ ui16CtxNumOne ][ 1 ];
-    iRate += m_pcEstBitsSbac->m_levelAbsBits[ ui16CtxNumAbs ][ 1 ];
-#endif
-  }
-  return xGetICost( iRate );
-}
-
-#if MULTIBITS_DATA_HIDING
-__inline Int TComTrQuant::xGetICRate  ( UInt                            uiAbsLevel,
-                                       UShort                          ui16CtxNumOne,
-                                       UShort                          ui16CtxNumAbs,
-                                       UShort                          ui16AbsGoRice
-#if RESTRICT_GR1GR2FLAG_NUMBER
-                                     , UInt                            c1Idx,
-                                       UInt                            c2Idx
-#endif
-                                       ) const
-{
-  Int iRate = 0;
-#if RESTRICT_GR1GR2FLAG_NUMBER
-  UInt baseLevel  =  (c1Idx < C1FLAG_NUMBER)? (2 + (c2Idx < C2FLAG_NUMBER)) : 1;
-
-  if ( uiAbsLevel >= baseLevel )
-  {
-    UInt uiSymbol     = uiAbsLevel - baseLevel;
-    UInt uiMaxVlc     = g_auiGoRiceRange[ ui16AbsGoRice ];
-    Bool bExpGolomb   = ( uiSymbol > uiMaxVlc );
-
-    if( bExpGolomb )
-    {
-      uiAbsLevel  = uiSymbol - uiMaxVlc;
-      int iEGS    = 1;  for( UInt uiMax = 2; uiAbsLevel >= uiMax; uiMax <<= 1, iEGS += 2 );
-      iRate      += iEGS << 15;
-      uiSymbol    = min<UInt>( uiSymbol, ( uiMaxVlc + 1 ) );
-    }
-
-    UShort ui16PrefLen = UShort( uiSymbol >> ui16AbsGoRice ) + 1;
-    UShort ui16NumBins = min<UInt>( ui16PrefLen, g_auiGoRicePrefixLen[ ui16AbsGoRice ] ) + ui16AbsGoRice;
-
-    iRate += ui16NumBins << 15;
 
     if (c1Idx < C1FLAG_NUMBER)
@@ -3559 +2388 @@
   }
   else
-#endif
   if( uiAbsLevel == 0 )
   {
@@ -3575 +2403 @@
   else
   {
-#if RESTRICT_GR1GR2FLAG_NUMBER
     assert(0);
-#else
-    UInt uiSymbol     = uiAbsLevel - 3;
-    UInt uiMaxVlc     = g_auiGoRiceRange[ ui16AbsGoRice ];
-    Bool bExpGolomb   = ( uiSymbol > uiMaxVlc );
-
-    if( bExpGolomb )
-    {
-      uiAbsLevel  = uiSymbol - uiMaxVlc;
-      int iEGS    = 1;  for( UInt uiMax = 2; uiAbsLevel >= uiMax; uiMax <<= 1, iEGS += 2 );
-      iRate      += iEGS << 15;
-      uiSymbol    = min<UInt>( uiSymbol, ( uiMaxVlc + 1 ) );
-    }
-
-    UShort ui16PrefLen = UShort( uiSymbol >> ui16AbsGoRice ) + 1;
-    UShort ui16NumBins = min<UInt>( ui16PrefLen, g_auiGoRicePrefixLen[ ui16AbsGoRice ] ) + ui16AbsGoRice;
-
-    iRate += ui16NumBins << 15;
-    iRate += m_pcEstBitsSbac->m_greaterOneBits[ ui16CtxNumOne ][ 1 ];
-    iRate += m_pcEstBitsSbac->m_levelAbsBits[ ui16CtxNumAbs ][ 1 ];
-#endif
   }
   return iRate;
 }
-#endif
 
 __inline Double TComTrQuant::xGetRateSigCoeffGroup  ( UShort                    uiSignificanceCoeffGroup,
@@ -3674 +2480 @@
                                            const UInt                      uiCGPosX,
                                            const UInt                      uiCGPosY,
-#if MULTILEVEL_SIGMAP_EXT
                                            const UInt                      scanIdx,
-#endif
                                            Int width, Int height)
 {
@@ -3684 +2488 @@
   width >>= 2;
   height >>= 2;
-#if MULTILEVEL_SIGMAP_EXT
   if( width == 2 && height == 2 ) // 8x8
   {
@@ -3698 +2501 @@
     }
   }
-#endif
   if( uiCGPosX < width - 1 )
   {
@@ -3707 +2509 @@
     uiLower = (uiSigCoeffGroupFlag[ (uiCGPosY  + 1 ) * width + uiCGPosX ] != 0);
   }
-#if REMOVE_INFER_SIGGRP
   return (uiRight || uiLower);
-#else
-  return uiRight + uiLower;
-#endif
-
-}
-#if !REMOVE_INFER_SIGGRP
-// return 1 if both right neighbour and lower neighour are 1's
-Bool TComTrQuant::bothCGNeighboursOne ( const UInt*                   uiSigCoeffGroupFlag,
-                                       const UInt                      uiCGPosX,
-                                       const UInt                      uiCGPosY, 
-#if MULTILEVEL_SIGMAP_EXT
-                                       const UInt                      scanIdx,
-#endif
-                                       Int width, Int height)
-{
-  UInt uiRight = 0;
-  UInt uiLower = 0;
-
-  width >>= 2;
-  height >>= 2;
-#if MULTILEVEL_SIGMAP_EXT
-  if( width == 2 && height == 2 ) // 8x8
-  {
-    if( scanIdx == SCAN_HOR )  
-    {
-      width = 1;
-      height = 4;
-    }
-    else if( scanIdx == SCAN_VER )
-    {
-      width = 4;
-      height = 1;
-    }
-  }
-#endif
-  if( uiCGPosX < width - 1 )
-  {
-    uiRight = (uiSigCoeffGroupFlag[ uiCGPosY * width + uiCGPosX + 1 ] != 0);
-  }
-  if (uiCGPosY < height - 1 )
-  {
-    uiLower = (uiSigCoeffGroupFlag[ (uiCGPosY  + 1 ) * width + uiCGPosX ] != 0);
-  }
-  
-  return (uiRight & uiLower);
-}
-#endif
+
+}
 /** set quantized matrix coefficient for encode
  * \param scalingList quantaized matrix address
@@ -3842 +2598 @@
   UInt width = g_scalingListSizeX[sizeId];
   UInt height = g_scalingListSizeX[sizeId];
-#if SCALING_LIST
   UInt ratio = g_scalingListSizeX[sizeId]/min(MAX_MATRIX_SIZE_NUM,(Int)g_scalingListSizeX[sizeId]);
-#endif
   Int *quantcoeff;
   Int *coeff = scalingList->getScalingListAddress(sizeId,listId);
   quantcoeff   = getQuantCoeff(listId, qp, sizeId, SCALING_LIST_SQT);
 
-#if SCALING_LIST
   processScalingListEnc(coeff,quantcoeff,g_quantScales[qp]<<4,height,width,ratio,min(MAX_MATRIX_SIZE_NUM,(Int)g_scalingListSizeX[sizeId]),scalingList->getScalingListDC(sizeId,listId));
-#else
-  processScalingListEnc(coeff,quantcoeff,g_quantScales[qp]<<4,height,width,1,(Int)g_scalingListSizeX[sizeId],0);
-#endif
 
   if(sizeId == SCALING_LIST_32x32 || sizeId == SCALING_LIST_16x16) //for NSQT
   {
     quantcoeff   = getQuantCoeff(listId, qp, sizeId-1,SCALING_LIST_VER);
-#if SCALING_LIST
     processScalingListEnc(coeff,quantcoeff,g_quantScales[qp]<<4,height,width>>2,ratio,min(MAX_MATRIX_SIZE_NUM,(Int)g_scalingListSizeX[sizeId]),scalingList->getScalingListDC(sizeId,listId));
-#else
-    processScalingListEnc(coeff,quantcoeff,g_quantScales[qp]<<4,height,width>>2,1,(Int)g_scalingListSizeX[sizeId],0);
-#endif
 
     quantcoeff   = getQuantCoeff(listId, qp, sizeId-1,SCALING_LIST_HOR);
-#if SCALING_LIST
     processScalingListEnc(coeff,quantcoeff,g_quantScales[qp]<<4,height>>2,width,ratio,min(MAX_MATRIX_SIZE_NUM,(Int)g_scalingListSizeX[sizeId]),scalingList->getScalingListDC(sizeId,listId));
-#else
-    processScalingListEnc(coeff,quantcoeff,g_quantScales[qp]<<4,height>>2,width,1,(Int)g_scalingListSizeX[sizeId],0);
-#endif
   }
 }
@@ -3882 +2624 @@
   UInt width = g_scalingListSizeX[sizeId];
   UInt height = g_scalingListSizeX[sizeId];
-#if SCALING_LIST
   UInt ratio = g_scalingListSizeX[sizeId]/min(MAX_MATRIX_SIZE_NUM,(Int)g_scalingListSizeX[sizeId]);
-#endif
   Int *dequantcoeff;
   Int *coeff = scalingList->getScalingListAddress(sizeId,listId);
 
   dequantcoeff = getDequantCoeff(listId, qp, sizeId,SCALING_LIST_SQT);
-#if SCALING_LIST
   processScalingListDec(coeff,dequantcoeff,g_invQuantScales[qp],height,width,ratio,min(MAX_MATRIX_SIZE_NUM,(Int)g_scalingListSizeX[sizeId]),scalingList->getScalingListDC(sizeId,listId));
-#else
-  processScalingListDec(coeff,dequantcoeff,g_invQuantScales[qp],height,width,1,(Int)g_scalingListSizeX[sizeId],0);
-#endif
 
   if(sizeId == SCALING_LIST_32x32 || sizeId == SCALING_LIST_16x16)
   {
     dequantcoeff   = getDequantCoeff(listId, qp, sizeId-1,SCALING_LIST_VER);
-#if SCALING_LIST
     processScalingListDec(coeff,dequantcoeff,g_invQuantScales[qp],height,width>>2,ratio,min(MAX_MATRIX_SIZE_NUM,(Int)g_scalingListSizeX[sizeId]),scalingList->getScalingListDC(sizeId,listId));
-#else
-    processScalingListDec(coeff,dequantcoeff,g_invQuantScales[qp],height,width>>2,1,(Int)g_scalingListSizeX[sizeId],0);
-#endif
 
     dequantcoeff   = getDequantCoeff(listId, qp, sizeId-1,SCALING_LIST_HOR);
 
-#if SCALING_LIST
     processScalingListDec(coeff,dequantcoeff,g_invQuantScales[qp],height>>2,width,ratio,min(MAX_MATRIX_SIZE_NUM,(Int)g_scalingListSizeX[sizeId]),scalingList->getScalingListDC(sizeId,listId));
-#else
-    processScalingListDec(coeff,dequantcoeff,g_invQuantScales[qp],height>>2,width,1,min(MAX_MATRIX_SIZE_NUM,(Int)g_scalingListSizeX[sizeId]),0);
-#endif
   }
 }
@@ -4004 +2732 @@
     }
   }
-#if SCALING_LIST
   if(ratio > 1)
   {
     quantcoeff[0] = quantScales / dc;
   }
-#endif
 }
 /** set quantized matrix coefficient for decode
@@ -4032 +2758 @@
     }
   }
-#if SCALING_LIST
   if(ratio > 1)
   {
     dequantcoeff[0] = invQuantScales * dc;
   }
-#endif
 }
 

branches/HTM-5.1-dev0/source/Lib/TLibCommon/TComTrQuant.h

@@ -89 +89 @@
   Int m_iBits;
     
-#if H0736_AVC_STYLE_QP_RANGE
   Void setQpParam( Int qpScaled, Bool bLowpass, SliceType eSliceType )
   {
@@ -97 +96 @@
     m_iBits = QP_BITS + m_iPer;
   }
-#else
-  Void setQpParam( Int iQP, Bool bLowpass, SliceType eSliceType )
-  {
-    assert ( iQP >= MIN_QP && iQP <= MAX_QP );
-    m_iQP   = iQP;
-    
-    m_iPer  = (iQP + 6*g_uiBitIncrement)/6;
-#if FULL_NBIT
-    m_iPer += g_uiBitDepth - 8;
-#endif
-    m_iRem  = iQP % 6;
-    
-    m_iBits = QP_BITS + m_iPer;
-  }
-#endif
   
   Void clear()
@@ -165 +149 @@
   
   // Misc functions
-#if H0736_AVC_STYLE_QP_RANGE
   Void setQPforQuant( Int qpy, Bool bLowpass, SliceType eSliceType, TextType eTxtType, Int qpBdOffset, Int chromaQPOffset);
-#else
-  Void setQPforQuant( Int iQP, Bool bLowpass, SliceType eSliceType, TextType eTxtType, Int Shift);
-#endif
 
 #if RDOQ_CHROMA_LAMBDA 
@@ -192 +172 @@
                                        const UInt                       uiCGPosX,
                                        const UInt                       uiCGPosY,
-#if MULTILEVEL_SIGMAP_EXT
                                        const UInt                     scanIdx,
-#endif
                                        Int width, Int height);
-#if !REMOVE_INFER_SIGGRP  
-  static Bool bothCGNeighboursOne  ( const UInt*                      uiSigCoeffGroupFlag,
-                                    const UInt                       uiCGPosX,
-                                    const UInt                       uiCGPosY,
-#if MULTILEVEL_SIGMAP_EXT
-                                    const UInt                       scanIdx,
-#endif
-                                    Int width, Int height);
-#endif
   Void initScalingList                      ();
   Void destroyScalingList                   ();
@@ -259 +228 @@
   Void xT   ( UInt uiMode,Pel* pResidual, UInt uiStride, Int* plCoeff, Int iWidth, Int iHeight );
   
-#if MULTIBITS_DATA_HIDING
   Void signBitHidingHDQ( TComDataCU* pcCU, TCoeff* pQCoef, TCoeff* pCoef, UInt const *scan, Int* deltaU, Int width, Int height );
-#endif
 
   // quantization
@@ -298 +265 @@
                                              UShort                          ui16CtxNumAbs,
                                              UShort                          ui16AbsGoRice,
-#if RESTRICT_GR1GR2FLAG_NUMBER
                                              UInt                            c1Idx,  
                                              UInt                            c2Idx,  
-#endif
                                              Int                             iQBits,
                                              Double                          dTemp,
@@ -309 +274 @@
                                      UShort                          ui16CtxNumAbs,
                                      UShort                          ui16AbsGoRice 
-#if RESTRICT_GR1GR2FLAG_NUMBER
                                    , UInt                            c1Idx,
                                      UInt                            c2Idx
-#endif
                                      ) const;
-#if MULTIBITS_DATA_HIDING
 __inline Int xGetICRate  ( UInt                            uiAbsLevel,
                            UShort                          ui16CtxNumOne,
                            UShort                          ui16CtxNumAbs,
                            UShort                          ui16AbsGoRice
-#if RESTRICT_GR1GR2FLAG_NUMBER
                          , UInt                            c1Idx,
                            UInt                            c2Idx
-#endif
                          ) const;
-#endif
   __inline Double xGetRateLast     ( const UInt                      uiPosX,
                                      const UInt                      uiPosY,

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

@@ -257 +257 @@
 ///// ***** HM 6.1 *********
 
-// REMOVED HM 6.1 Macros 
+//// REMOVED HM 6.1 Guard macros 
+/*
 #define SKIPFRAME_BUGFIX                  1 ///< bug fix to enable skipFrame at decoder
 #define START_DECODING_AT_CRA             1 ///< H0496, start decoding at clear random access point
@@ -319 +320 @@
 #define COMPLETE_SLICES_IN_TILE     1 // Among the constraints between slices and tiles, all slices within a tile shall be complete (JCTVC-H0348/JCTVC-H0463) for SliceMode 1&2
 #define WPP_SIMPLIFICATION          1 // JCTVC-H0349/JCTVC-0517
-
+*/
 
 
@@ -329 +330 @@
 #define LOG2_PARALLEL_MERGE_LEVEL_MINUS2  0 //< H0082 parallel merge level 0-> 4x4, 1-> 8x8, 2->16x16, 3->32x32, 4->64x64
 
-#if PARALLEL_MERGE && LOG2_PARALLEL_MERGE_LEVEL_MINUS2
+#if LOG2_PARALLEL_MERGE_LEVEL_MINUS2
 #define CU_BASED_MRG_CAND_LIST            1  //< H0240: single merge candidate list for all PUs inside a 8x8 CU conditioned on LOG2_PARALLEL_MERGE_LEVEL_MINUS2 > 0
 #define FIX_CU_BASED_MRG_CAND_LIST_B0136  1  //< B0136 bug fix for CU_BASED_MRG_CAND_LIST
@@ -337 +338 @@
 #define SIGMAP_CONST_AT_HIGH_FREQUENCY      1      ///< H0095 method2.1: const significance map at high freaquency
 
-#if RESTRICT_GR1GR2FLAG_NUMBER    //
 #define C1FLAG_NUMBER               8 // maximum number of largerThan1 flag coded in one chunk :  16 in HM5
 #define C2FLAG_NUMBER               1 // maximum number of largerThan2 flag coded in one chunk:  16 in HM5
-#endif
 
 #define REMOVE_SAO_LCU_ENC_CONSTRAINTS_1 0  ///< disable the encoder constraint that does not test SAO/BO mode for chroma in interleaved mode
@@ -391 +390 @@
 
 
-#if !H0137_0138_LIST_MODIFICATION
-#error "H0137_0138_LIST_MODIFICATION must be enabled for multi-view coding."
-#endif
 
 #define VERBOSE_RATE 0                               ///< Print additional rate information in encoder
@@ -475 +471 @@
 
 #define PLANAR_IDX             0
-#if LOGI_INTRA_NAME_3MPM
 #define VER_IDX                26                    // index for intra VERTICAL   mode
 #define HOR_IDX                10                    // index for intra HORIZONTAL mode
 #define DC_IDX                 1                     // index for intra DC mode
-#else
-#define DC_IDX                 3                     // index for intra DC mode
-#endif
 #define NUM_CHROMA_MODE        6                     // total number of chroma modes
 #define DM_CHROMA_IDX          36                    // chroma mode index for derived from luma intra mode
@@ -495 +487 @@
 #define AD_HOC_SLICES_FIXED_NUMBER_OF_LCU_IN_SLICE      1          ///< OPTION IDENTIFIER. mode==1 -> Limit maximum number of largest coding tree blocks in a slice
 #define AD_HOC_SLICES_FIXED_NUMBER_OF_BYTES_IN_SLICE    2          ///< OPTION IDENTIFIER. mode==2 -> Limit maximum number of bins/bits in a slice
-#if FIXED_NUMBER_OF_TILES_SLICE_MODE
 #define AD_HOC_SLICES_FIXED_NUMBER_OF_TILES_IN_SLICE    3
-#endif
 
 // Entropy slice options
@@ -521 +511 @@
 
 #define SCALING_LIST_OUTPUT_RESULT    0 //JCTVC-G880/JCTVC-G1016 quantization matrices
-#if H0566_TLA
 #define H0566_TLA_SET_FOR_SWITCHING_POINTS 1
-#endif
 
 
@@ -609 +597 @@
 {
   SAO_EO_LEN    = 4,
-#if SAO_UNIT_INTERLEAVING
   SAO_BO_LEN    = 4,
   SAO_MAX_BO_CLASSES = 32
-#else
-  SAO_BO_LEN    = 16
-#endif
 };
 
@@ -623 +607 @@
   SAO_EO_2,
   SAO_EO_3,
-#if SAO_UNIT_INTERLEAVING
   SAO_BO,
-#else
-  SAO_BO_0,
-  SAO_BO_1,
-#endif
   MAX_NUM_SAO_TYPE
 };
@@ -634 +613 @@
 typedef struct _SaoQTPart
 {
-#if !SAO_UNIT_INTERLEAVING
-  Bool        bEnableFlag;
-#endif
   Int         iBestType;
   Int         iLength;
-#if SAO_UNIT_INTERLEAVING
   Int         bandPosition ;
   Int         iOffset[4];
-#else
-  Int         iOffset[32];
-#endif
   Int         StartCUX;
   Int         StartCUY;
@@ -668 +640 @@
 } SAOQTPart;
 
-#if SAO_UNIT_INTERLEAVING
 typedef struct _SaoLcuParam
 {
@@ -682 +653 @@
   Int        length;
 } SaoLcuParam;
-#endif
 
 struct SAOParam
@@ -690 +660 @@
   Int        iMaxSplitLevel;
   Int        iNumClass[MAX_NUM_SAO_TYPE];
-#if SAO_UNIT_INTERLEAVING
   Bool         oneUnitFlag[3];
   SaoLcuParam* saoLcuParam[3];
   Int          numCuInHeight;
   Int          numCuInWidth;
-#endif
   ~SAOParam();
 };
@@ -702 +670 @@
 {
   Int alf_flag;                           ///< indicates use of ALF
-#if !LCU_SYNTAX_ALF
-  Int chroma_idc;                         ///< indicates use of ALF for chroma
-#endif
   Int num_coeff;                          ///< number of filter coefficients
   Int filter_shape;
-#if !LCU_SYNTAX_ALF
-  Int filter_shape_chroma;
-  Int num_coeff_chroma;                   ///< number of filter coefficients (chroma)
-  Int *coeff_chroma;                      ///< filter coefficient array (chroma)
-#endif
   Int *filterPattern;
   Int startSecondFilter;
@@ -719 +679 @@
   Int **coeffmulti;
   Int minKStart;
-#if !LCU_SYNTAX_ALF
-  Int maxScanVal;
-  Int kMinTab[42];
-
-  Int alf_pcr_region_flag;
-  ~ALFParam();
-#endif
-#if LCU_SYNTAX_ALF
   Int componentID;
   Int* kMinTab;
@@ -739 +691 @@
   Void destroy();
   Void copy(const ALFParam& src);
-#endif
-};
-
-#if LCU_SYNTAX_ALF
+};
+
 struct AlfUnitParam
 {
@@ -775 +725 @@
   Void destroy();
 };
-#endif
 
 

branches/HTM-5.1-dev0/source/Lib/TLibDecoder/NALread.cpp

@@ -124 +124 @@
   assert(forbidden_zero_bit == 0);
 
-#if NAL_REF_FLAG
   nalu.m_nalRefFlag  = (bs.read(1) != 0 );
   nalu.m_nalUnitType = (NalUnitType) bs.read(6);
-#else
-  nalu.m_nalRefIDC   = (NalRefIdc) bs.read(2);
-  nalu.m_nalUnitType = (NalUnitType) bs.read(5);
-#endif
 
 #if QC_MVHEVC_B0046
@@ -137 +132 @@
   nalu.m_temporalId = bs.read(3) - 1;
 #else
-#if H0388
   nalu.m_temporalId = bs.read(3);
  //  unsigned reserved_one_5bits = bs.read(5);
@@ -147 +141 @@
   nalu.m_isDepth  = bs.read(1);
 #endif
-#if H0566_TLA
   if ( nalu.m_temporalId )
   {
@@ -157 +150 @@
   }
 #endif
-#else
-  switch (nalu.m_nalUnitType)
-  {
-  case NAL_UNIT_CODED_SLICE:
-  case NAL_UNIT_CODED_SLICE_IDR:
-#if H0566_TLA
-#if !QC_REM_IDV_B0046
-  case NAL_UNIT_CODED_SLICE_IDV:
-#endif
-  case NAL_UNIT_CODED_SLICE_CRA:
-  case NAL_UNIT_CODED_SLICE_TLA:
-#else
-  case NAL_UNIT_CODED_SLICE_CDR:
-#endif
-    {
-      nalu.m_temporalId = bs.read(3);
-#if VIDYO_VPS_INTEGRATION
-      nalu.m_layerId    = bs.read(5) - 1;
-#else
-      nalu.m_OutputFlag = bs.read(1);
-  //    unsigned reserved_one_4bits = bs.read(4);
-  //    assert(reserved_one_4bits == 1);
-      nalu.m_viewId   = bs.read(3)-1;
-      nalu.m_isDepth  = bs.read(1);
-#endif
-
-#if H0566_TLA
-      if (nalu.m_temporalId == 0)
-      {
-#if QC_REM_IDV_B0046
-        assert(nalu.m_nalUnitType == NAL_UNIT_CODED_SLICE || nalu.m_nalUnitType == NAL_UNIT_CODED_SLICE_CRA || nalu.m_nalUnitType == NAL_UNIT_CODED_SLICE_IDR);
-#else
-        assert(nalu.m_nalUnitType == NAL_UNIT_CODED_SLICE || nalu.m_nalUnitType == NAL_UNIT_CODED_SLICE_CRA || nalu.m_nalUnitType == NAL_UNIT_CODED_SLICE_IDR || nalu.m_nalUnitType == NAL_UNIT_CODED_SLICE_IDV );
-#endif
-      }
-      else
-      {
-        assert(nalu.m_nalUnitType == NAL_UNIT_CODED_SLICE || nalu.m_nalUnitType == NAL_UNIT_CODED_SLICE_TLA);
-      }
-#endif
-    }
-    break;
-  default:
-    nalu.m_temporalId = 0;
-    nalu.m_OutputFlag = true;
-    break;
-  }
-#endif
-#endif
 }
 //! \}

branches/HTM-5.1-dev0/source/Lib/TLibDecoder/TDecBinCoder.h

@@ -54 +54 @@
   virtual Void  start             ()                                          = 0;
   virtual Void  finish            ()                                          = 0;
-#if OL_FLUSH
   virtual Void  flush            ()                                           = 0;
-#endif
 
   virtual Void  decodeBin         ( UInt& ruiBin, ContextModel& rcCtxModel )  = 0;
@@ -64 +62 @@
   
   virtual Void  resetBac          ()                                          = 0;
-#if BURST_IPCM
   virtual Void  decodeNumSubseqIPCM( Int& numSubseqIPCM )                  = 0;
-#endif
   virtual Void  decodePCMAlignBits()                                          = 0;
   virtual Void  xReadPCMCode      ( UInt uiLength, UInt& ruiCode)              = 0;

branches/HTM-5.1-dev0/source/Lib/TLibDecoder/TDecBinCoderCABAC.cpp

@@ -65 +65 @@
 TDecBinCABAC::start()
 {
-#if !OL_FLUSH || OL_FLUSH_ALIGN
+#if OL_FLUSH_ALIGN
   assert( m_pcTComBitstream->getNumBitsUntilByteAligned() == 0 );
 #endif
@@ -72 +72 @@
   m_bitsNeeded = -8;
   m_uiValue    = m_pcTComBitstream->readByte() << 8;
-#if OL_FLUSH && !OL_FLUSH_ALIGN
+#if !OL_FLUSH_ALIGN
   m_uiLastByte = m_pcTComBitstream->readByte();
   m_uiValue   |= m_uiLastByte;
@@ -85 +85 @@
 }
 
-#if OL_FLUSH
 Void 
 TDecBinCABAC::flush()
@@ -108 +107 @@
 #endif // OL_FLUSH_ALIGN
 }
-#endif // OL_FLUSH
 
 /**
@@ -122 +120 @@
   m_uiValue   = pcTDecBinCABAC->m_uiValue;
   m_bitsNeeded= pcTDecBinCABAC->m_bitsNeeded;
-#if OL_FLUSH && !OL_FLUSH_ALIGN
+#if !OL_FLUSH_ALIGN
   m_uiLastByte= pcTDecBinCABAC->m_uiLastByte;
 #endif
@@ -152 +150 @@
     {
       m_bitsNeeded = -8;
-#if OL_FLUSH && !OL_FLUSH_ALIGN
+#if !OL_FLUSH_ALIGN
       m_uiLastByte = m_pcTComBitstream->readByte();
       m_uiValue += m_uiLastByte;    
@@ -173 +171 @@
     if ( m_bitsNeeded >= 0 )
     {
-#if OL_FLUSH && !OL_FLUSH_ALIGN
+#if !OL_FLUSH_ALIGN
       m_uiLastByte = m_pcTComBitstream->readByte();
       m_uiValue += m_uiLastByte << m_bitsNeeded;
@@ -192 +190 @@
   {
     m_bitsNeeded = -8;
-#if OL_FLUSH && !OL_FLUSH_ALIGN
+#if !OL_FLUSH_ALIGN
     m_uiLastByte = m_pcTComBitstream->readByte();
     m_uiValue += m_uiLastByte;
@@ -215 +213 @@
   while ( numBins > 8 )
   {
-#if OL_FLUSH && !OL_FLUSH_ALIGN
+#if !OL_FLUSH_ALIGN
     m_uiLastByte = m_pcTComBitstream->readByte();
     m_uiValue = ( m_uiValue << 8 ) + ( m_uiLastByte << ( 8 + m_bitsNeeded ) );
@@ -241 +239 @@
   if ( m_bitsNeeded >= 0 )
   {
-#if OL_FLUSH && !OL_FLUSH_ALIGN
+#if !OL_FLUSH_ALIGN
     m_uiLastByte = m_pcTComBitstream->readByte();
     m_uiValue += m_uiLastByte << m_bitsNeeded;
@@ -285 +283 @@
       {
         m_bitsNeeded = -8;
-#if OL_FLUSH && !OL_FLUSH_ALIGN
+#if !OL_FLUSH_ALIGN
         m_uiLastByte = m_pcTComBitstream->readByte();
         m_uiValue += m_uiLastByte;    
@@ -306 +304 @@
 }
 
-#if BURST_IPCM
 /** Decode subsequent_pcm_num.
  * \param numSubseqIPCM
@@ -323 +320 @@
     {
       m_bitsNeeded = -8;
-#if OL_FLUSH && !OL_FLUSH_ALIGN
+#if !OL_FLUSH_ALIGN
       m_uiLastByte = m_pcTComBitstream->readByte();
       m_uiValue += m_uiLastByte;
@@ -342 +339 @@
   numSubseqIPCM --;
 }
-#endif
 
 /** Decode PCM alignment zero bits.

branches/HTM-5.1-dev0/source/Lib/TLibDecoder/TDecBinCoderCABAC.h

@@ -56 +56 @@
   Void  start             ();
   Void  finish            ();
-#if OL_FLUSH
   Void  flush             ();
-#endif
   
   Void  decodeBin         ( UInt& ruiBin, ContextModel& rcCtxModel );
@@ -66 +64 @@
   
   Void  resetBac          ();
-#if BURST_IPCM
   Void  decodeNumSubseqIPCM( Int& numSubseqIPCM ) ;
-#endif
   Void  decodePCMAlignBits();
   Void  xReadPCMCode      ( UInt uiLength, UInt& ruiCode );
@@ -82 +78 @@
   UInt                m_uiRange;
   UInt                m_uiValue;
-#if OL_FLUSH && !OL_FLUSH_ALIGN
+#if !OL_FLUSH_ALIGN
   UInt                m_uiLastByte;
 #endif

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

@@ -169 +169 @@
   assert(m_pcBitstream->getNumBitsLeft() == 8); /* rsbp_trailing_bits */
 }
-#if RPS_IN_SPS
 void TDecCavlc::parseShortTermRefPicSet( TComSPS* sps, TComReferencePictureSet* rps, Int idx )
-#else
-void TDecCavlc::parseShortTermRefPicSet( TComPPS* pcPPS, TComReferencePictureSet* rps, Int idx )
-#endif
 {
   UInt code;
@@ -184 +180 @@
     Int rIdx =  idx - 1 - code;
     assert (rIdx <= idx && rIdx >= 0);
-#if RPS_IN_SPS
     TComReferencePictureSet*   rpsRef = sps->getRPSList()->getReferencePictureSet(rIdx);
-#else
-    TComReferencePictureSet*   rpsRef = pcPPS->getRPSList()->getReferencePictureSet(rIdx);
-#endif
     Int k = 0, k0 = 0, k1 = 0;
     READ_CODE(1, bit, "delta_rps_sign"); // delta_RPS_sign
@@ -265 +257 @@
   READ_FLAG(uiCode, "aps_scaling_list_data_present_flag"); aps->setScalingListEnabled( (uiCode==1)?true:false );
   READ_FLAG(uiCode, "aps_deblocking_filter_flag");         aps->setLoopFilterOffsetInAPS( (uiCode==1)?true:false );
-#if !SAO_UNIT_INTERLEAVING
-  READ_FLAG(uiCode, "aps_sample_adaptive_offset_flag");    aps->setSaoEnabled( (uiCode==1)?true:false );
-#endif
-#if !LCU_SYNTAX_ALF
-  READ_FLAG(uiCode, "aps_adaptive_loop_filter_flag");      aps->setAlfEnabled( (uiCode==1)?true:false );
-#endif
   if(aps->getScalingListEnabled())
   {
     parseScalingList( aps->getScalingList() );
   }
-#if DBL_CONTROL
   if(aps->getLoopFilterOffsetInAPS())
   {
     xParseDblParam( aps );    
   }
-#endif
-#if SAO_UNIT_INTERLEAVING
   READ_FLAG(uiCode, "aps_sao_interleaving_flag");      aps->setSaoInterleavingFlag( (uiCode==1)?true:false );
   if(!aps->getSaoInterleavingFlag())
   {
     READ_FLAG(uiCode, "aps_sample_adaptive_offset_flag");      aps->setSaoEnabled( (uiCode==1)?true:false );
-#endif
   if(aps->getSaoEnabled())
   {
@@ -292 +274 @@
     xParseSaoParam( aps->getSaoParam() );
   }
-#if SAO_UNIT_INTERLEAVING
-  }
-#endif
-#if LCU_SYNTAX_ALF
+  }
   READ_FLAG(uiCode, "aps_adaptive_loop_filter_flag");      aps->setAlfEnabled( (uiCode==1)?true:false );
-#endif
   if(aps->getAlfEnabled())
   {
-#if !LCU_SYNTAX_ALF
-    aps->getAlfParam()->alf_flag = 1;
-#endif
     xParseAlfParam( aps->getAlfParam());
   }
@@ -316 +291 @@
 }
 
-#if DBL_CONTROL
 Void  TDecCavlc::xParseDblParam       ( TComAPS* aps )
 {
@@ -333 +307 @@
   }
 }
-#endif
 /** parse SAO parameters
  * \param pSaoParam
@@ -341 +314 @@
   UInt uiSymbol;
 
-#if SAO_UNIT_INTERLEAVING
   int i,j, compIdx; 
   int numCuInWidth; 
@@ -393 +365 @@
     }
   }
-#else
-  if (pSaoParam->bSaoFlag[0])
-  {
-    xParseSaoSplitParam (pSaoParam, 0, 0);
-    xParseSaoOffsetParam(pSaoParam, 0, 0);
-    READ_FLAG (uiSymbol, "sao_flag_cb");
-    pSaoParam->bSaoFlag[1] = uiSymbol? true:false;
-    if (pSaoParam->bSaoFlag[1])
-    {
-      xParseSaoSplitParam (pSaoParam, 0, 1);
-      xParseSaoOffsetParam(pSaoParam, 0, 1);
-    }
-
-    READ_FLAG (uiSymbol, "sao_flag_cr");
-    pSaoParam->bSaoFlag[2] = uiSymbol? true:false;
-    if (pSaoParam->bSaoFlag[2])
-    {
-      xParseSaoSplitParam (pSaoParam, 0, 2);
-      xParseSaoOffsetParam(pSaoParam, 0, 2);
-    }
-  }
-#endif
-}
-#if SAO_UNIT_INTERLEAVING
+}
 /** copy SAO parameter
  * \param dst  
@@ -584 +533 @@
 }
 
-#else
-/** Decode quadtree split flag
- * \param  pSaoParam, iPartIdx
- */
-Void TDecCavlc::xParseSaoSplitParam(SAOParam* pSaoParam, Int iPartIdx, Int iYCbCr)
-{
-  UInt uiSymbol;
-  SAOQTPart*  pSaoPart = NULL;
-  pSaoPart= &(pSaoParam->psSaoPart[iYCbCr][iPartIdx]);
-
-  if(pSaoPart->PartLevel < pSaoParam->iMaxSplitLevel)
-  {
-    READ_FLAG (uiSymbol, "sao_split_flag");
-    pSaoPart->bSplit = uiSymbol? true:false; 
-    if(pSaoPart->bSplit)
-    {
-      for (Int i=0;i<NUM_DOWN_PART;i++)
-      {
-        xParseSaoSplitParam(pSaoParam, pSaoPart->DownPartsIdx[i], iYCbCr);
-      }
-    }
-  }
-  else
-  {
-    pSaoPart->bSplit = false; 
-  }
-}
-
-/** Decode SAO for one partition
- * \param  pSaoParam, iPartIdx
- */
-Void TDecCavlc::xParseSaoOffsetParam(SAOParam* pSaoParam, Int iPartIdx, Int iYCbCr)
-{
-  UInt uiSymbol;
-  Int iSymbol;  
-  SAOQTPart*  pSaoPart = NULL;
-  pSaoPart = &(pSaoParam->psSaoPart[iYCbCr][iPartIdx]);
-
-  static Int iTypeLength[MAX_NUM_SAO_TYPE] = {
-    SAO_EO_LEN,
-    SAO_EO_LEN,
-    SAO_EO_LEN,
-    SAO_EO_LEN,
-    SAO_BO_LEN,
-    SAO_BO_LEN
-  };  
-  if(!pSaoPart->bSplit)
-  {
-    READ_UVLC (uiSymbol, "sao_type_idx");
-    if (uiSymbol)
-    {
-      pSaoPart->iBestType = uiSymbol-1;
-      pSaoPart->bEnableFlag = true;
-    }
-    else
-    {
-      pSaoPart->iBestType = -1;
-      pSaoPart->bEnableFlag = false;
-    }
-
-    if (pSaoPart->bEnableFlag)
-    {
-      pSaoPart->iLength = iTypeLength[pSaoPart->iBestType];
-      for(Int i=0; i< pSaoPart->iLength; i++)
-      {
-        READ_SVLC (iSymbol, "sao_offset");
-        pSaoPart->iOffset[i] = iSymbol;
-      }
-    }
-    return;
-  }
-
-  //split
-  if (pSaoPart->PartLevel < pSaoParam->iMaxSplitLevel)
-  {
-    for(Int i=0;i<NUM_DOWN_PART;i++)
-    {
-      xParseSaoOffsetParam(pSaoParam, pSaoPart->DownPartsIdx[i], iYCbCr);
-    }
-  }
-}
-#endif
-
-#if LCU_SYNTAX_ALF 
+
 Void TDecCavlc::xParseAlfParam(AlfParamSet* pAlfParamSet, Bool bSentInAPS, Int firstLCUAddr, Bool acrossSlice, Int numLCUInWidth, Int numLCUInHeight)
 {
@@ -931 +797 @@
 }
 
-#endif
 
 Void TDecCavlc::xParseAlfParam(ALFParam* pAlfParam)
@@ -937 +802 @@
   UInt uiSymbol;
   Int iSymbol;
-#if ALF_SINGLE_FILTER_SHAPE
   Int sqrFiltLengthTab[NUM_ALF_FILTER_SHAPE] = {ALF_FILTER_LEN}; 
-#else
-  Int sqrFiltLengthTab[2] = { 9, 9}; 
-#endif
-
-#if LCU_SYNTAX_ALF
+
   switch(pAlfParam->componentID)
   {
@@ -961 +821 @@
   case ALF_Y:
     {
-#endif
   pAlfParam->filters_per_group = 0;
   memset (pAlfParam->filterPattern, 0 , sizeof(Int)*NO_VAR_BINS);
-#if !LCU_SYNTAX_ALF
-  READ_FLAG (uiSymbol, "alf_region_adaptation_flag");
-  pAlfParam->alf_pcr_region_flag = uiSymbol;  
-#endif
-#if ALF_SINGLE_FILTER_SHAPE  
   pAlfParam->filter_shape = 0;
-#else
-  READ_UVLC (uiSymbol, "alf_length_luma_minus_5_div2");
-  pAlfParam->filter_shape = uiSymbol;
-#endif
   pAlfParam->num_coeff = sqrFiltLengthTab[pAlfParam->filter_shape];
 
@@ -989 +839 @@
   {
     pAlfParam->filters_per_group = 1;
-#if LCU_SYNTAX_ALF
-#if ALF_16_BA_GROUPS
     Int numMergeFlags = 16;
-#else
-    Int numMergeFlags = 15;
-#endif
-#else
-#if ALF_16_BA_GROUPS
-    Int numMergeFlags = 16;
-#else
-    Int numMergeFlags = pAlfParam->alf_pcr_region_flag ? 16 : 15;
-#endif
-#endif
     for (Int i=1; i<numMergeFlags; i++) 
     {
@@ -1021 +859 @@
   }
 
-#if ALF_SINGLE_FILTER_SHAPE
   Int minScanVal = MIN_SCAN_POS_CROSS;
-#else
-  Int minScanVal = (pAlfParam->filter_shape == ALF_STAR5x5) ? 0: MIN_SCAN_POS_CROSS;
-#endif
 
   // Determine maxScanVal
@@ -1036 +870 @@
 
   // Golomb parameters
-#if LCU_SYNTAX_ALF
   if( pAlfParam->filters_per_group > 1 )
   {
-#endif
   READ_UVLC (uiSymbol, "alf_min_kstart_minus1");
   pAlfParam->minKStart = 1 + uiSymbol;
@@ -1051 +883 @@
     kMin = pAlfParam->kMinTab[scanPos];
   }
-#if LCU_SYNTAX_ALF
-  }
-#endif
+  }
 
   Int scanPos;
@@ -1061 +891 @@
     {
       scanPos = pDepthInt[i] - 1;
-#if LCU_SYNTAX_ALF
       Int k = (pAlfParam->filters_per_group == 1) ? kTableTabShapes[ALF_CROSS9x7_SQUARE3x3][i] : pAlfParam->kMinTab[scanPos];
       pAlfParam->coeffmulti[idx][i] = xGolombDecode(k);
-#else
-      pAlfParam->coeffmulti[idx][i] = xGolombDecode(pAlfParam->kMinTab[scanPos]);
-#endif
-    }
-  }
-#if LCU_SYNTAX_ALF
+    }
+  }
     }
     break;
@@ -1079 +904 @@
     }
   }
-#else
-  // filter parameters for chroma
-  READ_UVLC (uiSymbol, "alf_chroma_idc");
-  pAlfParam->chroma_idc = uiSymbol;
-
-  if(pAlfParam->chroma_idc)
-  {
-
-#if ALF_SINGLE_FILTER_SHAPE 
-    pAlfParam->filter_shape_chroma  = 0;
-#else
-    READ_UVLC (uiSymbol, "alf_length_chroma_minus_5_div2");
-
-    pAlfParam->filter_shape_chroma = uiSymbol;
-#endif
-    pAlfParam->num_coeff_chroma = sqrFiltLengthTab[pAlfParam->filter_shape_chroma];
-    // filter coefficients for chroma
-    for(Int pos=0; pos<pAlfParam->num_coeff_chroma; pos++)
-    {
-      READ_SVLC (iSymbol, "alf_coeff_chroma");
-      pAlfParam->coeff_chroma[pos] = iSymbol;
-    }
-  }
-#endif
 }
 
@@ -1137 +938 @@
 }
 
-#if TILES_OR_ENTROPY_SYNC_IDC
 Void TDecCavlc::parsePPS(TComPPS* pcPPS, ParameterSetManagerDecoder *parameterSet)
-#else
-Void TDecCavlc::parsePPS(TComPPS* pcPPS)
-#endif
 {
 #if ENC_DEC_TRACE  
@@ -1150 +947 @@
   Int   iCode;
 
-#if !RPS_IN_SPS
-  TComRPSList* rpsList = pcPPS->getRPSList();
-#endif
   READ_UVLC( uiCode, "pic_parameter_set_id");                      pcPPS->setPPSId (uiCode);
   READ_UVLC( uiCode, "seq_parameter_set_id");                      pcPPS->setSPSId (uiCode);
 
-#if MULTIBITS_DATA_HIDING
   READ_FLAG ( uiCode, "sign_data_hiding_flag" ); pcPPS->setSignHideFlag( uiCode );
   if( pcPPS->getSignHideFlag() )
@@ -1162 +955 @@
     READ_CODE( 4, uiCode, "sign_hiding_threshold"); pcPPS->setTSIG(uiCode);
   }
-#endif
 
 #if CABAC_INIT_FLAG
   READ_FLAG( uiCode,   "cabac_init_present_flag" );            pcPPS->setCabacInitPresentFlag( uiCode ? true : false );
-#endif
-#if !RPS_IN_SPS
-  // RPS is put before entropy_coding_mode_flag
-  // since entropy_coding_mode_flag will probably be removed from the WD
-  TComReferencePictureSet*      pcRPS;
-
-  READ_UVLC( uiCode, "num_short_term_ref_pic_sets" );
-  rpsList->create(uiCode);
-
-  for(Int i=0; i< rpsList->getNumberOfReferencePictureSets(); i++)
-  {
-    pcRPS = rpsList->getReferencePictureSet(i);
-    parseShortTermRefPicSet(pcPPS,pcRPS,i);
-  }
-  READ_FLAG( uiCode, "long_term_ref_pics_present_flag" );          pcPPS->setLongTermRefsPresent(uiCode);
 #endif
   // entropy_coding_mode_flag
@@ -1187 +964 @@
   if (pcPPS->getEntropyCodingMode())
   {
-#if !WPP_SIMPLIFICATION
-    READ_UVLC( uiCode, "entropy_coding_synchro" );                 pcPPS->setEntropyCodingSynchro( uiCode );
-    READ_FLAG( uiCode, "cabac_istate_reset" );                     pcPPS->setCabacIstateReset( uiCode ? true : false );
-#endif
-#if !TILES_OR_ENTROPY_SYNC_IDC
-#if !WPP_SIMPLIFICATION
-    if ( pcPPS->getEntropyCodingSynchro() )
-#endif
-    {
-      READ_UVLC( uiCode, "num_substreams_minus1" );                pcPPS->setNumSubstreams(uiCode+1);
-    }
-#endif
-  }
-#if !H0566_TLA
-  READ_UVLC( uiCode, "num_temporal_layer_switching_point_flags" ); pcPPS->setNumTLayerSwitchingFlags( uiCode );
-  for ( UInt i = 0; i < pcPPS->getNumTLayerSwitchingFlags(); i++ )
-  {
-    READ_FLAG( uiCode, "temporal_layer_switching_point_flag" );    pcPPS->setTLayerSwitchingFlag( i, uiCode > 0 ? true : false );
-  }
-#endif
+  }
   
   // num_ref_idx_l0_default_active_minus1
@@ -1241 +999 @@
 //printf("TDecCavlc::parsePPS():\tm_bUseWeightPred=%d\tm_uiBiPredIdc=%d\n", pcPPS->getUseWP(), pcPPS->getWPBiPredIdc());
 
-#if H0388
   READ_FLAG( uiCode, "output_flag_present_flag" );
   pcPPS->setOutputFlagPresentFlag( uiCode==1 );
-#endif
-
-#if TILES_OR_ENTROPY_SYNC_IDC
+
   if(parameterSet->getPrefetchedSPS(pcPPS->getSPSId())->getTilesOrEntropyCodingSyncIdc()==1)
   {
-#endif
     READ_FLAG ( uiCode, "tile_info_present_flag" );
     pcPPS->setColumnRowInfoPresent(uiCode);
@@ -1290 +1044 @@
       Int iNumColTilesMinus1 = (pcPPS->getColumnRowInfoPresent() == 1)?(pcPPS->getNumColumnsMinus1()):(pcPPS->getSPS()->getNumColumnsMinus1());
       Int iNumRowTilesMinus1 = (pcPPS->getColumnRowInfoPresent() == 1)?(pcPPS->getNumColumnsMinus1()):(pcPPS->getSPS()->getNumRowsMinus1());
-#if !REMOVE_TILE_DEPENDENCE
-      pcPPS->setTileBoundaryIndependenceIdr( 1 ); //default
-#endif
       pcPPS->setLFCrossTileBoundaryFlag(true); //default
 
       if(iNumColTilesMinus1 !=0 || iNumRowTilesMinus1 !=0)
       {
-#if !REMOVE_TILE_DEPENDENCE
-        READ_FLAG ( uiCode, "tile_boundary_independence_flag" );  
-        pcPPS->setTileBoundaryIndependenceIdr( uiCode );
-
-        if(pcPPS->getTileBoundaryIndependenceIdr() == 1)
-        {
-#endif
           READ_FLAG ( uiCode, "loop_filter_across_tile_flag" );  
           pcPPS->setLFCrossTileBoundaryFlag( (uiCode == 1)?true:false );
-#if !REMOVE_TILE_DEPENDENCE
-        }
-#endif
-      }
-    }
-#if TILES_OR_ENTROPY_SYNC_IDC
+      }
+    }
   }
   else if(parameterSet->getPrefetchedSPS(pcPPS->getSPSId())->getTilesOrEntropyCodingSyncIdc()==2)
@@ -1317 +1057 @@
     READ_UVLC( uiCode, "num_substreams_minus1" );                pcPPS->setNumSubstreams(uiCode+1);
   }
-#endif
-
-#if DBL_CONTROL
+
   READ_FLAG( uiCode, "deblocking_filter_control_present_flag" ); 
   pcPPS->setDeblockingFilterControlPresent( uiCode ? true : false);
-#endif
-#if PARALLEL_MERGE
   READ_UVLC( uiCode, "log2_parallel_merge_level_minus2");
   assert(uiCode == LOG2_PARALLEL_MERGE_LEVEL_MINUS2);
   pcPPS->setLog2ParallelMergeLevelMinus2 (uiCode);
-#endif
 
   READ_FLAG( uiCode, "pps_extension_flag");
@@ -1496 +1231 @@
   READ_UVLC (    uiCode, "pic_width_in_luma_samples" );          pcSPS->setPicWidthInLumaSamples ( uiCode    );
   READ_UVLC (    uiCode, "pic_height_in_luma_samples" );         pcSPS->setPicHeightInLumaSamples( uiCode    );
-#if PIC_CROPPING
   READ_FLAG(     uiCode, "pic_cropping_flag");                   pcSPS->setPicCroppingFlag ( uiCode ? true : false );
   if (uiCode != 0)
@@ -1505 +1239 @@
     READ_UVLC(   uiCode, "pic_crop_bottom_offset" );             pcSPS->setPicCropBottomOffset( uiCode );
   }
-#endif
 
 #if FULL_NBIT
@@ -1525 +1258 @@
 #endif
 
-#if H0736_AVC_STYLE_QP_RANGE
   pcSPS->setQpBDOffsetY( (Int) (6*uiCode) );
-#endif
 
   g_uiBASE_MAX  = ((1<<(g_uiBitDepth))-1);
@@ -1537 +1268 @@
 #endif
   READ_UVLC( uiCode,    "bit_depth_chroma_minus8" );
-#if H0736_AVC_STYLE_QP_RANGE
   pcSPS->setQpBDOffsetC( (Int) (6*uiCode) );
-#endif
 
   READ_FLAG( uiCode, "pcm_enabled_flag" ); pcSPS->setUsePCM( uiCode ? true : false );
@@ -1554 +1283 @@
 
   READ_UVLC( uiCode,    "log2_max_pic_order_cnt_lsb_minus4" );   pcSPS->setBitsForPOC( 4 + uiCode );
-#if H0567_DPB_PARAMETERS_PER_TEMPORAL_LAYER
   for(UInt i=0; i <= pcSPS->getMaxTLayers()-1; i++)
   {
@@ -1564 +1292 @@
     pcSPS->setMaxLatencyIncrease( uiCode, i );
   }
-#else
-  READ_UVLC( uiCode,    "max_num_ref_pics" );                    pcSPS->setMaxNumberOfReferencePictures(uiCode);
-  READ_UVLC( uiCode,    "num_reorder_frames" );                  pcSPS->setNumReorderFrames(uiCode);
-  READ_UVLC ( uiCode, "max_dec_frame_buffering");
-  pcSPS->setMaxDecFrameBuffering( uiCode );
-  READ_UVLC ( uiCode, "max_latency_increase");
-  pcSPS->setMaxLatencyIncrease( uiCode );
-#endif
-
-#if H0412_REF_PIC_LIST_RESTRICTION
+
   READ_FLAG( uiCode, "restricted_ref_pic_lists_flag" );
   pcSPS->setRestrictedRefPicListsFlag( uiCode );
@@ -1585 +1304 @@
     pcSPS->setListsModificationPresentFlag(true);
   }
-#endif
   READ_UVLC( uiCode, "log2_min_coding_block_size_minus3" );
   UInt log2MinCUSize = uiCode + 3;
@@ -1628 +1346 @@
   READ_FLAG( uiCode, "sample_adaptive_offset_enabled_flag" );       pcSPS->setUseSAO ( uiCode ? true : false );  
   READ_FLAG( uiCode, "adaptive_loop_filter_enabled_flag" );         pcSPS->setUseALF ( uiCode ? true : false );
-#if LCU_SYNTAX_ALF
   if(pcSPS->getUseALF())
   {
     READ_FLAG( uiCode, "alf_coef_in_slice_flag" );      pcSPS->setUseALFCoefInSlice ( uiCode ? true : false );
   }
-#endif
   if( pcSPS->getUsePCM() )
   {
@@ -1642 +1358 @@
 
 
-#if RPS_IN_SPS
   TComRPSList* rpsList = pcSPS->getRPSList();
   TComReferencePictureSet* rps;
@@ -1655 +1370 @@
   }
   READ_FLAG( uiCode, "long_term_ref_pics_present_flag" );          pcSPS->setLongTermRefsPresent(uiCode);
-#endif
-#if !PIC_CROPPING
-  //!!!KS: Syntax not in WD !!!
-
-  xReadUvlc ( uiCode ); pcSPS->setPadX        ( uiCode    );
-  xReadUvlc ( uiCode ); pcSPS->setPadY        ( uiCode    );
-#endif
   
   // AMVP mode for each depth (AM_NONE or AM_EXPL)
@@ -1670 +1378 @@
   }
 
-#if TILES_WPP_ENTRY_POINT_SIGNALLING
   READ_CODE(2, uiCode, "tiles_or_entropy_coding_sync_idc");         pcSPS->setTilesOrEntropyCodingSyncIdc(uiCode);
-#endif
-
-#if TILES_OR_ENTROPY_SYNC_IDC
+
   if(pcSPS->getTilesOrEntropyCodingSyncIdc() == 1)
   {
-#endif
     READ_UVLC ( uiCode, "num_tile_columns_minus1" );
     pcSPS->setNumColumnsMinus1( uiCode );  
@@ -1704 +1408 @@
       free(rowHeight);  
     }
-#if !REMOVE_TILE_DEPENDENCE
-    pcSPS->setTileBoundaryIndependenceIdr( 1 ); //default
-#endif
     pcSPS->setLFCrossTileBoundaryFlag(true); //default
 
     if( pcSPS->getNumColumnsMinus1() !=0 || pcSPS->getNumRowsMinus1() != 0)
     {
-#if !REMOVE_TILE_DEPENDENCE
-      READ_FLAG ( uiCode, "tile_boundary_independence_flag" );  
-      pcSPS->setTileBoundaryIndependenceIdr( uiCode );
-      if(pcSPS->getTileBoundaryIndependenceIdr() == 1)
-      {
-#endif
         READ_FLAG ( uiCode, "loop_filter_across_tile_flag" );  
         pcSPS->setLFCrossTileBoundaryFlag( (uiCode==1)?true:false);
-#if !REMOVE_TILE_DEPENDENCE
-      }
-#endif
-    }
-#if TILES_OR_ENTROPY_SYNC_IDC
-  }
-#endif
+    }
+  }
   READ_FLAG( uiCode, "sps_extension_flag");
 #if !QC_MVHEVC_B0046
@@ -1894 +1584 @@
 }
 
-#if LCU_SYNTAX_ALF
 #if MTK_DEPTH_MERGE_TEXTURE_CANDIDATE_C0137
 Void TDecCavlc::parseSliceHeader (TComSlice*& rpcSlice, ParameterSetManagerDecoder *parameterSetManager, AlfCUCtrlInfo &alfCUCtrl, AlfParamSet& alfParamSet, bool isDepth)
 #else
 Void TDecCavlc::parseSliceHeader (TComSlice*& rpcSlice, ParameterSetManagerDecoder *parameterSetManager, AlfCUCtrlInfo &alfCUCtrl, AlfParamSet& alfParamSet)
-#endif
-#else
-Void TDecCavlc::parseSliceHeader (TComSlice*& rpcSlice, ParameterSetManagerDecoder *parameterSetManager, AlfCUCtrlInfo &alfCUCtrl)
 #endif
 {
@@ -1988 +1674 @@
     rpcSlice->setSPS(sps);
     rpcSlice->setPPS(pps);
-#if H0388
     if( pps->getOutputFlagPresentFlag() )
     {
@@ -1998 +1683 @@
       rpcSlice->setPicOutputFlag( true );
     }
-#endif
 #if QC_REM_IDV_B0046
 #if !QC_MVHEVC_B0046
@@ -2065 +1749 @@
         {
           rps = rpcSlice->getLocalRPS();
-#if RPS_IN_SPS
           parseShortTermRefPicSet(sps,rps, sps->getRPSList()->getNumberOfReferencePictureSets());
-#else
-          parseShortTermRefPicSet(pps,rps, pps->getRPSList()->getNumberOfReferencePictureSets());
-#endif
           rpcSlice->setRPS(rps);
         }
         else // use reference to short-term reference picture set in PPS
         {
-#if RPS_IN_SPS
           READ_UVLC( uiCode, "short_term_ref_pic_set_idx"); rpcSlice->setRPS(sps->getRPSList()->getReferencePictureSet(uiCode));
-#else
-          READ_UVLC( uiCode, "short_term_ref_pic_set_idx"); rpcSlice->setRPS(pps->getRPSList()->getReferencePictureSet(uiCode));
-#endif
           rps = rpcSlice->getRPS();
         }
-#if RPS_IN_SPS
         if(sps->getLongTermRefsPresent())
-#else
-        if(pps->getLongTermRefsPresent())
-#endif
         {
           Int offset = rps->getNumberOfNegativePictures()+rps->getNumberOfPositivePictures();
           READ_UVLC( uiCode, "num_long_term_pics");             rps->setNumberOfLongtermPictures(uiCode);
           Int prev = 0;
-#if LTRP_MULT
           Int prevMsb=0;
           Int prevDeltaPocLt=0;
-#endif
           for(Int j=rps->getNumberOfLongtermPictures()+offset-1 ; j > offset-1; j--)
           {
@@ -2099 +1769 @@
             prev += uiCode;
 
-#if LTRP_MULT
             READ_FLAG(uiCode,"delta_poc_msb_present_flag");
             Int decDeltaPOCMsbPresent=uiCode;
@@ -2120 +1789 @@
             else
             {
-#endif
               rps->setPOC(j,rpcSlice->getPOC()-prev);          
               rps->setDeltaPOC(j,-(Int)prev);
-#if LTRP_MULT
             }
             prevDeltaPocLt=prev;
-#endif
             READ_FLAG( uiCode, "used_by_curr_pic_lt_flag");     rps->setUsed(j,uiCode);
           }
@@ -2145 +1811 @@
       if (sps->getUseSAO())
       {
-#if SAO_UNIT_INTERLEAVING
         READ_FLAG(uiCode, "slice_sao_interleaving_flag");        rpcSlice->setSaoInterleavingFlag(uiCode);
-#endif
         READ_FLAG(uiCode, "slice_sample_adaptive_offset_flag");  rpcSlice->setSaoEnabledFlag((Bool)uiCode);
-#if SAO_UNIT_INTERLEAVING
         if (rpcSlice->getSaoEnabledFlag() && rpcSlice->getSaoInterleavingFlag())
         {
@@ -2160 +1823 @@
           rpcSlice->setSaoEnabledFlagCr(0);
         }
-#endif
       }
       READ_UVLC (    uiCode, "aps_id" );  rpcSlice->setAPSId(uiCode);
@@ -2188 +1850 @@
     if( !rpcSlice->isIntra() )
     {
-#if H0412_REF_PIC_LIST_RESTRICTION
 #if QC_MVHEVC_B0046
     if( !rpcSlice->getViewId() || !rpcSlice->getSPS()->getListsModificationPresentFlag() )
@@ -2199 +1860 @@
       else
       {
-#endif
         READ_FLAG( uiCode, "ref_pic_list_modification_flag_l0" ); refPicListModification->setRefPicListModificationFlagL0( uiCode ? 1 : 0 );
-#if H0412_REF_PIC_LIST_RESTRICTION
-      }
-#endif
+      }
       
       if(refPicListModification->getRefPicListModificationFlagL0())
@@ -2209 +1867 @@
         uiCode = 0;
         Int i = 0;
-#if H0137_0138_LIST_MODIFICATION
         Int NumPocTotalCurr = rpcSlice->getNumPocTotalCurrMvc();
         if ( NumPocTotalCurr > 1 )
@@ -2232 +1889 @@
           }
         }
-#else
-        Int list_modification_idc = 0;
-        while(list_modification_idc != 3)  
-        {
-          READ_UVLC( uiCode, "list_modification_idc" ); refPicListModification->setListIdcL0(i, uiCode );
-          list_modification_idc = uiCode;
-          if(uiCode != 3)
-          {
-            READ_UVLC( uiCode, "ref_pic_set_idx" ); refPicListModification->setRefPicSetIdxL0(i, uiCode );
-          }
-          i++;
-        }
-        refPicListModification->setNumberOfRefPicListModificationsL0(i-1);
-#endif
-      }
-#if !H0137_0138_LIST_MODIFICATION
-      else
-      {
-        refPicListModification->setNumberOfRefPicListModificationsL0(0); 
-      }
-#endif
+      }
     }
     else
     {
       refPicListModification->setRefPicListModificationFlagL0(0);
-#if !H0137_0138_LIST_MODIFICATION
-      refPicListModification->setNumberOfRefPicListModificationsL0(0);
-#endif
     }
     if(rpcSlice->isInterB())
     {
-#if H0412_REF_PIC_LIST_RESTRICTION
 #if QC_MVHEVC_B0046
     if( !rpcSlice->getViewId() || !rpcSlice->getSPS()->getListsModificationPresentFlag() )
@@ -2274 +1907 @@
       else
       {
-#endif
         READ_FLAG( uiCode, "ref_pic_list_modification_flag_l1" ); refPicListModification->setRefPicListModificationFlagL1( uiCode ? 1 : 0 );
-#if H0412_REF_PIC_LIST_RESTRICTION
-      }
-#endif
+      }
       if(refPicListModification->getRefPicListModificationFlagL1())
       {
         uiCode = 0;
         Int i = 0;
-#if H0137_0138_LIST_MODIFICATION
         Int NumPocTotalCurr = rpcSlice->getNumPocTotalCurrMvc();
         if ( NumPocTotalCurr > 1 )
@@ -2306 +1935 @@
           }
         }
-#else
-        Int list_modification_idc = 0;
-        while(list_modification_idc != 3)  
-        {
-          READ_UVLC( uiCode, "list_modification_idc" ); refPicListModification->setListIdcL1(i, uiCode );
-          list_modification_idc = uiCode;
-          if(uiCode != 3)
-          {
-            READ_UVLC( uiCode, "ref_pic_set_idx" ); refPicListModification->setRefPicSetIdxL1(i, uiCode );
-          }
-          i++;
-        }
-        refPicListModification->setNumberOfRefPicListModificationsL1(i-1);
-#endif
-      }
-#if !H0137_0138_LIST_MODIFICATION
-      else
-      {
-        refPicListModification->setNumberOfRefPicListModificationsL1(0);
-      }
-#endif
+      }
     }  
     else
     {
       refPicListModification->setRefPicListModificationFlagL1(0);
-#if !H0137_0138_LIST_MODIFICATION
-      refPicListModification->setNumberOfRefPicListModificationsL1(0);
-#endif
     }
   }
@@ -2351 +1957 @@
       READ_UVLC( uiCode, "num_ref_idx_lc_active_minus1" );      rpcSlice->setNumRefIdx( REF_PIC_LIST_C, uiCode + 1 );
       
-#if H0412_REF_PIC_LIST_RESTRICTION
 #if QC_MVHEVC_B0046
     if( rpcSlice->getViewId() && rpcSlice->getSPS()->getListsModificationPresentFlag() )
@@ -2358 +1963 @@
 #endif
       {
-#endif
         READ_FLAG( uiCode, "ref_pic_list_modification_flag_lc" ); rpcSlice->setRefPicListModificationFlagLC( uiCode ? 1 : 0 );
         if(uiCode)
@@ -2366 +1970 @@
             READ_FLAG( uiCode, "pic_from_list_0_flag" );
             rpcSlice->setListIdFromIdxOfLC(i, uiCode);
-#if H0137_0138_LIST_MODIFICATION
           if (((rpcSlice->getListIdFromIdxOfLC(i) == REF_PIC_LIST_0) && (rpcSlice->getNumRefIdx( REF_PIC_LIST_0 ) == 1)) || ((rpcSlice->getListIdFromIdxOfLC(i) == REF_PIC_LIST_1) && (rpcSlice->getNumRefIdx( REF_PIC_LIST_1 ) == 1)) )
           {
@@ -2375 +1978 @@
             READ_UVLC( uiCode, "ref_idx_list_curr" );
           }
-#else
-            READ_UVLC( uiCode, "ref_idx_list_curr" );
-#endif
             rpcSlice->setRefIdxFromIdxOfLC(i, uiCode);
             rpcSlice->setRefIdxOfLC((RefPicList)rpcSlice->getListIdFromIdxOfLC(i), rpcSlice->getRefIdxFromIdxOfLC(i), i);
           }
         }
-#if H0412_REF_PIC_LIST_RESTRICTION
       }
       else
@@ -2388 +1987 @@
         rpcSlice->setRefPicListModificationFlagLC(false);
       }
-#endif
     }
     else
@@ -2401 +1999 @@
   }
   
-#if H0111_MVD_L1_ZERO
   if (rpcSlice->isInterB())
   {
     READ_FLAG( uiCode, "mvd_l1_zero_flag" );       rpcSlice->setMvdL1ZeroFlag( (uiCode ? true : false) );
   }
-#endif
 
 #if CABAC_INIT_FLAG
@@ -2432 +2028 @@
     rpcSlice->setSliceQp (26 + pps->getPicInitQPMinus26() + iCode);
 
-#if H0736_AVC_STYLE_QP_RANGE
     assert( rpcSlice->getSliceQp() >= -sps->getQpBDOffsetY() );
     assert( rpcSlice->getSliceQp() <=  51 );
-#endif
-
-#if DBL_CONTROL
+
     if (rpcSlice->getPPS()->getDeblockingFilterControlPresent())
     {
@@ -2447 +2040 @@
         rpcSlice->setInheritDblParamFromAPS(0);
       }
-#else
-    READ_FLAG ( uiCode, "inherit_dbl_param_from_APS_flag" ); rpcSlice->setInheritDblParamFromAPS(uiCode ? 1 : 0);
-#endif
       if(!rpcSlice->getInheritDblParamFromAPS())
       {
@@ -2459 +2049 @@
         }
       }
-#if DBL_CONTROL
    }
-#endif
     if ( rpcSlice->getSliceType() == B_SLICE )
     {
@@ -2531 +2119 @@
 
       Int uiNumCUsInFrame = uiNumLCUsInWidth* uiNumLCUsInHeight; 
-#if LCU_SYNTAX_ALF
       if(sps->getUseALFCoefInSlice())
       {
@@ -2544 +2131 @@
       if(!sps->getUseALFCoefInSlice())
       {
-#endif
       xParseAlfCuControlParam(alfCUCtrl, uiNumCUsInFrame);
-#if LCU_SYNTAX_ALF
-      }
-#endif
+      }
 
     }
@@ -2557 +2141 @@
   if (!bEntropySlice)
   {
-#if !REMOVE_TILE_DEPENDENCE
-    if (sps->getTileBoundaryIndependenceIdr())
-    {   
-#endif
     xReadCode(1, uiCode); // read flag indicating if tile markers transmitted
     rpcSlice->setTileMarkerFlag( uiCode );
-#if !REMOVE_TILE_DEPENDENCE
-    }
-#endif
-  }
-
-#if TILES_WPP_ENTRY_POINT_SIGNALLING
+  }
+
   Int tilesOrEntropyCodingSyncIdc = rpcSlice->getSPS()->getTilesOrEntropyCodingSyncIdc();
   UInt *entryPointOffset          = NULL;
@@ -2629 +2205 @@
     delete [] entryPointOffset;
   }
-#else
-#if WPP_SIMPLIFICATION
-  if (pps->getNumSubstreams() > 1)
-#else
-  if (pps->getEntropyCodingSynchro())
-#endif
-  {
-    UInt uiNumSubstreams = pps->getNumSubstreams();
-    rpcSlice->allocSubstreamSizes(uiNumSubstreams);
-    UInt *puiSubstreamSizes = rpcSlice->getSubstreamSizes();
-
-    for (UInt ui = 0; ui+1 < uiNumSubstreams; ui++)
-    {
-      xReadCode(2, uiCode);
-      
-      switch ( uiCode )
-      {
-      case 0:
-        xReadCode(8,  uiCode);
-        break;
-      case 1:
-        xReadCode(16, uiCode);
-        break;
-      case 2:
-        xReadCode(24, uiCode);
-        break;
-      case 3:
-        xReadCode(32, uiCode);
-        break;
-      default:
-        printf("Error in parseSliceHeader\n");
-        exit(-1);
-        break;
-      }
-      puiSubstreamSizes[ui] = uiCode;
-    }
-  }
-#endif
 
   if (!bEntropySlice)
   {
     // Reading location information
-#if !REMOVE_TILE_DEPENDENCE
-    if (sps->getTileBoundaryIndependenceIdr())
-    {   
-#endif
-#if !TILES_WPP_ENTRY_POINT_SIGNALLING
-      xReadCode(1, uiCode); // read flag indicating if location information signaled in slice header
-      Bool bTileLocationInformationInSliceHeaderFlag = (uiCode)? true : false;
-
-      if (bTileLocationInformationInSliceHeaderFlag)
-      {
-        // location count
-        xReadCode(5, uiCode); // number of tiles for which location information signaled
-        rpcSlice->setTileLocationCount ( uiCode + 1 );
-
-        xReadCode(5, uiCode); // number of bits used by diff
-        Int iBitsUsedByDiff = uiCode + 1;
-
-        // read out tile start location
-        Int iLastSize = 0;
-        for (UInt uiIdx=0; uiIdx<rpcSlice->getTileLocationCount(); uiIdx++)
-        {
-          Int iAbsDiff, iCurSize, iCurDiff;
-          if (uiIdx==0)
-          {
-            xReadCode(iBitsUsedByDiff-1, uiCode); iAbsDiff  = uiCode;
-            rpcSlice->setTileLocation( uiIdx, iAbsDiff );
-            iCurDiff  = iAbsDiff;
-            iLastSize = iAbsDiff;
-          }
-          else
-          {
-            xReadCode(1, uiCode); // read sign
-            Int iSign = (uiCode) ? -1 : +1;
-
-            xReadCode(iBitsUsedByDiff-1, uiCode); iAbsDiff  = uiCode;
-            iCurDiff  = (iSign) * iAbsDiff;
-            iCurSize  = iLastSize + iCurDiff;
-            iLastSize = iCurSize;
-            rpcSlice->setTileLocation( uiIdx, rpcSlice->getTileLocation( uiIdx-1 ) + iCurSize ); // calculate byte location
-          }
-        }
-      }
-#endif
 
       // read out trailing bits
     m_pcBitstream->readOutTrailingBits();
-#if !REMOVE_TILE_DEPENDENCE
-    }
-#endif
   }
   return;
@@ -2814 +2306 @@
 Void TDecCavlc::parseIPCMInfo( TComDataCU* pcCU, UInt uiAbsPartIdx, UInt uiDepth )
 {
-#if BURST_IPCM
   assert(0);
-#else
-  UInt uiSymbol;
-
-  xReadFlag( uiSymbol );
-
-  if ( uiSymbol )
-  {
-    Bool bIpcmFlag   = true;
-
-    xReadPCMAlignZero();
-
-    pcCU->setPartSizeSubParts  ( SIZE_2Nx2N, uiAbsPartIdx, uiDepth );
-    pcCU->setSizeSubParts      ( g_uiMaxCUWidth>>uiDepth, g_uiMaxCUHeight>>uiDepth, uiAbsPartIdx, uiDepth );
-    pcCU->setIPCMFlagSubParts  ( bIpcmFlag, uiAbsPartIdx, uiDepth );
-
-    UInt uiMinCoeffSize = pcCU->getPic()->getMinCUWidth()*pcCU->getPic()->getMinCUHeight();
-    UInt uiLumaOffset   = uiMinCoeffSize*uiAbsPartIdx;
-    UInt uiChromaOffset = uiLumaOffset>>2;
-
-    Pel* piPCMSample;
-    UInt uiWidth;
-    UInt uiHeight;
-    UInt uiSampleBits;
-    UInt uiX, uiY;
-
-    piPCMSample = pcCU->getPCMSampleY() + uiLumaOffset;
-    uiWidth = pcCU->getWidth(uiAbsPartIdx);
-    uiHeight = pcCU->getHeight(uiAbsPartIdx);
-    uiSampleBits = pcCU->getSlice()->getSPS()->getPCMBitDepthLuma();
-
-    for(uiY = 0; uiY < uiHeight; uiY++)
-    {
-      for(uiX = 0; uiX < uiWidth; uiX++)
-      {
-        UInt uiSample;
-        xReadCode(uiSampleBits, uiSample);
-
-        piPCMSample[uiX] = uiSample;
-      }
-      piPCMSample += uiWidth;
-    }
-
-    piPCMSample = pcCU->getPCMSampleCb() + uiChromaOffset;
-    uiWidth = pcCU->getWidth(uiAbsPartIdx)/2;
-    uiHeight = pcCU->getHeight(uiAbsPartIdx)/2;
-    uiSampleBits = pcCU->getSlice()->getSPS()->getPCMBitDepthChroma();
-
-    for(uiY = 0; uiY < uiHeight; uiY++)
-    {
-      for(uiX = 0; uiX < uiWidth; uiX++)
-      {
-        UInt uiSample;
-        xReadCode(uiSampleBits, uiSample);
-        piPCMSample[uiX] = uiSample;
-      }
-      piPCMSample += uiWidth;
-    }
-
-    piPCMSample = pcCU->getPCMSampleCr() + uiChromaOffset;
-    uiWidth = pcCU->getWidth(uiAbsPartIdx)/2;
-    uiHeight = pcCU->getHeight(uiAbsPartIdx)/2;
-    uiSampleBits = pcCU->getSlice()->getSPS()->getPCMBitDepthChroma();
-
-    for(uiY = 0; uiY < uiHeight; uiY++)
-    {
-      for(uiX = 0; uiX < uiWidth; uiX++)
-      {
-        UInt uiSample;
-        xReadCode(uiSampleBits, uiSample);
-        piPCMSample[uiX] = uiSample;
-      }
-      piPCMSample += uiWidth;
-    }
-  }
-#endif
 }
 
@@ -2920 +2336 @@
 Void TDecCavlc::parseDeltaQP( TComDataCU* pcCU, UInt uiAbsPartIdx, UInt uiDepth )
 {
-#if H0736_AVC_STYLE_QP_RANGE
   Int qp;
-#else
-  UInt uiQp;
-#endif
   Int  iDQp;
   
   xReadSvlc( iDQp );
 
-#if H0736_AVC_STYLE_QP_RANGE
   Int qpBdOffsetY = pcCU->getSlice()->getSPS()->getQpBDOffsetY();
   qp = (((Int) pcCU->getRefQP( uiAbsPartIdx ) + iDQp + 52 + 2*qpBdOffsetY )%(52+ qpBdOffsetY)) -  qpBdOffsetY;
-#else
-  uiQp = pcCU->getRefQP( uiAbsPartIdx ) + iDQp;
-#endif
 
   UInt uiAbsQpCUPartIdx = (uiAbsPartIdx>>(8-(pcCU->getSlice()->getPPS()->getMaxCuDQPDepth()<<1)))<<(8-(pcCU->getSlice()->getPPS()->getMaxCuDQPDepth()<<1)) ;
   UInt uiQpCUDepth =   min(uiDepth,pcCU->getSlice()->getPPS()->getMaxCuDQPDepth()) ;
 
-#if H0736_AVC_STYLE_QP_RANGE
   pcCU->setQPSubParts( qp, uiAbsQpCUPartIdx, uiQpCUDepth );
-#else
-  pcCU->setQPSubParts( uiQp, uiAbsQpCUPartIdx, uiQpCUDepth );
-#endif
 }
 
@@ -3407 +2811 @@
           READ_UVLC( code, "scaling_list_pred_matrix_id_delta");
           scalingList->setRefMatrixId (sizeId,listId,(UInt)((Int)(listId)-(code+1)));
-#if SCALING_LIST
           if( sizeId > SCALING_LIST_8x8 )
           {
             scalingList->setScalingListDC(sizeId,listId,scalingList->getScalingListDC(sizeId, scalingList->getRefMatrixId (sizeId,listId)));
           }
-#endif
           scalingList->processRefMatrix( sizeId, listId, scalingList->getRefMatrixId (sizeId,listId));
           
@@ -3433 +2835 @@
 Void TDecCavlc::xDecodeScalingList(TComScalingList *scalingList, UInt sizeId, UInt listId)
 {
-#if SCALING_LIST
   Int i,coefNum = min(MAX_MATRIX_COEF_NUM,(Int)g_scalingListSize[sizeId]);
   Int data;
@@ -3473 +2874 @@
     }
   }
-#else
-  Int i,coefNum = g_scalingListSize[sizeId];
-  Int data;
-  Int nextCoef = SCALING_LIST_START_VALUE;
-  UInt* scan  = g_auiFrameScanXY [ sizeId + 1 ];
-  Int *dst = scalingList->getScalingListAddress(sizeId, listId);
-
-  for(i = 0; i < coefNum; i++)
-  {
-    READ_SVLC( data, "scaling_list_delta_coef");
-    nextCoef = (nextCoef + data + 256 ) % 256;
-    dst[scan[i]] = nextCoef;
-  }
-#endif
 }
 

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

@@ -82 +82 @@
   UInt  xGetBit             ();
   
-#if RPS_IN_SPS
   void  parseShortTermRefPicSet            (TComSPS* pcSPS, TComReferencePictureSet* pcRPS, Int idx);
-#else
-  void  parseShortTermRefPicSet            (TComPPS* pcPPS, TComReferencePictureSet* pcRPS, Int idx);
-#endif
 private:
   TComInputBitstream*   m_pcBitstream;
@@ -123 +119 @@
   Void  parseSPS            ( TComSPS* pcSPS );
 #endif
-#if TILES_OR_ENTROPY_SYNC_IDC
   Void  parsePPS            ( TComPPS* pcPPS, ParameterSetManagerDecoder *parameterSet);
-#else
-  Void  parsePPS            ( TComPPS* pcPPS);
-#endif
   Void  parseSEI(SEImessages&);
   Void  parseAPS            ( TComAPS* pAPS );
-#if LCU_SYNTAX_ALF
 #if MTK_DEPTH_MERGE_TEXTURE_CANDIDATE_C0137
   Void  parseSliceHeader    ( TComSlice*& rpcSlice, ParameterSetManagerDecoder *parameterSetManager, AlfCUCtrlInfo &alfCUCtrl, AlfParamSet& alfParamSet, bool isDepth);
 #else
   Void  parseSliceHeader    ( TComSlice*& rpcSlice, ParameterSetManagerDecoder *parameterSetManager, AlfCUCtrlInfo &alfCUCtrl, AlfParamSet& alfParamSet);
-#endif
-#else
-  Void  parseSliceHeader    ( TComSlice*& rpcSlice, ParameterSetManagerDecoder *parameterSetManager, AlfCUCtrlInfo &alfCUCtrl );
 #endif
   Void  parseTerminatingBit ( UInt& ruiBit );
@@ -175 +163 @@
   Void readTileMarker     ( UInt& uiTileIdx, UInt uiBitsUsed );
   Void updateContextTables  ( SliceType eSliceType, Int iQp ) { return; }
-#if OL_FLUSH
   Void decodeFlush() {};
-#endif
 
   Void xParsePredWeightTable ( TComSlice* pcSlice );
@@ -190 +176 @@
 #endif
 protected:
-#if DBL_CONTROL
   Void  xParseDblParam       ( TComAPS* aps );
-#endif
   Void  xParseSaoParam       ( SAOParam* pSaoParam );
-#if SAO_UNIT_INTERLEAVING
   Void  xParseSaoOffset      (SaoLcuParam* saoLcuParam);
   Void  xParseSaoUnit        (Int rx, Int ry, Int compIdx, SAOParam* saoParam, Bool& repeatedRow );
-#else
-  Void  xParseSaoSplitParam  ( SAOParam* pSaoParam, Int iPartIdx, Int iYCbCr );
-  Void  xParseSaoOffsetParam ( SAOParam* pSaoParam, Int iPartIdx, Int iYCbCr );
-#endif
-#if LCU_SYNTAX_ALF 
   Void  xParseAlfParam(AlfParamSet* pAlfParamSet, Bool bSentInAPS = true, Int firstLCUAddr = 0, Bool acrossSlice = true, Int numLCUInWidth= -1, Int numLCUInHeight= -1);
   Void  parseAlfParamSet(AlfParamSet* pAlfParamSet, Int firstLCUAddr, Bool alfAcrossSlice);
   Void  parseAlfFixedLengthRun(UInt& idx, UInt rx, UInt numLCUInWidth);
   Void  parseAlfStoredFilterIdx(UInt& idx, UInt numFilterSetsInBuffer);
-#endif
   Void  xParseAlfParam       ( ALFParam* pAlfParam );
   Void  xParseAlfCuControlParam(AlfCUCtrlInfo& cAlfParam, Int iNumCUsInPic);

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

@@ -148 +148 @@
   }
 
-#if BURST_IPCM
   pcCU->setNumSucIPCM(0);
-#endif
 
   // start from the top level CU
@@ -240 +238 @@
   if((!bStartInCU) && ( uiRPelX < pcSlice->getSPS()->getPicWidthInLumaSamples() ) && ( uiBPelY < pcSlice->getSPS()->getPicHeightInLumaSamples() ) )
   {
-#if BURST_IPCM
     if(pcCU->getNumSucIPCM() == 0)
     {
@@ -252 +249 @@
       pcCU->setDepthSubParts( uiDepth, uiAbsPartIdx );
     }
-#else
-#if HHI_MPI
-    if( pcCU->getTextureModeDepth( uiAbsPartIdx ) == -1 || uiDepth < pcCU->getTextureModeDepth( uiAbsPartIdx ) )
-#endif
-    m_pcEntropyDecoder->decodeSplitFlag( pcCU, uiAbsPartIdx, uiDepth );
-#endif
   }
   else
@@ -323 +314 @@
 
   // decode CU mode and the partition size
-#if BURST_IPCM
   if( !pcCU->getSlice()->isIntra() && pcCU->getNumSucIPCM() == 0 )
-#else
-  if( !pcCU->getSlice()->isIntra() )
-#endif
 #if HHI_MPI
   if( pcCU->getTextureModeDepth( uiAbsPartIdx ) == -1 )
@@ -382 +369 @@
     {
 #endif
-#if SIMP_MRG_PRUN      
     UInt uiMergeIndex = pcCU->getMergeIndex(uiAbsPartIdx);
 #if MERL_VSP_C0152
@@ -404 +390 @@
     m_ppcCU[uiDepth]->getInterMergeCandidates( 0, 0, uiDepth, cMvFieldNeighbours, uhInterDirNeighbours, numValidMergeCand, uiMergeIndex );
 #endif
-#else
-    m_ppcCU[uiDepth]->getInterMergeCandidates( 0, 0, uiDepth, cMvFieldNeighbours, uhInterDirNeighbours, numValidMergeCand );
-    UInt uiMergeIndex = pcCU->getMergeIndex(uiAbsPartIdx);
-#endif
     pcCU->setInterDirSubParts( uhInterDirNeighbours[uiMergeIndex], uiAbsPartIdx, 0, uiDepth );
 
@@ -438 +420 @@
   {
 #endif
-#if BURST_IPCM
   if( pcCU->getNumSucIPCM() == 0 ) 
   {
@@ -451 +432 @@
     pcCU->setTrIdxSubParts( 0, uiAbsPartIdx, uiDepth );
   }
-#else
-  m_pcEntropyDecoder->decodePredMode( pcCU, uiAbsPartIdx, uiDepth );
-  m_pcEntropyDecoder->decodePartSize( pcCU, uiAbsPartIdx, uiDepth );
-#endif
 
   if (pcCU->isIntra( uiAbsPartIdx ) && pcCU->getPartitionSize( uiAbsPartIdx ) == SIZE_2Nx2N )
@@ -592 +569 @@
   }
 
-#if BURST_IPCM
   if( pcCU->getNumSucIPCM() > 0 )
   {
@@ -598 +574 @@
     return;
   }
-#endif
 
   ruiIsLast = xDecodeSliceEnd( pcCU, uiAbsPartIdx, uiDepth);
@@ -820 +795 @@
   
   //===== inverse transform =====
-#if H0736_AVC_STYLE_QP_RANGE
   m_pcTrQuant->setQPforQuant  ( pcCU->getQP(0), !pcCU->getSlice()->getDepth(), pcCU->getSlice()->getSliceType(), TEXT_LUMA, pcCU->getSlice()->getSPS()->getQpBDOffsetY(), 0 );
-#else
-  m_pcTrQuant->setQPforQuant  ( pcCU->getQP(0), !pcCU->getSlice()->getDepth(), pcCU->getSlice()->getSliceType(), TEXT_LUMA, 0 );
-#endif
 
   Int scalingListType = (pcCU->isIntra(uiAbsPartIdx) ? 0 : 3) + g_eTTable[(Int)TEXT_LUMA];
@@ -940 +911 @@
   if(eText == TEXT_CHROMA_U)
   {
-#if H0736_AVC_STYLE_QP_RANGE
     m_pcTrQuant->setQPforQuant  ( pcCU->getQP(0), !pcCU->getSlice()->getDepth(), pcCU->getSlice()->getSliceType(), eText, pcCU->getSlice()->getSPS()->getQpBDOffsetC(), pcCU->getSlice()->getPPS()->getChromaQpOffset() );
-#else
-    m_pcTrQuant->setQPforQuant  ( pcCU->getQP(0), !pcCU->getSlice()->getDepth(), pcCU->getSlice()->getSliceType(), eText, pcCU->getSlice()->getPPS()->getChromaQpOffset() );
-#endif
   }
   else
   {
-#if H0736_AVC_STYLE_QP_RANGE
     m_pcTrQuant->setQPforQuant  ( pcCU->getQP(0), !pcCU->getSlice()->getDepth(), pcCU->getSlice()->getSliceType(), eText, pcCU->getSlice()->getSPS()->getQpBDOffsetC(), pcCU->getSlice()->getPPS()->getChromaQpOffset2nd() );
-#else
-    m_pcTrQuant->setQPforQuant  ( pcCU->getQP(0), !pcCU->getSlice()->getDepth(), pcCU->getSlice()->getSliceType(), eText, pcCU->getSlice()->getPPS()->getChromaQpOffset2nd() );
-#endif
   }
 
@@ -1252 +1215 @@
   pResi = m_ppcYuvResi[uiDepth]->getLumaAddr();
 
-#if H0736_AVC_STYLE_QP_RANGE
   m_pcTrQuant->setQPforQuant( pcCU->getQP( uiAbsPartIdx ), !pcCU->getSlice()->getDepth(), pcCU->getSlice()->getSliceType(), TEXT_LUMA, pcCU->getSlice()->getSPS()->getQpBDOffsetY(), 0 );
-#else
-  m_pcTrQuant->setQPforQuant( pcCU->getQP( uiAbsPartIdx ), !pcCU->getSlice()->getDepth(), pcCU->getSlice()->getSliceType(), TEXT_LUMA, 0 );
-#endif
 
   m_pcTrQuant->invRecurTransformNxN ( pcCU, 0, TEXT_LUMA, pResi, 0, m_ppcYuvResi[uiDepth]->getStride(), uiWidth, uiHeight, uiLumaTrMode, 0, piCoeff );
   
   // Cb and Cr
-#if H0736_AVC_STYLE_QP_RANGE
   m_pcTrQuant->setQPforQuant( pcCU->getQP( uiAbsPartIdx ), !pcCU->getSlice()->getDepth(), pcCU->getSlice()->getSliceType(), TEXT_CHROMA, pcCU->getSlice()->getSPS()->getQpBDOffsetC(), pcCU->getSlice()->getPPS()->getChromaQpOffset() );
-#else
-  m_pcTrQuant->setQPforQuant( pcCU->getQP( uiAbsPartIdx ), !pcCU->getSlice()->getDepth(), pcCU->getSlice()->getSliceType(), TEXT_CHROMA, pcCU->getSlice()->getPPS()->getChromaQpOffset() );
-#endif
 
   uiWidth  >>= 1;
@@ -1272 +1227 @@
   m_pcTrQuant->invRecurTransformNxN ( pcCU, 0, TEXT_CHROMA_U, pResi, 0, m_ppcYuvResi[uiDepth]->getCStride(), uiWidth, uiHeight, uiChromaTrMode, 0, piCoeff );
 
-#if H0736_AVC_STYLE_QP_RANGE
   m_pcTrQuant->setQPforQuant( pcCU->getQP( uiAbsPartIdx ), !pcCU->getSlice()->getDepth(), pcCU->getSlice()->getSliceType(), TEXT_CHROMA, pcCU->getSlice()->getSPS()->getQpBDOffsetC(), pcCU->getSlice()->getPPS()->getChromaQpOffset2nd() );
-#else
-  m_pcTrQuant->setQPforQuant( pcCU->getQP( uiAbsPartIdx ), !pcCU->getSlice()->getDepth(), pcCU->getSlice()->getSliceType(), TEXT_CHROMA, pcCU->getSlice()->getPPS()->getChromaQpOffset2nd() );
-#endif
 
   piCoeff = pcCU->getCoeffCr(); pResi = m_ppcYuvResi[uiDepth]->getCrAddr();

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

@@ -330 +330 @@
       else
       {
-#if SIMP_MRG_PRUN
         uiMergeIndex = pcCU->getMergeIndex(uiSubPartIdx);
         pcSubCU->getInterMergeCandidates( uiSubPartIdx-uiAbsPartIdx, uiPartIdx, uiDepth, cMvFieldNeighbours, uhInterDirNeighbours, numValidMergeCand, uiMergeIndex );
-#else      
-        pcSubCU->getInterMergeCandidates( uiSubPartIdx-uiAbsPartIdx, uiPartIdx, uiDepth, cMvFieldNeighbours, uhInterDirNeighbours, numValidMergeCand );
-        uiMergeIndex = pcCU->getMergeIndex(uiSubPartIdx);
-#endif
       }
 #else
-#if SIMP_MRG_PRUN       
       UInt uiMergeIndex = pcCU->getMergeIndex(uiSubPartIdx);
 #if MERL_VSP_C0152
@@ -375 +369 @@
 #else
       pcSubCU->getInterMergeCandidates( uiSubPartIdx-uiAbsPartIdx, uiPartIdx, uiDepth, cMvFieldNeighbours, uhInterDirNeighbours, numValidMergeCand, uiMergeIndex );
-#endif
-#else      
-      pcSubCU->getInterMergeCandidates( uiSubPartIdx-uiAbsPartIdx, uiPartIdx, uiDepth, cMvFieldNeighbours, uhInterDirNeighbours, numValidMergeCand );
-      UInt uiMergeIndex = pcCU->getMergeIndex(uiSubPartIdx);
 #endif
 #endif
@@ -547 +537 @@
 }
 
-#if UNIFIED_TRANSFORM_TREE
 Void TDecEntropy::xDecodeTransform( TComDataCU* pcCU, UInt offsetLuma, UInt offsetChroma, UInt uiAbsPartIdx, UInt absTUPartIdx, UInt uiDepth, UInt width, UInt height, UInt uiTrIdx, UInt uiInnerQuadIdx, UInt& uiYCbfFront3, UInt& uiUCbfFront3, UInt& uiVCbfFront3, Bool& bCodeDQP )
-#else
-Void TDecEntropy::xDecodeTransformSubdiv( TComDataCU* pcCU, UInt uiAbsPartIdx, UInt absTUPartIdx, UInt uiDepth, UInt uiInnerQuadIdx, UInt& uiYCbfFront3, UInt& uiUCbfFront3, UInt& uiVCbfFront3 )
-#endif
 {
   UInt uiSubdiv;
   const UInt uiLog2TrafoSize = g_aucConvertToBit[pcCU->getSlice()->getSPS()->getMaxCUWidth()]+2 - uiDepth;
 
-#if UNIFIED_TRANSFORM_TREE
   if(uiTrIdx==0)
   {
@@ -570 +555 @@
     }
   }
-#endif // UNIFIED_TRANSFORM_TREE
   if( pcCU->getPredictionMode(uiAbsPartIdx) == MODE_INTRA && pcCU->getPartitionSize(uiAbsPartIdx) == SIZE_NxN && uiDepth == pcCU->getDepth(uiAbsPartIdx) )
   {
     uiSubdiv = 1;
   }
-#if G519_TU_AMP_NSQT_HARMONIZATION
   else if( (pcCU->getSlice()->getSPS()->getQuadtreeTUMaxDepthInter() == 1) && (pcCU->getPredictionMode(uiAbsPartIdx) == MODE_INTER) && ( pcCU->getPartitionSize(uiAbsPartIdx) != SIZE_2Nx2N ) && (uiDepth == pcCU->getDepth(uiAbsPartIdx)) )
-#else
-  else if( (pcCU->getSlice()->getSPS()->getQuadtreeTUMaxDepthInter() == 1) && (pcCU->getPredictionMode(uiAbsPartIdx) == MODE_INTER) && ( pcCU->getPartitionSize(uiAbsPartIdx) == SIZE_2NxN || pcCU->getPartitionSize(uiAbsPartIdx) == SIZE_Nx2N) && (uiDepth == pcCU->getDepth(uiAbsPartIdx)) )
-#endif
   {
     uiSubdiv = (uiLog2TrafoSize > pcCU->getQuadtreeTULog2MinSizeInCU(uiAbsPartIdx));
@@ -656 +636 @@
   if( uiSubdiv )
   {
-#if UNIFIED_TRANSFORM_TREE
     UInt size;
     width  >>= 1;
@@ -662 +641 @@
     size = width*height;
     uiTrIdx++;
-#endif
     ++uiDepth;
     const UInt uiQPartNum = pcCU->getPic()->getNumPartInCU() >> (uiDepth << 1);
@@ -678 +656 @@
     for( Int i = 0; i < 4; i++ )
     {
-#if UNIFIED_TRANSFORM_TREE
       UInt nsAddr = 0;
       nsAddr = pcCU->getNSAbsPartIdx( uiLog2TrafoSize-1, uiAbsPartIdx, absTUPartIdx, i, uiTrDepth+1 );
       xDecodeTransform( pcCU, offsetLuma, offsetChroma, uiAbsPartIdx, nsAddr, uiDepth, width, height, uiTrIdx, i, uiCurrentCbfY, uiCurrentCbfU, uiCurrentCbfV, bCodeDQP );
-#else
-      UInt nsAddr = 0;
-      nsAddr = pcCU->getNSAbsPartIdx( uiLog2TrafoSize-1, uiAbsPartIdx, absTUPartIdx, i, uiTrDepth+1 );
-      xDecodeTransformSubdiv( pcCU, uiAbsPartIdx, nsAddr, uiDepth, i, uiCurrentCbfY, uiCurrentCbfU, uiCurrentCbfV );
-#endif
       uiYCbf |= pcCU->getCbf( uiAbsPartIdx, TEXT_LUMA, uiLumaTrMode );
       uiUCbf |= pcCU->getCbf( uiAbsPartIdx, TEXT_CHROMA_U, uiChromaTrMode );
       uiVCbf |= pcCU->getCbf( uiAbsPartIdx, TEXT_CHROMA_V, uiChromaTrMode );
       uiAbsPartIdx += uiQPartNum;
-#if UNIFIED_TRANSFORM_TREE
       offsetLuma += size;  offsetChroma += (size>>2);
-#endif
     }
     
@@ -751 +721 @@
       }
     }
-#if UNIFIED_TRANSFORM_TREE
     // transform_unit begin
     UInt cbfY = pcCU->getCbf( uiAbsPartIdx, TEXT_LUMA    , uiTrIdx );
@@ -817 +786 @@
     }
     // transform_unit end
-#endif // UNIFIED_TRANSFORM_TREE
-  }
-}
-
-#if !UNIFIED_TRANSFORM_TREE
-Void TDecEntropy::decodeTransformIdx( TComDataCU* pcCU, UInt uiAbsPartIdx, UInt uiDepth )
-{
-  DTRACE_CABAC_VL( g_nSymbolCounter++ )
-  DTRACE_CABAC_T( "\tdecodeTransformIdx()\tCUDepth=" )
-  DTRACE_CABAC_V( uiDepth )
-  DTRACE_CABAC_T( "\n" )
-  UInt temp = 0;
-  UInt temp1 = 0;
-  UInt temp2 = 0;
-  xDecodeTransformSubdiv( pcCU, uiAbsPartIdx, uiAbsPartIdx, uiDepth, 0, temp, temp1, temp2 );
-}
-#endif // UNIFIED_TRANSFORM_TREE
-
-#if UNIFIED_TRANSFORM_TREE
+  }
+}
+
+
 Void TDecEntropy::decodeQP          ( TComDataCU* pcCU, UInt uiAbsPartIdx )
 {
@@ -843 +797 @@
   }
 }
-#else
-Void TDecEntropy::decodeQP          ( TComDataCU* pcCU, UInt uiAbsPartIdx, UInt uiDepth )
-{
-  if ( pcCU->getSlice()->getPPS()->getUseDQP() )
-  {
-    m_pcEntropyDecoderIf->parseDeltaQP( pcCU, uiAbsPartIdx, uiDepth );
-  }
-}
-#endif
-
-#if !UNIFIED_TRANSFORM_TREE
-Void TDecEntropy::xDecodeCoeff( TComDataCU* pcCU, UInt uiLumaOffset, UInt uiChromaOffset, UInt uiAbsPartIdx, UInt uiDepth, UInt uiWidth, UInt uiHeight, UInt uiTrIdx, UInt uiCurrTrIdx, Bool& bCodeDQP )
-{
-  UInt uiLog2TrSize = g_aucConvertToBit[ pcCU->getSlice()->getSPS()->getMaxCUWidth() >> uiDepth ] + 2;
-  UInt uiCbfY = pcCU->getCbf( uiAbsPartIdx, TEXT_LUMA, uiTrIdx );
-  UInt uiCbfU = pcCU->getCbf( uiAbsPartIdx, TEXT_CHROMA_U, uiTrIdx );
-  UInt uiCbfV = pcCU->getCbf( uiAbsPartIdx, TEXT_CHROMA_V, uiTrIdx );
-  if( uiLog2TrSize == 2 )
-  {
-    UInt uiQPDiv = pcCU->getPic()->getNumPartInCU() >> ( ( uiDepth - 1 ) << 1 );
-    if( ( uiAbsPartIdx % uiQPDiv ) == 0 )
-    {
-      m_uiBakAbsPartIdx   = uiAbsPartIdx;
-      m_uiBakChromaOffset = uiChromaOffset;
-    }
-    else if( ( uiAbsPartIdx % uiQPDiv ) == (uiQPDiv - 1) )
-    {
-      uiCbfU = pcCU->getCbf( m_uiBakAbsPartIdx, TEXT_CHROMA_U, uiTrIdx );
-      uiCbfV = pcCU->getCbf( m_uiBakAbsPartIdx, TEXT_CHROMA_V, uiTrIdx );
-    }
-  }
-
-  if ( uiCbfY || uiCbfU || uiCbfV )
-  {
-    // dQP: only for LCU
-    if ( pcCU->getSlice()->getPPS()->getUseDQP() )
-    {
-      if ( bCodeDQP )
-      {
-        decodeQP( pcCU, uiAbsPartIdx, uiDepth);
-        bCodeDQP = false;
-      }
-    }   
-    UInt uiLumaTrMode, uiChromaTrMode;
-    pcCU->convertTransIdx( uiAbsPartIdx, pcCU->getTransformIdx( uiAbsPartIdx ), uiLumaTrMode, uiChromaTrMode );
-    const UInt uiStopTrMode = uiLumaTrMode;
-    
-    if( uiTrIdx == uiStopTrMode )
-    {
-      if( pcCU->getCbf( uiAbsPartIdx, TEXT_LUMA, uiTrIdx ) )
-      {
-        Int trWidth = uiWidth;
-        Int trHeight = uiHeight;
-        pcCU->getNSQTSize( uiTrIdx, uiAbsPartIdx, trWidth, trHeight );
-        m_pcEntropyDecoderIf->parseCoeffNxN( pcCU, (pcCU->getCoeffY()+uiLumaOffset), uiAbsPartIdx, trWidth, trHeight, uiDepth, TEXT_LUMA );
-      }
-      
-      uiWidth  >>= 1;
-      uiHeight >>= 1;
-
-      if( uiLog2TrSize == 2 )
-      {
-        UInt uiQPDiv = pcCU->getPic()->getNumPartInCU() >> ( ( uiDepth - 1 ) << 1 );
-        if( ( uiAbsPartIdx % uiQPDiv ) == (uiQPDiv - 1) )
-        {
-          uiWidth  <<= 1;
-          uiHeight <<= 1;
-          Int trWidth = uiWidth;
-          Int trHeight = uiHeight;
-          pcCU->getNSQTSize( uiTrIdx-1, uiAbsPartIdx, trWidth, trHeight );
-          if( pcCU->getCbf( m_uiBakAbsPartIdx, TEXT_CHROMA_U, uiTrIdx ) )
-          {
-            m_pcEntropyDecoderIf->parseCoeffNxN( pcCU, (pcCU->getCoeffCb()+m_uiBakChromaOffset), m_uiBakAbsPartIdx, trWidth, trHeight, uiDepth, TEXT_CHROMA_U );
-          }
-          if( pcCU->getCbf( m_uiBakAbsPartIdx, TEXT_CHROMA_V, uiTrIdx ) )
-          {
-            m_pcEntropyDecoderIf->parseCoeffNxN( pcCU, (pcCU->getCoeffCr()+m_uiBakChromaOffset), m_uiBakAbsPartIdx, trWidth, trHeight, uiDepth, TEXT_CHROMA_V );
-          }
-        }
-      }
-      else
-      {
-        Int trWidth = uiWidth;
-        Int trHeight = uiHeight;
-        pcCU->getNSQTSize( uiTrIdx, uiAbsPartIdx, trWidth, trHeight );
-        if( pcCU->getCbf( uiAbsPartIdx, TEXT_CHROMA_U, uiTrIdx ) )
-        {
-          m_pcEntropyDecoderIf->parseCoeffNxN( pcCU, (pcCU->getCoeffCb()+uiChromaOffset), uiAbsPartIdx, trWidth, trHeight, uiDepth, TEXT_CHROMA_U );
-        }
-        if( pcCU->getCbf( uiAbsPartIdx, TEXT_CHROMA_V, uiTrIdx ) )
-        {
-          m_pcEntropyDecoderIf->parseCoeffNxN( pcCU, (pcCU->getCoeffCr()+uiChromaOffset), uiAbsPartIdx, trWidth, trHeight, uiDepth, TEXT_CHROMA_V );
-        }
-      }
-    }
-    else
-    {
-      {
-        DTRACE_CABAC_VL( g_nSymbolCounter++ );
-        DTRACE_CABAC_T( "\tgoing down\tdepth=" );
-        DTRACE_CABAC_V( uiDepth );
-        DTRACE_CABAC_T( "\ttridx=" );
-        DTRACE_CABAC_V( uiTrIdx );
-        DTRACE_CABAC_T( "\n" );
-      }
-      if( uiCurrTrIdx <= uiTrIdx )
-      {
-        assert(1);
-      }
-      UInt uiSize;
-      uiWidth  >>= 1;
-      uiHeight >>= 1;
-      uiSize = uiWidth*uiHeight;
-      uiDepth++;
-      uiTrIdx++;
-      
-      UInt uiQPartNum = pcCU->getPic()->getNumPartInCU() >> (uiDepth << 1);
-      UInt uiIdx      = uiAbsPartIdx;
-      
-      xDecodeCoeff( pcCU, uiLumaOffset, uiChromaOffset, uiIdx, uiDepth, uiWidth, uiHeight, uiTrIdx, uiCurrTrIdx, bCodeDQP );
-      uiLumaOffset += uiSize;  uiChromaOffset += (uiSize>>2);  uiIdx += uiQPartNum;
-      
-      xDecodeCoeff( pcCU, uiLumaOffset, uiChromaOffset, uiIdx, uiDepth, uiWidth, uiHeight, uiTrIdx, uiCurrTrIdx, bCodeDQP );
-      uiLumaOffset += uiSize;  uiChromaOffset += (uiSize>>2);  uiIdx += uiQPartNum;
-      
-      xDecodeCoeff( pcCU, uiLumaOffset, uiChromaOffset, uiIdx, uiDepth, uiWidth, uiHeight, uiTrIdx, uiCurrTrIdx, bCodeDQP );
-      uiLumaOffset += uiSize;  uiChromaOffset += (uiSize>>2);  uiIdx += uiQPartNum;
-      
-      xDecodeCoeff( pcCU, uiLumaOffset, uiChromaOffset, uiIdx, uiDepth, uiWidth, uiHeight, uiTrIdx, uiCurrTrIdx, bCodeDQP );
-      {
-        DTRACE_CABAC_VL( g_nSymbolCounter++ );
-        DTRACE_CABAC_T( "\tgoing up\n" );
-      }
-    }
-  }
-}
-#endif // !UNIFIED_TRANSFORM_TREE
+
 
 /** decode coefficients
@@ -994 +812 @@
   UInt uiLumaOffset   = uiMinCoeffSize*uiAbsPartIdx;
   UInt uiChromaOffset = uiLumaOffset>>2;
-#if UNIFIED_TRANSFORM_TREE
   UInt temp  = 0;
   UInt temp1 = 0;
   UInt temp2 = 0;
-#else
-  UInt uiLumaTrMode, uiChromaTrMode;
-#endif
   
 #if RWTH_SDC_DLT_B0036
@@ -1018 +832 @@
   if( pcCU->isIntra(uiAbsPartIdx) )
   {
-#if !UNIFIED_TRANSFORM_TREE
-    decodeTransformIdx( pcCU, uiAbsPartIdx, pcCU->getDepth(uiAbsPartIdx) );
-    
-    pcCU->convertTransIdx( uiAbsPartIdx, pcCU->getTransformIdx(uiAbsPartIdx), uiLumaTrMode, uiChromaTrMode );
-    
-#endif // !UNIFIED_TRANSFORM_TREE
   }
   else
@@ -1045 +853 @@
     }
     
-#if !UNIFIED_TRANSFORM_TREE
-    decodeTransformIdx( pcCU, uiAbsPartIdx, pcCU->getDepth(uiAbsPartIdx) );
-    
-    pcCU->convertTransIdx( uiAbsPartIdx, pcCU->getTransformIdx(uiAbsPartIdx), uiLumaTrMode, uiChromaTrMode );
-#endif // !UNIFIED_TRANSFORM_TREE
   }
 
@@ -1068 +871 @@
 #endif
 
-#if UNIFIED_TRANSFORM_TREE
   xDecodeTransform( pcCU, uiLumaOffset, uiChromaOffset, uiAbsPartIdx, uiAbsPartIdx, uiDepth, uiWidth, uiHeight, 0, 0, temp, temp1, temp2, bCodeDQP );
-#else // UNIFIED_TRANSFORM_TREE
-  xDecodeCoeff( pcCU, uiLumaOffset, uiChromaOffset, uiAbsPartIdx, uiDepth, uiWidth, uiHeight, 0, uiLumaTrMode, bCodeDQP );
-#endif // UNIFIED_TRANSFORM_TREE
 
 #if FIX_MPI_B0065

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

@@ -67 +67 @@
   virtual Void  setBitstream          ( TComInputBitstream* p )  = 0;
 
-#if OL_FLUSH
   virtual Void  decodeFlush()                                                                      = 0;
-#endif
 
 #if VIDYO_VPS_INTEGRATION|QC_MVHEVC_B0046
@@ -79 +77 @@
   virtual Void  parseSPS                  ( TComSPS* pcSPS )                                      = 0;
 #endif
-#if TILES_OR_ENTROPY_SYNC_IDC  
   virtual Void  parsePPS                  ( TComPPS* pcPPS, ParameterSetManagerDecoder *parameterSet )                                      = 0;
-#else
-  virtual Void  parsePPS                  ( TComPPS* pcPPS )                                      = 0;
-#endif
   virtual Void  parseAPS                  ( TComAPS* pAPS  )                                      = 0;
   virtual void parseSEI(SEImessages&) = 0;
 
-#if LCU_SYNTAX_ALF
 #if MTK_DEPTH_MERGE_TEXTURE_CANDIDATE_C0137
   virtual Void parseSliceHeader          ( TComSlice*& rpcSlice, ParameterSetManagerDecoder *parameterSetManager, AlfCUCtrlInfo &alfCUCtrl, AlfParamSet& alfParamSet, bool isDepth)       = 0;
 #else
   virtual Void parseSliceHeader          ( TComSlice*& rpcSlice, ParameterSetManagerDecoder *parameterSetManager, AlfCUCtrlInfo &alfCUCtrl, AlfParamSet& alfParamSet)       = 0;
-#endif
-#else
-  virtual Void parseSliceHeader          ( TComSlice*& rpcSlice, ParameterSetManagerDecoder *parameterSetManager, AlfCUCtrlInfo &alfCUCtrl )                                = 0;
 #endif
 
@@ -163 +153 @@
   UInt    m_uiBakAbsPartIdx;
   UInt    m_uiBakChromaOffset;
-#if UNIFIED_TRANSFORM_TREE
   UInt    m_bakAbsPartIdxCU;
-#endif
   
 public:
@@ -188 +176 @@
   Void    decodeSPS                   ( TComSPS* pcSPS     )    { m_pcEntropyDecoderIf->parseSPS(pcSPS);                    }
 #endif
-#if TILES_OR_ENTROPY_SYNC_IDC
   Void    decodePPS                   ( TComPPS* pcPPS, ParameterSetManagerDecoder *parameterSet    )    { m_pcEntropyDecoderIf->parsePPS(pcPPS, parameterSet);                    }
-#else
-  Void    decodePPS                   ( TComPPS* pcPPS     )    { m_pcEntropyDecoderIf->parsePPS(pcPPS);                    }
-#endif
   Void    decodeAPS                   ( TComAPS* pAPS      )    { m_pcEntropyDecoderIf->parseAPS(pAPS);}
   void decodeSEI(SEImessages& seis) { m_pcEntropyDecoderIf->parseSEI(seis); }
 
-#if LCU_SYNTAX_ALF
 #if MTK_DEPTH_MERGE_TEXTURE_CANDIDATE_C0137
   Void    decodeSliceHeader           ( TComSlice*& rpcSlice, ParameterSetManagerDecoder *parameterSetManager, AlfCUCtrlInfo &alfCUCtrl, AlfParamSet& alfParamSet, bool isDepth)  { m_pcEntropyDecoderIf->parseSliceHeader(rpcSlice, parameterSetManager, alfCUCtrl, alfParamSet, isDepth);         }
 #else
   Void    decodeSliceHeader           ( TComSlice*& rpcSlice, ParameterSetManagerDecoder *parameterSetManager, AlfCUCtrlInfo &alfCUCtrl, AlfParamSet& alfParamSet)  { m_pcEntropyDecoderIf->parseSliceHeader(rpcSlice, parameterSetManager, alfCUCtrl, alfParamSet);         }
-#endif
-#else
-  Void    decodeSliceHeader           ( TComSlice*& rpcSlice, ParameterSetManagerDecoder *parameterSetManager, AlfCUCtrlInfo &alfCUCtrl )  { m_pcEntropyDecoderIf->parseSliceHeader(rpcSlice, parameterSetManager, alfCUCtrl);         }
 #endif
 
@@ -231 +211 @@
   Void decodeIntraDirModeChroma( TComDataCU* pcCU, UInt uiAbsPartIdx, UInt uiDepth );
   
-#if !UNIFIED_TRANSFORM_TREE
-  Void decodeTransformIdx      ( TComDataCU* pcCU, UInt uiAbsPartIdx, UInt uiDepth );
-#endif
-#if UNIFIED_TRANSFORM_TREE
   Void decodeQP                ( TComDataCU* pcCU, UInt uiAbsPartIdx );
-#else
-  Void decodeQP                ( TComDataCU* pcCU, UInt uiAbsPartIdx, UInt uiDepth );
-#endif
   
   Void readTileMarker         ( UInt& uiTileIdx, UInt uiBitsUsed )  {  m_pcEntropyDecoderIf->readTileMarker( uiTileIdx, uiBitsUsed ); }
@@ -245 +218 @@
   
 private:
-#if UNIFIED_TRANSFORM_TREE
   Void xDecodeTransform        ( TComDataCU* pcCU, UInt offsetLuma, UInt offsetChroma, UInt uiAbsPartIdx, UInt absTUPartIdx, UInt uiDepth, UInt width, UInt height, UInt uiTrIdx, UInt uiInnerQuadIdx, UInt& uiYCbfFront3, UInt& uiUCbfFront3, UInt& uiVCbfFront3, Bool& bCodeDQP );
-#else
-  Void xDecodeTransformSubdiv  ( TComDataCU* pcCU, UInt uiAbsPartIdx, UInt absTUPartIdx, UInt uiDepth, UInt uiInnerQuadIdx, UInt& uiYCbfFront3, UInt& uiUCbfFront3, UInt& uiVCbfFront3 );
-  
-  Void xDecodeCoeff            ( TComDataCU* pcCU, UInt uiLumaOffset, UInt uiChromaOffset, UInt uiAbsPartIdx, UInt uiDepth, UInt uiWidth, UInt uiHeight, UInt uiTrIdx, UInt uiCurrTrIdx, Bool& bCodeDQP );
-#endif //UNIFIED_TRANSFORM_TREE
 
 public:
@@ -261 +228 @@
   Void setSliceGranularity (Int iSliceGranularity) {m_pcEntropyDecoderIf->setSliceGranularity(iSliceGranularity);}
 
-#if SAO_UNIT_INTERLEAVING
   Void decodeSaoParam         (SAOParam* saoParam);
   void decodeSaoLcu(Int rx, Int ry, Int compIdx, SAOParam* saoParam, Bool &repeatedRow );
   Void decodeSaoOneLcu(SaoLcuParam* saoLcuParam);
-#endif
-
-#if OL_FLUSH
+
   Void decodeFlush() { m_pcEntropyDecoderIf->decodeFlush(); }
-#endif
   
 #if RWTH_SDC_DLT_B0036

branches/HTM-5.1-dev0/source/Lib/TLibDecoder/TDecGop.cpp

@@ -79 +79 @@
 Void TDecGop::destroy()
 {
-#if LCU_SYNTAX_ALF
   m_alfParamSetPilot.releaseALFParam();
-#endif
 }
 
@@ -120 +118 @@
 // Private member functions
 // ====================================================================================================================
-#if LCU_SYNTAX_ALF
 Void TDecGop::patchAlfLCUParams(ALFParam*** alfLCUParam, AlfParamSet* alfParamSet, Int firstLCUAddr)
 {
@@ -195 +192 @@
 }
 
-#endif
 // ====================================================================================================================
 // Public member functions
@@ -279 +275 @@
         if(pcSlice->getAlfEnabledFlag())
         {
-#if LCU_SYNTAX_ALF
           if(pcSlice->getSPS()->getUseALFCoefInSlice())
           {
@@ -289 +284 @@
           if( !pcSlice->getSPS()->getUseALFCoefInSlice())
           {
-#endif
           m_vAlfCUCtrlSlices.push_back(m_cAlfCUCtrlOneSlice);
-#if LCU_SYNTAX_ALF
           }
-#endif
         }
       }
@@ -323 +315 @@
     m_pcSliceDecoder->decompressSlice( pcBitstream, ppcSubstreams, rpcPic, m_pcSbacDecoder, m_pcSbacDecoders);
     m_pcEntropyDecoder->setBitstream(  ppcSubstreams[uiNumSubstreams-1] );
-#if WPP_SIMPLIFICATION
     if ( uiNumSubstreams > 1 )
-#else
-    if ( pcSlice->getPPS()->getEntropyCodingSynchro() )
-#endif
     {
       // deallocate all created substreams, including internal buffers.
@@ -356 +344 @@
     Bool bLFCrossTileBoundary = (pcSlice->getPPS()->getTileBehaviorControlPresentFlag() == 1)?
                                 (pcSlice->getPPS()->getLFCrossTileBoundaryFlag()):(pcSlice->getPPS()->getSPS()->getLFCrossTileBoundaryFlag());
-#if DBL_CONTROL
     if (pcSlice->getPPS()->getDeblockingFilterControlPresent())
     {
-#endif
       if(pcSlice->getSPS()->getUseDF())
       {
@@ -372 +358 @@
         }
       }
-#if DBL_CONTROL
     }
     m_pcLoopFilter->setCfg(pcSlice->getPPS()->getDeblockingFilterControlPresent(), pcSlice->getLoopFilterDisable(), pcSlice->getLoopFilterBetaOffset(), pcSlice->getLoopFilterTcOffset(), bLFCrossTileBoundary);
-#else
-    m_pcLoopFilter->setCfg(pcSlice->getLoopFilterDisable(), pcSlice->getLoopFilterBetaOffset(), pcSlice->getLoopFilterTcOffset(), bLFCrossTileBoundary);
-#endif
     m_pcLoopFilter->loopFilterPic( rpcPic );
 
@@ -392 +374 @@
       if(pcSlice->getSaoEnabledFlag())
       {
-#if SAO_UNIT_INTERLEAVING
         if (pcSlice->getSaoInterleavingFlag())
         {
@@ -402 +383 @@
         }
         m_pcSAO->setSaoInterleavingFlag(pcSlice->getAPS()->getSaoInterleavingFlag());
-#endif
         m_pcSAO->createPicSaoInfo(rpcPic, m_uiILSliceCount);
         m_pcSAO->SAOProcess(rpcPic, pcSlice->getAPS()->getSaoParam());  
@@ -413 +393 @@
     if( pcSlice->getSPS()->getUseALF() )
     {
-#if LCU_SYNTAX_ALF
       if( (pcSlice->getSPS()->getUseALFCoefInSlice())?(true):(pcSlice->getAlfEnabledFlag()))
-#else
-      if(pcSlice->getAlfEnabledFlag())
-#endif
-      {
-
-#if LCU_SYNTAX_ALF
+      {
+
         if(!pcSlice->getSPS()->getUseALFCoefInSlice())
         {
@@ -427 +402 @@
         m_pcAdaptiveLoopFilter->createPicAlfInfo(rpcPic, m_uiILSliceCount, pcSlice->getSliceQp());
         m_pcAdaptiveLoopFilter->ALFProcess(rpcPic, m_vAlfCUCtrlSlices, pcSlice->getSPS()->getUseALFCoefInSlice());
-#else
-        m_pcAdaptiveLoopFilter->createPicAlfInfo(rpcPic, m_uiILSliceCount);
-      m_pcAdaptiveLoopFilter->ALFProcess(rpcPic, pcSlice->getAPS()->getAlfParam(), m_vAlfCUCtrlSlices);
-#endif
       m_pcAdaptiveLoopFilter->PCMLFDisableProcess(rpcPic);
       m_pcAdaptiveLoopFilter->destroyPicAlfInfo();
       }
-#if LCU_SYNTAX_ALF
       m_pcAdaptiveLoopFilter->resetLCUAlfInfo(); //reset all LCU ALFParam->alf_flag = 0
-#endif    
     }
     

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

@@ -101 +101 @@
   bool m_pictureDigestEnabled; ///< if true, handle picture_digest SEI messages
   AlfCUCtrlInfo       m_cAlfCUCtrlOneSlice;
-#if LCU_SYNTAX_ALF
   AlfParamSet           m_alfParamSetPilot;
-#endif
 
 public:
@@ -131 +129 @@
   void setPictureDigestEnabled(bool enabled) { m_pictureDigestEnabled = enabled; }
   AlfCUCtrlInfo& getAlfCuCtrlParam() { return m_cAlfCUCtrlOneSlice; }
-#if LCU_SYNTAX_ALF
   AlfParamSet& getAlfParamSet() {return m_alfParamSetPilot;}
-#endif
 
 private:
-#if LCU_SYNTAX_ALF
   Void patchAlfLCUParams(ALFParam*** alfLCUParam, AlfParamSet* alfParamSet, Int firstLCUAddr = 0);
-#endif
 
 

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

@@ -87 +87 @@
 , m_cALFUvlcSCModel           ( 1,             1,               NUM_ALF_UVLC_CTX              , m_contextModels + m_numContextModels, m_numContextModels)
 , m_cALFSvlcSCModel           ( 1,             1,               NUM_ALF_SVLC_CTX              , m_contextModels + m_numContextModels, m_numContextModels)
-#if AMP_CTX
 , m_cCUAMPSCModel             ( 1,             1,               NUM_CU_AMP_CTX                , m_contextModels + m_numContextModels, m_numContextModels)
-#else
-, m_cCUXPosiSCModel           ( 1,             1,               NUM_CU_X_POS_CTX              , m_contextModels + m_numContextModels, m_numContextModels)
-, m_cCUYPosiSCModel           ( 1,             1,               NUM_CU_Y_POS_CTX              , m_contextModels + m_numContextModels, m_numContextModels)
-#endif
 , m_cSaoFlagSCModel           ( 1,             1,               NUM_SAO_FLAG_CTX              , m_contextModels + m_numContextModels, m_numContextModels)
 , m_cSaoUvlcSCModel           ( 1,             1,               NUM_SAO_UVLC_CTX              , m_contextModels + m_numContextModels, m_numContextModels)
 , m_cSaoSvlcSCModel           ( 1,             1,               NUM_SAO_SVLC_CTX              , m_contextModels + m_numContextModels, m_numContextModels)
-#if SAO_UNIT_INTERLEAVING
 , m_cSaoMergeLeftSCModel      ( 1,             1,               NUM_SAO_MERGE_LEFT_FLAG_CTX   , m_contextModels + m_numContextModels, m_numContextModels)
 , m_cSaoMergeUpSCModel        ( 1,             1,               NUM_SAO_MERGE_UP_FLAG_CTX     , m_contextModels + m_numContextModels, m_numContextModels)
 , m_cSaoTypeIdxSCModel        ( 1,             1,               NUM_SAO_TYPE_IDX_CTX          , m_contextModels + m_numContextModels, m_numContextModels)
-#endif
 #if HHI_DMM_WEDGE_INTRA || HHI_DMM_PRED_TEX
 , m_cDmmFlagSCModel           ( 1,             1,               NUM_DMM_FLAG_CTX              , m_contextModels + m_numContextModels, m_numContextModels)
@@ -171 +164 @@
   m_cCUAlfCtrlFlagSCModel.initBuffer     ( sliceType, qp, (UChar*)INIT_ALF_CTRL_FLAG );
   m_cCUPartSizeSCModel.initBuffer        ( sliceType, qp, (UChar*)INIT_PART_SIZE );
-#if AMP_CTX
   m_cCUAMPSCModel.initBuffer             ( sliceType, qp, (UChar*)INIT_CU_AMP_POS );
-#else
-  m_cCUXPosiSCModel.initBuffer           ( sliceType, qp, (UChar*)INIT_CU_X_POS );
-  m_cCUYPosiSCModel.initBuffer           ( sliceType, qp, (UChar*)INIT_CU_Y_POS );
-#endif
   m_cCUPredModeSCModel.initBuffer        ( sliceType, qp, (UChar*)INIT_PRED_MODE );
   m_cCUIntraPredSCModel.initBuffer       ( sliceType, qp, (UChar*)INIT_INTRA_PRED_MODE );
@@ -199 +187 @@
   m_cSaoUvlcSCModel.initBuffer           ( sliceType, qp, (UChar*)INIT_SAO_UVLC );
   m_cSaoSvlcSCModel.initBuffer           ( sliceType, qp, (UChar*)INIT_SAO_SVLC );
-#if SAO_UNIT_INTERLEAVING
   m_cSaoMergeLeftSCModel.initBuffer      ( sliceType, qp, (UChar*)INIT_SAO_MERGE_LEFT_FLAG );
   m_cSaoMergeUpSCModel.initBuffer        ( sliceType, qp, (UChar*)INIT_SAO_MERGE_UP_FLAG );
   m_cSaoTypeIdxSCModel.initBuffer        ( sliceType, qp, (UChar*)INIT_SAO_TYPE_IDX );
-#endif
 
   m_cCUTransSubdivFlagSCModel.initBuffer ( sliceType, qp, (UChar*)INIT_TRANS_SUBDIV_FLAG );
@@ -265 +251 @@
   m_cCUAlfCtrlFlagSCModel.initBuffer     ( eSliceType, iQp, (UChar*)INIT_ALF_CTRL_FLAG );
   m_cCUPartSizeSCModel.initBuffer        ( eSliceType, iQp, (UChar*)INIT_PART_SIZE );
-#if AMP_CTX
   m_cCUAMPSCModel.initBuffer             ( eSliceType, iQp, (UChar*)INIT_CU_AMP_POS );
-#else
-  m_cCUXPosiSCModel.initBuffer           ( eSliceType, iQp, (UChar*)INIT_CU_X_POS );
-  m_cCUYPosiSCModel.initBuffer           ( eSliceType, iQp, (UChar*)INIT_CU_Y_POS );
-#endif
   m_cCUPredModeSCModel.initBuffer        ( eSliceType, iQp, (UChar*)INIT_PRED_MODE );
   m_cCUIntraPredSCModel.initBuffer       ( eSliceType, iQp, (UChar*)INIT_INTRA_PRED_MODE );
@@ -293 +274 @@
   m_cSaoUvlcSCModel.initBuffer           ( eSliceType, iQp, (UChar*)INIT_SAO_UVLC );
   m_cSaoSvlcSCModel.initBuffer           ( eSliceType, iQp, (UChar*)INIT_SAO_SVLC );
-#if SAO_UNIT_INTERLEAVING
   m_cSaoMergeLeftSCModel.initBuffer      ( eSliceType, iQp, (UChar*)INIT_SAO_MERGE_LEFT_FLAG );
   m_cSaoMergeUpSCModel.initBuffer        ( eSliceType, iQp, (UChar*)INIT_SAO_MERGE_UP_FLAG );
   m_cSaoTypeIdxSCModel.initBuffer        ( eSliceType, iQp, (UChar*)INIT_SAO_TYPE_IDX );
-#endif
   m_cCUTransSubdivFlagSCModel.initBuffer ( eSliceType, iQp, (UChar*)INIT_TRANS_SUBDIV_FLAG );
 #if HHI_DMM_WEDGE_INTRA || HHI_DMM_PRED_TEX
@@ -449 +428 @@
   }
 
-#if EIGHT_BITS_RICE_CODE
   ruiGoRiceParam = g_aauiGoRiceUpdate[ ruiGoRiceParam ][ min<UInt>( ruiSymbol, 23 ) ];
-#else
-  ruiGoRiceParam = g_aauiGoRiceUpdate[ ruiGoRiceParam ][ min<UInt>( ruiSymbol, 15 ) ];
-#endif
 
   return;
@@ -470 +445 @@
 {
   UInt uiSymbol;
-#if BURST_IPCM
   Int numSubseqIPCM = 0;
   Bool readPCMSampleFlag = false;
@@ -490 +464 @@
     }
   }
-#else
-  m_pcTDecBinIf->decodeBinTrm(uiSymbol);
-#endif
-
-#if BURST_IPCM
+
   if (readPCMSampleFlag == true)
-#else
-  if (uiSymbol)
-#endif
   {
     Bool bIpcmFlag = true;
 
-#if !BURST_IPCM
-    m_pcTDecBinIf->decodePCMAlignBits();
-#endif
 
     pcCU->setPartSizeSubParts  ( SIZE_2Nx2N, uiAbsPartIdx, uiDepth );
@@ -568 +532 @@
     }
 
-#if BURST_IPCM
     pcCU->setNumSucIPCM( pcCU->getNumSucIPCM() - 1);
     if(pcCU->getNumSucIPCM() == 0)
@@ -574 +537 @@
       m_pcTDecBinIf->resetBac();
     }
-#else
-    m_pcTDecBinIf->resetBac();
-#endif
   }
 }
@@ -664 +624 @@
 {
   UInt uiNumCand = MRG_MAX_NUM_CANDS;
-#if !MRG_IDX_CTX_RED  
-  UInt auiCtx[4] = { 0, 1, 2, 3 };
-#endif
   UInt uiUnaryIdx = 0;
   uiNumCand = pcCU->getSlice()->getMaxNumMergeCand();
@@ -678 +635 @@
     {
       UInt uiSymbol = 0;
-#if MRG_IDX_CTX_RED
       if ( uiUnaryIdx==0 )
       {
@@ -687 +643 @@
         m_pcTDecBinIf->decodeBinEP( uiSymbol );
       }
-#else
-      m_pcTDecBinIf->decodeBin( uiSymbol, m_cCUMergeIdxExtSCModel.get( 0, 0, auiCtx[uiUnaryIdx] ) );
-#endif
       if( uiSymbol == 0 )
       {
@@ -879 +832 @@
         if (eMode == SIZE_2NxN)
         {
-#if AMP_CTX
             m_pcTDecBinIf->decodeBin(uiSymbol, m_cCUAMPSCModel.get( 0, 0, 0 ));
-#else
-          m_pcTDecBinIf->decodeBin(uiSymbol, m_cCUYPosiSCModel.get( 0, 0, 0 ));
-#endif
           if (uiSymbol == 0)
           {
-#if AMP_CTX
             m_pcTDecBinIf->decodeBinEP(uiSymbol);
-#else
-            m_pcTDecBinIf->decodeBin(uiSymbol, m_cCUYPosiSCModel.get( 0, 0, 1 ));
-#endif
             eMode = (uiSymbol == 0? SIZE_2NxnU : SIZE_2NxnD);
           }
@@ -896 +841 @@
         else if (eMode == SIZE_Nx2N)
         {
-#if AMP_CTX
           m_pcTDecBinIf->decodeBin(uiSymbol, m_cCUAMPSCModel.get( 0, 0, 0 ));
-#else
-          m_pcTDecBinIf->decodeBin(uiSymbol, m_cCUXPosiSCModel.get( 0, 0, 0 ));
-#endif
           if (uiSymbol == 0)
           {
-#if AMP_CTX
             m_pcTDecBinIf->decodeBinEP(uiSymbol);
-#else
-            m_pcTDecBinIf->decodeBin(uiSymbol, m_cCUXPosiSCModel.get( 0, 0, 1 ));
-#endif
             eMode = (uiSymbol == 0? SIZE_nLx2N : SIZE_nRx2N);
           }
@@ -989 +926 @@
   {
 #endif
-#if !LOGI_INTRA_NAME_3MPM
-    Int iIntraIdx = pcCU->getIntraSizeIdx(uiAbsPartIdx);
-#endif
 
 #if LGE_EDGE_INTRA_A0070
@@ -1003 +937 @@
 #endif
 
-#if LOGI_INTRA_NAME_3MPM
     Int uiPreds[3] = {-1, -1, -1};
-#else
-    Int uiPreds[2] = {-1, -1};
-#endif
     Int uiPredNum = pcCU->getIntraDirLumaPredictor(uiAbsPartIdx, uiPreds);  
 #if LGE_EDGE_INTRA_A0070
@@ -1018 +948 @@
     {
       m_pcTDecBinIf->decodeBinEP( uiSymbol );
-#if LOGI_INTRA_NAME_3MPM
       if (uiSymbol)
       {
@@ -1024 +953 @@
         uiSymbol++;
       }
-#endif
       intraPredMode = uiPreds[uiSymbol];
     }
@@ -1031 +959 @@
       intraPredMode = 0;
 
-#if LOGI_INTRA_NAME_3MPM
 
       m_pcTDecBinIf->decodeBinsEP( uiSymbol, 5 );
@@ -1060 +987 @@
         std::swap(uiPreds[1], uiPreds[2]);
       }
-#else
-      m_pcTDecBinIf->decodeBinsEP( uiSymbol, g_aucIntraModeBitsAng[iIntraIdx] - 1 );
-      intraPredMode = uiSymbol;
-
-      if ( intraPredMode == 31 )
-      {
-        m_pcTDecBinIf->decodeBinEP( uiSymbol );
-        intraPredMode += uiSymbol;      
-      }
-#endif
 #if LGE_EDGE_INTRA_A0070
       if ( intraPredMode != EDGE_INTRA_IDX)
@@ -1158 +1075 @@
     {
       UInt uiIPredMode;
-#if CHROMA_MODE_CODING
       m_pcTDecBinIf->decodeBinsEP( uiIPredMode, 2 );
-#else
-      xReadUnaryMaxSymbol( uiIPredMode, m_cCUChromaPredSCModel.get( 0, 0 ) + 1, 0, 3 );
-#endif
       UInt uiAllowedChromaDir[ NUM_CHROMA_MODE ];
       pcCU->getAllowedChromaDir( uiAbsPartIdx, uiAllowedChromaDir );
@@ -1230 +1143 @@
   ContextModel *pCtx = m_cCUMvdSCModel.get( 0 );
 
-#if H0111_MVD_L1_ZERO
   if(pcCU->getSlice()->getMvdL1ZeroFlag() && eRefList == REF_PIC_LIST_1 && pcCU->getInterDir(uiAbsPartIdx)==3)
   {
@@ -1238 +1150 @@
   else
   {
-#endif
 
     m_pcTDecBinIf->decodeBin( uiHorAbs, *pCtx );
@@ -1281 +1192 @@
     }
 
-#if H0111_MVD_L1_ZERO
-  }
-#endif
+  }
 
   const TComMv cMv( uiHorSign ? -Int( uiHorAbs ): uiHorAbs, uiVerSign ? -Int( uiVerAbs ) : uiVerAbs );
@@ -1323 +1232 @@
 Void TDecSbac::parseDeltaQP( TComDataCU* pcCU, UInt uiAbsPartIdx, UInt uiDepth )
 {
-#if H0736_AVC_STYLE_QP_RANGE
   Int qp;
-#endif
   UInt uiDQp;
   Int  iDQp;
@@ -1333 +1240 @@
   if ( uiDQp == 0 )
   {
-#if H0736_AVC_STYLE_QP_RANGE
     qp = pcCU->getRefQP(uiAbsPartIdx);
-#else
-    uiDQp = pcCU->getRefQP(uiAbsPartIdx);
-#endif
   }
   else
   {
     UInt uiSign;
-#if H0736_AVC_STYLE_QP_RANGE
     Int qpBdOffsetY = pcCU->getSlice()->getSPS()->getQpBDOffsetY();
-#else
-    UInt uiQpBdOffsetY = 6*(g_uiBitIncrement + g_uiBitDepth - 8);
-#endif
     m_pcTDecBinIf->decodeBinEP(uiSign);
 
-#if H0736_AVC_STYLE_QP_RANGE
     UInt uiMaxAbsDQpMinus1 = 24 + (qpBdOffsetY/2) + (uiSign);
-#else
-    UInt uiMaxAbsDQpMinus1 = 24 + (uiQpBdOffsetY/2) + (uiSign);
-#endif
     UInt uiAbsDQpMinus1;
     xReadUnaryMaxSymbol (uiAbsDQpMinus1,  &m_cCUDeltaQpSCModel.get( 0, 0, 1 ), 1, uiMaxAbsDQpMinus1);
@@ -1364 +1259 @@
     }
 
-#if H0736_AVC_STYLE_QP_RANGE
     qp = (((Int) pcCU->getRefQP( uiAbsPartIdx ) + iDQp + 52 + 2*qpBdOffsetY )%(52+qpBdOffsetY)) - qpBdOffsetY;
-#else
-#if LOSSLESS_CODING
-    uiDQp = (pcCU->getRefQP(uiAbsPartIdx) + iDQp + 52) % 52;
-#else
-    uiDQp = pcCU->getRefQP(uiAbsPartIdx) + iDQp;
-#endif
-#endif
   }
   
   UInt uiAbsQpCUPartIdx = (uiAbsPartIdx>>(8-(pcCU->getSlice()->getPPS()->getMaxCuDQPDepth()<<1)))<<(8-(pcCU->getSlice()->getPPS()->getMaxCuDQPDepth()<<1)) ;
   UInt uiQpCUDepth =   min(uiDepth,pcCU->getSlice()->getPPS()->getMaxCuDQPDepth()) ;
-#if H0736_AVC_STYLE_QP_RANGE
   pcCU->setQPSubParts( qp, uiAbsQpCUPartIdx, uiQpCUDepth );
-#else
-  pcCU->setQPSubParts( uiDQp, uiAbsQpCUPartIdx, uiQpCUDepth );
-#endif
 }
 
@@ -1422 +1305 @@
 
   // posX
-#if LAST_CTX_REDUCTION
   Int widthCtx = eTType ? 4 : width;
   const UInt *puiCtxIdxX = g_uiLastCtx + ( g_aucConvertToBit[ widthCtx ] * ( g_aucConvertToBit[ widthCtx ] + 3 ) );
-#else
-  const UInt *puiCtxIdxX = g_uiLastCtx + ( g_aucConvertToBit[ width ] * ( g_aucConvertToBit[ width ] + 3 ) );
-#endif
   for( uiPosLastX = 0; uiPosLastX < g_uiGroupIdx[ width - 1 ]; uiPosLastX++ )
   {
-#if LAST_CTX_REDUCTION
     if ( eTType  )
     {
@@ -1437 +1315 @@
     else
     {
-#endif
       m_pcTDecBinIf->decodeBin( uiLast, *( pCtxX + puiCtxIdxX[ uiPosLastX ] ) );
-#if LAST_CTX_REDUCTION
-    }
-#endif
+    }
     if( !uiLast )
     {
@@ -1449 +1324 @@
 
   // posY
-#if LAST_CTX_REDUCTION
   Int heightCtx = eTType? 4 : height;
   const UInt *puiCtxIdxY = g_uiLastCtx + ( g_aucConvertToBit[ heightCtx ] * ( g_aucConvertToBit[ heightCtx ] + 3 ) );
-#else
-  const UInt *puiCtxIdxY = g_uiLastCtx + ( g_aucConvertToBit[ height ] * ( g_aucConvertToBit[ height ] + 3 ) );
-#endif
   for( uiPosLastY = 0; uiPosLastY < g_uiGroupIdx[ height - 1 ]; uiPosLastY++ )
   {
-#if LAST_CTX_REDUCTION
     if (eTType)
     {
@@ -1464 +1334 @@
     else
     {
-#endif
       m_pcTDecBinIf->decodeBin( uiLast, *( pCtxY + puiCtxIdxY[ uiPosLastY ] ) );
-#if LAST_CTX_REDUCTION
-    }
-#endif
+    }
     if( !uiLast )
     {
@@ -1588 +1455 @@
   UInt uiGoRiceParam           = 0;
 
-#if MULTIBITS_DATA_HIDING
   UInt const tsig = pcCU->getSlice()->getPPS()->getTSIG();
 #if LOSSLESS_CODING
@@ -1604 +1470 @@
 #endif
   UInt absSum = 0;
-#endif  // MULTIBITS_DATA_HIDING
 
   UInt uiSigCoeffGroupFlag[ MLS_GRP_NUM ];
@@ -1613 +1478 @@
   {
     scanCG = g_auiSigLastScan[ uiScanIdx ][ uiLog2BlockSize > 3 ? uiLog2BlockSize-2-1 : 0  ];    
-#if MULTILEVEL_SIGMAP_EXT
     if( uiLog2BlockSize == 3 )
     {
@@ -1622 +1486 @@
       scanCG = g_sigLastScanCG32x32;
     }
-#endif
   }
   else
@@ -1635 +1498 @@
     Int numNonZero = 0;
     
-#if MULTIBITS_DATA_HIDING
     Int lastNZPosInCG = -1, firstNZPosInCG = SCAN_SET_SIZE;
-#endif
 
     Int pos[SCAN_SET_SIZE];
     if( iScanPosSig == (Int) uiScanPosLast )
     {
-#if MULTIBITS_DATA_HIDING
       lastNZPosInCG  = iScanPosSig;
       firstNZPosInCG = iScanPosSig;
-#endif
       iScanPosSig--;
       pos[ numNonZero ] = uiBlkPosLast;
@@ -1651 +1510 @@
     }
 
-#if !MULTILEVEL_SIGMAP_EXT
-    if( blockType > 3 )
-    {
-#endif
       // decode significant_coeffgroup_flag
       Int iCGBlkPos = scanCG[ iSubSet ];
       Int iCGPosY   = iCGBlkPos / uiNumBlkSide;
       Int iCGPosX   = iCGBlkPos - (iCGPosY * uiNumBlkSide);
-#if MULTILEVEL_SIGMAP_EXT
       if( uiWidth == 8 && uiHeight == 8 && (uiScanIdx == SCAN_HOR || uiScanIdx == SCAN_VER) )
       {
@@ -1665 +1519 @@
         iCGPosX = (uiScanIdx == SCAN_VER ? iCGBlkPos : 0);
       }
-#endif
-#if !REMOVE_INFER_SIGGRP
-      Bool bInferredCGFlag = false;
-#endif
-#if REMOVE_INFER_SIGGRP
       if( iSubSet == iLastScanSet || iSubSet == 0)
-#else
-      if( iSubSet == iLastScanSet ) 
-#endif
       {
         uiSigCoeffGroupFlag[ iCGBlkPos ] = 1;
@@ -1679 +1525 @@
       else
       {
-#if !REMOVE_INFER_SIGGRP
-#if MULTILEVEL_SIGMAP_EXT
-        if( !TComTrQuant::bothCGNeighboursOne( uiSigCoeffGroupFlag, iCGPosX, iCGPosY, uiScanIdx, uiWidth, uiHeight) && ( iSubSet ) )
-#else
-        if( !TComTrQuant::bothCGNeighboursOne( uiSigCoeffGroupFlag, iCGPosX, iCGPosY, uiWidth, uiHeight) && ( iSubSet ) )
-#endif
-        {
-#endif
           UInt uiSigCoeffGroup;
-#if MULTILEVEL_SIGMAP_EXT
           UInt uiCtxSig  = TComTrQuant::getSigCoeffGroupCtxInc( uiSigCoeffGroupFlag, iCGPosX, iCGPosY, uiScanIdx, uiWidth, uiHeight );
-#else
-          UInt uiCtxSig  = TComTrQuant::getSigCoeffGroupCtxInc( uiSigCoeffGroupFlag, iCGPosX, iCGPosY, uiWidth, uiHeight );
-#endif
           m_pcTDecBinIf->decodeBin( uiSigCoeffGroup, baseCoeffGroupCtx[ uiCtxSig ] );
           uiSigCoeffGroupFlag[ iCGBlkPos ] = uiSigCoeffGroup;
-#if !REMOVE_INFER_SIGGRP
-        }
-        else
-        {
-          uiSigCoeffGroupFlag[ iCGBlkPos ] = 1;
-          bInferredCGFlag = true;
-        }
-#endif
       }
 
@@ -1716 +1542 @@
         if( uiSigCoeffGroupFlag[ iCGBlkPos ] )
         {
-#if REMOVE_INFER_SIGGRP
           if( iScanPosSig > iSubPos || iSubSet == 0  || numNonZero )
-#else
-          if( iScanPosSig > iSubPos || bInferredCGFlag || numNonZero )
-#endif
           {
             uiCtxSig  = TComTrQuant::getSigCtxInc( pcCoef, uiPosX, uiPosY, blockType, uiWidth, uiHeight, eTType );
@@ -1735 +1557 @@
           pos[ numNonZero ] = uiBlkPos;
           numNonZero ++;
-#if MULTIBITS_DATA_HIDING
           if( lastNZPosInCG == -1 )
           {
@@ -1741 +1562 @@
           }
           firstNZPosInCG = iScanPosSig;
-#endif
         }
       }
-#if !MULTILEVEL_SIGMAP_EXT
-    }
-    else
-    {
-      for( ; iScanPosSig >= iSubPos; iScanPosSig-- )
-      {
-        UInt uiBlkPos   = scan[ iScanPosSig ];
-        UInt  uiPosY    = uiBlkPos >> uiLog2BlockSize;
-        UInt  uiPosX    = uiBlkPos - ( uiPosY << uiLog2BlockSize );
-        UInt  uiSig     = 0;
-        UInt  uiCtxSig  = TComTrQuant::getSigCtxInc( pcCoef, uiPosX, uiPosY, blockType, uiWidth, uiHeight, eTType );
-        m_pcTDecBinIf->decodeBin( uiSig, baseCtx[ uiCtxSig ] );
-        pcCoef[ uiBlkPos ] = uiSig;
-        if( uiSig )
-        {
-          pos[ numNonZero ] = uiBlkPos;
-          numNonZero ++;
-#if MULTIBITS_DATA_HIDING
-          if( lastNZPosInCG == -1 )
-          {
-            lastNZPosInCG = iScanPosSig;
-          }
-          firstNZPosInCG = iScanPosSig;
-#endif
-        }
-      }
-    }
-#endif
 
     
     if( numNonZero )
     {
-#if MULTIBITS_DATA_HIDING
       Bool signHidden = ( lastNZPosInCG - firstNZPosInCG >= (Int)tsig );
       absSum = 0;
-#endif  // MULTIBITS_DATA_HIDING
 
       UInt c1 = 1;
-#if !RESTRICT_GR1GR2FLAG_NUMBER
-      UInt c2 = 0;
-#endif
-#if LEVEL_CTX_LUMA_RED
       UInt uiCtxSet    = (iSubSet > 0 && eTType==TEXT_LUMA) ? 2 : 0;
-#else
-      UInt uiCtxSet    = (iSubSet > 0 && eTType==TEXT_LUMA) ? 3 : 0;
-#endif
       UInt uiBin;
       
@@ -1795 +1578 @@
       {
         uiCtxSet++;
-#if !LEVEL_CTX_LUMA_RED
-        if(eTType==TEXT_LUMA && uiNumOne > 3)
-        {
-          uiCtxSet++;
-        }
-#endif
       }
       
@@ -1807 +1584 @@
       Int absCoeff[SCAN_SET_SIZE];
 
-#if RESTRICT_GR1GR2FLAG_NUMBER
       for ( Int i = 0; i < numNonZero; i++) absCoeff[i] = 1;   
       Int numC1Flag = min(numNonZero, C1FLAG_NUMBER);
@@ -1813 +1589 @@
 
       for( Int idx = 0; idx < numC1Flag; idx++ )
-#else
-      for( Int idx = 0; idx < numNonZero; idx++ )
-#endif
       {
         m_pcTDecBinIf->decodeBin( uiBin, baseCtxMod[c1] );
@@ -1821 +1594 @@
         {
           c1 = 0;
-#if RESTRICT_GR1GR2FLAG_NUMBER
           if (firstC2FlagIdx == -1)
           {
             firstC2FlagIdx = idx;
           }
-#endif
         }
         else if( (c1 < 3) && (c1 > 0) )
@@ -1837 +1608 @@
       if (c1 == 0)
       {
-#if RESTRICT_GR1GR2FLAG_NUMBER
         baseCtxMod = ( eTType==TEXT_LUMA ) ? m_cCUAbsSCModel.get( 0, 0 ) + uiCtxSet : m_cCUAbsSCModel.get( 0, 0 ) + NUM_ABS_FLAG_CTX_LUMA + uiCtxSet;
         if ( firstC2FlagIdx != -1)
@@ -1844 +1614 @@
           absCoeff[ firstC2FlagIdx ] = uiBin + 2;
         }
-#else    
-        baseCtxMod = ( eTType==TEXT_LUMA ) ? m_cCUAbsSCModel.get( 0, 0 ) + 3 * uiCtxSet : m_cCUAbsSCModel.get( 0, 0 ) + NUM_ABS_FLAG_CTX_LUMA + 3 * uiCtxSet;
+      }
+
+      UInt coeffSigns;
+      if ( signHidden && beValid )
+      {
+        m_pcTDecBinIf->decodeBinsEP( coeffSigns, numNonZero-1 );
+        coeffSigns <<= 32 - (numNonZero-1);
+      }
+      else
+      {
+        m_pcTDecBinIf->decodeBinsEP( coeffSigns, numNonZero );
+        coeffSigns <<= 32 - numNonZero;
+      }
+      
+      Int iFirstCoeff2 = 1;    
+      if (c1 == 0 || numNonZero > C1FLAG_NUMBER)
+      {
         for( Int idx = 0; idx < numNonZero; idx++ )
         {
-          if( absCoeff[ idx ] == 2 ) 
-          {
-            m_pcTDecBinIf->decodeBin( uiBin, baseCtxMod[c2] );
-            absCoeff[ idx ] = uiBin + 2;
-            c2 += (c2 < 2);
-            uiNumOne++;
-          }
-        }
-#endif
-      }
-
-#if MULTIBITS_DATA_HIDING
-      UInt coeffSigns;
-      if ( signHidden && beValid )
-      {
-        m_pcTDecBinIf->decodeBinsEP( coeffSigns, numNonZero-1 );
-        coeffSigns <<= 32 - (numNonZero-1);
-      }
-      else
-      {
-        m_pcTDecBinIf->decodeBinsEP( coeffSigns, numNonZero );
-        coeffSigns <<= 32 - numNonZero;
-      }
-#else
-      UInt coeffSigns;
-      m_pcTDecBinIf->decodeBinsEP( coeffSigns, numNonZero );
-      coeffSigns <<= 32 - numNonZero;
-#endif
-      
-#if RESTRICT_GR1GR2FLAG_NUMBER
-      Int iFirstCoeff2 = 1;    
-      if (c1 == 0 || numNonZero > C1FLAG_NUMBER)
-#else
-      if (c1 == 0)
-#endif
-      {
-        for( Int idx = 0; idx < numNonZero; idx++ )
-        {
-#if RESTRICT_GR1GR2FLAG_NUMBER   
           UInt baseLevel  = (idx < C1FLAG_NUMBER)? (2 + iFirstCoeff2) : 1;
 
@@ -1901 +1647 @@
             uiNumOne++;
           }
-#else
-          if( absCoeff[ idx ] == 3 )
-          {
-            UInt uiLevel;
-            xReadGoRiceExGolomb( uiLevel, uiGoRiceParam );
-            absCoeff[ idx ] = uiLevel + 3;
-          }
-#endif
         }
       }
@@ -1915 +1653 @@
       {
         Int blkPos = pos[ idx ];
-#if MULTIBITS_DATA_HIDING
         // Signs applied later.
         pcCoef[ blkPos ] = absCoeff[ idx ];
@@ -1932 +1669 @@
           coeffSigns <<= 1;
         }
-#else
-        Int sign = static_cast<Int>( coeffSigns ) >> 31;
-        pcCoef[ blkPos ] = ( absCoeff[ idx ] ^ sign ) - sign;
-        coeffSigns <<= 1;
-#endif
       }
     }
@@ -1949 +1681 @@
 
 
-#if SAO_UNIT_INTERLEAVING
 Void TDecSbac::parseSaoUvlc (UInt& ruiVal)
 {
@@ -2186 +1917 @@
   }
 }
-#endif
 
 /**
@@ -2217 +1947 @@
 }
 
-#if OL_FLUSH
 Void TDecSbac::decodeFlush ( )
 {
@@ -2225 +1954 @@
 
 }
-#endif
 
 #if HHI_DMM_WEDGE_INTRA || HHI_DMM_PRED_TEX || (LGE_EDGE_INTRA_A0070 && LGE_EDGE_INTRA_DELTA_DC)

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

@@ -74 +74 @@
   Void xCopyFrom           ( TDecSbac* pSrc );
   Void xCopyContextsFrom       ( TDecSbac* pSrc );
-#if OL_FLUSH
   Void decodeFlush();
-#endif
 
 #if CABAC_INIT_FLAG
@@ -95 +93 @@
   Void  parseSPS                  ( TComSPS* pcSPS         ) {}
 #endif
-#if TILES_OR_ENTROPY_SYNC_IDC  
   Void  parsePPS                  ( TComPPS* pcPPS, ParameterSetManagerDecoder *parameterSet         ) {}
-#else
-  Void  parsePPS                  ( TComPPS* pcPPS         ) {}
-#endif
   Void  parseAPS                  ( TComAPS* pAPS          ) {}
   void parseSEI(SEImessages&) {}
 
-#if LCU_SYNTAX_ALF
 #if MTK_DEPTH_MERGE_TEXTURE_CANDIDATE_C0137
   Void  parseSliceHeader          ( TComSlice*& rpcSlice, ParameterSetManagerDecoder *parameterSetManager, AlfCUCtrlInfo &alfCUCtrl, AlfParamSet& alfParamSet, bool isDepth) {}
 #else
   Void  parseSliceHeader          ( TComSlice*& rpcSlice, ParameterSetManagerDecoder *parameterSetManager, AlfCUCtrlInfo &alfCUCtrl, AlfParamSet& alfParamSet) {}
-#endif
-#else
-  Void  parseSliceHeader          ( TComSlice*& rpcSlice, ParameterSetManagerDecoder *parameterSetManager, AlfCUCtrlInfo &alfCUCtrl ) {}
 #endif
 
@@ -120 +110 @@
 #endif
   
-#if SAO_UNIT_INTERLEAVING
   Void  parseSaoUvlc              ( UInt& ruiVal           );
   Void  parseSaoSvlc              ( Int&  riVal            );
@@ -129 +118 @@
   Void  parseSaoOneLcuInterleaving(Int rx, Int ry, SAOParam* pSaoParam, TComDataCU* pcCU, Int iCUAddrInSlice, Int iCUAddrUpInSlice, Bool bLFCrossSliceBoundaryFlag);
   Void  parseSaoOffset            (SaoLcuParam* psSaoLcuParam);
-#endif
   
 #if RWTH_SDC_DLT_B0036
@@ -256 +244 @@
   ContextModel3DBuffer m_cALFUvlcSCModel;
   ContextModel3DBuffer m_cALFSvlcSCModel;
-#if AMP_CTX
   ContextModel3DBuffer m_cCUAMPSCModel;
-#else
-  ContextModel3DBuffer m_cCUXPosiSCModel;
-  ContextModel3DBuffer m_cCUYPosiSCModel;
-#endif
   ContextModel3DBuffer m_cSaoFlagSCModel;
   ContextModel3DBuffer m_cSaoUvlcSCModel;
   ContextModel3DBuffer m_cSaoSvlcSCModel;
-#if SAO_UNIT_INTERLEAVING
   ContextModel3DBuffer m_cSaoMergeLeftSCModel;
   ContextModel3DBuffer m_cSaoMergeUpSCModel;
   ContextModel3DBuffer m_cSaoTypeIdxSCModel;
-#endif
 
 #if HHI_DMM_WEDGE_INTRA || HHI_DMM_PRED_TEX

branches/HTM-5.1-dev0/source/Lib/TLibDecoder/TDecSlice.cpp

@@ -148 +148 @@
   UInt uiCol=0, uiLin=0, uiSubStrm=0;
 
-#if !REMOVE_TILE_DEPENDENCE
-  Int iBreakDep;
-#endif
   UInt uiTileCol;
   UInt uiTileStartLCU;
@@ -163 +160 @@
     pcCU = rpcPic->getCU( iCUAddr );
     pcCU->initCU( rpcPic, iCUAddr );
-#if !REMOVE_TILE_DEPENDENCE
-    iBreakDep = rpcPic->getPicSym()->getTileBoundaryIndependenceIdr();
-#endif
     uiTileCol = rpcPic->getPicSym()->getTileIdxMap(iCUAddr) % (rpcPic->getPicSym()->getNumColumnsMinus1()+1); // what column of tiles are we in?
     uiTileStartLCU = rpcPic->getPicSym()->getTComTile(rpcPic->getPicSym()->getTileIdxMap(iCUAddr))->getFirstCUAddr();
@@ -175 +169 @@
     uiLin     = iCUAddr / uiWidthInLCUs;
     // inherit from TR if necessary, select substream to use.
-#if WPP_SIMPLIFICATION
     if( iSymbolMode && pcSlice->getPPS()->getNumSubstreams() > 1 )
-#else
-    if( iSymbolMode && pcSlice->getPPS()->getEntropyCodingSynchro() )
-#endif
-    {
-#if !REMOVE_TILE_DEPENDENCE
-#if WPP_SIMPLIFICATION
-      if (iBreakDep && pcSlice->getPPS()->getNumSubstreams() > 1)
-#else
-      if (iBreakDep && pcSlice->getPPS()->getEntropyCodingSynchro())
-#endif
-#else
-#if WPP_SIMPLIFICATION
+    {
       if (pcSlice->getPPS()->getNumSubstreams() > 1)
-#else
-      if (pcSlice->getPPS()->getEntropyCodingSynchro())
-#endif
-#endif
       {
         // independent tiles => substreams are "per tile".  iNumSubstreams has already been multiplied.
@@ -207 +185 @@
       m_pcEntropyDecoder->setBitstream( ppcSubstreams[uiSubStrm] );
       // Synchronize cabac probabilities with upper-right LCU if it's available and we're at the start of a line.
-#if WPP_SIMPLIFICATION
       if (pcSlice->getPPS()->getNumSubstreams() > 1 && uiCol == uiTileLCUX)
-#else
-      if (pcSlice->getPPS()->getEntropyCodingSynchro() && uiCol == uiTileLCUX)
-#endif
       {
         // We'll sync if the TR is available.
@@ -217 +191 @@
         UInt uiWidthInCU = rpcPic->getFrameWidthInCU();
         TComDataCU *pcCUTR = NULL;
-#if WPP_SIMPLIFICATION
         if ( pcCUUp && ((iCUAddr%uiWidthInCU+1) < uiWidthInCU)  )
         {
           pcCUTR = rpcPic->getCU( iCUAddr - uiWidthInCU + 1 );
         }
-#else
-        if ( pcCUUp && ((iCUAddr%uiWidthInCU+pcSlice->getPPS()->getEntropyCodingSynchro()) < uiWidthInCU)  )
-        {
-          pcCUTR = rpcPic->getCU( iCUAddr - uiWidthInCU + pcSlice->getPPS()->getEntropyCodingSynchro() );
-        }
-#endif
         UInt uiMaxParts = 1<<(pcSlice->getSPS()->getMaxCUDepth()<<1);
 
@@ -233 +200 @@
              ((pcCUTR==NULL) || (pcCUTR->getSlice()==NULL) || 
              ((pcCUTR->getSCUAddr()+uiMaxParts-1) < pcSlice->getSliceCurStartCUAddr()) ||
-#if !REMOVE_TILE_DEPENDENCE
-             (rpcPic->getPicSym()->getTileBoundaryIndependenceIdr() && (rpcPic->getPicSym()->getTileIdxMap( pcCUTR->getAddr() ) != rpcPic->getPicSym()->getTileIdxMap(iCUAddr)))
-#else
              ((rpcPic->getPicSym()->getTileIdxMap( pcCUTR->getAddr() ) != rpcPic->getPicSym()->getTileIdxMap(iCUAddr)))
-#endif
              ))||
              (true/*bEnforceEntropySliceRestriction*/ &&
              ((pcCUTR==NULL) || (pcCUTR->getSlice()==NULL) || 
              ((pcCUTR->getSCUAddr()+uiMaxParts-1) < pcSlice->getEntropySliceCurStartCUAddr()) ||
-#if !REMOVE_TILE_DEPENDENCE
-             (rpcPic->getPicSym()->getTileBoundaryIndependenceIdr() && (rpcPic->getPicSym()->getTileIdxMap( pcCUTR->getAddr() ) != rpcPic->getPicSym()->getTileIdxMap(iCUAddr)))
-#else
              ((rpcPic->getPicSym()->getTileIdxMap( pcCUTR->getAddr() ) != rpcPic->getPicSym()->getTileIdxMap(iCUAddr)))
-#endif
              ))
            )
@@ -260 +219 @@
       pcSbacDecoder->load(&pcSbacDecoders[uiSubStrm]);  //this load is used to simplify the code (avoid to change all the call to pcSbacDecoders)
     }
-#if WPP_SIMPLIFICATION
     else if ( iSymbolMode && pcSlice->getPPS()->getNumSubstreams() <= 1 )
-#else
-    else if ( iSymbolMode && !pcSlice->getPPS()->getEntropyCodingSynchro() )
-#endif
     {
       // Set variables to appropriate values to avoid later code change.
@@ -273 +228 @@
          (iCUAddr!=0) && (iCUAddr!=rpcPic->getPicSym()->getPicSCUAddr(rpcPic->getSlice(rpcPic->getCurrSliceIdx())->getSliceCurStartCUAddr())/rpcPic->getNumPartInCU())) // !1st in frame && !1st in slice
     {
-#if WPP_SIMPLIFICATION
       if (pcSlice->getPPS()->getNumSubstreams() > 1)
-#else
-      if (pcSlice->getPPS()->getEntropyCodingSynchro())
-#endif
       {
         // We're crossing into another tile, tiles are independent.
@@ -330 +281 @@
     }
 
-#if !REMOVE_TILE_DEPENDENCE
-    if ( (rpcPic->getPicSym()->getTileBoundaryIndependenceIdr()==0) && (rpcPic->getPicSym()->getNumColumnsMinus1()!=0) )
-    {    
-      // Synchronize cabac probabilities with LCU among Tiles
-      if( (uiTileLCUX != 0) &&
-          (iCUAddr == rpcPic->getPicSym()->getTComTile(rpcPic->getPicSym()->getTileIdxMap(iCUAddr))->getFirstCUAddr()) )
-      {        
-        TComDataCU *pcCULeft = pcCU->getCULeft();
-        UInt uiMaxParts = 1<<(pcSlice->getSPS()->getMaxCUDepth()<<1);
-
-        if ( (true/*bEnforceSliceRestriction*/ &&
-              ((pcCULeft==NULL) || (pcCULeft->getSlice()==NULL) || 
-               ((pcCULeft->getSCUAddr()+uiMaxParts-1) < pcSlice->getSliceCurStartCUAddr()) 
-              )
-             )||
-             (true/*bEnforceEntropySliceRestriction*/ &&
-              ((pcCULeft==NULL) || (pcCULeft->getSlice()==NULL) || 
-               ((pcCULeft->getSCUAddr()+uiMaxParts-1) < pcSlice->getEntropySliceCurStartCUAddr())
-              )
-             )
-           )
-        {
-          // Left not available.
-        }
-        else
-        {
-          // Left is available, we use it.
-          pcSbacDecoders[uiSubStrm].loadContexts( &m_pcBufferLowLatSbacDecoders[uiTileCol-1] );
-          pcSbacDecoder->loadContexts(&pcSbacDecoders[uiSubStrm]);  //this load is used to simplify the code (avoid to change all the call to pcSbacDecoders)
-        }
-      }
-    }
-#endif
 
 
@@ -368 +286 @@
     g_bJustDoIt = g_bEncDecTraceEnable;
 #endif
-#if SAO_UNIT_INTERLEAVING
     if ( pcSlice->getSPS()->getUseSAO() && pcSlice->getSaoInterleavingFlag() && pcSlice->getSaoEnabledFlag() )
     {
@@ -384 +301 @@
       pcSbacDecoder->parseSaoOneLcuInterleaving(rx, ry, pcSlice->getAPS()->getSaoParam(),pcCU, cuAddrInSlice, cuAddrUpInSlice, pcSlice->getSPS()->getLFCrossSliceBoundaryFlag() );
     }
-#endif
 
     m_pcCuDecoder->decodeCU     ( pcCU, uiIsLast );
@@ -394 +310 @@
     if( iSymbolMode )
     {
-#if OL_FLUSH
       /*If at the end of a LCU line but not at the end of a substream, perform CABAC flush*/
-#if WPP_SIMPLIFICATION
       if (!uiIsLast && pcSlice->getPPS()->getNumSubstreams() > 1)
-#else
-      if (!uiIsLast && pcSlice->getPPS()->getCabacIstateReset())
-#endif
-      {
-#if !REMOVE_TILE_DEPENDENCE
-        if ((iBreakDep && (uiCol == uiTileLCUX+uiTileWidth-1) && (uiLin+iNumSubstreamsPerTile < uiTileLCUY+uiTileHeight))
-            || (!iBreakDep && (uiCol == uiWidthInLCUs-1) && (uiLin+iNumSubstreams < pcCU->getPic()->getFrameHeightInCU())))
-#else
+      {
         if ((uiCol == uiTileLCUX+uiTileWidth-1) && (uiLin+iNumSubstreamsPerTile < uiTileLCUY+uiTileHeight))
-#endif
         {
           m_pcEntropyDecoder->decodeFlush();
         }
       }
-#endif
       pcSbacDecoders[uiSubStrm].load(pcSbacDecoder);
 
       //Store probabilities of second LCU in line into buffer
-#if WPP_SIMPLIFICATION
       if (pcSlice->getPPS()->getNumSubstreams() > 1 && (uiCol == uiTileLCUX+1))
-#else
-      if (pcSlice->getPPS()->getEntropyCodingSynchro() && (uiCol == uiTileLCUX+pcSlice->getPPS()->getEntropyCodingSynchro()))
-#endif
       {
         m_pcBufferSbacDecoders[uiTileCol].loadContexts( &pcSbacDecoders[uiSubStrm] );
@@ -426 +327 @@
 
     }
-#if !REMOVE_TILE_DEPENDENCE
-    if ( (rpcPic->getPicSym()->getTileBoundaryIndependenceIdr()==0) && (rpcPic->getPicSym()->getNumColumnsMinus1()!=0) )
-    {
-      pcSbacDecoders[uiSubStrm].load(pcSbacDecoder);
-       //Store probabilties for next tile
-      if( (uiLin == (rpcPic->getPicSym()->getTComTile(rpcPic->getPicSym()->getTileIdxMap(iCUAddr))->getFirstCUAddr() / uiWidthInLCUs )) && 
-          (uiCol == rpcPic->getPicSym()->getTComTile(rpcPic->getPicSym()->getTileIdxMap(iCUAddr))->getRightEdgePosInCU()) )
-      {
-        m_pcBufferLowLatSbacDecoders[uiTileCol].loadContexts( &pcSbacDecoders[uiSubStrm] );
-      }
-    }
-#endif
   }
 

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

@@ -525 +525 @@
   xUpdateGopSize(pcSlice);
   
-#if H0567_DPB_PARAMETERS_PER_TEMPORAL_LAYER
   m_iMaxRefPicNum = pcSlice->getSPS()->getMaxDecPicBuffering(pcSlice->getTLayer())+pcSlice->getSPS()->getNumReorderPics(pcSlice->getTLayer()) + 1; // +1 to have space for the picture currently being decoded
-#else
-  m_iMaxRefPicNum = pcSlice->getSPS()->getMaxNumberOfReferencePictures()+pcSlice->getSPS()->getNumReorderFrames() + 1; // +1 to have space for the picture currently being decoded
-#endif
 
 #if DEPTH_MAP_GENERATION
@@ -716 +712 @@
   }
 
-#if !LCU_SYNTAX_ALF
-  // create ALF temporary buffer
-  m_cAdaptiveLoopFilter.create( sps->getPicWidthInLumaSamples(), sps->getPicHeightInLumaSamples(), g_uiMaxCUWidth, g_uiMaxCUHeight, g_uiMaxCUDepth );
-#endif
   m_cSAO.create( sps->getPicWidthInLumaSamples(), sps->getPicHeightInLumaSamples(), g_uiMaxCUWidth, g_uiMaxCUHeight, g_uiMaxCUDepth );
   m_cLoopFilter.        create( g_uiMaxCUDepth );
 }
 
-#if SKIPFRAME_BUGFIX
 Bool TDecTop::xDecodeSlice(InputNALUnit &nalu, Int &iSkipFrame, Int iPOCLastDisplay )
-#else
-Bool TDecTop::xDecodeSlice(InputNALUnit &nalu, Int iSkipFrame, Int iPOCLastDisplay )
-#endif
 {
   TComPic*&   pcPic         = m_pcPic;
@@ -785 +773 @@
   }
 
-#if NAL_REF_FLAG
   m_apcSlicePilot->setReferenced(nalu.m_nalRefFlag);
-#else
-  m_apcSlicePilot->setReferenced(nalu.m_nalRefIDC != NAL_REF_IDC_PRIORITY_LOWEST);
-#endif
   m_apcSlicePilot->setTLayerInfo(nalu.m_temporalId);
 
   // ALF CU parameters should be part of the slice header -> needs to be fixed 
-#if LCU_SYNTAX_ALF
 #if MTK_DEPTH_MERGE_TEXTURE_CANDIDATE_C0137
   m_cEntropyDecoder.decodeSliceHeader (m_apcSlicePilot, &m_parameterSetManagerDecoder, m_cGopDecoder.getAlfCuCtrlParam(), m_cGopDecoder.getAlfParamSet(),m_apcSlicePilot->getVPS()->getDepthFlag(nalu.m_layerId));
@@ -799 +782 @@
   m_cEntropyDecoder.decodeSliceHeader (m_apcSlicePilot, &m_parameterSetManagerDecoder, m_cGopDecoder.getAlfCuCtrlParam(), m_cGopDecoder.getAlfParamSet());
 #endif
-#else
-  m_cEntropyDecoder.decodeSliceHeader (m_apcSlicePilot, &m_parameterSetManagerDecoder, m_cGopDecoder.getAlfCuCtrlParam() );
-#endif
   // byte align
   {
@@ -816 +796 @@
   if (m_apcSlicePilot->isNextSlice() && m_apcSlicePilot->getPOC()!=m_prevPOC && !m_bFirstSliceInSequence)
   {
-#if START_DECODING_AT_CRA
     if (m_prevPOC >= m_pocRandomAccess)
     {
@@ -823 +802 @@
     }
     m_prevPOC = m_apcSlicePilot->getPOC();
-#else
-    m_prevPOC = m_apcSlicePilot->getPOC();
-    return true;
-#endif
   }
   // actual decoding starts here
@@ -846 +821 @@
   }
   //detect lost reference picture and insert copy of earlier frame.
-#if START_DECODING_AT_CRA
   while(m_apcSlicePilot->checkThatAllRefPicsAreAvailable(m_cListPic, m_apcSlicePilot->getRPS(), true, m_pocRandomAccess) > 0)
-#else
-  while(m_apcSlicePilot->checkThatAllRefPicsAreAvailable(m_cListPic, m_apcSlicePilot->getRPS(), true) > 0)
-#endif
   {
     xCreateLostPicture(m_apcSlicePilot->checkThatAllRefPicsAreAvailable(m_cListPic, m_apcSlicePilot->getRPS(), false)-1);
@@ -897 +868 @@
   UInt i, j, p;
 
-#if !REMOVE_TILE_DEPENDENCE
-  //set the TileBoundaryIndependenceIdr
-  if(pcSlice->getPPS()->getTileBehaviorControlPresentFlag() == 1)
-  {
-    pcPic->getPicSym()->setTileBoundaryIndependenceIdr( pcSlice->getPPS()->getTileBoundaryIndependenceIdr() );
-  }
-  else
-  {
-    pcPic->getPicSym()->setTileBoundaryIndependenceIdr( pcSlice->getPPS()->getSPS()->getTileBoundaryIndependenceIdr() );
-  }
-#endif
 
   if( pcSlice->getPPS()->getColumnRowInfoPresent() == 1 )
@@ -1265 +1225 @@
 {
   TComSPS* sps = new TComSPS();
-#if RPS_IN_SPS
   TComRPSList* rps = new TComRPSList();
   sps->setRPSList(rps);
-#endif
 #if HHI_MPI || OL_QTLIMIT_PREDCODING_B0068
   m_cEntropyDecoder.decodeSPS( sps, m_isDepth );
@@ -1275 +1233 @@
 #endif
   m_parameterSetManagerDecoder.storePrefetchedSPS(sps);
-#if LCU_SYNTAX_ALF
   m_cAdaptiveLoopFilter.create( sps->getPicWidthInLumaSamples(), sps->getPicHeightInLumaSamples(), g_uiMaxCUWidth, g_uiMaxCUHeight, g_uiMaxCUDepth );
-#endif
 }
 
 Void TDecTop::xDecodePPS()
 {
-#if !RPS_IN_SPS
-  TComRPSList* rps = new TComRPSList();
-#endif
   TComPPS* pps = new TComPPS();
-#if !RPS_IN_SPS
-  pps->setRPSList(rps);
-#endif
-#if TILES_OR_ENTROPY_SYNC_IDC
   m_cEntropyDecoder.decodePPS( pps, &m_parameterSetManagerDecoder );
-#else
-  m_cEntropyDecoder.decodePPS( pps );
-#endif
   m_parameterSetManagerDecoder.storePrefetchedPPS( pps );
 
@@ -1346 +1292 @@
     case NAL_UNIT_CODED_SLICE:
     case NAL_UNIT_CODED_SLICE_IDR:
-#if H0566_TLA
 #if !QC_REM_IDV_B0046
     case NAL_UNIT_CODED_SLICE_IDV:
@@ -1352 +1297 @@
     case NAL_UNIT_CODED_SLICE_CRA:
     case NAL_UNIT_CODED_SLICE_TLA:
-#else
-    case NAL_UNIT_CODED_SLICE_CDR:
-#endif
       return xDecodeSlice(nalu, iSkipFrame, iPOCLastDisplay);
       break;
@@ -1375 +1317 @@
   sps = pSPSV0;
   m_parameterSetManagerDecoder.storePrefetchedSPS(sps);
-#if LCU_SYNTAX_ALF
   m_cAdaptiveLoopFilter.create( sps->getPicWidthInLumaSamples(), sps->getPicHeightInLumaSamples(), g_uiMaxCUWidth, g_uiMaxCUHeight, g_uiMaxCUDepth );
-#endif
 }
 
@@ -1412 +1352 @@
   else if (m_pocRandomAccess == MAX_INT) // start of random access point, m_pocRandomAccess has not been set yet.
   {
-#if H0566_TLA
     if( m_apcSlicePilot->getNalUnitTypeBaseViewMvc() == NAL_UNIT_CODED_SLICE_CRA )
-#else
-    if( m_apcSlicePilot->getNalUnitTypeBaseViewMvc() == NAL_UNIT_CODED_SLICE_CDR )
-#endif
     {
       m_pocRandomAccess = m_apcSlicePilot->getPOC(); // set the POC random access since we need to skip the reordered pictures in CRA.
@@ -1426 +1362 @@
     else 
     {
-#if START_DECODING_AT_CRA
       static bool warningMessage = false;
       if(!warningMessage)
@@ -1434 +1369 @@
       }
       return true;
-#else
-      printf("\nUnsafe random access point. Decoder may crash.");
-      m_pocRandomAccess = 0;
-#endif
     }
   }
@@ -1458 +1389 @@
   m_cSAO.allocSaoParam(pAPS->getSaoParam());
   pAPS->createAlfParam();
-#if !LCU_SYNTAX_ALF
-  m_cAdaptiveLoopFilter.allocALFParam(pAPS->getAlfParam());
-#endif
 }
 

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

@@ -282 +282 @@
   Void      decodeAPS( TComAPS* cAPS) { m_cEntropyDecoder.decodeAPS(cAPS); };
   Void      xActivateParameterSets();
-#if SKIPFRAME_BUGFIX
   Bool      xDecodeSlice(InputNALUnit &nalu, Int &iSkipFrame, Int iPOCLastDisplay);
-#else
-  Bool      xDecodeSlice(InputNALUnit &nalu, Int iSkipFrame, Int iPOCLastDisplay);
-#endif
 #if VIDYO_VPS_INTEGRATION|QC_MVHEVC_B0046
   Void      xDecodeVPS();

branches/HTM-5.1-dev0/source/Lib/TLibEncoder/NALwrite.cpp

@@ -56 +56 @@
 
   bsNALUHeader.write(0,1); // forbidden_zero_flag
-#if NAL_REF_FLAG
   bsNALUHeader.write(nalu.m_nalRefFlag? 1 : 0, 1); // nal_ref_flag
   bsNALUHeader.write(nalu.m_nalUnitType, 6);          // nal_unit_type
-#else
-  bsNALUHeader.write(nalu.m_nalRefIDC, 2); // nal_ref_idc
-  bsNALUHeader.write(nalu.m_nalUnitType, 5); // nal_unit_type
-#endif
 
 #if QC_MVHEVC_B0046
@@ -72 +67 @@
   bsNALUHeader.write(nalu.m_layerId + 1, 5); // layer_id_plus1
 #else
-#if H0388
   bsNALUHeader.write(nalu.m_temporalId, 3); // temporal_id
  // bsNALUHeader.write(1, 5); // reserved_one_5bits
   bsNALUHeader.write(nalu.m_viewId+1,4); 
   bsNALUHeader.write(nalu.m_isDepth,1);
-#else
-  switch (nalu.m_nalUnitType)
-  {
-  case NAL_UNIT_CODED_SLICE:
-  case NAL_UNIT_CODED_SLICE_IDR:
-#if H0566_TLA
-#if !QC_REM_IDV_B0046
-  case NAL_UNIT_CODED_SLICE_IDV:
-#endif
-  case NAL_UNIT_CODED_SLICE_CRA:
-  case NAL_UNIT_CODED_SLICE_TLA:
-#else
-  case NAL_UNIT_CODED_SLICE_CDR:
-#endif
-    bsNALUHeader.write(nalu.m_temporalId, 3); // temporal_id
-    bsNALUHeader.write(nalu.m_OutputFlag, 1); // output_flag
-  //  bsNALUHeader.write(1, 4); // reserved_one_4bits
-    bsNALUHeader.write(nalu.m_viewId+1,3); 
-    bsNALUHeader.write(nalu.m_isDepth,1);
-    break;
-  default: break;
-  }
-#endif
 #endif
 #endif 
@@ -209 +180 @@
 {
   naluDest.m_nalUnitType = naluSrc.m_nalUnitType;
-#if NAL_REF_FLAG
   naluDest.m_nalRefFlag  = naluSrc.m_nalRefFlag;
-#else
-  naluDest.m_nalRefIDC   = naluSrc.m_nalRefIDC;
-#endif
 #if !VIDYO_VPS_INTEGRATION
   naluDest.m_viewId      = naluSrc.m_viewId;
@@ -223 +190 @@
 #else
   
-#if !H0388
-  naluDest.m_OutputFlag  = naluSrc.m_OutputFlag;
-#endif
 #endif
   naluDest.m_Bitstream   = naluSrc.m_Bitstream;

branches/HTM-5.1-dev0/source/Lib/TLibEncoder/NALwrite.h

@@ -54 +54 @@
    * written to the bitstream.
    */
-#if H0388
   OutputNALUnit(
     NalUnitType nalUnitType,
-#if NAL_REF_FLAG
     Bool nalRefFlag,
-#else
-    NalRefIdc nalRefIDC,
-#endif
 #if VIDYO_VPS_INTEGRATION|QC_MVHEVC_B0046
     unsigned layerId,
@@ -69 +64 @@
 #endif
     unsigned temporalID = 0)
-#if NAL_REF_FLAG
 #if VIDYO_VPS_INTEGRATION|QC_MVHEVC_B0046
   : NALUnit(nalUnitType, nalRefFlag, layerId, temporalID)
@@ -75 +69 @@
   : NALUnit(nalUnitType, nalRefFlag, viewId, isDepth, temporalID)
 #endif
-#else
-#if VIDYO_VPS_INTEGRATION
-  : NALUnit(nalUnitType, nalRefIDC, layerId, temporalID)
-#else
-  : NALUnit(nalUnitType, nalRefIDC, viewId, isDepth, temporalID)
-#endif
-#endif
   , m_Bitstream()
   {}
-#else
-  OutputNALUnit(
-    NalUnitType nalUnitType,
-    NalRefIdc nalRefIDC,
-    Int viewId,
-    Bool isDepth,
-    unsigned temporalID = 0,
-    bool outputFlag = true)
-  : NALUnit(nalUnitType, nalRefIDC, viewId, isDepth, temporalID, outputFlag)
-  , m_Bitstream()
-  {}
-#endif
 
   OutputNALUnit(const NALUnit& src)

branches/HTM-5.1-dev0/source/Lib/TLibEncoder/TEncAdaptiveLoopFilter.cpp

@@ -47 +47 @@
 // Constants
 // ====================================================================================================================
-#if LCU_SYNTAX_ALF
 #define ALF_NUM_OF_REDESIGN 1
-#else
-#define ALF_NUM_OF_REDESIGN 3
-#endif
 // ====================================================================================================================
 // Tables
 // ====================================================================================================================
-#if LCU_SYNTAX_ALF
 const Int TEncAdaptiveLoopFilter::m_alfNumPartsInRowTab[5] =
 {
@@ -82 +77 @@
   341,  //level 4
 };
-#endif
 // ====================================================================================================================
 // Constructor / destructor
 // ====================================================================================================================
 
-#if LCU_SYNTAX_ALF
 ///AlfCorrData
 AlfCorrData::AlfCorrData()
@@ -376 +369 @@
   return *this;
 }
-#endif
 
 
 TEncAdaptiveLoopFilter::TEncAdaptiveLoopFilter()
 {
-#if !LCU_SYNTAX_ALF
-  m_ppdAlfCorr = NULL;
-  m_ppdAlfCorrCb = NULL;
-  m_ppdAlfCorrCr = NULL;
-  m_pdDoubleAlfCoeff = NULL;
-#endif
   m_pcEntropyCoder = NULL;
-#if !LCU_SYNTAX_ALF
-  m_pcBestAlfParam = NULL;
-  m_pcTempAlfParam = NULL;
-#endif
   m_pcPicYuvBest = NULL;
   m_pcPicYuvTmp = NULL;
-#if !LCU_SYNTAX_ALF
-  pcAlfParamShape0 = NULL;
-  pcAlfParamShape1 = NULL;
-  pcPicYuvRecShape0 = NULL;
-  pcPicYuvRecShape1 = NULL;
-  m_pcSliceYuvTmp = NULL;
-#endif
 
   m_iALFMaxNumberFilters = NO_FILTERS;
@@ -411 +386 @@
 // ====================================================================================================================
 
-#if LCU_SYNTAX_ALF
 /** convert Level Row Col to Idx
  * \param   level,  row,  col
@@ -799 +773 @@
 }
 
-#else
-
-/** create ALF global buffers
- * \param iALFEncodePassReduction 0: 16-pass encoding, 1: 1-pass encoding, 2: 2-pass encoding
- * This function is used to create the filter buffers to perform time-delay filtering.
- */
-Void TEncAdaptiveLoopFilter::createAlfGlobalBuffers(Int iALFEncodePassReduction)
-{
-  if(iALFEncodePassReduction)
-  {
-    Int iNumOfBuffer = m_iGOPSize +1;
-
-    for(Int i=0; i< NUM_ALF_CLASS_METHOD; i++)
-    {
-      m_mergeTableSavedMethods[i] = new Int*[iNumOfBuffer];
-      m_aiFilterCoeffSavedMethods[i] = new Int**[iNumOfBuffer];
-      for(Int j=0; j< iNumOfBuffer; j++)
-      {
-        m_mergeTableSavedMethods[i][j] = new Int[NO_VAR_BINS];
-        m_aiFilterCoeffSavedMethods[i][j] = new Int*[NO_VAR_BINS];
-        for(Int k=0; k< NO_VAR_BINS; k++)
-        {
-          m_aiFilterCoeffSavedMethods[i][j][k] = new Int[ALF_MAX_NUM_COEF];
-        }
-      }
-      m_iPreviousFilterShapeMethods[i] = new Int[iNumOfBuffer];
-    }
-
-  }
-}
-/** destroy ALF global buffers
- * This function is used to destroy the filter buffers.
- */
-
-Void TEncAdaptiveLoopFilter::destroyAlfGlobalBuffers()
-{
-  if(m_iALFEncodePassReduction)
-  {
-    for(Int i=0; i< NUM_ALF_CLASS_METHOD; i++)
-    {
-      for(Int j=0; j< m_iGOPSize+1; j++)
-      {
-        for(Int k=0; k< NO_VAR_BINS; k++)
-        {
-          delete[] m_aiFilterCoeffSavedMethods[i][j][k];
-        }
-        delete[] m_aiFilterCoeffSavedMethods[i][j];
-        delete[] m_mergeTableSavedMethods[i][j];
-      }
-      delete[] m_aiFilterCoeffSavedMethods[i];
-      delete[] m_iPreviousFilterShapeMethods[i];
-      delete[] m_mergeTableSavedMethods[i];
-
-    }
-
-  }
-
-}
-#endif
 /**
  \param pcPic           picture (TComPic) pointer
@@ -865 +780 @@
 {
   m_pcEntropyCoder = pcEntropyCoder;
-#if !LCU_SYNTAX_ALF
-  xInitParam();
-#endif
   xCreateTmpAlfCtrlFlags();
   
@@ -876 +788 @@
   m_pcPicYuvTmp->createLuma(iWidth, iHeight, g_uiMaxCUWidth, g_uiMaxCUHeight, g_uiMaxCUDepth);
   m_pcPicYuvBest = pcPic->getPicYuvPred();
-#if !LCU_SYNTAX_ALF  
-  m_pcBestAlfParam = new ALFParam;
-  m_pcTempAlfParam = new ALFParam;
-  allocALFParam(m_pcBestAlfParam);
-  allocALFParam(m_pcTempAlfParam);
-  pcPicYuvRecShape0 = new TComPicYuv();
-  pcPicYuvRecShape0->createLuma(iWidth, iHeight, g_uiMaxCUWidth, g_uiMaxCUHeight, g_uiMaxCUDepth);
- 
-  pcPicYuvRecShape1 = new TComPicYuv();
-  pcPicYuvRecShape1->createLuma(iWidth, iHeight, g_uiMaxCUWidth, g_uiMaxCUHeight, g_uiMaxCUDepth);
-
-  pcAlfParamShape0 = new ALFParam;
-  pcAlfParamShape1 = new ALFParam;
-
-  allocALFParam(pcAlfParamShape0);  
-  allocALFParam(pcAlfParamShape1);
-
-  // init qc_filter
-  initMatrix4D_double(&m_EGlobalSym, NUM_ALF_FILTER_SHAPE+1,  NO_VAR_BINS, MAX_SQR_FILT_LENGTH, MAX_SQR_FILT_LENGTH);
-  initMatrix3D_double(&m_yGlobalSym, NUM_ALF_FILTER_SHAPE+1, NO_VAR_BINS, MAX_SQR_FILT_LENGTH); 
-#endif
   initMatrix_int(&m_filterCoeffSymQuant, NO_VAR_BINS, ALF_MAX_NUM_COEF); 
-#if !LCU_SYNTAX_ALF
-  m_pixAcc = (double *) calloc(NO_VAR_BINS, sizeof(double));
-#endif
   initMatrix_Pel(&m_maskImg, m_img_height, m_img_width);
   initMatrix_double(&m_E_temp, MAX_SQR_FILT_LENGTH, MAX_SQR_FILT_LENGTH);//
@@ -913 +801 @@
   initMatrix_int(&m_FilterCoeffQuantTemp, NO_VAR_BINS, ALF_MAX_NUM_COEF);//
 
-#if LCU_SYNTAX_ALF
   m_tempALFp = new ALFParam(ALF_Y);
-#else
-  m_tempALFp = new ALFParam;
-  allocALFParam(m_tempALFp);
-  if( m_bUseNonCrossALF )
-  {
-    m_pcSliceYuvTmp = new TComPicYuv();
-    m_pcSliceYuvTmp->create(iWidth, iHeight, g_uiMaxCUWidth, g_uiMaxCUHeight, g_uiMaxCUDepth);
-  }
-#endif
 }
 
 Void TEncAdaptiveLoopFilter::endALFEnc()
 {
-#if !LCU_SYNTAX_ALF
-  xUninitParam();
-#endif
   xDestroyTmpAlfCtrlFlags();
   
@@ -938 +813 @@
   m_pcPic = NULL;
   m_pcEntropyCoder = NULL;
-#if !LCU_SYNTAX_ALF
-  freeALFParam(m_pcBestAlfParam);
-  freeALFParam(m_pcTempAlfParam);
-  delete m_pcBestAlfParam;
-  delete m_pcTempAlfParam;
-
-  pcPicYuvRecShape0->destroyLuma();
-  delete pcPicYuvRecShape0;
-  pcPicYuvRecShape0 = NULL;
-
-  pcPicYuvRecShape1->destroyLuma();
-  delete pcPicYuvRecShape1;
-  pcPicYuvRecShape1 = NULL;
-
-  freeALFParam(pcAlfParamShape0);
-  freeALFParam(pcAlfParamShape1);
-
-  delete pcAlfParamShape0;
-  delete pcAlfParamShape1;
-
-  // delete qc filters
-  destroyMatrix4D_double(m_EGlobalSym, NUM_ALF_FILTER_SHAPE+1,  NO_VAR_BINS);
-  destroyMatrix3D_double(m_yGlobalSym, NUM_ALF_FILTER_SHAPE+1);
-#endif
   destroyMatrix_int(m_filterCoeffSymQuant);
-#if !LCU_SYNTAX_ALF  
-  free(m_pixAcc);
-#endif
   destroyMatrix_Pel(m_maskImg);
   destroyMatrix3D_double(m_E_merged, NO_VAR_BINS);
@@ -980 +828 @@
   destroyMatrix_int(m_FilterCoeffQuantTemp);
   
-#if LCU_SYNTAX_ALF
   delete m_tempALFp;
-#else
-  freeALFParam(m_tempALFp);
-  delete m_tempALFp;
-
-  if(m_bUseNonCrossALF)
-  {
-    m_pcSliceYuvTmp->destroy();
-    delete m_pcSliceYuvTmp;
-    m_pcSliceYuvTmp = NULL;
-  }
-#endif
-}
-
-#if LCU_SYNTAX_ALF
+}
+
 
 /** Assign output ALF parameters
@@ -2762 +2597 @@
 #endif
 
-#if ALF_SINGLE_FILTER_SHAPE
         calcCorrOneCompRegionChma(pPicOrg, pPicSrc, stride, ypos, xpos, height, width, alfCorr->ECorr[0], alfCorr->yCorr[0], isLastBlock);
-#endif
       }
     }
@@ -2822 +2655 @@
 #endif
 
-#if ALF_SINGLE_FILTER_SHAPE
         calcCorrOneCompRegionLuma(pPicOrg, pPicSrc, stride, ypos, xpos, height, width, alfCorr->ECorr, alfCorr->yCorr, alfCorr->pixAcc, forceCollection, isLastBlock);
-#endif        
       }
     }
@@ -2838 +2669 @@
 
 
-#if ALF_SINGLE_FILTER_SHAPE
 /** Gather correlations for one region for chroma component
  * \param [in] imgOrg picture buffer for original picture
@@ -3086 +2916 @@
 
 }
-#endif
-
-#else
-
-
-#if ALF_CHROMA_LAMBDA  
-/**
- \param pcAlfParam           ALF parameter
- \param [out] pvAlfCtrlParam ALF CU control parameters container for slices
- \param dLambdaLuma          luma lambda value for RD cost computation
- \param dLambdaChroma        chroma lambda value for RD cost computation
- \retval ruiDist             distortion
- \retval ruiBits             required bits
- \retval ruiMaxAlfCtrlDepth  optimal partition depth
- */
-#if HHI_INTERVIEW_SKIP
-Void TEncAdaptiveLoopFilter::ALFProcess( ALFParam* pcAlfParam, std::vector<AlfCUCtrlInfo>* pvAlfCtrlParam, Double dLambdaLuma, Double dLambdaChroma, UInt64& ruiDist, UInt64& ruiBits, Bool bInterviewSkip)
-#else
-Void TEncAdaptiveLoopFilter::ALFProcess( ALFParam* pcAlfParam, std::vector<AlfCUCtrlInfo>* pvAlfCtrlParam, Double dLambdaLuma, Double dLambdaChroma, UInt64& ruiDist, UInt64& ruiBits)
-
-#endif
-#else
-/**
- \param pcAlfParam           ALF parameter
- \param dLambda              lambda value for RD cost computation
- \retval ruiDist             distortion
- \retval ruiBits             required bits
- \retval ruiMaxAlfCtrlDepth  optimal partition depth
- */
-#if HHI_INTERVIEW_SKIP
-Void TEncAdaptiveLoopFilter::ALFProcess( ALFParam* pcAlfParam, std::vector<AlfCUCtrlInfo>* pvAlfCtrlParam, Double dLambda, UInt64& ruiDist, UInt64& ruiBits, Bool bInterviewSkip)
-#else
-Void TEncAdaptiveLoopFilter::ALFProcess( ALFParam* pcAlfParam, std::vector<AlfCUCtrlInfo>* pvAlfCtrlParam, Double dLambda, UInt64& ruiDist, UInt64& ruiBits)
-
-#endif
-#endif
-{
-  
-  // set lambda
-#if ALF_CHROMA_LAMBDA  
-  m_dLambdaLuma   = dLambdaLuma;
-  m_dLambdaChroma = dLambdaChroma;
-#else
-  m_dLambdaLuma   = dLambda;
-  m_dLambdaChroma = dLambda;
-#endif
-
-  m_lcuHeight = m_pcPic->getSlice(0)->getSPS()->getMaxCUHeight();
-
-#if ALF_SINGLE_FILTER_SHAPE
-  m_lineIdxPadBot = m_lcuHeight - 4 - 3; // DFRegion, Vertical Taps
-#else
-  m_lineIdxPadBot = m_lcuHeight - 4 - 4; // DFRegion, Vertical Taps
-#endif
-  m_lineIdxPadTop = m_lcuHeight - 4; // DFRegion
-
-  m_lcuHeightChroma = m_lcuHeight>>1;
-#if ALF_SINGLE_FILTER_SHAPE
-  m_lineIdxPadBotChroma = m_lcuHeightChroma - 2 - 3; // DFRegion, Vertical Taps
-#else
-  m_lineIdxPadBotChroma = m_lcuHeightChroma - 2 - 4; // DFRegion, Vertical Taps
-#endif
-  m_lineIdxPadTopChroma = m_lcuHeightChroma - 2 ; // DFRegion
-
-  TComPicYuv* pcPicOrg = m_pcPic->getPicYuvOrg();
-  
-  // extend image for filtering
-  TComPicYuv* pcPicYuvRec    = m_pcPic->getPicYuvRec();
-  TComPicYuv* pcPicYuvExtRec = m_pcTempPicYuv;
-#if HHI_INTERVIEW_SKIP
-  TComPicYuv* pcUsedPelMap   = m_pcPic->getUsedPelsMap() ;
-  if(bInterviewSkip)
-    assert( pcUsedPelMap ) ;
-#endif
-  
-  pcPicYuvRec->copyToPic(pcPicYuvExtRec);
-  if(!m_bUseNonCrossALF)
-  {
-  pcPicYuvExtRec->setBorderExtension( false );
-  pcPicYuvExtRec->extendPicBorder   ();
-  }
- 
-  // set min cost
-  UInt64 uiMinRate = MAX_INT;
-  UInt64 uiMinDist = MAX_INT;
-  Double dMinCost  = MAX_DOUBLE;
-  
-  UInt64  uiOrigRate;
-  UInt64  uiOrigDist;
-  Double  dOrigCost;
-  
-  // calc original cost
-#if HHI_INTERVIEW_SKIP
-  xCalcRDCost( pcPicOrg, pcPicYuvRec, pcUsedPelMap, NULL, uiOrigRate, uiOrigDist, dOrigCost );
-#else
-  xCalcRDCost( pcPicOrg, pcPicYuvRec, NULL, uiOrigRate, uiOrigDist, dOrigCost );
-#endif
-  m_pcBestAlfParam->alf_flag = 0;
-  // initialize temp_alfps
-  m_pcTempAlfParam->alf_flag        = 1;
-  m_pcTempAlfParam->chroma_idc      = 0;
-
-  m_bAlfCUCtrlEnabled = (pvAlfCtrlParam != NULL)?true:false;
-  if(m_bAlfCUCtrlEnabled)
-  {
-    m_vBestAlfCUCtrlParam.resize(m_uiNumSlicesInPic);
-    for(Int s=0; s< m_uiNumSlicesInPic; s++)
-    {
-      m_vBestAlfCUCtrlParam[s].cu_control_flag = 0;
-    }
-  }
-  else
-  {
-    m_vBestAlfCUCtrlParam.clear();
-  }
-
-  setALFEncodingParam(m_pcPic);
-
-  // adaptive in-loop wiener filtering
-#if HHI_INTERVIEW_SKIP
-  xEncALFLuma( pcPicOrg, pcPicYuvExtRec, pcPicYuvRec, uiMinRate, uiMinDist, dMinCost, bInterviewSkip );
-#else
-  xEncALFLuma( pcPicOrg, pcPicYuvExtRec, pcPicYuvRec, uiMinRate, uiMinDist, dMinCost );
-#endif
-
-  // cu-based filter on/off control
-#if HHI_INTERVIEW_SKIP
-  xCUAdaptiveControl_qc( pcPicOrg, pcPicYuvExtRec, pcPicYuvRec, pcUsedPelMap, uiMinRate, uiMinDist, dMinCost );
-#else
-  xCUAdaptiveControl_qc( pcPicOrg, pcPicYuvExtRec, pcPicYuvRec, uiMinRate, uiMinDist, dMinCost );
-#endif
-  
-  // compare RD cost to non-ALF case
-  if( dMinCost < dOrigCost )
-  {
-    m_pcBestAlfParam->alf_flag = 1;
-    
-    ruiBits = uiMinRate;
-    ruiDist = uiMinDist;
-  }
-  else
-  {
-    m_pcBestAlfParam->alf_flag        = 0;
-
-    uiMinRate = uiOrigRate;
-    uiMinDist = uiOrigDist;
-    
-    m_pcEntropyCoder->setAlfCtrl(false);
-    if(m_bAlfCUCtrlEnabled)
-    {
-      for(Int s=0; s< m_uiNumSlicesInPic; s++)
-      {
-        m_vBestAlfCUCtrlParam[s].cu_control_flag = 0;
-      }
-    }
-    pcPicYuvExtRec->copyToPicLuma(pcPicYuvRec);
-    
-    ruiBits = uiOrigRate;
-    ruiDist = uiOrigDist;
-  }
-  // if ALF works
-  if( m_pcBestAlfParam->alf_flag )
-  {
-    // do additional ALF process for chroma
-    xFilterTapDecisionChroma( uiMinRate, pcPicOrg, pcPicYuvExtRec, pcPicYuvRec, ruiDist, ruiBits );
-  }
-  
-  // copy to best storage
-  copyALFParam(pcAlfParam, m_pcBestAlfParam);
-  
-  if(m_bAlfCUCtrlEnabled)
-  {
-    for(Int s=0; s< m_uiNumSlicesInPic; s++)
-    {
-      (*pvAlfCtrlParam)[s]= m_vBestAlfCUCtrlParam[s];
-    }
-  }
-}
-#endif
+
 
 /** PCM LF disable process.
@@ -3284 +2936 @@
 // Private member functions
 // ====================================================================================================================
-#if !LCU_SYNTAX_ALF
-Void TEncAdaptiveLoopFilter::xInitParam()
-{
-  Int i, j;
-  
-  if (m_ppdAlfCorr != NULL)
-  {
-    for (i = 0; i < ALF_MAX_NUM_COEF; i++)
-    {
-      for (j = 0; j < ALF_MAX_NUM_COEF+1; j++)
-      {
-        m_ppdAlfCorr[i][j] = 0;
-      }
-    }
-  }
-  else
-  {
-    m_ppdAlfCorr = new Double*[ALF_MAX_NUM_COEF];
-    for (i = 0; i < ALF_MAX_NUM_COEF; i++)
-    {
-      m_ppdAlfCorr[i] = new Double[ALF_MAX_NUM_COEF+1];
-      for (j = 0; j < ALF_MAX_NUM_COEF+1; j++)
-      {
-        m_ppdAlfCorr[i][j] = 0;
-      }
-    }
-  }
-  
-  if (m_pdDoubleAlfCoeff != NULL)
-  {
-    for (i = 0; i < ALF_MAX_NUM_COEF; i++)
-    {
-      m_pdDoubleAlfCoeff[i] = 0;
-    }
-  }
-  else
-  {
-    m_pdDoubleAlfCoeff = new Double[ALF_MAX_NUM_COEF];
-    for (i = 0; i < ALF_MAX_NUM_COEF; i++)
-    {
-      m_pdDoubleAlfCoeff[i] = 0;
-    }
-  }
-  if (m_ppdAlfCorrCb != NULL)
-  {
-    for (i = 0; i < ALF_MAX_NUM_COEF; i++)
-    {
-      for (j = 0; j < ALF_MAX_NUM_COEF+1; j++)
-      {
-        m_ppdAlfCorrCb[i][j] = 0;
-      }
-    }
-  }
-  else
-  {
-    m_ppdAlfCorrCb = new Double*[ALF_MAX_NUM_COEF];
-    for (i = 0; i < ALF_MAX_NUM_COEF; i++)
-    {
-      m_ppdAlfCorrCb[i] = new Double[ALF_MAX_NUM_COEF+1];
-      for (j = 0; j < ALF_MAX_NUM_COEF+1; j++)
-      {
-        m_ppdAlfCorrCb[i][j] = 0;
-      }
-    }
-  }
-  
-  if (m_ppdAlfCorrCr != NULL)
-  {
-    for (i = 0; i < ALF_MAX_NUM_COEF; i++)
-    {
-      for (j = 0; j < ALF_MAX_NUM_COEF+1; j++)
-      {
-        m_ppdAlfCorrCr[i][j] = 0;
-      }
-    }
-  }
-  else
-  {
-    m_ppdAlfCorrCr = new Double*[ALF_MAX_NUM_COEF];
-    for (i = 0; i < ALF_MAX_NUM_COEF; i++)
-    {
-      m_ppdAlfCorrCr[i] = new Double[ALF_MAX_NUM_COEF+1];
-      for (j = 0; j < ALF_MAX_NUM_COEF+1; j++)
-      {
-        m_ppdAlfCorrCr[i][j] = 0;
-      }
-    }
-  }
-}
-
-Void TEncAdaptiveLoopFilter::xUninitParam()
-{
-  Int i;
-  
-  if (m_ppdAlfCorr != NULL)
-  {
-    for (i = 0; i < ALF_MAX_NUM_COEF; i++)
-    {
-      delete[] m_ppdAlfCorr[i];
-      m_ppdAlfCorr[i] = NULL;
-    }
-    delete[] m_ppdAlfCorr;
-    m_ppdAlfCorr = NULL;
-  }
-  
-  if (m_pdDoubleAlfCoeff != NULL)
-  {
-    delete[] m_pdDoubleAlfCoeff;
-    m_pdDoubleAlfCoeff = NULL;
-  }
-  if (m_ppdAlfCorrCb != NULL)
-  {
-    for (i = 0; i < ALF_MAX_NUM_COEF; i++)
-    {
-      delete[] m_ppdAlfCorrCb[i];
-      m_ppdAlfCorrCb[i] = NULL;
-    }
-    delete[] m_ppdAlfCorrCb;
-    m_ppdAlfCorrCb = NULL;
-  }
-  
-  if (m_ppdAlfCorrCr != NULL)
-  {
-    for (i = 0; i < ALF_MAX_NUM_COEF; i++)
-    {
-      delete[] m_ppdAlfCorrCr[i];
-      m_ppdAlfCorrCr[i] = NULL;
-    }
-    delete[] m_ppdAlfCorrCr;
-    m_ppdAlfCorrCr = NULL;
-  }
-}
-#endif
 Void TEncAdaptiveLoopFilter::xCreateTmpAlfCtrlFlags()
 {
@@ -3512 +3031 @@
 }
 
-#if !LCU_SYNTAX_ALF
-
-Void TEncAdaptiveLoopFilter::xCalcCorrelationFunc(Int ypos, Int xpos, Pel* pImgOrg, Pel* pImgPad, Int filtNo, Int iWidth, Int iHeight, Int iOrgStride, Int iCmpStride, Bool bSymmCopyBlockMatrix)
-{
-  Int     yposEnd = ypos + iHeight -1;
-  Int     xposEnd = xpos + iWidth  -1;
-  Int     N       = m_sqrFiltLengthTab[filtNo];
-
-  Int imgHeightChroma = m_img_height>>1;
-  Int yLineInLCU;
-  Int paddingline ;
-
-  Int ELocal[ALF_MAX_NUM_COEF];
-  Pel *pImgPad1, *pImgPad2, *pImgPad3, *pImgPad4;
-  Int i, j, k, l;
-  Int yLocal;
-
-  pImgPad += (ypos*iCmpStride);
-  pImgOrg += (ypos*iOrgStride);
-
-  switch(filtNo)
-  {
-#if !ALF_SINGLE_FILTER_SHAPE
-  case ALF_STAR5x5:
-    {
-      for (i= ypos; i<= yposEnd; i++)
-      {
-        yLineInLCU = i % m_lcuHeightChroma;
-
-        if (yLineInLCU < m_lineIdxPadBotChroma || i-yLineInLCU+m_lcuHeightChroma >= imgHeightChroma )
-        {
-          pImgPad1 = pImgPad +   iCmpStride;
-          pImgPad2 = pImgPad -   iCmpStride;
-          pImgPad3 = pImgPad + 2*iCmpStride;
-          pImgPad4 = pImgPad - 2*iCmpStride;
-        }
-        else if (yLineInLCU < m_lineIdxPadTopChroma)
-        {
-          paddingline = - yLineInLCU + m_lineIdxPadTopChroma - 1;
-          pImgPad1 = pImgPad + min(paddingline, 1)*iCmpStride;
-          pImgPad2 = pImgPad -   iCmpStride;
-          pImgPad3 = pImgPad + min(paddingline, 2)*iCmpStride;
-          pImgPad4 = pImgPad - 2*iCmpStride;
-        }
-        else
-        {
-          paddingline = yLineInLCU - m_lineIdxPadTopChroma ;
-          pImgPad1 = pImgPad +   iCmpStride;
-          pImgPad2 = pImgPad - min(paddingline, 1)*iCmpStride;
-          pImgPad3 = pImgPad + 2*iCmpStride;
-          pImgPad4 = pImgPad - min(paddingline, 2)*iCmpStride;
-        }
-
-        if ( (yLineInLCU == m_lineIdxPadTopChroma || yLineInLCU == m_lineIdxPadTopChroma-1) && i-yLineInLCU+m_lcuHeightChroma < imgHeightChroma ) 
-        {
-          pImgPad+= iCmpStride;
-          pImgOrg+= iOrgStride;
-          continue;
-        }
-        else
-        {
-        for (j= xpos; j<= xposEnd; j++)
-        {
-          memset(ELocal, 0, N*sizeof(Int));
-
-          ELocal[0] = (pImgPad3[j+2] + pImgPad4[j-2]);
-          ELocal[1] = (pImgPad3[j  ] + pImgPad4[j  ]);
-          ELocal[2] = (pImgPad3[j-2] + pImgPad4[j+2]);
-
-          ELocal[3] = (pImgPad1[j+1] + pImgPad2[j-1]);
-          ELocal[4] = (pImgPad1[j  ] + pImgPad2[j  ]);
-          ELocal[5] = (pImgPad1[j-1] + pImgPad2[j+1]);
-
-          ELocal[6] = (pImgPad[j+2] + pImgPad[j-2]);
-          ELocal[7] = (pImgPad[j+1] + pImgPad[j-1]);
-          ELocal[8] = (pImgPad[j  ]);
-
-          yLocal= (Int)pImgOrg[j];
-
-          for(k=0; k<N; k++)
-          {
-            m_ppdAlfCorr[k][k] += ELocal[k]*ELocal[k];
-            for(l=k+1; l<N; l++)
-            {
-              m_ppdAlfCorr[k][l] += ELocal[k]*ELocal[l];
-            }
-
-            m_ppdAlfCorr[k][N] += yLocal*ELocal[k];
-          }
-        }
-        pImgPad+= iCmpStride;
-        pImgOrg+= iOrgStride;
-      }
-
-      }
-    }
-    break;
-  case ALF_CROSS9x9:
-    {
-      Pel *pImgPad5, *pImgPad6, *pImgPad7, *pImgPad8;
-#else
-  case ALF_CROSS9x7_SQUARE3x3:
-    {
-      Pel *pImgPad5, *pImgPad6;
-#endif
-      for (i= ypos; i<= yposEnd; i++)
-      {
-        yLineInLCU = i % m_lcuHeightChroma;
-
-        if (yLineInLCU<2 && i> 2)
-        {
-          paddingline = yLineInLCU + 2 ;
-          pImgPad1 = pImgPad +   iCmpStride;
-          pImgPad2 = pImgPad -   iCmpStride;
-          pImgPad3 = pImgPad + 2*iCmpStride;
-          pImgPad4 = pImgPad - 2*iCmpStride;
-          pImgPad5 = (paddingline < 3) ? pImgPad : pImgPad + 3*iCmpStride;
-          pImgPad6 = (paddingline < 3) ? pImgPad : pImgPad - min(paddingline, 3)*iCmpStride;;
-#if !ALF_SINGLE_FILTER_SHAPE
-          pImgPad7 = (paddingline < 4) ? pImgPad : pImgPad + 4*iCmpStride;
-          pImgPad8 = (paddingline < 4) ? pImgPad : pImgPad - min(paddingline, 4)*iCmpStride;;      
-#endif
-        }
-        else if (yLineInLCU < m_lineIdxPadBotChroma || i-yLineInLCU+m_lcuHeightChroma >= imgHeightChroma )
-        {
-          pImgPad1 = pImgPad +   iCmpStride;
-          pImgPad2 = pImgPad -   iCmpStride;
-          pImgPad3 = pImgPad + 2*iCmpStride;
-          pImgPad4 = pImgPad - 2*iCmpStride;
-          pImgPad5 = pImgPad + 3*iCmpStride;
-          pImgPad6 = pImgPad - 3*iCmpStride;
-#if !ALF_SINGLE_FILTER_SHAPE
-          pImgPad7 = pImgPad + 4*iCmpStride;
-          pImgPad8 = pImgPad - 4*iCmpStride;
-#endif
-        }
-        else if (yLineInLCU < m_lineIdxPadTopChroma)
-        {
-          paddingline = - yLineInLCU + m_lineIdxPadTopChroma - 1;
-          pImgPad1 = (paddingline < 1) ? pImgPad : pImgPad + min(paddingline, 1)*iCmpStride;
-          pImgPad2 = (paddingline < 1) ? pImgPad : pImgPad -   iCmpStride;
-          pImgPad3 = (paddingline < 2) ? pImgPad : pImgPad + min(paddingline, 2)*iCmpStride;
-          pImgPad4 = (paddingline < 2) ? pImgPad : pImgPad - 2*iCmpStride;
-          pImgPad5 = (paddingline < 3) ? pImgPad : pImgPad + min(paddingline, 3)*iCmpStride;
-          pImgPad6 = (paddingline < 3) ? pImgPad : pImgPad - 3*iCmpStride;
-#if !ALF_SINGLE_FILTER_SHAPE
-          pImgPad7 = (paddingline < 4) ? pImgPad : pImgPad + min(paddingline, 4)*iCmpStride;
-          pImgPad8 = (paddingline < 4) ? pImgPad : pImgPad - 4*iCmpStride;
-#endif
-        }
-        else
-        {
-          paddingline = yLineInLCU - m_lineIdxPadTopChroma ;
-          pImgPad1 = (paddingline < 1) ? pImgPad : pImgPad +   iCmpStride;
-          pImgPad2 = (paddingline < 1) ? pImgPad : pImgPad - min(paddingline, 1)*iCmpStride;
-          pImgPad3 = (paddingline < 2) ? pImgPad : pImgPad + 2*iCmpStride;
-          pImgPad4 = (paddingline < 2) ? pImgPad : pImgPad - min(paddingline, 2)*iCmpStride;
-          pImgPad5 = (paddingline < 3) ? pImgPad : pImgPad + 3*iCmpStride;
-          pImgPad6 = (paddingline < 3) ? pImgPad : pImgPad - min(paddingline, 3)*iCmpStride;
-#if !ALF_SINGLE_FILTER_SHAPE
-          pImgPad7 = (paddingline < 4) ? pImgPad : pImgPad + 4*iCmpStride;
-          pImgPad8 = (paddingline < 4) ? pImgPad : pImgPad - min(paddingline, 4)*iCmpStride;
-#endif
-        }
-
-        for (j= xpos; j<= xposEnd; j++)
-        {
-          memset(ELocal, 0, N*sizeof(Int));
-#if ALF_SINGLE_FILTER_SHAPE
-          ELocal[0] = (pImgPad5[j]+pImgPad6[j]);
-          ELocal[1] = (pImgPad3[j]+pImgPad4[j]);
-          ELocal[2] = (pImgPad1[j-1]+pImgPad2[j+1]);
-          ELocal[3] = (pImgPad1[j]+pImgPad2[j]);
-          ELocal[4] = (pImgPad1[j+1]+pImgPad2[j-1]);
-          ELocal[5] = (pImgPad[j+4]+pImgPad[j-4]);
-          ELocal[6] = (pImgPad[j+3]+pImgPad[j-3]);
-          ELocal[7] = (pImgPad[j+2]+pImgPad[j-2]);
-          ELocal[8] = (pImgPad[j+1]+pImgPad[j-1]);
-          ELocal[9] = (pImgPad[j  ]);
-#else
-          ELocal[0] = (pImgPad7[j] + pImgPad8[j]);
-
-          ELocal[1] = (pImgPad5[j] + pImgPad6[j]);
-
-          ELocal[2] = (pImgPad3[j] + pImgPad4[j]);
-
-          ELocal[3] = (pImgPad1[j] + pImgPad2[j]);
-
-          ELocal[4] = (pImgPad[j+4] + pImgPad[j-4]);
-          ELocal[5] = (pImgPad[j+3] + pImgPad[j-3]);
-          ELocal[6] = (pImgPad[j+2] + pImgPad[j-2]);
-          ELocal[7] = (pImgPad[j+1] + pImgPad[j-1]);
-          ELocal[8] = (pImgPad[j  ] );
-#endif
-          yLocal= (Int)pImgOrg[j];
-
-          for(k=0; k<N; k++)
-          {
-            m_ppdAlfCorr[k][k] += ELocal[k]*ELocal[k];
-            for(l=k+1; l<N; l++)
-            {
-              m_ppdAlfCorr[k][l] += ELocal[k]*ELocal[l];
-            }
-
-            m_ppdAlfCorr[k][N] += yLocal*ELocal[k];
-          }
-        }
-        pImgPad+= iCmpStride;
-        pImgOrg+= iOrgStride;
-      }
-
-    }
-    break;
-  default:
-    {
-      printf("Not a supported filter shape\n");
-      assert(0);
-      exit(1);
-    }
-  }
-
-  if(bSymmCopyBlockMatrix)
-  {
-    for(j=0; j<N-1; j++)
-    {
-      for(i=j+1; i<N; i++)
-      {
-        m_ppdAlfCorr[i][j] = m_ppdAlfCorr[j][i];
-      }
-    }
-  }
-}
-
-#endif
 #if IBDI_DISTORTION
 #if HHI_INTERVIEW_SKIP
@@ -3946 +3231 @@
   Int    *nc;
   const Int    *pFiltMag;
-#if LCU_SYNTAX_ALF && LCUALF_QP_DEPENDENT_BITS
+#if LCUALF_QP_DEPENDENT_BITS
   Int alfPrecisionBit = getAlfPrecisionBit( m_alfQP );
 #endif
 
   N = m_sqrFiltLengthTab[tap];
-#if ALF_SINGLE_FILTER_SHAPE
   pFiltMag = weightsShape1Sym;
-#else
-  // star shape
-  if(tap == 0)
-  {
-    pFiltMag = weightsShape0Sym;
-  }
-  // cross shape
-  else
-  {
-    pFiltMag = weightsShape1Sym;
-  }
-#endif
 
   dh = new Double[N];
   nc = new Int[N];
   
-#if LCU_SYNTAX_ALF && LCUALF_QP_DEPENDENT_BITS  
+#if LCUALF_QP_DEPENDENT_BITS  
   max_value =   (1<<(1+alfPrecisionBit))-1;
   min_value = 0-(1<<(1+alfPrecisionBit));
@@ -3983 +3255 @@
     if(h[i]>=0.0)
     {
-#if LCU_SYNTAX_ALF && LCUALF_QP_DEPENDENT_BITS
+#if LCUALF_QP_DEPENDENT_BITS
       qh[i] =  (Int)( h[i]*(1<<alfPrecisionBit)+0.5);
 #else
@@ -3991 +3263 @@
     else
     {
-#if LCU_SYNTAX_ALF && LCUALF_QP_DEPENDENT_BITS
+#if LCUALF_QP_DEPENDENT_BITS
       qh[i] = -(Int)(-h[i]*(1<<alfPrecisionBit)+0.5);
 #else
@@ -3998 +3270 @@
     }
 
-#if LCU_SYNTAX_ALF && LCUALF_QP_DEPENDENT_BITS
+#if LCUALF_QP_DEPENDENT_BITS
     dh[i] = (Double)qh[i]/(Double)(1<<alfPrecisionBit) - h[i];
 #else
@@ -4010 +3282 @@
   
   // modification of quantized filter coefficients
-#if LCU_SYNTAX_ALF && LCUALF_QP_DEPENDENT_BITS
+#if LCUALF_QP_DEPENDENT_BITS
   total_gain = (Int)(dbl_total_gain*(1<<alfPrecisionBit)+0.5);
 #else
@@ -4082 +3354 @@
   nc = NULL;
 }
-#if !LCU_SYNTAX_ALF
-Void TEncAdaptiveLoopFilter::xClearFilterCoefInt(Int* qh, Int N)
-{
-  // clear
-  memset( qh, 0, sizeof( Int ) * N );
-  
-  // center pos
-  qh[N-1]  = 1<<ALF_NUM_BIT_SHIFT;
-}
-/** Calculate RD cost
- * \param [in] pAlfParam ALF parameters
- * \param [out] ruiRate coding bits
- * \param [in] uiDist distortion
- * \param [out] rdCost rate-distortion cost
- * \param [in] pvAlfCUCtrlParam ALF CU control parameters
- */
-Void TEncAdaptiveLoopFilter::xCalcRDCost(ALFParam* pAlfParam, UInt64& ruiRate, UInt64 uiDist, Double& rdCost, std::vector<AlfCUCtrlInfo>* pvAlfCUCtrlParam)
-{
-  if(pAlfParam != NULL)
-  {
-    m_pcEntropyCoder->resetEntropy();
-    m_pcEntropyCoder->resetBits();
-    m_pcEntropyCoder->encodeAlfParam(pAlfParam);
-
-    ruiRate = m_pcEntropyCoder->getNumberOfWrittenBits();
-
-    if(pvAlfCUCtrlParam != NULL)
-    {
-      for(UInt s=0; s< m_uiNumSlicesInPic; s++)
-      {
-        if(!m_pcPic->getValidSlice(s))
-        {
-          continue;
-        }
-        m_pcEntropyCoder->resetEntropy();
-        m_pcEntropyCoder->resetBits();
-        m_pcEntropyCoder->encodeAlfCtrlParam( (*pvAlfCUCtrlParam)[s], m_uiNumCUsInFrame);
-        ruiRate += m_pcEntropyCoder->getNumberOfWrittenBits();
-      }
-    }
-    else
-    {
-      ruiRate += m_uiNumSlicesInPic;
-    }
-  }
-  else
-  {
-    ruiRate = 1;
-  }
-  
-  rdCost      = (Double)(ruiRate) * m_dLambdaLuma + (Double)(uiDist);
-}
-
-/** Calculate RD cost
- * \param [in] pcPicOrg original picture buffer
- * \param [in] pcPicCmp compared picture buffer
- * \param [in] pAlfParam ALF parameters
- * \param [out] ruiRate coding bits
- * \param [out] ruiDist distortion
- * \param [out] rdCost rate-distortion cost
- * \param [in] pvAlfCUCtrlParam ALF CU control parameters
- */
-#if HHI_INTERVIEW_SKIP
-Void TEncAdaptiveLoopFilter::xCalcRDCost(TComPicYuv* pcPicOrg, TComPicYuv* pcPicCmp, TComPicYuv* pcUsedPelMap, ALFParam* pAlfParam, UInt64& ruiRate, UInt64& ruiDist, Double& rdCost, std::vector<AlfCUCtrlInfo>* pvAlfCUCtrlParam)
-#else
-Void TEncAdaptiveLoopFilter::xCalcRDCost(TComPicYuv* pcPicOrg, TComPicYuv* pcPicCmp, ALFParam* pAlfParam, UInt64& ruiRate, UInt64& ruiDist, Double& rdCost, std::vector<AlfCUCtrlInfo>* pvAlfCUCtrlParam)
-#endif
-{
-  if(pAlfParam != NULL)
-  {
-    m_pcEntropyCoder->resetEntropy();
-    m_pcEntropyCoder->resetBits();
-    m_pcEntropyCoder->encodeAlfParam(pAlfParam);
-    
-    ruiRate = m_pcEntropyCoder->getNumberOfWrittenBits();
-
-    if(pvAlfCUCtrlParam != NULL)
-    {
-      for(UInt s=0; s< m_uiNumSlicesInPic; s++)
-      {
-        if(! m_pcPic->getValidSlice(s))
-        {
-          continue;
-        }
-        m_pcEntropyCoder->resetEntropy();
-        m_pcEntropyCoder->resetBits();
-        m_pcEntropyCoder->encodeAlfCtrlParam( (*pvAlfCUCtrlParam)[s], m_uiNumCUsInFrame);
-        ruiRate += m_pcEntropyCoder->getNumberOfWrittenBits();
-      }
-
-    }
-    else
-    {
-      ruiRate += m_uiNumSlicesInPic;
-    }
-  }
-  else
-  {
-    ruiRate = 1;
-  }
-  
-  ruiDist     = xCalcSSD(pcPicOrg->getLumaAddr(), pcPicCmp->getLumaAddr(), pcPicOrg->getWidth(), pcPicOrg->getHeight(), pcPicOrg->getStride());
-  rdCost      = (Double)(ruiRate) * m_dLambdaLuma + (Double)(ruiDist);
-}
-/** Calculate RD cost for chroma ALF
- * \param pcPicOrg original picture buffer
- * \param pcPicCmp compared picture buffer
- * \param pAlfParam ALF parameters
- * \returns ruiRate bitrate
- * \returns uiDist distortion
- * \returns rdCost RD cost
- */
-Void TEncAdaptiveLoopFilter::xCalcRDCostChroma(TComPicYuv* pcPicOrg, TComPicYuv* pcPicCmp, ALFParam* pAlfParam, UInt64& ruiRate, UInt64& ruiDist, Double& rdCost)
-{
-  if(pAlfParam->chroma_idc)
-  {
-    ruiRate = xCalcRateChroma(pAlfParam);
-  }
-  ruiDist = 0;
-  ruiDist += xCalcSSD(pcPicOrg->getCbAddr(), pcPicCmp->getCbAddr(), (pcPicOrg->getWidth()>>1), (pcPicOrg->getHeight()>>1), pcPicOrg->getCStride());
-  ruiDist += xCalcSSD(pcPicOrg->getCrAddr(), pcPicCmp->getCrAddr(), (pcPicOrg->getWidth()>>1), (pcPicOrg->getHeight()>>1), pcPicOrg->getCStride());
-  rdCost  = (Double)(ruiRate) * m_dLambdaChroma + (Double)(ruiDist);
-}
-
-Void TEncAdaptiveLoopFilter::xFilteringFrameChroma(ALFParam* pcAlfParam, TComPicYuv* pcPicOrg, TComPicYuv* pcPicDec, TComPicYuv* pcPicRest)
-{
-  Int filtNo = pcAlfParam->filter_shape_chroma;
-  Int *coeff = pcAlfParam->coeff_chroma;
-  Int iChromaFormatShift = 1; //4:2:0
-
-  if ((pcAlfParam->chroma_idc>>1)&0x01)
-  {
-    if(!m_bUseNonCrossALF)
-    {
-      Int iStride   = pcPicRest->getCStride();
-      Pel* pDec  = pcPicDec->getCbAddr();
-      Pel* pRest = pcPicRest->getCbAddr();
-
-      filterChroma(pRest, pDec, iStride, 0, (Int)(m_img_height>>1) -1, 0, (Int)(m_img_width>>1)-1, filtNo,  coeff);
-    }
-    else
-    {
-      xFilterChromaSlices(ALF_Cb, pcPicDec, pcPicRest, coeff, filtNo, iChromaFormatShift);
-    }
-  }
-  if ((pcAlfParam->chroma_idc)&0x01)
-  {
-    if(!m_bUseNonCrossALF)
-    {
-      Int iStride   = pcPicRest->getCStride();
-      Pel* pDec  = pcPicDec->getCrAddr();
-      Pel* pRest = pcPicRest->getCrAddr();
-
-      filterChroma(pRest, pDec, iStride, 0, (Int)(m_img_height>>1) -1, 0, (Int)(m_img_width>>1)-1, filtNo,  coeff);
-    }
-    else
-    {
-      xFilterChromaSlices(ALF_Cr, pcPicDec, pcPicRest, coeff, filtNo, iChromaFormatShift);
-    }
-  }
-
-  if(pcAlfParam->chroma_idc<3)
-  {
-    if(pcAlfParam->chroma_idc==1)
-    {
-      pcPicDec->copyToPicCb(pcPicRest);
-    }
-    if(pcAlfParam->chroma_idc==2)
-    {
-      pcPicDec->copyToPicCr(pcPicRest);
-    }
-  }
-
-}
-#endif
-#if LCU_SYNTAX_ALF 
 /** Restore the not-filtered pixels
  * \param [in] imgDec picture buffer before filtering
@@ -4264 +3360 @@
  */
 Void TEncAdaptiveLoopFilter::xCopyDecToRestCUs(Pel* imgDec, Pel* imgRest, Int stride)
-#else
-/** Restore the not-filtered pixels
- * \param pcPicDec picture buffer before filtering
- * \param pcPicRest picture buffer after filtering
- */
-Void TEncAdaptiveLoopFilter::xCopyDecToRestCUs(TComPicYuv* pcPicDec, TComPicYuv* pcPicRest)
-#endif
 {
 
   if(m_uiNumSlicesInPic > 1)
   {
-#if LCU_SYNTAX_ALF
     Pel* pPicDecLuma  = imgDec;
     Pel* pPicRestLuma = imgRest;
-#else
-    Pel* pPicDecLuma  = pcPicDec->getLumaAddr();
-    Pel* pPicRestLuma = pcPicRest->getLumaAddr();
-    Int  stride       = pcPicDec->getStride();
-#endif
     UInt SUWidth      = m_pcPic->getMinCUWidth();
     UInt SUHeight     = m_pcPic->getMinCUHeight();
@@ -4335 +3418 @@
   {
     TComDataCU* pcCU = m_pcPic->getCU( uiCUAddr );
-#if LCU_SYNTAX_ALF
     xCopyDecToRestCU(pcCU, 0, 0, imgDec, imgRest, stride);
-#else 
-    xCopyDecToRestCU(pcCU, 0, 0, pcPicDec, pcPicRest);
-#endif
-  }
-}
-
-#if LCU_SYNTAX_ALF
+  }
+}
+
 Void TEncAdaptiveLoopFilter::xCopyDecToRestCU(TComDataCU* pcCU, UInt uiAbsPartIdx, UInt uiDepth, Pel* imgDec, Pel* imgRest, Int stride)
-#else
-Void TEncAdaptiveLoopFilter::xCopyDecToRestCU(TComDataCU* pcCU, UInt uiAbsPartIdx, UInt uiDepth, TComPicYuv* pcPicDec, TComPicYuv* pcPicRest)
-#endif
 {
   Bool bBoundary = false;
@@ -4369 +3444 @@
       
       if( ( uiLPelX < pcCU->getSlice()->getSPS()->getPicWidthInLumaSamples() ) && ( uiTPelY < pcCU->getSlice()->getSPS()->getPicHeightInLumaSamples() ) )      
-#if LCU_SYNTAX_ALF
         xCopyDecToRestCU(pcCU, uiAbsPartIdx, uiDepth+1, imgDec, imgRest, stride);
-#else
-        xCopyDecToRestCU(pcCU, uiAbsPartIdx, uiDepth+1, pcPicDec, pcPicRest);
-#endif
     }
     return;
@@ -4380 +3451 @@
   if (!pcCU->getAlfCtrlFlag(uiAbsPartIdx))
   {
-#if !LCU_SYNTAX_ALF
-    UInt uiCUAddr = pcCU->getAddr();
-#endif    
     Int iWidth = pcCU->getWidth(uiAbsPartIdx);
     Int iHeight = pcCU->getHeight(uiAbsPartIdx);
-#if LCU_SYNTAX_ALF
     copyPixelsInOneRegion(imgRest, imgDec, stride, (Int)uiTPelY, iHeight, (Int)uiLPelX, iWidth);
-#else
-    Pel* pRec = pcPicDec->getLumaAddr(uiCUAddr, uiAbsPartIdx);
-    Pel* pFilt = pcPicRest->getLumaAddr(uiCUAddr, uiAbsPartIdx);
-    
-    Int iRecStride = pcPicDec->getStride();
-    Int iFiltStride = pcPicRest->getStride();
-    
-    for (Int y = 0; y < iHeight; y++)
-    {
-      for (Int x = 0; x < iWidth; x++)
-      {
-        pFilt[x] = pRec[x];
-      }
-      pRec += iRecStride;
-      pFilt += iFiltStride;
-    }
-#endif
   }
 }
@@ -4426 +3476 @@
 Void TEncAdaptiveLoopFilter::predictALFCoeffLumaEnc(ALFParam* pcAlfParam, Int **pfilterCoeffSym, Int filter_shape)
 {
-#if LCU_SYNTAX_ALF && LCUALF_QP_DEPENDENT_BITS
+#if LCUALF_QP_DEPENDENT_BITS
   Int alfPrecisionBit = getAlfPrecisionBit( m_alfQP );
 #endif
@@ -4442 +3492 @@
     if((pcAlfParam->predMethod==0)|(ind==0))
     {
-#if LCU_SYNTAX_ALF && LCUALF_QP_DEPENDENT_BITS
+#if LCUALF_QP_DEPENDENT_BITS
       coeffPred = ((1<<alfPrecisionBit)-sum) >> 2;
 #else
@@ -4465 +3515 @@
     if((pcAlfParam->predMethod==0)|(ind==0))
     {
-#if LCU_SYNTAX_ALF && LCUALF_QP_DEPENDENT_BITS
+#if LCUALF_QP_DEPENDENT_BITS
       coeffPred = (1<<alfPrecisionBit)-sum;
 #else
@@ -4600 +3650 @@
     *pDepthInt=NULL, kMinTab[MAX_SCAN_VAL], bitsCoeffScan[MAX_SCAN_VAL][MAX_EXP_GOLOMB],
   minKStart, minBitsKStart, bitsKStart;
-#if ALF_SINGLE_FILTER_SHAPE
   Int minScanVal = MIN_SCAN_POS_CROSS;
-#else  
-  int minScanVal = (fl==ALF_STAR5x5) ? 0 : MIN_SCAN_POS_CROSS;
-#endif
   pDepthInt = pDepthIntTabShapes[fl];
   
@@ -4672 +3718 @@
   // Coding parameters
   //  len += lengthFilterCodingParams(minKStart, maxScanVal, kMinTab, createBitstream);
-#if LCU_SYNTAX_ALF
   if (filters_per_group == 1)
   {
@@ -4680 +3725 @@
   else
   {
-#endif
   len += (3 + maxScanVal);
   
@@ -4686 +3730 @@
   len += lengthFilterCoeffs(sqrFiltLength, filters_per_group, pDepthInt, pDiffQFilterCoeffIntPP, 
                             kMinTab, createBitstream);
-#if LCU_SYNTAX_ALF
-  }
-#endif
+  }
 
   return len;
@@ -4735 +3777 @@
     {
       scanPos = pDepthInt[i] - 1;
-#if LCU_SYNTAX_ALF
       Int k = (filters_per_group == 1) ? kMinTab[i] : kMinTab[scanPos];
       bit_cnt += lengthGolomb(abs(FilterCoeff[ind][i]), k);
-#else
-      bit_cnt += lengthGolomb(abs(FilterCoeff[ind][i]), kMinTab[scanPos]);
-#endif
     }
   }
@@ -4746 +3784 @@
 }
 
-#if !LCU_SYNTAX_ALF
-
-Void   TEncAdaptiveLoopFilter::xEncALFLuma ( TComPicYuv* pcPicOrg, TComPicYuv* pcPicDec, TComPicYuv* pcPicRest, UInt64& ruiMinRate, UInt64& ruiMinDist, Double& rdMinCost )
-{
-  //pcPicDec: extended decoded
-  //pcPicRest: original decoded: filtered signal will be stored
-
-  UInt64  uiRate;
-  UInt64  uiDist;
-  Double dCost;
-  Int    LumaStride = pcPicOrg->getStride();
-  Pel* pOrg  = pcPicOrg->getLumaAddr();
-  Pel* pRest = pcPicRest->getLumaAddr();
-  Pel* pDec  = pcPicDec->getLumaAddr();
-
-  Double    dMinMethodCost  = MAX_DOUBLE;
-  UInt64    uiMinMethodDist = MAX_UINT;
-  UInt64    uiMinMethodRate = MAX_UINT;
-  Int       iBestClassMethod = ALF_RA;
-  Double    adExtraCostReduction[NUM_ALF_CLASS_METHOD];
-  ALFParam  cFrmAlfParam        [NUM_ALF_CLASS_METHOD];
-  ALFParam* pcAlfParam = NULL;
-
-  for(Int i=0; i< NUM_ALF_CLASS_METHOD; i++)
-  {
-    pcAlfParam = &(cFrmAlfParam[i]);
-    allocALFParam(pcAlfParam);
-
-    pcAlfParam->alf_flag        = 1;
-    pcAlfParam->chroma_idc      = 0;
-
-    switch(i)
-    {
-    case ALF_RA:
-      {
-        adExtraCostReduction[i] = (double)(m_img_height * m_img_width) * m_dLambdaLuma * 2.0 / 4096.0;
-      }
-      break;
-    case ALF_BA:
-      {
-        adExtraCostReduction[i] = 0.0;
-      }
-      break;
-    default:
-      {
-        printf("Not a support adaptation method\n");
-        assert(0);
-        exit(-1);
-      }
-    }
-  }
-
-
-  for(Int i=0; i< NUM_ALF_CLASS_METHOD; i++)
-  {
-    m_uiVarGenMethod = i;
-
-    pcAlfParam       = &(cFrmAlfParam[m_uiVarGenMethod]);
-    m_varImg         = m_varImgMethods[m_uiVarGenMethod];
-
-    pcAlfParam->alf_pcr_region_flag = m_uiVarGenMethod;
-
-    setInitialMask(pcPicOrg, pcPicDec);
-
-    if(m_iALFEncodePassReduction == 0)
-    {
-      static Int best_filter_shape = 0;
-      if (m_uiVarGenMethod == 0)
-      {
-        UInt64 MinRate_Shape0 = MAX_INT;
-        UInt64 MinDist_Shape0 = MAX_INT;
-        Double MinCost_Shape0 = MAX_DOUBLE;
-
-        UInt64 MinRate_Shape1 = MAX_INT;
-        UInt64 MinDist_Shape1 = MAX_INT;
-        Double MinCost_Shape1 = MAX_DOUBLE;
-
-#if ALF_SINGLE_FILTER_SHAPE
-        Int filter_shape = 0;
-#else        
-        for (Int filter_shape = 0; filter_shape < 2 ;filter_shape ++)
-#endif 
-        {
-          pcAlfParam->filter_shape = filter_shape;
-          pcAlfParam->num_coeff = m_pcTempAlfParam->num_coeff = m_sqrFiltLengthTab[filter_shape];
-          xFirstFilteringFrameLuma(pOrg, pDec, m_pcPicYuvTmp->getLumaAddr(), pcAlfParam, pcAlfParam->filter_shape, LumaStride);
-          xCalcRDCost(pcPicOrg, m_pcPicYuvTmp, pcAlfParam, uiRate, uiDist, dCost);
-          if (filter_shape == 0)
-          {
-            // copy Shape0
-            MinRate_Shape0 = uiRate;
-            MinDist_Shape0 = uiDist;
-            MinCost_Shape0 = dCost;
-            m_pcPicYuvTmp->copyToPicLuma(pcPicYuvRecShape0);
-            copyALFParam(pcAlfParamShape0, pcAlfParam);
-          }
-          else //if (filter_shape == 1)
-          {
-            // copy Shape1
-            MinRate_Shape1 = uiRate;
-            MinDist_Shape1 = uiDist;
-            MinCost_Shape1  = dCost;
-            m_pcPicYuvTmp->copyToPicLuma(pcPicYuvRecShape1);
-            copyALFParam(pcAlfParamShape1, pcAlfParam);
-          }
-        }
-
-        if (MinCost_Shape0 <= MinCost_Shape1)
-        {
-          pcPicYuvRecShape0->copyToPicLuma(m_pcPicYuvTmp);
-          copyALFParam(pcAlfParam, pcAlfParamShape0);
-          uiRate = MinRate_Shape0;
-          uiDist = MinDist_Shape0;
-          dCost = MinCost_Shape0;
-          best_filter_shape = 0;
-        }
-        else //if (MinCost_Shape1 < MinCost_Shape0)
-        {
-          pcPicYuvRecShape1->copyToPicLuma(m_pcPicYuvTmp);
-          copyALFParam(pcAlfParam, pcAlfParamShape1);
-          uiRate = MinRate_Shape1;
-          uiDist = MinDist_Shape1;
-          dCost = MinCost_Shape1;
-          best_filter_shape = 1;
-        }
-      }
-      else
-      {
-        pcAlfParam->filter_shape = best_filter_shape;
-        pcAlfParam->num_coeff = m_pcTempAlfParam->num_coeff = m_sqrFiltLengthTab[best_filter_shape];
-        xFirstFilteringFrameLuma(pOrg, pDec, m_pcPicYuvTmp->getLumaAddr(), pcAlfParam, best_filter_shape, LumaStride);
-        xCalcRDCost(pcPicOrg, m_pcPicYuvTmp, pcAlfParam, uiRate, uiDist, dCost);
-      }
-    }
-    else
-    {
-      decideFilterShapeLuma(pOrg, pDec, LumaStride, pcAlfParam, uiRate, uiDist, dCost);
-    }
-
-    dCost -= adExtraCostReduction[m_uiVarGenMethod];
-
-    if(dCost < dMinMethodCost)
-    {
-      iBestClassMethod = m_uiVarGenMethod;
-      dMinMethodCost = dCost;
-      uiMinMethodRate= uiRate;
-      uiMinMethodDist = uiDist;
-
-      if(m_iALFEncodePassReduction == 0)
-      {
-        m_pcPicYuvTmp->copyToPicLuma(pcPicRest);
-      }
-    }  
-  }
-
-  m_uiVarGenMethod = iBestClassMethod;
-  dMinMethodCost += adExtraCostReduction[m_uiVarGenMethod];
-  m_varImg= m_varImgMethods[m_uiVarGenMethod];
-
-  pcAlfParam = &(cFrmAlfParam[m_uiVarGenMethod]);
-
-  ALFParam  cAlfParamWithBestMethod;
-  allocALFParam(&cAlfParamWithBestMethod);  
-
-
-  if(m_iALFEncodePassReduction ==0)
-  {
-    copyALFParam(&cAlfParamWithBestMethod, pcAlfParam); 
-  }
-  else
-  {
-    cAlfParamWithBestMethod.alf_flag = 1;
-    cAlfParamWithBestMethod.chroma_idc = 0;
-    cAlfParamWithBestMethod.alf_pcr_region_flag = m_uiVarGenMethod;
-    cAlfParamWithBestMethod.filter_shape= pcAlfParam->filter_shape;
-    cAlfParamWithBestMethod.num_coeff = m_sqrFiltLengthTab[cAlfParamWithBestMethod.filter_shape]; 
-    decodeFilterSet(pcAlfParam, m_varIndTab, m_filterCoeffSym);
-    if(!m_bUseNonCrossALF)
-    {
-      filterLuma(pRest, pDec, LumaStride, 0, m_img_height-1, 0, m_img_width-1,  pcAlfParam->filter_shape, m_filterCoeffSym, m_varIndTab, m_varImg);
-    }
-    else
-    {
-      xfilterSlicesEncoder(pDec, pRest, LumaStride, pcAlfParam->filter_shape, m_filterCoeffSym, m_varIndTab, m_varImg);
-    }
-    xcodeFiltCoeff(m_filterCoeffSym, pcAlfParam->filter_shape, m_varIndTab, pcAlfParam->filters_per_group,&cAlfParamWithBestMethod);
-
-    xCalcRDCost(pcPicOrg, pcPicRest, &cAlfParamWithBestMethod, uiMinMethodRate, uiMinMethodDist, dMinMethodCost);
-
-  }
-
-  if(dMinMethodCost < rdMinCost )
-  {
-    ruiMinRate = uiMinMethodRate;
-    ruiMinDist = uiMinMethodDist;
-    rdMinCost =  dMinMethodCost;
-    copyALFParam(m_pcBestAlfParam, &cAlfParamWithBestMethod); 
-  }
-
-  freeALFParam(&cAlfParamWithBestMethod);
-  for(Int i=0; i< NUM_ALF_CLASS_METHOD; i++)
-  {
-    freeALFParam(&cFrmAlfParam[i]);
-  }
-}
-
-
-
-Void   TEncAdaptiveLoopFilter::xFirstFilteringFrameLuma(Pel* imgOrg, Pel* imgDec, Pel* imgRest, ALFParam* ALFp, Int filtNo, Int stride)
-{
-  if(!m_bUseNonCrossALF)
-  {
-    xstoreInBlockMatrix(0, 0, m_img_height, m_img_width, true, true, imgOrg, imgDec, filtNo, stride);
-  }
-  else
-  {
-    xstoreInBlockMatrixforSlices(imgOrg, imgDec, filtNo, stride);
-  }
-
-
-  xFilteringFrameLuma(imgOrg, imgDec, imgRest, ALFp, filtNo, stride);
-}
-
-Void   TEncAdaptiveLoopFilter::xstoreInBlockMatrix(Int ypos, Int xpos, Int iheight, Int iwidth, Bool bResetBlockMatrix, Bool bSymmCopyBlockMatrix, Pel* pImgOrg, Pel* pImgPad, Int filtNo, Int stride)
-{
-
-  Pel  regionOfInterested = (m_iDesignCurrentFilter ==1)?(1):(0);
-  Int     sqrFiltLength      = (filtNo == 2)?((Int)(MAX_SQR_FILT_LENGTH)):(m_sqrFiltLengthTab[filtNo]);
-  Int     yposEnd            = ypos + iheight -1;
-  Int     xposEnd            = xpos + iwidth  -1;
-  Double ***EShape           = m_EGlobalSym[filtNo];
-  Double **yShape            = m_yGlobalSym[filtNo];
-
-  Int ELocal[MAX_SQR_FILT_LENGTH];
-  Pel *pImgPad1, *pImgPad2, *pImgPad3, *pImgPad4;
-  Int i,j,k,l,varInd, yLocal;
-  double **E,*yy;
-
-  static Int numValidPels;
-  if(bResetBlockMatrix)
-  {
-    numValidPels = 0;
-    memset( m_pixAcc, 0,sizeof(double)*NO_VAR_BINS);
-    for (varInd=0; varInd<NO_VAR_BINS; varInd++)
-    {
-      memset(yShape[varInd],0,sizeof(double)*MAX_SQR_FILT_LENGTH);
-      for (k=0; k<sqrFiltLength; k++)
-      {
-        memset(EShape[varInd][k],0,sizeof(double)*MAX_SQR_FILT_LENGTH);
-      }
-    }
-    for (i = 0; i < m_img_height; i++)
-    {
-      for (j = 0; j < m_img_width; j++)
-      {
-        if (m_maskImg[i][j] == regionOfInterested)
-        {
-          numValidPels++;
-        }
-      }
-    }
-  }
-
-  Int yLineInLCU;
-  Int paddingLine ;
-
-  pImgPad += (ypos* stride);
-  pImgOrg += (ypos* stride);
-
-  switch(filtNo)
-  {
-#if !ALF_SINGLE_FILTER_SHAPE
-  case ALF_STAR5x5:
-    {
-      for (i= ypos; i<= yposEnd; i++)
-      {
-        yLineInLCU = i % m_lcuHeight;
-
-        if (yLineInLCU < m_lineIdxPadBot || i-yLineInLCU+m_lcuHeight >= m_img_height )
-        {
-          pImgPad1 = pImgPad +   stride;
-          pImgPad2 = pImgPad -   stride;
-          pImgPad3 = pImgPad + 2*stride;
-          pImgPad4 = pImgPad - 2*stride;
-        }
-        else if (yLineInLCU < m_lineIdxPadTop)
-        {
-          paddingLine = - yLineInLCU + m_lineIdxPadTop - 1;
-          pImgPad1 = pImgPad + min(paddingLine, 1)*stride;
-          pImgPad2 = pImgPad -   stride;
-          pImgPad3 = pImgPad + min(paddingLine, 2)*stride;
-          pImgPad4 = pImgPad - 2*stride;
-        }
-        else
-        {
-          paddingLine = yLineInLCU - m_lineIdxPadTop;
-          pImgPad1 = pImgPad +   stride;
-          pImgPad2 = pImgPad - min(paddingLine, 1)*stride;
-          pImgPad3 = pImgPad + 2*stride;
-          pImgPad4 = pImgPad - min(paddingLine, 2)*stride;
-        }
-
-        if ( (yLineInLCU == m_lineIdxPadTop || yLineInLCU == m_lineIdxPadTop-1) && i-yLineInLCU+m_lcuHeight < m_img_height ) 
-        {
-          pImgPad+= stride;
-          pImgOrg+= stride;
-          continue;
-        }
-        else
-        {
-        for (j= xpos; j<= xposEnd; j++)
-        {
-          if ( (m_maskImg[i][j] == regionOfInterested) || (numValidPels == 0) )
-          {
-            varInd = m_varImg[i/VAR_SIZE_H][j/VAR_SIZE_W];
-            memset(ELocal, 0, 10*sizeof(Int));
-
-            ELocal[0] = (pImgPad3[j+2] + pImgPad4[j-2]);
-            ELocal[1] = (pImgPad3[j  ] + pImgPad4[j  ]);
-            ELocal[2] = (pImgPad3[j-2] + pImgPad4[j+2]);
-
-            ELocal[3] = (pImgPad1[j+1] + pImgPad2[j-1]);
-            ELocal[4] = (pImgPad1[j  ] + pImgPad2[j  ]);
-            ELocal[5] = (pImgPad1[j-1] + pImgPad2[j+1]);
-
-            ELocal[6] = (pImgPad[j+2] + pImgPad[j-2]);
-            ELocal[7] = (pImgPad[j+1] + pImgPad[j-1]);
-            ELocal[8] = (pImgPad[j  ]);
-
-            yLocal= pImgOrg[j];
-            m_pixAcc[varInd]+=(yLocal*yLocal);
-            E= EShape[varInd];  
-            yy= yShape[varInd];
-
-            for (k=0; k<10; k++)
-            {
-              for (l=k; l<10; l++)
-              {
-                E[k][l]+=(double)(ELocal[k]*ELocal[l]);
-              }
-              yy[k]+=(double)(ELocal[k]*yLocal);
-            }
-
-          }
-        }
-        pImgPad+= stride;
-        pImgOrg+= stride;
-        }
-      }
-    }
-    break;
-  case ALF_CROSS9x9: 
-    {
-      Pel *pImgPad5, *pImgPad6, *pImgPad7, *pImgPad8;
-#else
-  case ALF_CROSS9x7_SQUARE3x3:
-    {
-      Pel *pImgPad5, *pImgPad6;
-#endif
-      for (i= ypos; i<= yposEnd; i++)
-      {
-        yLineInLCU = i % m_lcuHeight;
-
-        if (yLineInLCU<m_lineIdxPadBot || i-yLineInLCU+m_lcuHeight >= m_img_height)
-        {
-          pImgPad1 = pImgPad +   stride;
-          pImgPad2 = pImgPad -   stride;
-          pImgPad3 = pImgPad + 2*stride;
-          pImgPad4 = pImgPad - 2*stride;
-          pImgPad5 = pImgPad + 3*stride;
-          pImgPad6 = pImgPad - 3*stride;
-#if !ALF_SINGLE_FILTER_SHAPE
-          pImgPad7 = pImgPad + 4*stride;
-          pImgPad8 = pImgPad - 4*stride;
-#endif
-        }
-        else if (yLineInLCU<m_lineIdxPadTop)
-        {
-          paddingLine = - yLineInLCU + m_lineIdxPadTop - 1;
-          pImgPad1 = (paddingLine < 1) ? pImgPad : pImgPad + min(paddingLine, 1)*stride;
-          pImgPad2 = (paddingLine < 1) ? pImgPad : pImgPad -   stride;
-          pImgPad3 = (paddingLine < 2) ? pImgPad : pImgPad + min(paddingLine, 2)*stride;
-          pImgPad4 = (paddingLine < 2) ? pImgPad : pImgPad - 2*stride;
-          pImgPad5 = (paddingLine < 3) ? pImgPad : pImgPad + min(paddingLine, 3)*stride;
-          pImgPad6 = (paddingLine < 3) ? pImgPad : pImgPad - 3*stride;
-#if !ALF_SINGLE_FILTER_SHAPE
-          pImgPad7 = (paddingLine < 4) ? pImgPad : pImgPad + min(paddingLine, 4)*stride;
-          pImgPad8 = (paddingLine < 4) ? pImgPad : pImgPad - 4*stride;
-#endif
-        }
-        else
-        {
-          paddingLine = yLineInLCU - m_lineIdxPadTop;
-          pImgPad1 = (paddingLine < 1) ? pImgPad : pImgPad +   stride;
-          pImgPad2 = (paddingLine < 1) ? pImgPad : pImgPad - min(paddingLine, 1)*stride;
-          pImgPad3 = (paddingLine < 2) ? pImgPad : pImgPad + 2*stride;
-          pImgPad4 = (paddingLine < 2) ? pImgPad : pImgPad - min(paddingLine, 2)*stride;
-          pImgPad5 = (paddingLine < 3) ? pImgPad : pImgPad + 3*stride;
-          pImgPad6 = (paddingLine < 3) ? pImgPad : pImgPad - min(paddingLine, 3)*stride;
-#if !ALF_SINGLE_FILTER_SHAPE
-          pImgPad7 = (paddingLine < 4) ? pImgPad : pImgPad + 4*stride;
-          pImgPad8 = (paddingLine < 4) ? pImgPad : pImgPad - min(paddingLine, 4)*stride;
-#endif
-        }         
-
-        for (j= xpos; j<= xposEnd; j++)
-        {
-          if ( (m_maskImg[i][j] == regionOfInterested) || (numValidPels == 0) )
-          {
-            varInd = m_varImg[i/VAR_SIZE_H][j/VAR_SIZE_W];
-
-#if ALF_SINGLE_FILTER_SHAPE
-            memset(ELocal, 0, (sqrFiltLength+1)*sizeof(Int));
-
-            ELocal[0] = (pImgPad5[j]+pImgPad6[j]);
-            ELocal[1] = (pImgPad3[j]+pImgPad4[j]);
-            ELocal[2] = (pImgPad1[j-1]+pImgPad2[j+1]);
-            ELocal[3] = (pImgPad1[j]+pImgPad2[j]);
-            ELocal[4] = (pImgPad1[j+1]+pImgPad2[j-1]);
-            ELocal[5] = (pImgPad[j+4]+pImgPad[j-4]);
-            ELocal[6] = (pImgPad[j+3]+pImgPad[j-3]);
-            ELocal[7] = (pImgPad[j+2]+pImgPad[j-2]);
-            ELocal[8] = (pImgPad[j+1]+pImgPad[j-1]);
-            ELocal[9] = (pImgPad[j  ]);
-#else
-            memset(ELocal, 0, 10*sizeof(Int));
-
-            ELocal[0] = (pImgPad7[j] + pImgPad8[j]);
-
-            ELocal[1] = (pImgPad5[j] + pImgPad6[j]);
-
-            ELocal[2] = (pImgPad3[j] + pImgPad4[j]);
-
-            ELocal[3] = (pImgPad1[j] + pImgPad2[j]);
-
-            ELocal[4] = (pImgPad[j+4] + pImgPad[j-4]);
-            ELocal[5] = (pImgPad[j+3] + pImgPad[j-3]);
-            ELocal[6] = (pImgPad[j+2] + pImgPad[j-2]);
-            ELocal[7] = (pImgPad[j+1] + pImgPad[j-1]);
-            ELocal[8] = (pImgPad[j  ] );
-#endif
-            yLocal= pImgOrg[j];
-            m_pixAcc[varInd]+=(yLocal*yLocal);
-            E= EShape[varInd];
-            yy= yShape[varInd];
-
-#if ALF_SINGLE_FILTER_SHAPE
-            for (k=0; k<(sqrFiltLength+1); k++)
-            {
-              for (l=k; l<(sqrFiltLength+1); l++)
-              {
-                E[k][l]+=(double)(ELocal[k]*ELocal[l]);
-              }
-              yy[k]+=(double)(ELocal[k]*yLocal);
-            }
-#else
-            for (k=0; k<10; k++)
-            {
-              for (l=k; l<10; l++)
-              {
-                E[k][l]+=(double)(ELocal[k]*ELocal[l]);
-              }
-              yy[k]+=(double)(ELocal[k]*yLocal);
-            }
-#endif
-          }
-        }
-        pImgPad+= stride;
-        pImgOrg+= stride;
-      }
-
-    }
-    break;
-  default:
-    {
-      printf("Not a supported filter shape\n");
-      assert(0);
-      exit(1);
-    }
-  }
-
-  if(bSymmCopyBlockMatrix)
-  {
-    for (varInd=0; varInd<NO_VAR_BINS; varInd++)
-    {
-      double **pE = EShape[varInd];
-      for (k=1; k<sqrFiltLength; k++)
-      {
-        for (l=0; l<k; l++)
-        {
-          pE[k][l]=pE[l][k];
-        }
-      }
-    }
-  }
-}
-
-
-Void   TEncAdaptiveLoopFilter::xFilteringFrameLuma(Pel* imgOrg, Pel* imgPad, Pel* imgFilt, ALFParam* ALFp, Int filtNo, Int stride)
-{
-  static double **ySym, ***ESym;
-  Int  filters_per_fr;
-  Int lambdaVal = (Int) m_dLambdaLuma;
-  lambdaVal = lambdaVal * (1<<(2*g_uiBitIncrement));
-
-  ESym=m_EGlobalSym[filtNo];  
-  ySym=m_yGlobalSym[filtNo];
-
-  xfindBestFilterVarPred(ySym, ESym, m_pixAcc, m_filterCoeffSym, m_filterCoeffSymQuant, filtNo, &filters_per_fr,m_varIndTab, NULL, m_varImg, m_maskImg, NULL, lambdaVal);
-
-  if(!m_bUseNonCrossALF)
-  {
-    filterLuma(imgFilt, imgPad, stride, 0, m_img_height-1, 0, m_img_width-1,  ALFp->filter_shape, m_filterCoeffSym, m_varIndTab, m_varImg);
-  }
-  else
-  {
-    xfilterSlicesEncoder(imgPad, imgFilt, stride, filtNo, m_filterCoeffSym, m_varIndTab, m_varImg);
-  }
-
-  xcodeFiltCoeff(m_filterCoeffSymQuant, filtNo, m_varIndTab, filters_per_fr,ALFp);
-}
-#endif
-
-#if LCU_SYNTAX_ALF
+
 Void TEncAdaptiveLoopFilter::xfindBestFilterVarPred(double **ySym, double ***ESym, double *pixAcc, Int **filterCoeffSym, Int **filterCoeffSymQuant, Int filter_shape, Int *filters_per_fr_best, Int varIndTab[], Pel **imgY_rec, Pel **varImg, Pel **maskImg, Pel **imgY_pad, double lambda_val, Int numMaxFilters)
-#else
-Void TEncAdaptiveLoopFilter::xfindBestFilterVarPred(double **ySym, double ***ESym, double *pixAcc, Int **filterCoeffSym, Int **filterCoeffSymQuant, Int filter_shape, Int *filters_per_fr_best, Int varIndTab[], Pel **imgY_rec, Pel **varImg, Pel **maskImg, Pel **imgY_pad, double lambda_val)
-#endif
 {
   Int filters_per_fr, firstFilt, interval[NO_VAR_BINS][2], intervalBest[NO_VAR_BINS][2];
@@ -5305 +3817 @@
 
     lagrangian=xfindBestCoeffCodMethod(filterCoeffSymQuant, filter_shape, sqrFiltLength, filters_per_fr, errorForce0CoeffTab, lambda_val);
-#if LCU_SYNTAX_ALF 
     if (lagrangian<lagrangianMin || firstFilt==1 || filters_per_fr == numMaxFilters)
-#else
-    if (lagrangian<lagrangianMin || firstFilt==1 || filters_per_fr == m_iALFMaxNumberFilters)
-#endif
     {
       firstFilt=0;
@@ -5319 +3827 @@
     filters_per_fr--;
   }
-#if !ALF_16_BA_GROUPS
-  if ( (m_uiVarGenMethod == ALF_BA) && ((*filters_per_fr_best) > 1) )
-  {
-    Int iLastFilter = (*filters_per_fr_best)-1;
-    if (intervalBest[iLastFilter][0] == NO_VAR_BINS-1)
-    {
-      intervalBest[iLastFilter-1][1] = NO_VAR_BINS-1;
-      (*filters_per_fr_best) = iLastFilter;
-    }
-  }
-#endif
   findFilterCoeff(ESym, ySym, pixAcc, filterCoeffSym, filterCoeffSymQuant, intervalBest,
     varIndTab, sqrFiltLength, (*filters_per_fr_best), weights, errorForce0CoeffTab);
@@ -5489 +3986 @@
  * \param [in,out]vAlfCUCtrlParam ALF CU control parameters 
  */
-#if LCU_SYNTAX_ALF  
 #if HHI_INTERVIEW_SKIP
 Void TEncAdaptiveLoopFilter::setCUAlfCtrlFlags(UInt uiAlfCtrlDepth, Pel* imgOrg, Pel* imgDec, Pel* imgRest, Pel* imgUsed, Int stride, UInt64& ruiDist, std::vector<AlfCUCtrlInfo>& vAlfCUCtrlParam)
@@ -5495 +3991 @@
 Void TEncAdaptiveLoopFilter::setCUAlfCtrlFlags(UInt uiAlfCtrlDepth, Pel* imgOrg, Pel* imgDec, Pel* imgRest, Int stride, UInt64& ruiDist, std::vector<AlfCUCtrlInfo>& vAlfCUCtrlParam)
 #endif
-#else
-#if HHI_INTERVIEW_SKIP
-Void TEncAdaptiveLoopFilter::xSetCUAlfCtrlFlags_qc(UInt uiAlfCtrlDepth, TComPicYuv* pcPicOrg, TComPicYuv* pcPicDec, TComPicYuv* pcPicRest, TComPicYuv* pUsedPelMap, UInt64& ruiDist, std::vector<AlfCUCtrlInfo>& vAlfCUCtrlParam)
-#else
-Void TEncAdaptiveLoopFilter::xSetCUAlfCtrlFlags_qc(UInt uiAlfCtrlDepth, TComPicYuv* pcPicOrg, TComPicYuv* pcPicDec, TComPicYuv* pcPicRest, UInt64& ruiDist, std::vector<AlfCUCtrlInfo>& vAlfCUCtrlParam)
-#endif
-#endif
 {
   ruiDist = 0;
@@ -5520 +4009 @@
   {
     TComDataCU* pcCU = m_pcPic->getCU( CUAddr );
-#if LCU_SYNTAX_ALF 
 #if HHI_INTERVIEW_SKIP
     setCUAlfCtrlFlag(pcCU, 0, 0, uiAlfCtrlDepth, imgOrg, imgDec, imgRest, imgUsed, stride, ruiDist, vAlfCUCtrlParam[0].alf_cu_flag);
 #else
     setCUAlfCtrlFlag(pcCU, 0, 0, uiAlfCtrlDepth, imgOrg, imgDec, imgRest, stride, ruiDist, vAlfCUCtrlParam[0].alf_cu_flag);
-#endif
-#else
-#if HHI_INTERVIEW_SKIP
-    xSetCUAlfCtrlFlag_qc(pcCU, 0, 0, uiAlfCtrlDepth, pcPicOrg, pcPicDec, pcPicRest,imgUsed, ruiDist, vAlfCUCtrlParam[0].alf_cu_flag);
-#else
-    xSetCUAlfCtrlFlag_qc(pcCU, 0, 0, uiAlfCtrlDepth, pcPicOrg, pcPicDec, pcPicRest, ruiDist, vAlfCUCtrlParam[0].alf_cu_flag);
-#endif
 #endif
   }
@@ -5569 +4050 @@
 }
 
-#if LCU_SYNTAX_ALF
 #if HHI_INTERVIEW_SKIP
 Void TEncAdaptiveLoopFilter::setCUAlfCtrlFlag(TComDataCU* pcCU, UInt uiAbsPartIdx, UInt uiDepth, UInt uiAlfCtrlDepth, Pel* imgOrg, Pel* imgDec, Pel* imgRest, Pel* imgUsed, Int stride, UInt64& ruiDist, std::vector<UInt>& vCUCtrlFlag)
 #else
 Void TEncAdaptiveLoopFilter::setCUAlfCtrlFlag(TComDataCU* pcCU, UInt uiAbsPartIdx, UInt uiDepth, UInt uiAlfCtrlDepth, Pel* imgOrg, Pel* imgDec, Pel* imgRest, Int stride, UInt64& ruiDist, std::vector<UInt>& vCUCtrlFlag)
-#endif
-#else
-#if HHI_INTERVIEW_SKIP
-Void TEncAdaptiveLoopFilter::xSetCUAlfCtrlFlag_qc(TComDataCU* pcCU, UInt uiAbsPartIdx, UInt uiDepth, UInt uiAlfCtrlDepth, TComPicYuv* pcPicOrg, TComPicYuv* pcPicDec, TComPicYuv* pcPicRest, TComPicYuv* pcUsedPelMap, UInt64& ruiDist, std::vector<UInt>& vCUCtrlFlag)
-#else
-Void TEncAdaptiveLoopFilter::xSetCUAlfCtrlFlag_qc(TComDataCU* pcCU, UInt uiAbsPartIdx, UInt uiDepth, UInt uiAlfCtrlDepth, TComPicYuv* pcPicOrg, TComPicYuv* pcPicDec, TComPicYuv* pcPicRest, UInt64& ruiDist, std::vector<UInt>& vCUCtrlFlag)
-#endif
 #endif
 {
@@ -5603 +4076 @@
       
       if( ( uiLPelX < pcCU->getSlice()->getSPS()->getPicWidthInLumaSamples() ) && ( uiTPelY < pcCU->getSlice()->getSPS()->getPicHeightInLumaSamples() ) )
-#if LCU_SYNTAX_ALF
 #if HHI_INTERVIEW_SKIP
         setCUAlfCtrlFlag(pcCU, uiAbsPartIdx, uiDepth+1, uiAlfCtrlDepth, imgOrg, imgDec, imgRest, imgUsed, stride, ruiDist, vCUCtrlFlag);
@@ -5609 +4081 @@
         setCUAlfCtrlFlag(pcCU, uiAbsPartIdx, uiDepth+1, uiAlfCtrlDepth, imgOrg, imgDec, imgRest, stride, ruiDist, vCUCtrlFlag);
 #endif
-#else
-#if HHI_INTERVIEW_SKIP
-        xSetCUAlfCtrlFlag_qc(pcCU, uiAbsPartIdx, uiDepth+1, uiAlfCtrlDepth, pcPicOrg, pcPicDec, pcPicRest, imgUsed, ruiDist, vCUCtrlFlag);
-#else
-        xSetCUAlfCtrlFlag_qc(pcCU, uiAbsPartIdx, uiDepth+1, uiAlfCtrlDepth, pcPicOrg, pcPicDec, pcPicRest, ruiDist, vCUCtrlFlag);
-#endif
-#endif
     }
     return;
@@ -5624 +4089 @@
     return;
   }
-#if !LCU_SYNTAX_ALF
-  UInt uiCUAddr = pcCU->getAddr();
-#endif
   UInt64 uiRecSSD = 0;
   UInt64 uiFiltSSD = 0;
@@ -5661 +4123 @@
   }
   
-#if LCU_SYNTAX_ALF 
   Int  offset = uiTPelY*stride + uiLPelX;
   Pel* pOrg  = imgOrg  + offset;
@@ -5679 +4140 @@
   uiFiltSSD += xCalcSSD( pOrg, pFilt, iWidth, iHeight, stride );
 #endif
-#else
-  Pel* pOrg = pcPicOrg->getLumaAddr(uiCUAddr, uiAbsPartIdx);
-  Pel* pRec = pcPicDec->getLumaAddr(uiCUAddr, uiAbsPartIdx);
-  Pel* pFilt = pcPicRest->getLumaAddr(uiCUAddr, uiAbsPartIdx);
-  
-#if HHI_INTERVIEW_SKIP
-  Pel* pUsed = pcUsedPelMap->getLumaAddr(uiCUAddr, uiAbsPartIdx);
-  uiRecSSD  += xCalcSSD( pOrg, pRec, pUsed, iWidth, iHeight, pcPicOrg->getStride() );
-  uiFiltSSD += xCalcSSD( pOrg, pFilt, pUsed, iWidth, iHeight, pcPicOrg->getStride() );
-#else
-  uiRecSSD  += xCalcSSD( pOrg, pRec,  iWidth, iHeight, pcPicOrg->getStride() );
-  uiFiltSSD += xCalcSSD( pOrg, pFilt, iWidth, iHeight, pcPicOrg->getStride() );
-#endif
-#endif
   if (uiFiltSSD < uiRecSSD)
   {
@@ -5699 +4146 @@
     vCUCtrlFlag.push_back(1);
 
-#if LCU_SYNTAX_ALF 
     for (int i=uiTPelY ;i<=min(uiBPelY,(unsigned int)(m_img_height-1))  ;i++)
     {
       for (int j=uiLPelX ;j<=min(uiRPelX,(unsigned int)(m_img_width-1)) ;j++)
       { 
-#else
-    for (int i=uiTPelY ;i<=min(uiBPelY,(unsigned int)(pcPicOrg->getHeight()-1))  ;i++)
-    {
-      for (int j=uiLPelX ;j<=min(uiRPelX,(unsigned int)(pcPicOrg->getWidth()-1)) ;j++)
-      { 
-#endif
         m_maskImg[i][j]=1;
       }
@@ -5719 +4159 @@
     pcCU->setAlfCtrlFlagSubParts(0, uiAbsPartIdx, uiSetDepth);
     vCUCtrlFlag.push_back(0);
-#if LCU_SYNTAX_ALF 
     for (int i=uiTPelY ;i<=min(uiBPelY,(unsigned int)(m_img_height-1))  ;i++)
     {
       for (int j=uiLPelX ;j<=min(uiRPelX,(unsigned int)(m_img_width-1)) ;j++)
       { 
-#else
-    for (int i=uiTPelY ;i<=min(uiBPelY,(unsigned int)(pcPicOrg->getHeight()-1))  ;i++)
-    {
-      for (int j=uiLPelX ;j<=min(uiRPelX,(unsigned int)(pcPicOrg->getWidth()-1)) ;j++)
-      { 
-#endif
         m_maskImg[i][j]=0;
       }
@@ -5736 +4169 @@
 }
 
-#if !LCU_SYNTAX_ALF
-
-Void TEncAdaptiveLoopFilter::xReDesignFilterCoeff_qc(TComPicYuv* pcPicOrg, TComPicYuv* pcPicDec, TComPicYuv* pcPicRest, Bool bReadCorr)
-{
-  Int tap = m_pcTempAlfParam->filter_shape;
-  Int    LumaStride = pcPicOrg->getStride();
-  Pel* pOrg  = pcPicOrg->getLumaAddr();
-  Pel* pDec  = pcPicDec->getLumaAddr();
-  Pel* pRest = pcPicRest->getLumaAddr();
-  xFirstFilteringFrameLuma(pOrg, pDec, pRest, m_pcTempAlfParam, tap, LumaStride); 
-  
-  if (m_iALFEncodePassReduction)
-  {
-    if(!m_iUsePreviousFilter)
-    {
-      saveFilterCoeffToBuffer(m_filterCoeffSym, m_pcTempAlfParam->filters_per_group, m_varIndTab, m_pcTempAlfParam->alf_pcr_region_flag, tap);
-    }
-  }
-}
-
-Void TEncAdaptiveLoopFilter::xCUAdaptiveControl_qc(TComPicYuv* pcPicOrg, TComPicYuv* pcPicDec, TComPicYuv* pcPicRest, UInt64& ruiMinRate, UInt64& ruiMinDist, Double& rdMinCost)
-{
-  if(!m_bAlfCUCtrlEnabled) return;
-  Bool bChanged = false;
-  std::vector<AlfCUCtrlInfo> vAlfCUCtrlParamTemp(m_vBestAlfCUCtrlParam);
-
-  Pel** maskImgTemp;
-
-  if(m_iALFEncodePassReduction == 2)
-  {
-    initMatrix_Pel(&maskImgTemp, m_img_height, m_img_width);
-  }
-
-  m_pcEntropyCoder->setAlfCtrl(true);
-  
-  UInt uiBestDepth = 0;
-  
-  ALFParam cFrmAlfParam;
-  allocALFParam(&cFrmAlfParam);
-  copyALFParam(&cFrmAlfParam, m_pcBestAlfParam);
-  
-  for (UInt uiDepth = 0; uiDepth < g_uiMaxCUDepth; uiDepth++)
-  {
-    m_pcEntropyCoder->setMaxAlfCtrlDepth(uiDepth);
-    pcPicRest->copyToPicLuma(m_pcPicYuvTmp);
-    copyALFParam(m_pcTempAlfParam, &cFrmAlfParam);
-
-    for (UInt uiRD = 0; uiRD <= m_iALFNumOfRedesign; uiRD++)
-    {
-      if (uiRD)
-      {
-        // re-design filter coefficients
-        xReDesignFilterCoeff_qc(pcPicOrg, pcPicDec, m_pcPicYuvTmp, true); //use filtering of mine
-      }
-      
-      UInt64 uiRate, uiDist;
-      Double dCost;
-     //m_pcPicYuvTmp: filtered signal, pcPicDec: orig reconst
-      xSetCUAlfCtrlFlags_qc(uiDepth, pcPicOrg, pcPicDec, m_pcPicYuvTmp, uiDist, vAlfCUCtrlParamTemp); 
-      xCalcRDCost(m_pcTempAlfParam, uiRate, uiDist, dCost, &vAlfCUCtrlParamTemp);
-      if (dCost < rdMinCost)
-      {
-        bChanged = true;
-        m_vBestAlfCUCtrlParam = vAlfCUCtrlParamTemp;
-        uiBestDepth = uiDepth;
-        rdMinCost = dCost;
-        ruiMinDist = uiDist;
-        ruiMinRate = uiRate;
-        m_pcPicYuvTmp->copyToPicLuma(m_pcPicYuvBest);
-        copyALFParam(m_pcBestAlfParam, m_pcTempAlfParam);
-        //save maskImg
-        xCopyTmpAlfCtrlFlagsFrom();
-        if(m_iALFEncodePassReduction == 2)
-        {
-          ::memcpy(maskImgTemp[0], m_maskImg[0], sizeof(Pel)*m_img_height* m_img_width);
-        }
-      }
-    }
-  }
-
-  if(bChanged)
-  {
-    if(m_iALFEncodePassReduction == 2)
-    {
-      UInt uiDepth = uiBestDepth;
-      ::memcpy(m_maskImg[0], maskImgTemp[0], sizeof(Pel)*m_img_height* m_img_width);
-      xCopyTmpAlfCtrlFlagsTo();
-  
-      copyALFParam(&cFrmAlfParam, m_pcBestAlfParam);
-
-      m_pcEntropyCoder->setAlfCtrl(true);
-      m_pcEntropyCoder->setMaxAlfCtrlDepth(uiDepth);
-      copyALFParam(m_pcTempAlfParam, &cFrmAlfParam);
-
-      xReDesignFilterCoeff_qc(pcPicOrg, pcPicDec, m_pcPicYuvTmp, true); //use filtering of mine
-
-      UInt64 uiRate, uiDist;
-      Double dCost;
-      xSetCUAlfCtrlFlags_qc(uiDepth, pcPicOrg, pcPicDec, m_pcPicYuvTmp, uiDist, vAlfCUCtrlParamTemp); 
-      xCalcRDCost(m_pcTempAlfParam, uiRate, uiDist, dCost, &vAlfCUCtrlParamTemp);
-      if (dCost < rdMinCost)
-      {
-        rdMinCost = dCost;
-        ruiMinDist = uiDist;
-        ruiMinRate = uiRate;
-        m_pcPicYuvTmp->copyToPicLuma(m_pcPicYuvBest);
-        copyALFParam(m_pcBestAlfParam, m_pcTempAlfParam);
-        xCopyTmpAlfCtrlFlagsFrom();
-        m_vBestAlfCUCtrlParam = vAlfCUCtrlParamTemp;
-      }
-    }
-
-    m_pcEntropyCoder->setAlfCtrl(true);
-    m_pcEntropyCoder->setMaxAlfCtrlDepth(uiBestDepth);
-    xCopyTmpAlfCtrlFlagsTo();
-
-    m_pcPicYuvBest->copyToPicLuma(pcPicRest);//copy m_pcPicYuvBest to pcPicRest
-    xCopyDecToRestCUs(pcPicDec, pcPicRest); //pcPicRest = pcPicDec
-  }
-  else
-  {
-    m_pcEntropyCoder->setAlfCtrl(false);
-    m_pcEntropyCoder->setMaxAlfCtrlDepth(0);
-  }
-  freeALFParam(&cFrmAlfParam);
-
-  if(m_iALFEncodePassReduction == 2)
-  {
-    destroyMatrix_Pel(maskImgTemp);
-  }
-}
-
-#endif
 
 #define ROUND(a)  (((a) < 0)? (int)((a) - 0.5) : (int)((a) + 0.5))
@@ -6242 +4542 @@
 {
   double error;
-#if LCU_SYNTAX_ALF && LCUALF_QP_DEPENDENT_BITS
+#if LCUALF_QP_DEPENDENT_BITS
   Int factor = (1<<(getAlfPrecisionBit(m_alfQP)));
 #else
@@ -6384 +4684 @@
 }
 
-#if !LCU_SYNTAX_ALF
-
-/** Save redesigned filter set to buffer
- * \param filterCoeffPrevSelected filter set buffer
- */
-Void TEncAdaptiveLoopFilter::saveFilterCoeffToBuffer(Int **filterSet, Int numFilter, Int* mergeTable, Int mode, Int filtNo)
-{
-  Int iBufferIndex = m_iCurrentPOC % m_iGOPSize;
-
-  static Bool bFirst = true;
-  static Bool* pbFirstAccess;
-  if(bFirst)
-  {
-    pbFirstAccess = new Bool[NUM_ALF_CLASS_METHOD];
-    for(Int i=0; i< NUM_ALF_CLASS_METHOD; i++)
-    {
-      pbFirstAccess[i]= true;
-    }
-    bFirst = false;
-  }
-
-  if(iBufferIndex == 0)
-  {
-    if(pbFirstAccess[mode])
-    {
-      //store merge table
-      ::memcpy(m_mergeTableSavedMethods[mode][m_iGOPSize], mergeTable, sizeof(Int)*NO_VAR_BINS);
-      //store coefficients
-      for(Int varInd=0; varInd< numFilter; varInd++)
-      {
-        ::memcpy(m_aiFilterCoeffSavedMethods[mode][m_iGOPSize][varInd],filterSet[varInd], sizeof(Int)*ALF_MAX_NUM_COEF );
-      }
-      //store filter shape
-      m_iPreviousFilterShapeMethods[mode][m_iGOPSize]= filtNo; 
-
-      pbFirstAccess[mode] = false;
-    }
-
-
-    //store merge table
-    ::memcpy(m_mergeTableSavedMethods[mode][0         ], m_mergeTableSavedMethods[mode][m_iGOPSize], sizeof(Int)*NO_VAR_BINS);
-    ::memcpy(m_mergeTableSavedMethods[mode][m_iGOPSize], mergeTable,                          sizeof(Int)*NO_VAR_BINS);
-
-    //store coefficients
-    for(Int varInd=0; varInd< NO_VAR_BINS; varInd++)
-    {
-      ::memcpy(m_aiFilterCoeffSavedMethods[mode][0][varInd],m_aiFilterCoeffSavedMethods[mode][m_iGOPSize][varInd], sizeof(Int)*ALF_MAX_NUM_COEF );
-    }
-
-    for(Int varInd=0; varInd< numFilter; varInd++)
-    {
-      ::memcpy(m_aiFilterCoeffSavedMethods[mode][m_iGOPSize][varInd],filterSet[varInd], sizeof(Int)*ALF_MAX_NUM_COEF );
-    }
-
-    //store filter shape
-    m_iPreviousFilterShapeMethods[mode][0]= m_iPreviousFilterShapeMethods[mode][m_iGOPSize]; 
-    m_iPreviousFilterShapeMethods[mode][m_iGOPSize]= filtNo; 
-  }
-  else
-  {
-
-    //store merge table
-    ::memcpy(m_mergeTableSavedMethods[mode][iBufferIndex], mergeTable, sizeof(Int)*NO_VAR_BINS);
-
-    //store coefficients
-    for(Int varInd=0; varInd< numFilter; varInd++)
-    {
-      ::memcpy(m_aiFilterCoeffSavedMethods[mode][iBufferIndex][varInd],filterSet[varInd], sizeof(Int)*ALF_MAX_NUM_COEF );
-    }
-    //store filter_shape
-    m_iPreviousFilterShapeMethods[mode][iBufferIndex]= filtNo; 
-
-  }
-}
-
-
-/** set initial m_maskImg with previous (time-delayed) filters
- * \param pcPicOrg original picture
- * \param pcPicDec reconstructed picture after deblocking
- */
-Void TEncAdaptiveLoopFilter::setMaskWithTimeDelayedResults(TComPicYuv* pcPicOrg, TComPicYuv* pcPicDec)
-{
-
-  static Pel** bestImgMask;
-  static Bool bFirst = true;
-  if(bFirst)
-  {
-    initMatrix_Pel(&bestImgMask, m_img_height, m_img_width);
-    bFirst = false;
-  }
-
-  Pel*    pDec       = pcPicDec->getLumaAddr();
-  Pel*    pOrg       = pcPicOrg->getLumaAddr();
-  Pel*    pRest      = m_pcPicYuvTmp->getLumaAddr();
-  Int     LumaStride = pcPicOrg->getStride();
-  Int***   pppCoeffSaved     = m_aiFilterCoeffSavedMethods  [m_uiVarGenMethod];
-  Int**    ppMergeTableSaved = m_mergeTableSavedMethods     [m_uiVarGenMethod];
-  Int*     pFilterShapeSaved = m_iPreviousFilterShapeMethods[m_uiVarGenMethod];
-  Int      iBufIdx;
-
-  UInt64    uiRate, uiDist;
-  Double    dCost, dMinCost = MAX_DOUBLE;
-  ALFParam  cAlfParam;
-  allocALFParam(&cAlfParam);
-  cAlfParam.alf_flag        = 0;
-  cAlfParam.chroma_idc      = 0;
-
-  //filter frame with the previous time-delayed filters
-  Int filtNo;
-  Int maxDepth = (pcPicOrg->getWidth() < 1000) ?(2):(g_uiMaxCUDepth);
-  m_pcEntropyCoder->setAlfCtrl(true);
-  m_pcTempAlfParam->alf_flag = 1;
-  m_pcTempAlfParam->alf_pcr_region_flag = m_uiVarGenMethod;
-
-  for (Int index=0; index<2; index++)
-  {
-    iBufIdx = setFilterIdx(index);
-    filtNo = m_pcTempAlfParam->filter_shape = pFilterShapeSaved[iBufIdx];
-#if ALF_SINGLE_FILTER_SHAPE
-    assert(filtNo == ALF_CROSS9x7_SQUARE3x3);
-#else
-    assert(filtNo == ALF_STAR5x5 || filtNo == ALF_CROSS9x9);
-#endif
-    m_pcTempAlfParam->num_coeff = m_sqrFiltLengthTab[filtNo]; 
-    if(!m_bUseNonCrossALF)
-    {
-      filterLuma(pRest, pDec, LumaStride, 0, m_img_height-1, 0, m_img_width-1,  filtNo, pppCoeffSaved[iBufIdx], ppMergeTableSaved[iBufIdx], m_varImg);
-    }
-    else
-    {
-      xfilterSlicesEncoder(pDec, pRest, LumaStride, filtNo, pppCoeffSaved[iBufIdx], ppMergeTableSaved[iBufIdx], m_varImg);
-    }
-
-    for (UInt uiDepth = 0; uiDepth < maxDepth; uiDepth++)
-    {
-      m_pcEntropyCoder->setMaxAlfCtrlDepth(uiDepth);
-      std::vector<AlfCUCtrlInfo> vAlfCUCtrlParamTemp(m_uiNumSlicesInPic);
-      xSetCUAlfCtrlFlags_qc(uiDepth, pcPicOrg, pcPicDec, m_pcPicYuvTmp, uiDist, vAlfCUCtrlParamTemp);
-      m_pcEntropyCoder->resetEntropy();
-      m_pcEntropyCoder->resetBits();
-      xEncodeCUAlfCtrlFlags(vAlfCUCtrlParamTemp);
-      uiRate = m_pcEntropyCoder->getNumberOfWrittenBits();
-      dCost  = (Double)(uiRate) * m_dLambdaLuma + (Double)(uiDist);
-
-      if (dCost < dMinCost)
-      {
-        dMinCost    = dCost;
-        copyALFParam(&cAlfParam, m_pcTempAlfParam);
-        ::memcpy(bestImgMask[0], m_maskImg[0], sizeof(Pel)*m_img_height* m_img_width);
-      }
-    }
-  }
-  filtNo = cAlfParam.filter_shape;
-
-
-  ::memcpy(m_maskImg[0], bestImgMask[0], sizeof(Pel)*m_img_height* m_img_width);
-
-  m_pcEntropyCoder->setAlfCtrl(false);
-  m_pcEntropyCoder->setMaxAlfCtrlDepth(0);
-
-  // generate filters for future reference
-  m_iDesignCurrentFilter = 0; 
-
-  int  filters_per_fr;
-  int  lambda_val = (Int)m_dLambdaLuma;
-
-  lambda_val = lambda_val * (1<<(2*g_uiBitIncrement));
-
-  if(!m_bUseNonCrossALF)
-  {
-    xstoreInBlockMatrix(0, 0, m_img_height, m_img_width, true, true, pOrg, pDec, cAlfParam.filter_shape, LumaStride);
-  }
-  else
-  { 
-    xstoreInBlockMatrixforSlices(pOrg, pDec, cAlfParam.filter_shape, LumaStride);
-  }
-  xfindBestFilterVarPred(m_yGlobalSym[filtNo], m_EGlobalSym[filtNo], m_pixAcc, 
-    m_filterCoeffSym, m_filterCoeffSymQuant, 
-    filtNo, &filters_per_fr, 
-    m_varIndTab, NULL, m_varImg, m_maskImg, NULL, lambda_val);
-
-  saveFilterCoeffToBuffer(m_filterCoeffSym, filters_per_fr, m_varIndTab, cAlfParam.alf_pcr_region_flag, filtNo);
-  m_iDesignCurrentFilter = 1;
-
-  freeALFParam(&cAlfParam);
-
-}
-
-
-/** set ALF encoding parameters
- * \param pcPic picture pointer
- */
-Void TEncAdaptiveLoopFilter::setALFEncodingParam(TComPic *pcPic)
-{
-  if(m_iALFEncodePassReduction)
-  {
-    m_iALFNumOfRedesign = 0;
-    m_iCurrentPOC = m_pcPic->getPOC();
-    if((pcPic->getSlice(0)->getSliceType() == I_SLICE) || (m_iGOPSize==8 && (m_iCurrentPOC % 4 == 0)))
-    {
-      m_iUsePreviousFilter = 0;
-    }
-    else
-    {
-      m_iUsePreviousFilter = 1;
-    }
-  }
-  else
-  {
-    m_iALFNumOfRedesign = ALF_NUM_OF_REDESIGN;
-  }
-  m_iDesignCurrentFilter = 1;
-
-}
-
-/** set filter buffer index
- * \param index the processing order of time-delayed filtering
- */
-Int TEncAdaptiveLoopFilter::setFilterIdx(Int index)
-{
-  Int iBufIdx;
-
-  if (m_iGOPSize == 8)
-  {
-    switch(m_iCurrentPOC % m_iGOPSize)
-    {
-    case 0:
-      {
-        iBufIdx = (index == 0)?0:m_iGOPSize;
-      }
-      break;
-    case 1:
-      {
-        iBufIdx = (index == 0)?0:2;
-      }
-      break;
-    case 2:
-      {
-        iBufIdx = (index == 0)?0:4;
-      }
-      break;
-    case 3:
-      {
-        iBufIdx = (index == 0)?2:4;
-      }
-      break;
-    case 4:
-      {
-        iBufIdx = (index == 0)?0:m_iGOPSize;
-      }
-      break;
-    case 5:
-      {
-        iBufIdx = (index == 0)?4:6;
-      }
-      break;
-    case 6:
-      {
-        iBufIdx = (index == 0)?4:m_iGOPSize;
-      }
-      break;
-    case 7:
-      {
-        iBufIdx = (index == 0)?6:m_iGOPSize;
-      }
-      break;
-    default:
-      {
-        printf("error\n");
-        assert(0);
-      }
-    }
-  }
-  else
-  {
-    iBufIdx = (index == 0)?0:m_iGOPSize;
-  }
-
-  return iBufIdx;
-}
-
-
-/** set initial m_maskImg
- * \param pcPicOrg original picture pointer
- * \param pcPicDec reconstructed picture pointer
- */
-Void TEncAdaptiveLoopFilter::setInitialMask(TComPicYuv* pcPicOrg, TComPicYuv* pcPicDec)
-{
-  Int Height = pcPicOrg->getHeight();
-  Int Width = pcPicOrg->getWidth();
-  Int LumaStride = pcPicOrg->getStride();
-  Pel* pDec = pcPicDec->getLumaAddr();
-
-  calcVar(m_varImg, pDec, LumaStride, m_uiVarGenMethod);
-
-  if(!m_iALFEncodePassReduction || !m_iUsePreviousFilter)
-  {
-    for(Int y=0; y<Height; y++)
-    {
-      for(Int x=0; x<Width; x++)
-      {
-        m_maskImg[y][x] = 1;
-      }
-    }
-  }
-  else
-  {
-    setMaskWithTimeDelayedResults(pcPicOrg, pcPicDec);
-  }
-}
-
-
-
-/** Estimate RD cost of all filter size & store the best one
- * \param ImgOrg original picture
- * \param ImgDec reconstructed picture after deblocking
- * \param Sride  line buffer size of picture buffer
- * \param pcAlfSaved the best Alf parameters 
- * \returns ruiDist             estimated distortion
- * \returns ruiRate             required bits
- * \returns rdCost              estimated R-D cost
- */
-
-Void  TEncAdaptiveLoopFilter::decideFilterShapeLuma(Pel* ImgOrg, Pel* ImgDec, Int Stride, ALFParam* pcAlfSaved, UInt64& ruiRate, UInt64& ruiDist, Double& rdCost)
-{
-  static Double **ySym, ***ESym;
-  Int    lambda_val = ((Int) m_dLambdaLuma) * (1<<(2*g_uiBitIncrement));
-  Int    filtNo, filters_per_fr;
-  Int64  iEstimatedDist;
-  UInt64 uiRate;
-  Double dEstimatedCost, dEstimatedMinCost = MAX_DOUBLE;;
-
-  UInt   uiBitShift = (g_uiBitIncrement<<1);
-  Int64  iEstimateDistBeforeFilter;
-  Int*   coeffNoFilter[NUM_ALF_FILTER_SHAPE][NO_VAR_BINS];
-  for(Int filter_shape = 0; filter_shape < NUM_ALF_FILTER_SHAPE; filter_shape++)
-  {
-    for(Int i=0; i< NO_VAR_BINS; i++)
-    {
-      coeffNoFilter[filter_shape][i]= new Int[ALF_MAX_NUM_COEF];
-      ::memset(coeffNoFilter[filter_shape][i], 0, sizeof(Int)*ALF_MAX_NUM_COEF);
-      coeffNoFilter[filter_shape][i][ m_sqrFiltLengthTab[filter_shape]-1 ] = (1 << ((Int)ALF_NUM_BIT_SHIFT));
-    }
-  }
-
-  m_pcTempAlfParam->alf_flag = 1;
-  m_pcTempAlfParam->chroma_idc = 0;
-  m_pcTempAlfParam->alf_pcr_region_flag = m_uiVarGenMethod;
-
-  for (int filter_shape = 0; filter_shape < NUM_ALF_FILTER_SHAPE ;filter_shape ++)
-  {
-    m_pcTempAlfParam->filter_shape = filtNo = filter_shape;
-    m_pcTempAlfParam->num_coeff = m_sqrFiltLengthTab[filtNo] ;  
-
-    ESym     = m_EGlobalSym     [filtNo];
-    ySym     = m_yGlobalSym     [filtNo];
-
-    if(!m_bUseNonCrossALF)
-    {
-      xstoreInBlockMatrix(0, 0, m_img_height, m_img_width, true, true, ImgOrg, ImgDec, filter_shape, Stride);
-    }
-    else
-    {
-      xstoreInBlockMatrixforSlices(ImgOrg, ImgDec, filter_shape, Stride);
-    }
-    xfindBestFilterVarPred(ySym, ESym, m_pixAcc, m_filterCoeffSym, m_filterCoeffSymQuant, filtNo, &filters_per_fr, m_varIndTab, NULL, m_varImg, m_maskImg, NULL, lambda_val);
-
-    //estimate R-D cost
-    uiRate         = xcodeFiltCoeff(m_filterCoeffSymQuant, filtNo, m_varIndTab, filters_per_fr, m_pcTempAlfParam);
-    iEstimatedDist = xEstimateFiltDist(filters_per_fr, m_varIndTab, ESym, ySym, m_filterCoeffSym, m_pcTempAlfParam->num_coeff);
-    iEstimateDistBeforeFilter = xEstimateFiltDist(filters_per_fr, m_varIndTab, ESym, ySym, coeffNoFilter[filter_shape], m_pcTempAlfParam->num_coeff);
-    iEstimatedDist -= iEstimateDistBeforeFilter;
-    dEstimatedCost = (Double)(uiRate) * m_dLambdaLuma + (Double)(iEstimatedDist);
-
-    if(dEstimatedCost < dEstimatedMinCost)
-    {
-      dEstimatedMinCost   = dEstimatedCost;
-      copyALFParam(pcAlfSaved, m_pcTempAlfParam); 
-      iEstimatedDist += iEstimateDistBeforeFilter;
-
-      for(Int i=0; i< filters_per_fr; i++ )
-      {
-        iEstimatedDist += (((Int64)m_pixAcc_merged[i]) >> uiBitShift);
-      }
-      ruiDist = (iEstimatedDist > 0)?((UInt64)iEstimatedDist):(0);
-      rdCost  = dEstimatedMinCost + (Double)(ruiDist);
-      ruiRate = uiRate;
-    }
-  }
-
-  if (!m_iUsePreviousFilter)
-  {
-    decodeFilterSet(pcAlfSaved, m_varIndTab, m_filterCoeffSym);
-    saveFilterCoeffToBuffer(m_filterCoeffSym, pcAlfSaved->filters_per_group, m_varIndTab, pcAlfSaved->alf_pcr_region_flag, pcAlfSaved->filter_shape);
-  }
-
-  if( m_iUsePreviousFilter )
-  {
-    UInt64 uiOffRegionDistortion = 0;
-    Int    iPelDiff;
-    Pel*   pOrgTemp = (Pel*)ImgOrg;
-    Pel*   pDecTemp = (Pel*)ImgDec;
-    for(Int y=0; y< m_img_height; y++)
-    {
-      for(Int x=0; x< m_img_width; x++)
-      {
-        if(m_maskImg[y][x] == 0)
-        {
-          iPelDiff = pOrgTemp[x] - pDecTemp[x];
-          uiOffRegionDistortion += (UInt64)(  (iPelDiff*iPelDiff) >> uiBitShift );
-        }
-      }
-      pOrgTemp += Stride;
-      pDecTemp += Stride;
-
-      ruiDist += uiOffRegionDistortion;
-      rdCost  += (Double)uiOffRegionDistortion;
-    }
-  }
-  
-#if !ALF_SINGLE_FILTER_SHAPE
-  // if ALF_STAR5x5 is selected, the distortion of 2 skipped lines per LCU should be added.
-  if(pcAlfSaved->filter_shape == ALF_STAR5x5)
-  {
-    Int    iPelDiff;
-    UInt64  uiSkipPelsDistortion = 0;
-    Pel   *pOrgTemp, *pDecTemp;
-    for(Int y= m_lineIdxPadTop-1; y< m_img_height - m_lcuHeight ; y += m_lcuHeight)
-    {
-      pOrgTemp = ImgOrg + y*Stride;
-      pDecTemp = ImgDec + y*Stride;
-      for(Int x=0; x< m_img_width; x++)
-      {
-        if(m_maskImg[y][x] == 1)
-        {
-          iPelDiff = pOrgTemp[x] - pDecTemp[x];
-          uiSkipPelsDistortion += (UInt64)(  (iPelDiff*iPelDiff) >> uiBitShift );
-        }
-      }
-
-      pOrgTemp += Stride;
-      pDecTemp += Stride;
-      for(Int x=0; x< m_img_width; x++)
-      {
-        if(m_maskImg[y+1][x] == 1)
-        {
-          iPelDiff = pOrgTemp[x] - pDecTemp[x];
-          uiSkipPelsDistortion += (UInt64)(  (iPelDiff*iPelDiff) >> uiBitShift );
-        }
-      }
-    }
-    ruiDist += uiSkipPelsDistortion;
-    rdCost  += (Double)uiSkipPelsDistortion;
-  }
-#endif
-
-  for(Int filter_shape = 0; filter_shape < NUM_ALF_FILTER_SHAPE; filter_shape++)
-  {
-    for(Int i=0; i< NO_VAR_BINS; i++)
-    {
-      delete[] coeffNoFilter[filter_shape][i];
-    }
-  }
-}
-
-
-#endif
 
 /** Estimate filtering distortion by correlation values and filter coefficients
@@ -6867 +4700 @@
   Int64  iDist;
   Double dDist, dsum;
-#if LCU_SYNTAX_ALF && LCUALF_QP_DEPENDENT_BITS
+#if LCUALF_QP_DEPENDENT_BITS
   Int alfPrecisionBit = getAlfPrecisionBit( m_alfQP );
 #endif
@@ -6873 +4706 @@
   for(i=0; i< iFiltLength; i++)
   {
-#if LCU_SYNTAX_ALF && LCUALF_QP_DEPENDENT_BITS
+#if LCUALF_QP_DEPENDENT_BITS
     pdcoeff[i]= (Double)piCoeff[i] / (Double)(1<<alfPrecisionBit);
 #else
@@ -6908 +4741 @@
 
 
-#if !LCU_SYNTAX_ALF
-
-/** Estimate total filtering cost of all groups
- * \param filters_per_fr number of filters for the slice
- * \param VarIndTab merge index of all groups
- * \param pppdE  auto-correlation matrix pointer for all groups
- * \param ppdy cross-correlation array pointer for all groups
- * \returns estimated distortion
- */
-Int64 TEncAdaptiveLoopFilter::xEstimateFiltDist(Int filters_per_fr, Int* VarIndTab, 
-                                                Double*** pppdE, Double** ppdy, 
-                                                Int** ppiCoeffSet, Int iFiltLength)
-
-{
-  Int64     iDist;
-  Double**  ppdDstE;
-  Double**  ppdSrcE;
-  Double*   pdDsty;  
-  Double*   pdSrcy;
-  Int       f, j, i, varInd;
-  Int*      piCoeff;
-
-  //clean m_E_merged & m_y_merged
-  for(f=0; f< filters_per_fr; f++)
-  {
-    for(j =0; j < iFiltLength; j++)
-    {
-      //clean m_E_merged one line
-      for(i=0; i < iFiltLength; i++)
-      {
-        m_E_merged[f][j][i] = 0;
-      }
-
-      //clean m_y_merged
-      m_y_merged[f][j] = 0;
-    }
-    m_pixAcc_merged[f] = 0;
-  }
-
-
-  //merge correlation values
-  for (varInd=0; varInd< NO_VAR_BINS; varInd++)
-  {
-    ppdSrcE = pppdE[varInd];
-    ppdDstE = m_E_merged[ VarIndTab[varInd] ];
-
-    pdSrcy  = ppdy[varInd];
-    pdDsty  = m_y_merged[ VarIndTab[varInd] ];
-
-    for(j=0; j< iFiltLength; j++)
-    {
-      for(i=0; i< iFiltLength; i++)
-      {
-        ppdDstE[j][i] += ppdSrcE[j][i];
-      }
-
-      pdDsty[j] += pdSrcy[j];
-    }
-    m_pixAcc_merged[ VarIndTab[varInd]  ] += m_pixAcc[varInd];
-
-  }
-
-  //estimate distortion reduction by using FFDE (JCTVC-C143)
-  iDist = 0;
-  for(f=0; f< filters_per_fr; f++)
-  {
-    piCoeff = ppiCoeffSet[f];
-    ppdDstE = m_E_merged [f];
-    pdDsty  = m_y_merged [f];
-
-    iDist += xFastFiltDistEstimation(ppdDstE, pdDsty, piCoeff, iFiltLength);
-  }
-
-
-  return iDist;
-
-}
-
-/** Calculate ALF grouping indices for ALF slices
- * \param varmap grouping indices buffer
- * \param imgY_Dec picture buffer
- * \param pad_size (max. filter tap)/2
- * \param fl  VAR_SIZE
- * \param img_stride picture buffer stride
- */
-Void TEncAdaptiveLoopFilter::xfilterSlicesEncoder(Pel* ImgDec, Pel* ImgRest, Int iStride, Int filtNo, Int** filterCoeff, Int* mergeTable, Pel** varImg)
-{
-  Pel* pPicSrc   = (Pel *)ImgDec;
-  Pel* pPicSlice = m_pcSliceYuvTmp->getLumaAddr();
-
-  for(UInt s=0; s< m_uiNumSlicesInPic; s++)
-  {
-    if(!m_pcPic->getValidSlice(s)) 
-    {
-      continue;
-    }
-    std::vector< std::vector<AlfLCUInfo*> > & vpSliceTileAlfLCU = m_pvpSliceTileAlfLCU[s];
-
-    for(Int t=0; t< (Int)vpSliceTileAlfLCU.size(); t++)
-    {
-      std::vector<AlfLCUInfo*> & vpAlfLCU = vpSliceTileAlfLCU[t];
-      copyRegion(vpAlfLCU, pPicSlice, pPicSrc, iStride);
-      extendRegionBorder(vpAlfLCU, pPicSlice, iStride);
-      filterLumaRegion(vpAlfLCU, pPicSlice, ImgRest, iStride, filtNo, filterCoeff, mergeTable, varImg);
-    }
-  }
-}
-
-/** Calculate block autocorrelations and crosscorrelations for ALF slices
- * \param ImgOrg original picture
- * \param ImgDec picture before filtering
- * \param tap  filter tap size
- * \param iStride picture buffer stride
- */
-Void   TEncAdaptiveLoopFilter::xstoreInBlockMatrixforSlices(Pel* ImgOrg, Pel* ImgDec, Int tap, Int iStride)
-{
-  Pel* pPicSrc   = (Pel *)ImgDec;
-  Pel* pPicSlice = m_pcSliceYuvTmp->getLumaAddr();
-
-  UInt iLastValidSliceID =0;
-  for(UInt s=0; s< m_uiNumSlicesInPic; s++)
-  {
-    if(m_pcPic->getValidSlice(s))
-    {
-      iLastValidSliceID = s;
-    }
-  }
-
-  for(UInt s=0; s<= iLastValidSliceID; s++)
-  {
-    if(!m_pcPic->getValidSlice(s))
-    {
-      continue;
-    }
-    std::vector< std::vector<AlfLCUInfo*> > & vpSliceTileAlfLCU = m_pvpSliceTileAlfLCU[s];
-    Int numValidTilesInSlice = (Int)vpSliceTileAlfLCU.size();
-    for(Int t=0; t< numValidTilesInSlice; t++)
-    {
-      std::vector<AlfLCUInfo*> & vpAlfLCU = vpSliceTileAlfLCU[t];
-      copyRegion(vpAlfLCU, pPicSlice, pPicSrc, iStride);
-      extendRegionBorder(vpAlfLCU, pPicSlice, iStride);
-      xstoreInBlockMatrixforRegion(vpAlfLCU, ImgOrg, pPicSlice, tap, iStride, (s==0)&&(t==0), (s== iLastValidSliceID)&&(t==numValidTilesInSlice-1));
-    }
-  }
-}
-
-/** Calculate block autocorrelations and crosscorrelations for one ALF region
- * \param vpAlfLCU ALF LCU data container
- * \param ImgOrg original picture
- * \param ImgDec picture before filtering
- * \param tap  filter tap size
- * \param iStride picture buffer stride
- * \param bFirstSlice  true for the first processing slice of the picture
- * \param bLastSlice true for the last processing slice of the picture
- */
-Void   TEncAdaptiveLoopFilter::xstoreInBlockMatrixforRegion(std::vector< AlfLCUInfo* > &vpAlfLCU, 
-                                                              Pel* ImgOrg, Pel* ImgDec, 
-                                                              Int tap, Int iStride, 
-                                                              Bool bFirstSlice, 
-                                                              Bool bLastSlice
-                                                              )
-{
-
-  UInt uiNumLCUs = (UInt)vpAlfLCU.size();
-  Int iHeight, iWidth;
-  Int ypos, xpos;
-  Bool bFirstLCU, bLastLCU;
-  Bool bFirstSGU, bLastSGU;
-  UInt numSGUs;
-
-  for(UInt i=0; i< uiNumLCUs; i++)
-  {
-    bFirstLCU = (i==0);
-    bLastLCU  = (i== uiNumLCUs -1);
-    AlfLCUInfo& cAlfLCU = *(vpAlfLCU[i]); 
-    numSGUs = cAlfLCU.numSGU;
-    for(UInt j=0; j< numSGUs; j++)
-    {
-      bFirstSGU= (j ==0);
-      bLastSGU = (j == numSGUs -1);
-
-      ypos    = (Int)(cAlfLCU[j].posY  );
-      xpos    = (Int)(cAlfLCU[j].posX  );
-      iHeight = (Int)(cAlfLCU[j].height);
-      iWidth  = (Int)(cAlfLCU[j].width );
-
-      xstoreInBlockMatrix(ypos, xpos, iHeight, iWidth, 
-        (bFirstSlice && bFirstLCU && bFirstSGU),(bLastSlice && bLastLCU && bLastSGU),
-        ImgOrg, ImgDec,tap, iStride);
-    }
-  }
-}
-
-
-/** Calculate autocorrelations and crosscorrelations for chroma slices
- * \param ComponentID Cb or Cr
- * \param pOrg original picture
- * \param pCmp picture before filtering
- * \param iTap  filter tap size
- * \param iOrgStride picture buffer stride for pOrg
- * \param iCmpStride picture buffer stride for pCmp
- */
-Void TEncAdaptiveLoopFilter::xCalcCorrelationFuncforChromaSlices(Int ComponentID, Pel* pOrg, Pel* pCmp, Int iTap, Int iOrgStride, Int iCmpStride)
-{
-
-  assert(iOrgStride == iCmpStride);
-
-  Pel* pPicSrc   = pCmp;
-  Pel* pPicSlice = (ComponentID == ALF_Cb)?(m_pcSliceYuvTmp->getCbAddr()):(m_pcSliceYuvTmp->getCrAddr());
-  Int chromaFormatShift = 1;
-
-  UInt iLastValidSliceID =0;
-  for(UInt s=0; s< m_uiNumSlicesInPic; s++)
-  {
-    if(m_pcPic->getValidSlice(s))
-    {
-      iLastValidSliceID = s;
-    }
-  }
-
-  for(UInt s=0; s<= iLastValidSliceID; s++)
-  {
-    if(!m_pcPic->getValidSlice(s))
-    {
-      continue;
-    }
-    std::vector< std::vector<AlfLCUInfo*> > & vpSliceTileAlfLCU = m_pvpSliceTileAlfLCU[s];
-    Int numValidTilesInSlice = (Int)vpSliceTileAlfLCU.size();
-    for(Int t=0; t< numValidTilesInSlice; t++)
-    {
-      std::vector<AlfLCUInfo*> & vpAlfLCU = vpSliceTileAlfLCU[t];
-      copyRegion(vpAlfLCU, pPicSlice, pPicSrc, iCmpStride, chromaFormatShift);
-      extendRegionBorder(vpAlfLCU, pPicSlice, iCmpStride, chromaFormatShift);
-      xCalcCorrelationFuncforChromaRegion(vpAlfLCU, pOrg, pPicSlice, iTap, iCmpStride,(s== iLastValidSliceID)&&(t== numValidTilesInSlice-1), chromaFormatShift);
-    }
-  }
-}
-
-/** Calculate autocorrelations and crosscorrelations for one chroma slice
- * \param vpAlfLCU ALF LCU data container
- * \param pOrg original picture
- * \param pCmp picture before filtering
- * \param iTap  filter tap size
- * \param iStride picture buffer stride
- * \param bLastSlice the last processing slice of picture
- */
-Void TEncAdaptiveLoopFilter::xCalcCorrelationFuncforChromaRegion(std::vector< AlfLCUInfo* > &vpAlfLCU, Pel* pOrg, Pel* pCmp, Int filtNo, Int iStride, Bool bLastSlice, Int iFormatShift)
-{
-  UInt uiNumLCUs = (UInt)vpAlfLCU.size();
-
-  Int iHeight, iWidth;
-  Int ypos, xpos;
-  Bool bLastLCU;
-  Bool bLastSGU;
-  UInt numSGUs;
-
-  for(UInt i=0; i< uiNumLCUs; i++)
-  {
-    bLastLCU  = (i== uiNumLCUs -1);
-
-    AlfLCUInfo& cAlfLCU = *(vpAlfLCU[i]); 
-    numSGUs = cAlfLCU.numSGU;
-    for(UInt j=0; j< numSGUs; j++)
-    {
-      bLastSGU = (j == numSGUs -1);
-      ypos    = (Int)(cAlfLCU[j].posY   >> iFormatShift);
-      xpos    = (Int)(cAlfLCU[j].posX   >> iFormatShift);
-      iHeight = (Int)(cAlfLCU[j].height >> iFormatShift);
-      iWidth  = (Int)(cAlfLCU[j].width  >> iFormatShift);
-      xCalcCorrelationFunc(ypos, xpos, pOrg, pCmp, filtNo, iWidth, iHeight, iStride, iStride, (bLastSlice && bLastLCU && bLastSGU) );
-    }
-  }
-}
-
-// ====================================================================================================================
-// Protected member functions
-// ====================================================================================================================
-
-Void TEncAdaptiveLoopFilter::xFilterTapDecisionChroma( UInt64 uiLumaRate, TComPicYuv* pcPicOrg, TComPicYuv* pcPicDec, TComPicYuv* pcPicRest, UInt64& ruiDist, UInt64& ruiBits )
-{
-  Int   iShape, num_coeff;
-  Int64 iOrgDistCb, iOrgDistCr, iFiltDistCb, iFiltDistCr, iDist;
-  Bool  bChanged = false;
-  Int*  qh = m_pcTempAlfParam->coeff_chroma;
-
-  UInt64 uiMinRate = uiLumaRate;
-  UInt64 uiMinDist = MAX_INT;
-  Double dMinCost  = MAX_DOUBLE;
-  Double dLocalMinCost = MAX_DOUBLE;
-
-  copyALFParam(m_pcTempAlfParam, m_pcBestAlfParam);
-  xCalcRDCostChroma(pcPicOrg, pcPicRest, m_pcTempAlfParam, uiMinRate, uiMinDist, dMinCost);
-
-#if ALF_SINGLE_FILTER_SHAPE
-  iShape = 0;
-#else 
-  for(iShape = 0; iShape < 2; iShape++)
-#endif  
-  {
-    // set global variables
-    num_coeff = m_sqrFiltLengthTab[iShape];
-    m_pcTempAlfParam->chroma_idc = 3;
-    m_pcTempAlfParam->filter_shape_chroma = iShape;
-    m_pcTempAlfParam->num_coeff_chroma = num_coeff;
-
-    // keep original corr pointer
-    Double **ppdTmpCorr = m_ppdAlfCorr;
-
-    // calc Cb matrix
-    m_pcTempAlfParam->chroma_idc = 2;
-    m_ppdAlfCorr = m_ppdAlfCorrCb;
-    for(Int i=0; i<ALF_MAX_NUM_COEF; i++)
-    {
-      ::memset(m_ppdAlfCorr[i], 0, sizeof(Double) * (ALF_MAX_NUM_COEF + 1));
-    }
-    Pel *pOrg = pcPicOrg->getCbAddr();
-    Pel *pCmp = pcPicDec->getCbAddr();
-    if(!m_bUseNonCrossALF)
-    {
-      xCalcCorrelationFunc(0, 0, pOrg, pCmp, iShape, (pcPicOrg->getWidth()>>1), (pcPicOrg->getHeight()>>1), pcPicOrg->getCStride(), pcPicDec->getCStride(), true);
-    }
-    else
-    {
-      xCalcCorrelationFuncforChromaSlices(ALF_Cb, pOrg, pCmp, iShape, pcPicOrg->getCStride(), pcPicDec->getCStride());
-    }
-
-    // calc Cr matrix
-    m_pcTempAlfParam->chroma_idc = 1;
-    m_ppdAlfCorr = m_ppdAlfCorrCr;
-    for(Int i=0; i<ALF_MAX_NUM_COEF; i++)
-    {
-      ::memset(m_ppdAlfCorr[i], 0, sizeof(Double) * (ALF_MAX_NUM_COEF + 1));
-    }
-    pOrg = pcPicOrg->getCrAddr();
-    pCmp = pcPicDec->getCrAddr();
-    if(!m_bUseNonCrossALF)
-    {
-      xCalcCorrelationFunc(0, 0, pOrg, pCmp, iShape, (pcPicOrg->getWidth()>>1), (pcPicOrg->getHeight()>>1), pcPicOrg->getCStride(), pcPicDec->getCStride(), true);
-    }
-    else
-    {
-      xCalcCorrelationFuncforChromaSlices(ALF_Cr, pOrg, pCmp, iShape, pcPicOrg->getCStride(), pcPicDec->getCStride());
-    }
-
-    // restore original corr pointer
-    m_ppdAlfCorr = ppdTmpCorr;
-
-    // calc original dist
-    memset(qh, 0, sizeof(Int)*num_coeff);
-    qh[num_coeff-1] = 1<<((Int)ALF_NUM_BIT_SHIFT);
-    iOrgDistCb = xFastFiltDistEstimationChroma(m_ppdAlfCorrCb, qh, num_coeff);
-    iOrgDistCr = xFastFiltDistEstimationChroma(m_ppdAlfCorrCr, qh, num_coeff);
-
-    for(Int iCmp=1; iCmp<=3; iCmp++)
-    {
-      m_pcTempAlfParam->chroma_idc = iCmp;
-      xCalcALFCoeffChroma(iCmp, iShape, qh);
-      iFiltDistCb = ((iCmp>>1)&0x1) ? xFastFiltDistEstimationChroma(m_ppdAlfCorrCb, qh, num_coeff) : iOrgDistCb;
-      iFiltDistCr = ((iCmp)   &0x1) ? xFastFiltDistEstimationChroma(m_ppdAlfCorrCr, qh, num_coeff) : iOrgDistCr;
-      iDist = iFiltDistCb + iFiltDistCr;
-      UInt64 uiRate = xCalcRateChroma(m_pcTempAlfParam);
-      Double dCost  = (Double)iDist + m_dLambdaChroma * (Double)uiRate;
-      if(dCost < dLocalMinCost)
-      {
-        dLocalMinCost = dCost;
-        copyALFParam(m_pcBestAlfParam, m_pcTempAlfParam);
-        bChanged = true;
-      }
-    }
-  }
-  copyALFParam(m_pcTempAlfParam, m_pcBestAlfParam);
-  if(!bChanged)
-  {
-    m_pcBestAlfParam->chroma_idc = 0;
-    return;
-  }
-
-  // Adaptive in-loop wiener filtering for chroma
-  xFilteringFrameChroma(m_pcTempAlfParam, pcPicOrg, pcPicDec, pcPicRest);
-
-  // filter on/off decision for chroma
-  Int iCWidth = (pcPicOrg->getWidth()>>1);
-  Int iCHeight = (pcPicOrg->getHeight()>>1);
-  Int iCStride = pcPicOrg->getCStride();
-  UInt64 uiFiltDistCb = xCalcSSD(pcPicOrg->getCbAddr(), pcPicRest->getCbAddr(), iCWidth, iCHeight, iCStride);
-  UInt64 uiFiltDistCr = xCalcSSD(pcPicOrg->getCrAddr(), pcPicRest->getCrAddr(), iCWidth, iCHeight, iCStride);
-  UInt64 uiOrgDistCb  = xCalcSSD(pcPicOrg->getCbAddr(), pcPicDec->getCbAddr(), iCWidth, iCHeight, iCStride);
-  UInt64 uiOrgDistCr  = xCalcSSD(pcPicOrg->getCrAddr(), pcPicDec->getCrAddr(), iCWidth, iCHeight, iCStride);
-  if(((m_pcTempAlfParam->chroma_idc)>>1 & 0x1) && (uiOrgDistCb<=uiFiltDistCb))
-  {
-    m_pcTempAlfParam->chroma_idc -= 2;
-    pcPicDec->copyToPicCb(pcPicRest);
-  }
-  if(((m_pcTempAlfParam->chroma_idc)    & 0x1) && (uiOrgDistCr<=uiFiltDistCr))
-  {
-    m_pcTempAlfParam->chroma_idc -= 1;
-    pcPicDec->copyToPicCr(pcPicRest);
-  }
-
-  if(m_pcTempAlfParam->chroma_idc)
-  {
-    UInt64 uiRate, uiDist;
-    Double dCost;
-    xCalcRDCostChroma(pcPicOrg, pcPicRest, m_pcTempAlfParam, uiRate, uiDist, dCost);
-
-    if( dCost < dMinCost )
-    {
-      copyALFParam(m_pcBestAlfParam, m_pcTempAlfParam);
-      predictALFCoeffChroma(m_pcBestAlfParam);
-      
-      ruiBits += uiRate;
-      ruiDist += uiDist;
-    }
-    else
-    {
-      m_pcBestAlfParam->chroma_idc = 0;
-      
-      if((m_pcTempAlfParam->chroma_idc>>1)&0x01)
-      {
-        pcPicDec->copyToPicCb(pcPicRest);
-      }
-      if(m_pcTempAlfParam->chroma_idc&0x01)
-      {
-        pcPicDec->copyToPicCr(pcPicRest);
-      }
-      
-      ruiBits += uiMinRate;
-      ruiDist += uiMinDist;
-    }
-  }
-  else
-  {
-    m_pcBestAlfParam->chroma_idc = 0;
-    
-    ruiBits += uiMinRate;
-    ruiDist += uiMinDist;
-    
-    pcPicDec->copyToPicCb(pcPicRest);
-    pcPicDec->copyToPicCr(pcPicRest);
-  }
-}
-
-Int64 TEncAdaptiveLoopFilter::xFastFiltDistEstimationChroma(Double** ppdCorr, Int* piCoeff, Int iSqrFiltLength)
-{
-  Double pdcoeff[ALF_MAX_NUM_COEF];
-  Int    i,j;
-  Int64  iDist;
-  Double dDist, dsum;
-  for(i=0; i< iSqrFiltLength; i++)
-  {
-    pdcoeff[i]= (Double)piCoeff[i] / (Double)(1<< ((Int)ALF_NUM_BIT_SHIFT) );
-  }
-
-  dDist =0;
-  for(i=0; i< iSqrFiltLength; i++)
-  {
-    dsum= ((Double)ppdCorr[i][i]) * pdcoeff[i];
-    for(j=i+1; j< iSqrFiltLength; j++)
-    {
-      dsum += (Double)(2*ppdCorr[i][j])* pdcoeff[j];
-    }
-
-    dDist += ((dsum - 2.0 * ppdCorr[i][iSqrFiltLength])* pdcoeff[i] );
-  }
-
-  UInt uiShift = g_uiBitIncrement<<1;
-  if(dDist < 0)
-  {
-    iDist = -(((Int64)(-dDist + 0.5)) >> uiShift);
-  }
-  else //dDist >=0
-  {
-    iDist= ((Int64)(dDist+0.5)) >> uiShift;
-  }
-
-  return iDist;
-}
-
-Void TEncAdaptiveLoopFilter::xCalcALFCoeffChroma(Int iChromaIdc, Int iShape, Int* piCoeff)
-{
-  Int iSqrFiltLength = m_sqrFiltLengthTab[iShape];
-
-  for(Int i=0; i<iSqrFiltLength; i++)
-  {
-    memset(m_ppdAlfCorr[i], 0, sizeof(Double)*(iSqrFiltLength + 1));
-  }
-
-  // retrive
-  if((iChromaIdc>>1) & 0x1)
-  {
-    for(Int i=0; i<iSqrFiltLength; i++)
-    {
-      for(Int j=i; j<iSqrFiltLength+1; j++)
-      {
-        m_ppdAlfCorr[i][j] += m_ppdAlfCorrCb[i][j];
-      }
-    }
-  }
-  if(iChromaIdc & 0x1)
-  {
-    for(Int i=0; i<iSqrFiltLength; i++)
-    {
-      for(Int j=i; j<iSqrFiltLength+1; j++)
-      {
-        m_ppdAlfCorr[i][j] += m_ppdAlfCorrCr[i][j];
-      }
-    }
-  }
-
-  // copy
-  for(Int i=1; i<iSqrFiltLength; i++)
-  {
-    for(Int j=0; j<i; j++)
-    {
-      m_ppdAlfCorr[i][j] = m_ppdAlfCorr[j][i];
-    }
-  }
-
-  Double *corr = new Double[iSqrFiltLength];
-  for(Int i=0; i<iSqrFiltLength; i++)
-  {
-    corr[i] = m_ppdAlfCorr[i][iSqrFiltLength];
-  }
-
-  // calc coeff
-  gnsSolveByChol(m_ppdAlfCorr, corr, m_pdDoubleAlfCoeff, iSqrFiltLength);
-  xQuantFilterCoef(m_pdDoubleAlfCoeff, piCoeff, iShape, g_uiBitDepth + g_uiBitIncrement);
-  delete [] corr;
-}
-
-UInt64 TEncAdaptiveLoopFilter::xCalcRateChroma(ALFParam* pAlfParam)
-{
-  UInt64 uiRate;
-  Int* piTmpCoef;
-  piTmpCoef = new Int[ALF_MAX_NUM_COEF];
-  memcpy(piTmpCoef, pAlfParam->coeff_chroma, sizeof(Int)*pAlfParam->num_coeff_chroma);
-
-  predictALFCoeffChroma(pAlfParam);
-
-  m_pcEntropyCoder->resetEntropy();
-  m_pcEntropyCoder->resetBits();
-  m_pcEntropyCoder->encodeAlfParam(pAlfParam);
-  uiRate = m_pcEntropyCoder->getNumberOfWrittenBits();
-  if (m_vBestAlfCUCtrlParam.size() != 0)
-  {
-    for(UInt s=0; s< m_uiNumSlicesInPic; s++)
-    {
-      if(!m_pcPic->getValidSlice(s))
-      {
-        continue;
-      }
-      m_pcEntropyCoder->resetEntropy();
-      m_pcEntropyCoder->resetBits();
-      m_pcEntropyCoder->encodeAlfCtrlParam( m_vBestAlfCUCtrlParam[s], m_uiNumCUsInFrame);
-      uiRate += m_pcEntropyCoder->getNumberOfWrittenBits();
-    }
-  }
-  else
-  {
-    uiRate += m_uiNumSlicesInPic;
-  }
-  memcpy(pAlfParam->coeff_chroma, piTmpCoef, sizeof(int)*pAlfParam->num_coeff_chroma);
-  delete[] piTmpCoef;
-  piTmpCoef = NULL;
-
-  return uiRate;
-}
-#endif
 
 //! \}

branches/HTM-5.1-dev0/source/Lib/TLibEncoder/TEncAdaptiveLoopFilter.h

@@ -49 +49 @@
 //! \{
 
-#if LCU_SYNTAX_ALF
 #define LCUALF_FILTER_BUDGET_CONTROL_ENC        1 //!< filter budget control 
 #define LCUALF_AVOID_USING_BOTTOM_LINES_ENCODER 1 //!< avoid using LCU bottom lines when lcu-based encoder RDO is used
-#endif
 
 // ====================================================================================================================
@@ -58 +56 @@
 // ====================================================================================================================
 
-#if LCU_SYNTAX_ALF
 /// correlation info
 struct AlfCorrData
@@ -110 +107 @@
 };
 
-#endif
 
 
@@ -120 +116 @@
   /// variables for correlation calculation
   ///
-#if !LCU_SYNTAX_ALF
-  Double** m_ppdAlfCorr;
-  Double* m_pdDoubleAlfCoeff;
-  Double** m_ppdAlfCorrCb;
-  Double** m_ppdAlfCorrCr;
-  double ***m_yGlobalSym;
-  double ****m_EGlobalSym;
-  double *m_pixAcc;
-#endif
   double **m_y_merged;
   double ***m_E_merged;
@@ -134 +121 @@
   double *m_y_temp;
   double **m_E_temp;
-#if LCU_SYNTAX_ALF
   static const Int  m_alfNumPartsInRowTab[5];
   static const Int  m_alfNumPartsLevelTab[5];
@@ -154 +140 @@
   Int    m_alfUsedFilterNum;
 #endif
-#endif
 
   ///
   /// ALF parameters
   ///
-#if !LCU_SYNTAX_ALF
-  ALFParam* m_pcBestAlfParam;
-  ALFParam* m_pcTempAlfParam;
-  ALFParam* pcAlfParamShape0;
-  ALFParam* pcAlfParamShape1;
-#endif
   ALFParam *m_tempALFp;
 
@@ -172 +151 @@
   TComPicYuv* m_pcPicYuvBest;
   TComPicYuv* m_pcPicYuvTmp;
-#if !LCU_SYNTAX_ALF
-  TComPicYuv* pcPicYuvRecShape0;
-  TComPicYuv* pcPicYuvRecShape1;
-#endif
 
   ///
@@ -186 +161 @@
   Int    **m_diffFilterCoeffQuant;
   Int    **m_FilterCoeffQuantTemp;
-#if !LCU_SYNTAX_ALF
-  Int**  m_mergeTableSavedMethods[NUM_ALF_CLASS_METHOD];
-  Int*** m_aiFilterCoeffSavedMethods[NUM_ALF_CLASS_METHOD];  //!< time-delayed filter set buffer
-  Int*   m_iPreviousFilterShapeMethods[NUM_ALF_CLASS_METHOD];
-#endif
   ///
   /// coding control parameters
@@ -196 +166 @@
   Double m_dLambdaLuma;
   Double m_dLambdaChroma;
-#if !LCU_SYNTAX_ALF
-  Int  m_iUsePreviousFilter;     //!< for N-pass encoding- 1: time-delayed filtering is allowed. 0: not allowed.
-  Int  m_iDesignCurrentFilter;   //!< for N-pass encoding- 1: design filters for current slice. 0: design filters for future slice reference
-  Int  m_iGOPSize;                //!< GOP size
-  Int  m_iCurrentPOC;             //!< POC
-#endif
   Int  m_iALFEncodePassReduction; //!< 0: 16-pass encoding, 1: 1-pass encoding, 2: 2-pass encoding
 
@@ -221 +185 @@
 private:
 
-#if LCU_SYNTAX_ALF
   Void disableComponentAlfParam(Int compIdx, AlfParamSet* alfParamSet, AlfUnitParam* alfUnitPic);
   Void copyAlfParamSet(AlfParamSet* dst, AlfParamSet* src);
@@ -252 +215 @@
   Void xCopyDecToRestCUs( Pel* imgDec, Pel* imgRest, Int stride );
   Void xCopyDecToRestCU( TComDataCU* pcCU, UInt uiAbsPartIdx, UInt uiDepth, Pel* imgDec, Pel* imgRest, Int stride );
-#if ALF_SINGLE_FILTER_SHAPE 
   Void calcCorrOneCompRegionChma(Pel* imgOrg, Pel* imgPad, Int stride, Int yPos, Int xPos, Int height, Int width, Double **eCorr, Double *yCorr, Bool isSymmCopyBlockMatrix); //!< Calculate correlations for chroma                                        
   Void calcCorrOneCompRegionLuma(Pel* imgOrg, Pel* imgPad, Int stride, Int yPos, Int xPos, Int height, Int width, Double ***eCorr, Double **yCorr, Double *pixAcc, Bool isforceCollection, Bool isSymmCopyBlockMatrix);
-#endif
 
   //LCU-based mode decision
@@ -291 +252 @@
   Void transferToAlfParamSet(Int compIdx, AlfUnitParam* alfUnitPic, AlfParamSet* & alfParamSet);
   Int  calculateAlfParamSetRateRDO(Int compIdx, AlfParamSet* alfParamSet, std::vector<AlfCUCtrlInfo>* alfCUCtrlParam);
-#endif
-#if !LCU_SYNTAX_ALF
-  // init / uninit internal variables
-  Void xInitParam      ();
-  Void xUninitParam    ();
-#endif
   // ALF on/off control related functions
   Void xCreateTmpAlfCtrlFlags   ();
@@ -305 +260 @@
   Void xEncodeCUAlfCtrlFlags  (std::vector<AlfCUCtrlInfo> &vAlfCUCtrlParam);
   Void xEncodeCUAlfCtrlFlag   ( TComDataCU* pcCU, UInt uiAbsPartIdx, UInt uiDepth);
-#if !LCU_SYNTAX_ALF  
-  Void xCUAdaptiveControl_qc           ( TComPicYuv* pcPicOrg, TComPicYuv* pcPicDec, TComPicYuv* pcPicRest, UInt64& ruiMinRate, UInt64& ruiMinDist, Double& rdMinCost );
-  Void xSetCUAlfCtrlFlags_qc            (UInt uiAlfCtrlDepth, TComPicYuv* pcPicOrg, TComPicYuv* pcPicDec, TComPicYuv* pcPicRest, UInt64& ruiDist, std::vector<AlfCUCtrlInfo>& vAlfCUCtrlParam);
-  Void xSetCUAlfCtrlFlag_qc             (TComDataCU* pcCU, UInt uiAbsPartIdx, UInt uiDepth, UInt uiAlfCtrlDepth, TComPicYuv* pcPicOrg, TComPicYuv* pcPicDec, TComPicYuv* pcPicRest, UInt64& ruiDist, std::vector<UInt>& vCUCtrlFlag);
-
-  // functions related to correlation computation
-  Void xstoreInBlockMatrix(Int ypos, Int xpos, Int iheight, Int iwidth, Bool bResetBlockMatrix, Bool bSymmCopyBlockMatrix, Pel* pImgOrg, Pel* pImgPad, Int filtNo, Int stride); //!< Calculate correlations for luma
-  Void xstoreInBlockMatrixforRegion(std::vector< AlfLCUInfo* > &vpAlfLCU, Pel* ImgOrg, Pel* ImgDec, Int tap, Int iStride, Bool bFirstSlice, Bool bLastSlice); //!< Calculate block autocorrelations and crosscorrelations for one ALF slice
-  Void xstoreInBlockMatrixforSlices  (Pel* ImgOrg, Pel* ImgDec, Int tap, Int iStride); //!< Calculate block autocorrelations and crosscorrelations for ALF slices
-  Void xCalcCorrelationFunc(Int ypos, Int xpos, Pel* pImgOrg, Pel* pImgPad, Int filtNo, Int iWidth, Int iHeight, Int iOrgStride, Int iCmpStride, Bool bSymmCopyBlockMatrix); //!< Calculate correlations for chroma
-  Void xCalcCorrelationFuncforChromaRegion(std::vector< AlfLCUInfo* > &vpAlfLCU, Pel* pOrg, Pel* pCmp, Int filtNo, Int iStride, Bool bLastSlice, Int iFormatShift); //!< Calculate autocorrelations and crosscorrelations for one chroma slice
-  Void xCalcCorrelationFuncforChromaSlices  (Int ComponentID, Pel* pOrg, Pel* pCmp, Int iTap, Int iOrgStride, Int iCmpStride); //!< Calculate autocorrelations and crosscorrelations for chroma slices
-#endif
   // functions related to filtering
   Void xFilterCoefQuickSort   ( Double *coef_data, Int *coef_num, Int upper, Int lower );
   Void xQuantFilterCoef       ( Double* h, Int* qh, Int tap, int bit_depth );
-#if !LCU_SYNTAX_ALF
-  Void xClearFilterCoefInt    ( Int* qh, Int N );
-  Void xCopyDecToRestCUs      ( TComPicYuv* pcPicDec, TComPicYuv* pcPicRest );
-  Void xCopyDecToRestCU       ( TComDataCU* pcCU, UInt uiAbsPartIdx, UInt uiDepth, TComPicYuv* pcPicDec, TComPicYuv* pcPicRest );
-  Void xFilteringFrameChroma  (ALFParam* pcAlfParam, TComPicYuv* pcPicOrg, TComPicYuv* pcPicDec, TComPicYuv* pcPicRest);
-  Int  setFilterIdx(Int index); //!< set filter buffer index
-  Void setInitialMask(TComPicYuv* pcPicOrg, TComPicYuv* pcPicDec); //!< set initial m_maskImg
-  Void saveFilterCoeffToBuffer(Int **filterSet, Int numFilter, Int* mergeTable, Int mode, Int filtNo); //!< save filter coefficients to buffer
-  Void setMaskWithTimeDelayedResults(TComPicYuv* pcPicOrg, TComPicYuv* pcPicDec); //!< set initial m_maskImg with previous (time-delayed) filters
-  Void decideFilterShapeLuma(Pel* ImgOrg, Pel* ImgDec, Int Stride, ALFParam* pcAlfSaved, UInt64& ruiRate, UInt64& ruiDist,Double& rdCost); //!< Estimate RD cost of all filter size & store the best one
-  Void   xFilterTapDecisionChroma      (UInt64 uiLumaRate, TComPicYuv* pcPicOrg, TComPicYuv* pcPicDec, TComPicYuv* pcPicRest, UInt64& ruiDist, UInt64& ruiBits);
-  Int64  xFastFiltDistEstimationChroma (Double** ppdCorr, Int* piCoeff, Int iSqrFiltLength);
-  Void  xfilterSlicesEncoder(Pel* ImgDec, Pel* ImgRest, Int iStride, Int filtNo, Int** filterCoeff, Int* mergeTable, Pel** varImg); //!< Calculate ALF grouping indices for ALF slices
-  Void  setALFEncodingParam(TComPic *pcPic); //!< set ALF encoding parameters
-  Void xReDesignFilterCoeff_qc          (TComPicYuv* pcPicOrg, TComPicYuv* pcPicDec,  TComPicYuv* pcPicRest, Bool bReadCorr);
-  Void xFirstFilteringFrameLuma (Pel* imgOrg, Pel* imgDec, Pel* imgRest, ALFParam* ALFp, Int filtNo, Int stride);
-  Void xFilteringFrameLuma(Pel* imgOrg, Pel* imgPad, Pel* imgFilt, ALFParam* ALFp, Int filtNo, Int stride);
-  Void xEncALFLuma  ( TComPicYuv* pcPicOrg, TComPicYuv* pcPicDec, TComPicYuv* pcPicRest, UInt64& ruiMinRate, UInt64& ruiMinDist, Double& rdMinCost ); //!< estimate adaptation mode and filter shape
-#endif
   // distortion / misc functions
 #if HHI_INTERVIEW_SKIP
@@ -346 +269 @@
   UInt64 xCalcSSD             ( Pel* pOrg, Pel* pCmp, Int iWidth, Int iHeight, Int iStride );
 #endif
-#if !LCU_SYNTAX_ALF
-#if HHI_INTERVIEW_SKIP
-  Void  xCalcRDCost          ( TComPicYuv* pcPicOrg, TComPicYuv* pcPicCmp, ALFParam* pAlfParam, UInt64& ruiRate, UInt64& ruiDist, Double& rdCost, std::vector<AlfCUCtrlInfo>* pvAlfCUCtrlParam = NULL);
-  Void  xCalcRDCost          ( ALFParam* pAlfParam, UInt64& ruiRate, UInt64 uiDist, Double& rdCost, std::vector<AlfCUCtrlInfo>* pvAlfCUCtrlParam = NULL);
-  Void  xCalcRDCostChroma    ( TComPicYuv* pcPicOrg, TComPicYuv* pcPicCmp, ALFParam* pAlfParam, UInt64& ruiRate, UInt64& ruiDist, Double& rdCost );
-#else
-  Void  xCalcRDCost          ( TComPicYuv* pcPicOrg, TComPicYuv* pcPicCmp, ALFParam* pAlfParam, UInt64& ruiRate, UInt64& ruiDist, Double& rdCost, std::vector<AlfCUCtrlInfo>* pvAlfCUCtrlParam = NULL);
-  Void  xCalcRDCost          ( ALFParam* pAlfParam, UInt64& ruiRate, UInt64 uiDist, Double& rdCost, std::vector<AlfCUCtrlInfo>* pvAlfCUCtrlParam = NULL);
-  Void  xCalcRDCostChroma    ( TComPicYuv* pcPicOrg, TComPicYuv* pcPicCmp, ALFParam* pAlfParam, UInt64& ruiRate, UInt64& ruiDist, Double& rdCost );
-#endif
-#endif
   Int64 xFastFiltDistEstimation(Double** ppdE, Double* pdy, Int* piCoeff, Int iFiltLength); //!< Estimate filtering distortion by correlation values and filter coefficients
-#if !LCU_SYNTAX_ALF
-  Int64 xEstimateFiltDist      (Int filters_per_fr, Int* VarIndTab, Double*** pppdE, Double** ppdy, Int** ppiCoeffSet, Int iFiltLength); //!< Estimate total filtering cost of all groups  
-  UInt64 xCalcRateChroma               (ALFParam* pAlfParam);
-  Void   xCalcALFCoeffChroma           (Int iChromaIdc, Int iShape, Int* piCoeff);
-#endif
 
   /// code filter coefficients
   UInt xcodeFiltCoeff(Int **filterCoeffSymQuant, Int filter_shape, Int varIndTab[], Int filters_per_fr_best, ALFParam* ALFp);
-#if LCU_SYNTAX_ALF
   Void xfindBestFilterVarPred(double **ySym, double ***ESym, double *pixAcc, Int **filterCoeffSym, Int **filterCoeffSymQuant,Int filter_shape, Int *filters_per_fr_best, Int varIndTab[], Pel **imgY_rec, Pel **varImg, Pel **maskImg, Pel **imgY_pad, double lambda_val, Int numMaxFilters = NO_FILTERS);
-#else
-  Void xfindBestFilterVarPred(double **ySym, double ***ESym, double *pixAcc, Int **filterCoeffSym, Int **filterCoeffSymQuant,Int filter_shape, Int *filters_per_fr_best, Int varIndTab[], Pel **imgY_rec, Pel **varImg, Pel **maskImg, Pel **imgY_pad, double lambda_val);
-#endif
   double xfindBestCoeffCodMethod(int **filterCoeffSymQuant, int filter_shape, int sqrFiltLength, int filters_per_fr, double errorForce0CoeffTab[NO_VAR_BINS][2], double lambda);
   Int xsendAllFiltersPPPred(int **FilterCoeffQuant, int filter_shape, int sqrFiltLength, int filters_per_group, int createBistream, ALFParam* ALFp);
@@ -400 +303 @@
   Void startALFEnc(TComPic* pcPic, TEncEntropy* pcEntropyCoder); //!< allocate temporal memory
   Void endALFEnc(); //!< destroy temporal memory
-#if LCU_SYNTAX_ALF
 #if ALF_CHROMA_LAMBDA
 #if HHI_INTERVIEW_SKIP
@@ -418 +320 @@
   Void resetPicAlfUnit();
   Void setAlfCoefInSlice(Bool b) {m_alfCoefInSlice = b;}
-#else
-#if ALF_CHROMA_LAMBDA  
-#if HHI_INTERVIEW_SKIP
-  Void ALFProcess(ALFParam* pcAlfParam, std::vector<AlfCUCtrlInfo>* pvAlfCtrlParam, Double dLambdaLuma, Double dLambdaChroma, UInt64& ruiDist, UInt64& ruiBits, Bool bInterviewSkip); //!< estimate ALF parameters
-#else
-  Void ALFProcess(ALFParam* pcAlfParam, std::vector<AlfCUCtrlInfo>* pvAlfCtrlParam, Double dLambdaLuma, Double dLambdaChroma, UInt64& ruiDist, UInt64& ruiBits); //!< estimate ALF parameters
-#endif
-#else
-#if HHI_INTERVIEW_SKIP
-  Void ALFProcess(ALFParam* pcAlfParam, std::vector<AlfCUCtrlInfo>* pvAlfCtrlParam, Double dLambda, UInt64& ruiDist, UInt64& ruiBits, Bool bInterviewSkip); //!< estimate ALF parameters
-#else
-  Void ALFProcess(ALFParam* pcAlfParam, std::vector<AlfCUCtrlInfo>* pvAlfCtrlParam, Double dLambda, UInt64& ruiDist, UInt64& ruiBits); //!< estimate ALF parameters
-#endif
-#endif
-
-  Void setGOPSize(Int val) { m_iGOPSize = val; } //!< set GOP size
-#endif
   Void setALFEncodePassReduction (Int iVal) {m_iALFEncodePassReduction = iVal;} //!< set N-pass encoding. 0: 16(14)-pass encoding, 1: 1-pass encoding, 2: 2-pass encoding
 
   Void setALFMaxNumberFilters    (Int iVal) {m_iALFMaxNumberFilters = iVal;} //!< set ALF Max Number of Filters
 
-#if LCU_SYNTAX_ALF
   Void createAlfGlobalBuffers(); //!< create ALF global buffers
   Void initPicQuadTreePartition(Bool isPicBasedEncode);
-#else
-  Void createAlfGlobalBuffers(Int iALFEncodePassReduction); //!< create ALF global buffers
-#endif
   Void destroyAlfGlobalBuffers(); //!< destroy ALF global buffers
   Void PCMLFDisableProcess (TComPic* pcPic);

branches/HTM-5.1-dev0/source/Lib/TLibEncoder/TEncBinCoder.h

@@ -56 +56 @@
   virtual Void  finish            ()                                          = 0;
   virtual Void  copyState         ( TEncBinIf* pcTEncBinIf )                  = 0;
-#if OL_FLUSH
   virtual Void  flush            ()                                           = 0;
-#endif
 
   virtual Void  encodeFlush     (Bool bEnd) = 0;
 
   virtual Void  resetBac          ()                                          = 0;
-#if BURST_IPCM
   virtual Void  encodeNumSubseqIPCM( Int numSubseqIPCM )                   = 0;
-#endif
   virtual Void  encodePCMAlignBits()                                          = 0;
   virtual Void  xWritePCMCode     ( UInt uiCode, UInt uiLength )              = 0;

branches/HTM-5.1-dev0/source/Lib/TLibEncoder/TEncBinCoderCABAC.cpp

@@ -105 +105 @@
 }
 
-#if OL_FLUSH
 Void TEncBinCABAC::flush()
 {
@@ -117 +116 @@
   start();
 }
-#endif
 
 /** Reset BAC register and counter values.
@@ -127 +125 @@
 }
 
-#if BURST_IPCM
 /** Encode # of subsequent IPCM blocks.
  * \param numSubseqIPCM 
@@ -153 +150 @@
   }
 }
-#endif
 
 /** Encode PCM alignment zero bits.
@@ -160 +156 @@
 Void TEncBinCABAC::encodePCMAlignBits()
 {
-#if !BURST_IPCM
-  finish();
-  m_pcTComBitIf->write( 1, 1 ); // stop bit
-#endif
   m_pcTComBitIf->writeAlignZero(); // pcm align zero
 }

branches/HTM-5.1-dev0/source/Lib/TLibEncoder/TEncBinCoderCABAC.h

@@ -57 +57 @@
   Void  finish            ();
   Void  copyState         ( TEncBinIf* pcTEncBinIf );
-#if OL_FLUSH
   Void  flush            ();
-#endif
 
   Void  resetBac          ();
-#if BURST_IPCM
   Void  encodeNumSubseqIPCM( Int numSubseqIPCM );
-#endif
   Void  encodePCMAlignBits();
   Void  xWritePCMCode     ( UInt uiCode, UInt uiLength );

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

@@ -161 +161 @@
   //DF flag
   WRITE_FLAG(pcAPS->getLoopFilterOffsetInAPS()?1:0, "aps_deblocking_filter_flag");
-#if !SAO_UNIT_INTERLEAVING
-  //SAO flag
-  WRITE_FLAG( pcAPS->getSaoEnabled()?1:0, "aps_sample_adaptive_offset_flag"); 
-#endif
-#if !LCU_SYNTAX_ALF
-  //ALF flag
-  WRITE_FLAG( pcAPS->getAlfEnabled()?1:0, "aps_adaptive_loop_filter_flag"); 
-#endif
-}
-#if LCU_SYNTAX_ALF
+}
 Void TEncCavlc::codeAPSAlflag(UInt uiCode)
 {
   WRITE_FLAG(uiCode, "aps_adaptive_loop_filter_flag");
 }
-#endif
 
 Void TEncCavlc::codeDFFlag(UInt uiCode, const Char *pSymbolName)
@@ -186 +176 @@
 }
 
-#if RPS_IN_SPS
 Void TEncCavlc::codeShortTermRefPicSet( TComSPS* pcSPS, TComReferencePictureSet* rps )
-#else
-Void TEncCavlc::codeShortTermRefPicSet( TComPPS* pcPPS, TComReferencePictureSet* rps )
-#endif
 {
 #if PRINT_RPS_INFO
@@ -245 +231 @@
   xTracePPSHeader (pcPPS);
 #endif
-#if !RPS_IN_SPS
-  TComRPSList* rpsList = pcPPS->getRPSList();
-#endif
   
   WRITE_UVLC( pcPPS->getPPSId(),                             "pic_parameter_set_id" );
   WRITE_UVLC( pcPPS->getSPSId(),                             "seq_parameter_set_id" );
 
-#if MULTIBITS_DATA_HIDING
   WRITE_FLAG( pcPPS->getSignHideFlag(), "sign_data_hiding_flag" );
   if( pcPPS->getSignHideFlag() )
@@ -258 +240 @@
     WRITE_CODE(pcPPS->getTSIG(), 4, "sign_hiding_threshold");
   }
-#endif
 #if CABAC_INIT_FLAG
   WRITE_FLAG( pcPPS->getCabacInitPresentFlag() ? 1 : 0,   "cabac_init_present_flag" );
-#endif
-#if !RPS_IN_SPS
-  // RPS is put before entropy_coding_mode_flag
-  // since entropy_coding_mode_flag will probably be removed from the WD
-  TComReferencePictureSet*      rps;
-
-  WRITE_UVLC(rpsList->getNumberOfReferencePictureSets(), "num_short_term_ref_pic_sets" );
-  for(UInt i=0; i < rpsList->getNumberOfReferencePictureSets(); i++)
-  {
-    rps = rpsList->getReferencePictureSet(i);
-    codeShortTermRefPicSet(pcPPS,rps);
-  }
-  WRITE_FLAG( pcPPS->getLongTermRefsPresent() ? 1 : 0,         "long_term_ref_pics_present_flag" );
 #endif
   // entropy_coding_mode_flag
@@ -280 +248 @@
   if (pcPPS->getEntropyCodingMode())
   {
-#if !WPP_SIMPLIFICATION
-    WRITE_UVLC( pcPPS->getEntropyCodingSynchro(),            "entropy_coding_synchro" );
-    WRITE_FLAG( pcPPS->getCabacIstateReset() ? 1 : 0,        "cabac_istate_reset" );
-#endif
-#if !TILES_OR_ENTROPY_SYNC_IDC
-#if !WPP_SIMPLIFICATION
-    if ( pcPPS->getEntropyCodingSynchro() )
-#endif
-    {
-      WRITE_UVLC( pcPPS->getNumSubstreams()-1,               "num_substreams_minus1" );
-    }
-#endif
-  }
-#if !H0566_TLA
-  WRITE_UVLC( pcPPS->getNumTLayerSwitchingFlags(),           "num_temporal_layer_switching_point_flags" );
-  for( UInt i = 0; i < pcPPS->getNumTLayerSwitchingFlags(); i++ ) 
-  {
-    WRITE_FLAG( pcPPS->getTLayerSwitchingFlag( i ) ? 1 : 0 , "temporal_layer_switching_point_flag" ); 
-  }
-#endif
+  }
   //   num_ref_idx_l0_default_active_minus1
   //   num_ref_idx_l1_default_active_minus1
@@ -313 +262 @@
   WRITE_FLAG( pcPPS->getUseWP() ? 1 : 0,  "weighted_pred_flag" );   // Use of Weighting Prediction (P_SLICE)
   WRITE_CODE( pcPPS->getWPBiPredIdc(), 2, "weighted_bipred_idc" );  // Use of Weighting Bi-Prediction (B_SLICE)
-#if H0388
   WRITE_FLAG( pcPPS->getOutputFlagPresentFlag() ? 1 : 0,  "output_flag_present_flag" );
-#endif
-#if TILES_OR_ENTROPY_SYNC_IDC
   if(pcPPS->getSPS()->getTilesOrEntropyCodingSyncIdc()==1)
   {
-#endif
     WRITE_FLAG( pcPPS->getColumnRowInfoPresent(),           "tile_info_present_flag" );
     WRITE_FLAG( pcPPS->getTileBehaviorControlPresentFlag(),  "tile_control_present_flag");
@@ -347 +292 @@
       if(iNumColTilesMinus1 !=0 || iNumRowTilesMinus1 !=0)
       {
-#if !REMOVE_TILE_DEPENDENCE
-        WRITE_FLAG( pcPPS->getTileBoundaryIndependenceIdr(),                         "tile_boundary_independence_flag" );
-        if(pcPPS->getTileBoundaryIndependenceIdr() == 1)
-        {
-#endif
           WRITE_FLAG( pcPPS->getLFCrossTileBoundaryFlag()?1 : 0,            "loop_filter_across_tile_flag");
-#if !REMOVE_TILE_DEPENDENCE
-        }
-#endif
-      }
-    }
-#if TILES_OR_ENTROPY_SYNC_IDC
+      }
+    }
   }
   else if(pcPPS->getSPS()->getTilesOrEntropyCodingSyncIdc()==2)
@@ -364 +300 @@
     WRITE_UVLC( pcPPS->getNumSubstreams()-1,               "num_substreams_minus1" );
   }
-#endif
-
-#if DBL_CONTROL
+
   WRITE_FLAG( pcPPS->getDeblockingFilterControlPresent()?1 : 0, "deblocking_filter_control_present_flag");
-#endif
-#if PARALLEL_MERGE
   WRITE_UVLC( pcPPS->getLog2ParallelMergeLevelMinus2(), "log2_parallel_merge_level_minus2");
-#endif
   WRITE_FLAG( 0, "pps_extension_flag" );
 }
@@ -531 +462 @@
   WRITE_UVLC( pcSPS->getPicWidthInLumaSamples (),   "pic_width_in_luma_samples" );
   WRITE_UVLC( pcSPS->getPicHeightInLumaSamples(),   "pic_height_in_luma_samples" );
-#if PIC_CROPPING
   WRITE_FLAG( pcSPS->getPicCroppingFlag(),          "pic_cropping_flag" );
   if (pcSPS->getPicCroppingFlag())
@@ -540 +470 @@
     WRITE_UVLC( pcSPS->getPicCropBottomOffset(),    "pic_crop_bottom_offset" );
   }
-#endif
 
 #if FULL_NBIT
@@ -566 +495 @@
 
   WRITE_UVLC( pcSPS->getBitsForPOC()-4,                 "log2_max_pic_order_cnt_lsb_minus4" );
-#if H0567_DPB_PARAMETERS_PER_TEMPORAL_LAYER
   for(UInt i=0; i <= pcSPS->getMaxTLayers()-1; i++)
   {
@@ -573 +501 @@
     WRITE_UVLC( pcSPS->getMaxLatencyIncrease(i),           "max_latency_increase[i]" );
   }
-#else
-  WRITE_UVLC( pcSPS->getMaxNumberOfReferencePictures(), "max_num_ref_pics" ); 
-  WRITE_UVLC( pcSPS->getNumReorderFrames(),             "num_reorder_frames" ); 
-  WRITE_UVLC(pcSPS->getMaxDecFrameBuffering(),          "max_dec_frame_buffering" );
-  WRITE_UVLC(pcSPS->getMaxLatencyIncrease(),            "max_latency_increase"    );
-#endif
   assert( pcSPS->getMaxCUWidth() == pcSPS->getMaxCUHeight() );
   
@@ -589 +511 @@
   }
 
-#if H0412_REF_PIC_LIST_RESTRICTION
   WRITE_FLAG( pcSPS->getRestrictedRefPicListsFlag(),                                 "restricted_ref_pic_lists_flag" );
   if( pcSPS->getRestrictedRefPicListsFlag() )
@@ -595 +516 @@
     WRITE_FLAG( pcSPS->getListsModificationPresentFlag(),                            "lists_modification_present_flag" );
   }
-#endif
   WRITE_UVLC( log2MinCUSize - 3,                                                     "log2_min_coding_block_size_minus3" );
   WRITE_UVLC( pcSPS->getMaxCUDepth()-g_uiAddCUDepth,                                 "log2_diff_max_min_coding_block_size" );
@@ -621 +541 @@
   WRITE_FLAG( pcSPS->getUseSAO() ? 1 : 0,                                            "sample_adaptive_offset_enabled_flag");
   WRITE_FLAG( pcSPS->getUseALF () ? 1 : 0,                                           "adaptive_loop_filter_enabled_flag");
-#if LCU_SYNTAX_ALF
   if(pcSPS->getUseALF())
   {
     WRITE_FLAG( (pcSPS->getUseALFCoefInSlice()) ? 1 : 0,                             "alf_coef_in_slice_flag");
   }
-#endif
 
   if( pcSPS->getUsePCM() )
@@ -637 +555 @@
   WRITE_FLAG( pcSPS->getTemporalIdNestingFlag() ? 1 : 0,                             "temporal_id_nesting_flag" );
 
-#if RPS_IN_SPS
   TComRPSList* rpsList = pcSPS->getRPSList();
   TComReferencePictureSet*      rps;
@@ -648 +565 @@
   }    
   WRITE_FLAG( pcSPS->getLongTermRefsPresent() ? 1 : 0,         "long_term_ref_pics_present_flag" );
-#endif
-#if !PIC_CROPPING
-  //!!!KS: Syntax not in WD !!!
-  
-  xWriteUvlc  ( pcSPS->getPad (0) );
-  xWriteUvlc  ( pcSPS->getPad (1) );
-#endif
   // AMVP mode for each depth
   for (Int i = 0; i < pcSPS->getMaxCUDepth(); i++)
@@ -661 +571 @@
   }
 
-#if TILES_WPP_ENTRY_POINT_SIGNALLING
   Int tilesOrEntropyCodingSyncIdc = 0;
   if ( pcSPS->getNumColumnsMinus1() > 0 || pcSPS->getNumRowsMinus1() > 0)
@@ -673 +582 @@
   pcSPS->setTilesOrEntropyCodingSyncIdc( tilesOrEntropyCodingSyncIdc );
   WRITE_CODE(tilesOrEntropyCodingSyncIdc, 2, "tiles_or_entropy_coding_sync_idc");
-#endif
-
-#if TILES_OR_ENTROPY_SYNC_IDC
+
   if(tilesOrEntropyCodingSyncIdc == 1)
   {
-#endif
     WRITE_UVLC( pcSPS->getNumColumnsMinus1(),                           "num_tile_columns_minus1" );
     WRITE_UVLC( pcSPS->getNumRowsMinus1(),                              "num_tile_rows_minus1" );
@@ -697 +603 @@
     if( pcSPS->getNumColumnsMinus1() !=0 || pcSPS->getNumRowsMinus1() != 0)
     {
-#if !REMOVE_TILE_DEPENDENCE
-      WRITE_FLAG( pcSPS->getTileBoundaryIndependenceIdr(),                "tile_boundary_independence_flag" );
-      if(pcSPS->getTileBoundaryIndependenceIdr() == 1)
-      {
-#endif
         WRITE_FLAG( pcSPS->getLFCrossTileBoundaryFlag()?1 : 0,            "loop_filter_across_tile_flag");
-#if !REMOVE_TILE_DEPENDENCE
-      }
-#endif
-    }
-#if TILES_OR_ENTROPY_SYNC_IDC
-  }
-#endif
+    }
+  }
   WRITE_FLAG( 1, "sps_extension_flag" );
 #if !QC_MVHEVC_B0046
@@ -896 +792 @@
     WRITE_UVLC( pcSlice->getPPS()->getPPSId(), "pic_parameter_set_id" );
 #endif
-#if H0388
     if( pcSlice->getPPS()->getOutputFlagPresentFlag() )
     {
       WRITE_FLAG( pcSlice->getPicOutputFlag() ? 1 : 0, "pic_output_flag" );
     }
-#endif
 #if QC_REM_IDV_B0046
     if(pcSlice->getNalUnitType()==NAL_UNIT_CODED_SLICE_IDR && pcSlice->getViewId() == 0) 
@@ -924 +818 @@
         {
           WRITE_FLAG( 0, "short_term_ref_pic_set_sps_flag");
-#if RPS_IN_SPS
           codeShortTermRefPicSet(pcSlice->getSPS(), rps);
-#else
-          codeShortTermRefPicSet(pcSlice->getPPS(), rps);
-#endif
         }
         else
@@ -935 +825 @@
           WRITE_UVLC( pcSlice->getRPSidx(), "short_term_ref_pic_set_idx" );
         }
-#if RPS_IN_SPS
         if(pcSlice->getSPS()->getLongTermRefsPresent())
-#else
-        if(pcSlice->getPPS()->getLongTermRefsPresent())
-#endif
         {
           WRITE_UVLC( rps->getNumberOfLongtermPictures(), "num_long_term_pics");
           Int maxPocLsb = 1<<pcSlice->getSPS()->getBitsForPOC();
           Int prev = 0;
-#if LTRP_MULT
           Int prevDeltaPocLt=0;
           Int currDeltaPocLt=0;
-#endif
           for(Int i=rps->getNumberOfPictures()-1 ; i > rps->getNumberOfPictures()-rps->getNumberOfLongtermPictures()-1; i--)
           {
             WRITE_UVLC((maxPocLsb-rps->getDeltaPOC(i)+prev)%maxPocLsb, "delta_poc_lsb_lt");
           
-#if LTRP_MULT
             currDeltaPocLt=((maxPocLsb-rps->getDeltaPOC(i)+prev)%maxPocLsb)+prevDeltaPocLt;
 
@@ -983 +866 @@
             }
             prevDeltaPocLt=currDeltaPocLt;
-#endif
             prev = rps->getDeltaPOC(i);
             WRITE_FLAG( rps->getUsed(i), "used_by_curr_pic_lt_flag"); 
@@ -995 +877 @@
         {
           WRITE_FLAG( 0, "short_term_ref_pic_set_sps_flag");
-#if RPS_IN_SPS
           codeShortTermRefPicSet(pcSlice->getSPS(), rps);
-#else
-          codeShortTermRefPicSet(pcSlice->getPPS(), rps);
-#endif
         }
         else
@@ -1006 +884 @@
           WRITE_UVLC( pcSlice->getRPSidx(), "short_term_ref_pic_set_idx" );
         }
-#if RPS_IN_SPS
         if(pcSlice->getSPS()->getLongTermRefsPresent())
-#else
-        if(pcSlice->getPPS()->getLongTermRefsPresent())
-#endif
         {
           WRITE_UVLC( rps->getNumberOfLongtermPictures(), "num_long_term_pics");
           Int maxPocLsb = 1<<pcSlice->getSPS()->getBitsForPOC();
           Int prev = 0;
-#if LTRP_MULT
           Int prevDeltaPocLt=0;
           Int currDeltaPocLt=0;
-#endif
           for(Int i=rps->getNumberOfPictures()-1 ; i > rps->getNumberOfPictures()-rps->getNumberOfLongtermPictures()-1; i--)
           {
             WRITE_UVLC((maxPocLsb-rps->getDeltaPOC(i)+prev)%maxPocLsb, "delta_poc_lsb_lt");
           
-#if LTRP_MULT
             currDeltaPocLt=((maxPocLsb-rps->getDeltaPOC(i)+prev)%maxPocLsb)+prevDeltaPocLt;
 
@@ -1054 +925 @@
             }
             prevDeltaPocLt=currDeltaPocLt;
-#endif
             prev = rps->getDeltaPOC(i);
             WRITE_FLAG( rps->getUsed(i), "used_by_curr_pic_lt_flag"); 
@@ -1066 +936 @@
       if (pcSlice->getSPS()->getUseALF())
       {
-#if !LCU_SYNTAX_ALF
-         if (pcSlice->getAlfEnabledFlag())
-         {
-           assert (pcSlice->getAPS()->getAlfEnabled());
-         }
-#endif
          WRITE_FLAG( pcSlice->getAlfEnabledFlag(), "ALF on/off flag in slice header" );
       }
       if (pcSlice->getSPS()->getUseSAO())
       {
-#if SAO_UNIT_INTERLEAVING
         WRITE_FLAG( pcSlice->getSaoInterleavingFlag(), "SAO interleaving flag" );
-#endif
          assert (pcSlice->getSaoEnabledFlag() == pcSlice->getAPS()->getSaoEnabled());
          WRITE_FLAG( pcSlice->getSaoEnabledFlag(), "SAO on/off flag in slice header" );
-#if SAO_UNIT_INTERLEAVING
          if (pcSlice->getSaoInterleavingFlag()&&pcSlice->getSaoEnabledFlag() )
          {
@@ -1087 +948 @@
            WRITE_FLAG( pcSlice->getAPS()->getSaoParam()->bSaoFlag[2], "SAO on/off flag for Cr in slice header" );
          }
-#endif
       }
       WRITE_UVLC( pcSlice->getAPS()->getAPSID(), "aps_id");
@@ -1110 +970 @@
       pcSlice->setNumRefIdx(REF_PIC_LIST_1, 0);
     }
-#if H0412_REF_PIC_LIST_RESTRICTION
     if( pcSlice->getSPS()->getListsModificationPresentFlag() )
     {
-#endif
     TComRefPicListModification* refPicListModification = pcSlice->getRefPicListModification();
-#if H0137_0138_LIST_MODIFICATION
     if( !pcSlice->isIntra() )
     {
@@ -1158 +1015 @@
       }
     }
-#else
-      if(!pcSlice->isIntra())
-      {
-        WRITE_FLAG(pcSlice->getRefPicListModification()->getRefPicListModificationFlagL0() ? 1 : 0,       "ref_pic_list_modification_flag" );    
-        for(Int i = 0; i < refPicListModification->getNumberOfRefPicListModificationsL0(); i++)
-        {
-          WRITE_UVLC( refPicListModification->getListIdcL0(i), "ref_pic_list_modification_idc");
-          WRITE_UVLC( refPicListModification->getRefPicSetIdxL0(i), "ref_pic_set_idx");
-        }
-        if(pcSlice->getRefPicListModification()->getRefPicListModificationFlagL0())
-          WRITE_UVLC( 3, "ref_pic_list_modification_idc");
-      }
-      if(pcSlice->isInterB())
-      {    
-        WRITE_FLAG(pcSlice->getRefPicListModification()->getRefPicListModificationFlagL1() ? 1 : 0,       "ref_pic_list_modification_flag" );
-        for(Int i = 0; i < refPicListModification->getNumberOfRefPicListModificationsL1(); i++)
-        {
-          WRITE_UVLC( refPicListModification->getListIdcL1(i), "ref_pic_list_modification_idc");
-          WRITE_UVLC( refPicListModification->getRefPicSetIdxL1(i), "ref_pic_set_idx");
-        }
-        if(pcSlice->getRefPicListModification()->getRefPicListModificationFlagL1())
-          WRITE_UVLC( 3, "ref_pic_list_modification_idc");
-      }
-#endif
-    }
-#if H0412_REF_PIC_LIST_RESTRICTION
-  }
-#endif
+    }
+  }
   // ref_pic_list_combination( )
   // maybe move to own function?
@@ -1195 +1026 @@
       WRITE_UVLC( pcSlice->getNumRefIdx(REF_PIC_LIST_C) - 1,          "num_ref_idx lc_active_minus1");
       
-#if H0412_REF_PIC_LIST_RESTRICTION
       if( pcSlice->getSPS()->getListsModificationPresentFlag() )
       {
-#endif
         WRITE_FLAG( pcSlice->getRefPicListModificationFlagLC() ? 1 : 0, "ref_pic_list_modification_flag_lc" );
         if(pcSlice->getRefPicListModificationFlagLC())
@@ -1205 +1034 @@
           {
             WRITE_FLAG( pcSlice->getListIdFromIdxOfLC(i),               "pic_from_list_0_flag" );
-#if H0137_0138_LIST_MODIFICATION
           if (((pcSlice->getListIdFromIdxOfLC(i)==REF_PIC_LIST_0) && pcSlice->getNumRefIdx( REF_PIC_LIST_0 )>1 ) || ((pcSlice->getListIdFromIdxOfLC(i)==REF_PIC_LIST_1) && pcSlice->getNumRefIdx( REF_PIC_LIST_1 )>1 ) )
           {
             WRITE_UVLC( pcSlice->getRefIdxFromIdxOfLC(i),               "ref_idx_list_curr" );
           }
-#else
-            WRITE_UVLC( pcSlice->getRefIdxFromIdxOfLC(i),               "ref_idx_list_curr" );
-#endif
           }
         }
-#if H0412_REF_PIC_LIST_RESTRICTION
-      }
-#endif
+      }
     }
   }
     
-#if H0111_MVD_L1_ZERO
   if (pcSlice->isInterB())
   {
     WRITE_FLAG( pcSlice->getMvdL1ZeroFlag() ? 1 : 0,   "mvd_l1_zero_flag");
   }
-#endif
 
   if(pcSlice->getPPS()->getEntropyCodingMode() && !pcSlice->isIntra())
@@ -1249 +1070 @@
     Int iCode = pcSlice->getSliceQp() - ( pcSlice->getPPS()->getPicInitQPMinus26() + 26 );
     WRITE_SVLC( iCode, "slice_qp_delta" ); 
-#if DBL_CONTROL
     if (pcSlice->getPPS()->getDeblockingFilterControlPresent())
     {
@@ -1256 +1076 @@
         WRITE_FLAG(pcSlice->getInheritDblParamFromAPS(), "inherit_dbl_param_from_APS_flag");
       }
-#else
-    WRITE_FLAG(pcSlice->getInheritDblParamFromAPS(), "inherit_dbl_param_from_APS_flag");
-#endif
       if (!pcSlice->getInheritDblParamFromAPS())
       {
@@ -1268 +1085 @@
         }
       }
-#if DBL_CONTROL
-    }
-#endif
+    }
     if ( pcSlice->getSliceType() == B_SLICE )
     {
@@ -1341 +1156 @@
  \param pcSlice Where we find the substream size information.
  */
-#if TILES_WPP_ENTRY_POINT_SIGNALLING
 Void  TEncCavlc::codeTilesWPPEntryPoint( TComSlice* pSlice )
 {
@@ -1441 +1255 @@
   delete [] entryPointOffset;
 }
-#else
-Void TEncCavlc::codeSliceHeaderSubstreamTable( TComSlice* pcSlice )
-{
-  UInt uiNumSubstreams = pcSlice->getPPS()->getNumSubstreams();
-  UInt*puiSubstreamSizes = pcSlice->getSubstreamSizes();
-
-  // Write header information for all substreams except the last.
-  for (UInt ui = 0; ui+1 < uiNumSubstreams; ui++)
-  {
-    UInt uiNumbits = puiSubstreamSizes[ui];
-
-    //the 2 first bits are used to give the size of the header
-    if ( uiNumbits < (1<<8) )
-    {
-      xWriteCode(0,         2  );
-      xWriteCode(uiNumbits, 8  );
-    }
-    else if ( uiNumbits < (1<<16) )
-    {
-      xWriteCode(1,         2  );
-      xWriteCode(uiNumbits, 16 );
-    }
-    else if ( uiNumbits < (1<<24) )
-    {
-      xWriteCode(2,         2  );
-      xWriteCode(uiNumbits, 24 );
-    }
-    else if ( uiNumbits < (1<<31) )
-    {
-      xWriteCode(3,         2  );
-      xWriteCode(uiNumbits, 32 );
-    }
-    else
-    {
-      printf("Error in codeSliceHeaderTable\n");
-      exit(-1);
-    }
-  }
-}
-#endif
 
 Void TEncCavlc::codeTerminatingBit      ( UInt uilsLast )
@@ -1599 +1373 @@
 }
 
-#if BURST_IPCM
 /** Code I_PCM information. 
  * \param pcCU pointer to CU
@@ -1611 +1384 @@
   assert(0);
 }
-#else
-/** Code I_PCM information. 
- * \param pcCU pointer to CU
- * \param uiAbsPartIdx CU index
- * \returns Void
- *
- * If I_PCM flag indicates that the CU is I_PCM, code its PCM alignment bits and codes.  
- */
-Void TEncCavlc::codeIPCMInfo( TComDataCU* pcCU, UInt uiAbsPartIdx)
-{
-  UInt uiIPCM = (pcCU->getIPCMFlag(uiAbsPartIdx) == true)? 1 : 0;
-
-  xWriteFlag(uiIPCM);
-
-  if (uiIPCM)
-  {
-    xWritePCMAlignZero();
-
-    UInt uiMinCoeffSize = pcCU->getPic()->getMinCUWidth()*pcCU->getPic()->getMinCUHeight();
-    UInt uiLumaOffset   = uiMinCoeffSize*uiAbsPartIdx;
-    UInt uiChromaOffset = uiLumaOffset>>2;
-
-    Pel* piPCMSample;
-    UInt uiWidth;
-    UInt uiHeight;
-    UInt uiSampleBits;
-    UInt uiX, uiY;
-
-    piPCMSample = pcCU->getPCMSampleY() + uiLumaOffset;
-    uiWidth = pcCU->getWidth(uiAbsPartIdx);
-    uiHeight = pcCU->getHeight(uiAbsPartIdx);
-    uiSampleBits = pcCU->getSlice()->getSPS()->getPCMBitDepthLuma();
-
-    for(uiY = 0; uiY < uiHeight; uiY++)
-    {
-      for(uiX = 0; uiX < uiWidth; uiX++)
-      {
-        UInt uiSample = piPCMSample[uiX];
-
-        xWriteCode(uiSample, uiSampleBits);
-      }
-      piPCMSample += uiWidth;
-    }
-
-    piPCMSample = pcCU->getPCMSampleCb() + uiChromaOffset;
-    uiWidth = pcCU->getWidth(uiAbsPartIdx)/2;
-    uiHeight = pcCU->getHeight(uiAbsPartIdx)/2;
-    uiSampleBits = pcCU->getSlice()->getSPS()->getPCMBitDepthChroma();
-
-    for(uiY = 0; uiY < uiHeight; uiY++)
-    {
-      for(uiX = 0; uiX < uiWidth; uiX++)
-      {
-        UInt uiSample = piPCMSample[uiX];
-
-        xWriteCode(uiSample, uiSampleBits);
-      }
-      piPCMSample += uiWidth;
-    }
-
-    piPCMSample = pcCU->getPCMSampleCr() + uiChromaOffset;
-    uiWidth = pcCU->getWidth(uiAbsPartIdx)/2;
-    uiHeight = pcCU->getHeight(uiAbsPartIdx)/2;
-    uiSampleBits = pcCU->getSlice()->getSPS()->getPCMBitDepthChroma();
-
-    for(uiY = 0; uiY < uiHeight; uiY++)
-    {
-      for(uiX = 0; uiX < uiWidth; uiX++)
-      {
-        UInt uiSample = piPCMSample[uiX];
-
-        xWriteCode(uiSample, uiSampleBits);
-      }
-      piPCMSample += uiWidth;
-    }
-  }
-}
-#endif
 
 Void TEncCavlc::codeIntraDirLumaAng( TComDataCU* pcCU, UInt uiAbsPartIdx )
@@ -1719 +1414 @@
   Int iDQp  = pcCU->getQP( uiAbsPartIdx ) - pcCU->getRefQP( uiAbsPartIdx );
 
-#if H0736_AVC_STYLE_QP_RANGE
   Int qpBdOffsetY =  pcCU->getSlice()->getSPS()->getQpBDOffsetY();
   iDQp = (iDQp + 78 + qpBdOffsetY + (qpBdOffsetY/2)) % (52 + qpBdOffsetY) - 26 - (qpBdOffsetY/2);
-#endif
 
   xWriteSvlc( iDQp );
@@ -1753 +1446 @@
   xWriteSvlc( iCode );
 }
-#if LCU_SYNTAX_ALF
 /** Code the fixed length code (smaller than one max value) in OSALF
  * \param idx:  coded value 
@@ -1778 +1470 @@
   }
 }
-#endif
 
 Void TEncCavlc::codeSaoFlag( UInt uiCode )
@@ -1794 +1485 @@
     xWriteSvlc( iCode );
 }
-#if SAO_UNIT_INTERLEAVING
 /** Code SAO run. 
  * \param uiCode
@@ -1818 +1508 @@
   WRITE_CODE( uiCode, uiLength, "sao_run_diff");
 }
-#endif
 
 Void TEncCavlc::estBit( estBitsSbacStruct* pcEstBitsCabac, Int width, Int height, TextType eTType )
@@ -2123 +1812 @@
 Void TEncCavlc::xCodeScalingList(TComScalingList* scalingList, UInt sizeId, UInt listId)
 {
-#if SCALING_LIST
   Int coefNum = min(MAX_MATRIX_COEF_NUM,(Int)g_scalingListSize[sizeId]);
   UInt* scan    = g_auiFrameScanXY [ (sizeId == 0)? 1 : 2];
-#else
-  Int coefNum = (Int)g_scalingListSize[sizeId];
-  UInt* scan    = g_auiFrameScanXY [ sizeId + 1];
-#endif
   Int nextCoef = SCALING_LIST_START_VALUE;
   Int data;
   Int *src = scalingList->getScalingListAddress(sizeId, listId);
-#if SCALING_LIST
   if(sizeId > SCALING_LIST_8x8 && scalingList->getUseDefaultScalingMatrixFlag(sizeId,listId))
   {
@@ -2164 +1847 @@
     }
   }
-#else
-  for(Int i=0;i<coefNum;i++)
-  {
-    data = src[scan[i]] - nextCoef;
-    nextCoef = src[scan[i]];
-    if(data > 127)
-    {
-      data = data - 256;
-    }
-    if(data < -128)
-    {
-      data = data + 256;
-    }
-
-    WRITE_SVLC( data,  "delta_coef");
-  }
-#endif
 }
 Bool TComScalingList::checkPredMode(UInt sizeId, UInt listId)
@@ -2186 +1852 @@
   for(Int predListIdx = (Int)listId -1 ; predListIdx >= 0; predListIdx--)
   {
-#if SCALING_LIST
     if( !memcmp(getScalingListAddress(sizeId,listId),getScalingListAddress(sizeId, predListIdx),sizeof(Int)*min(MAX_MATRIX_COEF_NUM,(Int)g_scalingListSize[sizeId])) // check value of matrix
      && ((sizeId < SCALING_LIST_16x16) || (getScalingListDC(sizeId,listId) == getScalingListDC(sizeId,predListIdx)))) // check DC value
-#else
-    if( !memcmp(getScalingListAddress(sizeId,listId),getScalingListAddress(sizeId, predListIdx),sizeof(Int)*(Int)g_scalingListSize[sizeId])) // check value of matrix
-#endif
     {
       setRefMatrixId(sizeId, listId, predListIdx);

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

@@ -88 +88 @@
   Void  xWriteUnaryMaxSymbol  ( UInt uiSymbol, UInt uiMaxSymbol );
 
-#if RPS_IN_SPS
   Void codeShortTermRefPicSet              ( TComSPS* pcSPS, TComReferencePictureSet* pcRPS );
-#else
-  Void codeShortTermRefPicSet              ( TComPPS* pcPPS, TComReferencePictureSet* pcRPS );
-#endif
   
   UInt  xConvertToUInt        ( Int iValue ) {  return ( iValue <= 0) ? -iValue<<1 : (iValue<<1)-1; }
@@ -129 +125 @@
   Void codeTileMarkerFlag(TComSlice* pcSlice);
 
-#if TILES_WPP_ENTRY_POINT_SIGNALLING
   Void  codeTilesWPPEntryPoint( TComSlice* pSlice );
-#else
-  Void  codeSliceHeaderSubstreamTable( TComSlice* pcSlice );
-#endif
   Void  codeTerminatingBit      ( UInt uilsLast );
   Void  codeSliceFinish         ();
@@ -148 +140 @@
   Void codeAlfSvlc       ( Int   iCode );
   Void codeAlfCtrlDepth();
-#if LCU_SYNTAX_ALF
   Void codeAPSAlflag(UInt uiCode);
   Void codeAlfFixedLengthIdx( UInt idx, UInt numFilterSetsInBuffer);
-#endif
   Void codeSaoFlag       ( UInt uiCode );
   Void codeSaoUvlc       ( UInt uiCode );
   Void codeSaoSvlc       ( Int   iCode );
-#if SAO_UNIT_INTERLEAVING
   Void codeSaoRun        ( UInt uiCode, UInt maxValue  );
   Void codeSaoMergeLeft  ( UInt uiCode, UInt compIdx ){;}
@@ -161 +150 @@
   Void codeSaoTypeIdx    ( UInt uiCode ){ xWriteUvlc(uiCode   );}
   Void codeSaoUflc       ( UInt uiCode ){ assert(uiCode < 32); xWriteCode(uiCode, 5);}
-#endif
 
   Void codeSkipFlag      ( TComDataCU* pcCU, UInt uiAbsPartIdx );
@@ -189 +177 @@
   Void codePredMode      ( TComDataCU* pcCU, UInt uiAbsPartIdx );
   
-#if BURST_IPCM
   Void codeIPCMInfo      ( TComDataCU* pcCU, UInt uiAbsPartIdx, Int numIPCM, Bool firstIPCMFlag);
-#else
-  Void codeIPCMInfo      ( TComDataCU* pcCU, UInt uiAbsPartIdx );
-#endif
 
   Void codeTransformSubdivFlag( UInt uiSymbol, UInt uiCtx );

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

@@ -109 +109 @@
   Int       m_iSourceWidth;
   Int       m_iSourceHeight;
-#if PIC_CROPPING
   Int       m_croppingMode;
   Int       m_cropLeft;
@@ -115 +114 @@
   Int       m_cropTop;
   Int       m_cropBottom;
-#endif
   Int       m_iFrameToBeEncoded;
   Double    m_adLambdaModifier[ MAX_TLAYER ];
@@ -125 +123 @@
   GOPEntryMvc m_GOPList[MAX_GOP+1];
   Int       m_extraRPSs;
-#if H0567_DPB_PARAMETERS_PER_TEMPORAL_LAYER
   Int       m_maxDecPicBuffering[MAX_TLAYER];
   Int       m_numReorderPics[MAX_TLAYER];
-#else
-  Int       m_maxNumberOfReferencePictures;
-  Int       m_numReorderFrames;
-#endif
   
   Int       m_iQP;                              //  if (AdaptiveQP == OFF)
@@ -142 +135 @@
                                                  // TODO: We need to have a common sliding mechanism used by both the encoder and decoder
 
-#if H0566_TLA
   Int       m_maxTempLayer;                      ///< Max temporal layer
-#else
-  Bool      m_bTLayering;                        ///< indicates whether temporal IDs are set based on the hierarchical coding structure
-  Bool      m_abTLayerSwitchingFlag[MAX_TLAYER]; ///< temporal layer switching flags corresponding to temporal layer
-#endif
   Bool      m_bDisInter4x4;
   Bool m_useAMP;
@@ -163 +151 @@
   Int       m_loopFilterBetaOffsetDiv2;
   Int       m_loopFilterTcOffsetDiv2;
-#if DBL_CONTROL
   Bool      m_DeblockingFilterControlPresent;
-#endif
   Bool      m_bUseSAO;
 #if LGE_ILLUCOMP_B0045
@@ -173 +159 @@
   Bool      m_bUseIVS;
 #endif
-#if SAO_UNIT_INTERLEAVING
   Int       m_maxNumOffsetsPerPic;
   Bool      m_saoInterleavingFlag;
-#endif
 
   //====== Lossless ========
@@ -232 +216 @@
 
   Int       m_iALFMaxNumberFilters;
-#if LCU_SYNTAX_ALF
   Bool      m_bALFParamInSlice;
   Bool      m_bALFPicBasedEncode;
-#endif
 
   Bool      m_bUseASR;
@@ -242 +224 @@
   Bool      m_bLCMod;
   Bool      m_bUseRDOQ;
-#if !PIC_CROPPING
-  Bool      m_bUsePAD;
-#endif
   Bool      m_bUseFastEnc;
   Bool      m_bUseEarlyCU;
 
-#if FAST_DECISION_FOR_MRG_RD_COST
   Bool      m_useFastDecisionForMerge;
-#endif
   Bool      m_bUseCbfFastMode;
   Bool      m_bUseLMChroma; 
@@ -308 +285 @@
 
   Bool      m_bEnableTMVP;
-#if MULTIBITS_DATA_HIDING
   Int       m_signHideFlag;
   Int       m_signHidingThreshold;
-#endif
 
 #if VIDYO_VPS_INTEGRATION|QC_MVHEVC_B0046
@@ -386 +361 @@
   Void      setSourceWidth                  ( Int   i )      { m_iSourceWidth = i; }
   Void      setSourceHeight                 ( Int   i )      { m_iSourceHeight = i; }
-#if PIC_CROPPING
   Void      setCroppingMode                 ( Int   i )      { m_croppingMode = i; }
   Void      setCropLeft                     ( Int   i )      { m_cropLeft = i; }
@@ -392 +366 @@
   Void      setCropTop                      ( Int   i )      { m_cropTop = i; }
   Void      setCropBottom                   ( Int   i )      { m_cropBottom = i; }
-#endif
   Void      setFrameToBeEncoded             ( Int   i )      { m_iFrameToBeEncoded = i; }
   
@@ -402 +375 @@
   Void      setExtraRPSs                    ( Int   i )      { m_extraRPSs = i; }
   GOPEntryMvc getGOPEntry                   ( Int   i )      { return m_GOPList[i]; }
-#if H0567_DPB_PARAMETERS_PER_TEMPORAL_LAYER
   Void      setMaxDecPicBuffering           ( UInt u, UInt tlayer ) { m_maxDecPicBuffering[tlayer] = u;    }
   Void      setNumReorderPics               ( Int  i, UInt tlayer ) { m_numReorderPics[tlayer] = i;    }
-#else
-  Void      setMaxNumberOfReferencePictures ( Int u )       { m_maxNumberOfReferencePictures = u;    }
-  Void      setNumReorderFrames             ( Int  i )       { m_numReorderFrames = i;    }
-#endif
   
 #if HHI_INTERVIEW_SKIP
@@ -426 +394 @@
   Void      setMaxRefPicNum                 ( Int iMaxRefPicNum )           { m_iMaxRefPicNum = iMaxRefPicNum;  }
 
-#if H0566_TLA
   Bool      getMaxTempLayer                 ()                              { return m_maxTempLayer;              } 
   Void      setMaxTempLayer                 ( Int maxTempLayer )            { m_maxTempLayer = maxTempLayer;      }
-#else
-  Bool      getTLayering                    ()                              { return m_bTLayering;              } 
-  Void      setTLayering                    ( Bool bTLayering )             { m_bTLayering = bTLayering;        }
-  Bool      getTLayerSwitchingFlag          ( UInt uiTLayer )               { assert (uiTLayer < MAX_TLAYER ); return  m_abTLayerSwitchingFlag[uiTLayer];                   }
-  Void      setTLayerSwitchingFlag          ( Bool* pbTLayerSwitchingFlag ) { for ( Int i = 0; i < MAX_TLAYER; i++ ) m_abTLayerSwitchingFlag[i] = pbTLayerSwitchingFlag[i]; }
-#endif
 
   Bool      getDisInter4x4                  ()              { return m_bDisInter4x4;        }
@@ -470 +431 @@
   Void      setLoopFilterBetaOffset         ( Int   i )      { m_loopFilterBetaOffsetDiv2  = i; }
   Void      setLoopFilterTcOffset           ( Int   i )      { m_loopFilterTcOffsetDiv2    = i; }
-#if DBL_CONTROL
   Void      setDeblockingFilterControlPresent ( Bool b ) { m_DeblockingFilterControlPresent = b; }
-#endif
 
   //====== Motion search ========
@@ -527 +486 @@
   Int       getSourceWidth                  ()      { return  m_iSourceWidth; }
   Int       getSourceHeight                 ()      { return  m_iSourceHeight; }
-#if PIC_CROPPING
   Int       getCroppingMode                 ()      { return  m_croppingMode; }
   Int       getCropLeft                     ()      { return  m_cropLeft; }
@@ -533 +491 @@
   Int       getCropTop                      ()      { return  m_cropTop; }
   Int       getCropBottom                   ()      { return  m_cropBottom; }
-#endif
   Int       getFrameToBeEncoded             ()      { return  m_iFrameToBeEncoded; }
   void setLambdaModifier                    ( UInt uiIndex, Double dValue ) { m_adLambdaModifier[ uiIndex ] = dValue; }
@@ -542 +499 @@
   UInt      getDecodingRefreshType          ()      { return  m_uiDecodingRefreshType; }
   Int       getGOPSize                      ()      { return  m_iGOPSize; }
-#if H0567_DPB_PARAMETERS_PER_TEMPORAL_LAYER
   Int       getMaxDecPicBuffering           (UInt tlayer) { return m_maxDecPicBuffering[tlayer]; }
   Int       getNumReorderPics               (UInt tlayer) { return m_numReorderPics[tlayer]; }
-#else
-  Int      getMaxNumberOfReferencePictures ()      { return m_maxNumberOfReferencePictures; }
-  Int       geNumReorderFrames              ()      { return m_numReorderFrames; }
-#endif
   Int       getQP                           ()      { return  m_iQP; }
   
@@ -565 +517 @@
   Int       getLoopFilterBetaOffset         ()      { return m_loopFilterBetaOffsetDiv2; }
   Int       getLoopFilterTcOffset           ()      { return m_loopFilterTcOffsetDiv2; }
-#if DBL_CONTROL
   Bool      getDeblockingFilterControlPresent()  { return  m_DeblockingFilterControlPresent; }
-#endif
 
   //==== Motion search ========
@@ -610 +560 @@
   Void      setLCMod                        ( Bool  b )     { m_bLCMod   = b;    }
   Void      setUseRDOQ                      ( Bool  b )     { m_bUseRDOQ    = b; }
-#if !PIC_CROPPING
-  Void      setUsePAD                       ( Bool  b )     { m_bUsePAD     = b; }
-#endif
 #if HHI_VSO
   Void      setUseVSO                       ( Bool  b )     { m_bUseVSO     = b; }
@@ -624 +571 @@
   Void      setUseFastEnc                   ( Bool  b )     { m_bUseFastEnc = b; }
   Void      setUseEarlyCU                   ( Bool  b )     { m_bUseEarlyCU = b; }
-#if FAST_DECISION_FOR_MRG_RD_COST
   Void      setUseFastDecisionForMerge      ( Bool  b )     { m_useFastDecisionForMerge = b; }
-#endif
   Void      setUseCbfFastMode            ( Bool  b )     { m_bUseCbfFastMode = b; }
   Void      setUseConstrainedIntraPred      ( Bool  b )     { m_bUseConstrainedIntraPred = b; }
@@ -645 +590 @@
   Void      setALFMaxNumberFilters          (Int i)  { m_iALFMaxNumberFilters = i; } 
   Int       getALFMaxNumberFilters          ()       { return m_iALFMaxNumberFilters; } 
-#if LCU_SYNTAX_ALF
   Void      setALFParamInSlice              (Bool b) {m_bALFParamInSlice = b;}
   Bool      getALFParamInSlice              ()       {return m_bALFParamInSlice;}
   Void      setALFPicBasedEncode            (Bool b) {m_bALFPicBasedEncode = b;}
   Bool      getALFPicBasedEncode            ()       {return m_bALFPicBasedEncode;}
-#endif
 
   Bool      getUseLComb                     ()      { return m_bUseLComb;   }
   Bool      getLCMod                        ()      { return m_bLCMod; }
   Bool      getUseRDOQ                      ()      { return m_bUseRDOQ;    }
-#if !PIC_CROPPING
-  Bool      getUsePAD                       ()      { return m_bUsePAD;     }
-#endif
 
 #if HHI_VSO
@@ -669 +609 @@
   Bool      getUseFastEnc                   ()      { return m_bUseFastEnc; }
   Bool      getUseEarlyCU                   ()      { return m_bUseEarlyCU; }
-#if FAST_DECISION_FOR_MRG_RD_COST
   Bool      getUseFastDecisionForMerge      ()      { return m_useFastDecisionForMerge; }
-#endif
   Bool      getUseCbfFastMode           ()      { return m_bUseCbfFastMode; }
   Bool      getUseConstrainedIntraPred      ()      { return m_bUseConstrainedIntraPred; }
@@ -721 +659 @@
   Bool  getUseIVS                       ()              {return m_bUseIVS;}
 #endif
-#if SAO_UNIT_INTERLEAVING
   Void  setMaxNumOffsetsPerPic                   (Int iVal)            { m_maxNumOffsetsPerPic = iVal; }
   Int   getMaxNumOffsetsPerPic                   ()                    { return m_maxNumOffsetsPerPic; }
   Void  setSaoInterleavingFlag                   (bool bVal)           { m_saoInterleavingFlag = bVal; }
   Bool  getSaoInterleavingFlag                   ()                    { return m_saoInterleavingFlag; }
-#endif
   Void  setTileBehaviorControlPresentFlag        ( Int i )             { m_iTileBehaviorControlPresentFlag = i;    }
   Int   getTileBehaviorControlPresentFlag        ()                    { return m_iTileBehaviorControlPresentFlag; }
@@ -735 +671 @@
   Void  setUniformSpacingIdr           ( Int i )           { m_iUniformSpacingIdr = i; }
   Int   getUniformSpacingIdr           ()                  { return m_iUniformSpacingIdr; }
-#if !REMOVE_TILE_DEPENDENCE
-  Void  setTileBoundaryIndependenceIdr ( Int i )           { m_iTileBoundaryIndependenceIdr = i; }
-  Int   getTileBoundaryIndependenceIdr ()                  { return m_iTileBoundaryIndependenceIdr; }
-#endif
   Void  setNumColumnsMinus1            ( Int i )           { m_iNumColumnsMinus1 = i; }
   Int   getNumColumnsMinus1            ()                  { return m_iNumColumnsMinus1; }
@@ -834 +766 @@
   Void      setEnableTMVP          ( Bool b )    { m_bEnableTMVP = b;    }
   Bool      getEnableTMVP          ()            { return m_bEnableTMVP; }
-#if MULTIBITS_DATA_HIDING
   Void      setSignHideFlag( Int signHideFlag )  { m_signHideFlag = signHideFlag; }
   Void      setTSIG( Int tsig )                  { m_signHidingThreshold = tsig; }
   Int       getSignHideFlag()                    { return m_signHideFlag; }
   Int       getTSIG()                            { return m_signHidingThreshold; }
-#endif
 #if VIDYO_VPS_INTEGRATION |QC_MVHEVC_B0046
   Void      setLayerId             ( UInt layerId )   { m_layerId = layerId; }

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

@@ -107 +107 @@
   
   m_bEncodeDQP = false;
-#if BURST_IPCM
   m_checkBurstIPCMFlag = false;
-#endif
 
   // initialize partition order.
@@ -285 +283 @@
   }
 
-#if BURST_IPCM
   TComPic* pcPic = pcCU->getPic();
   Bool checkBurstIPCMFlag = (pcPic->getSlice(0)->getSPS()->getUsePCM())? true : false;
@@ -293 +290 @@
   pcCU->setNumSucIPCM(0);
   pcCU->setLastCUSucIPCMFlag(false);
-#endif
 
   // Encode CU data
   xEncodeCU( pcCU, 0, 0 );
   
-#if OL_FLUSH
   bool bTerminateSlice = bForceTerminate;
   UInt uiCUAddr = pcCU->getAddr();
     /* If at the end of an LCU line but not at the end of a substream, perform CABAC flush */
-#if WPP_SIMPLIFICATION
     if (!bTerminateSlice && pcCU->getSlice()->getPPS()->getNumSubstreams() > 1)
-#else
-    if (!bTerminateSlice && pcCU->getSlice()->getPPS()->getCabacIstateReset())
-#endif
     {
       Int iNumSubstreams = pcCU->getSlice()->getPPS()->getNumSubstreams();
@@ -312 +303 @@
       UInt uiCol     = uiCUAddr % uiWidthInLCUs;
       UInt uiLin     = uiCUAddr / uiWidthInLCUs;
-#if !REMOVE_TILE_DEPENDENCE
-      Int iBreakDep = pcCU->getPic()->getPicSym()->getTileBoundaryIndependenceIdr();
-#endif
       UInt uiTileStartLCU = pcCU->getPic()->getPicSym()->getTComTile(pcCU->getPic()->getPicSym()->getTileIdxMap(uiCUAddr))->getFirstCUAddr();
       UInt uiTileLCUX = uiTileStartLCU % uiWidthInLCUs;
@@ -321 +309 @@
       UInt uiTileHeight = pcCU->getPic()->getPicSym()->getTComTile(pcCU->getPic()->getPicSym()->getTileIdxMap(uiCUAddr))->getTileHeight();
       Int iNumSubstreamsPerTile = iNumSubstreams;
-#if !REMOVE_TILE_DEPENDENCE
-#if WPP_SIMPLIFICATION
-      if (iBreakDep && pcCU->getSlice()->getPPS()->getNumSubstreams() > 1)
-#else
-      if (iBreakDep && pcCU->getSlice()->getPPS()->getEntropyCodingSynchro())
-#endif
+      if (pcCU->getSlice()->getPPS()->getNumSubstreams() > 1)
+      {
         iNumSubstreamsPerTile /= pcCU->getPic()->getPicSym()->getNumTiles();
-      if ((iBreakDep && (uiCol == uiTileLCUX+uiTileWidth-1) && (uiLin+iNumSubstreamsPerTile < uiTileLCUY+uiTileHeight))
-          || (!iBreakDep && (uiCol == uiWidthInLCUs-1) && (uiLin+iNumSubstreams < pcCU->getPic()->getFrameHeightInCU())))
+      }
+      if ((uiCol == uiTileLCUX+uiTileWidth-1) && (uiLin+iNumSubstreamsPerTile < uiTileLCUY+uiTileHeight))
       {
         m_pcEntropyCoder->encodeFlush();
       }
-#else
-#if WPP_SIMPLIFICATION
-      if (pcCU->getSlice()->getPPS()->getNumSubstreams() > 1)
-#else
-      if (pcCU->getSlice()->getPPS()->getEntropyCodingSynchro())
-#endif
-      {
-        iNumSubstreamsPerTile /= pcCU->getPic()->getPicSym()->getNumTiles();
-      }
-      if ((uiCol == uiTileLCUX+uiTileWidth-1) && (uiLin+iNumSubstreamsPerTile < uiTileLCUY+uiTileHeight))
-      {
-        m_pcEntropyCoder->encodeFlush();
-      }
-#endif
-    }
-#endif // OL_FLUSH
+    }
 }
 
@@ -556 +525 @@
 #if LOSSLESS_CODING
   Bool isAddLowestQP = false;
-#if H0736_AVC_STYLE_QP_RANGE
   Int lowestQP = -rpcTempCU->getSlice()->getSPS()->getQpBDOffsetY();
-#else
-  Int lowestQP = 0;
-#endif
 #endif
 
@@ -566 +531 @@
   {
     Int idQP = m_pcEncCfg->getMaxDeltaQP();
-#if H0736_AVC_STYLE_QP_RANGE
     iMinQP = Clip3( -rpcTempCU->getSlice()->getSPS()->getQpBDOffsetY(), MAX_QP, iBaseQP-idQP );
     iMaxQP = Clip3( -rpcTempCU->getSlice()->getSPS()->getQpBDOffsetY(), MAX_QP, iBaseQP+idQP );
@@ -576 +540 @@
 
     }
-#endif
-#else
-    iMinQP = Clip3( MIN_QP, MAX_QP, iBaseQP-idQP );
-    iMaxQP = Clip3( MIN_QP, MAX_QP, iBaseQP+idQP );
-#if LOSSLESS_CODING
-    if ( (rpcTempCU->getSlice()->getSPS()->getUseLossless()) && (lowestQP < iMinQP) && rpcTempCU->getSlice()->getPPS()->getUseDQP() )
-    {
-      isAddLowestQP = true;
-      iMinQP = iMinQP - 1;
-    }
-#endif
 #endif
   }
@@ -1317 +1270 @@
   {
     Int idQP = m_pcEncCfg->getMaxDeltaQP();
-#if H0736_AVC_STYLE_QP_RANGE
     iMinQP = Clip3( -rpcTempCU->getSlice()->getSPS()->getQpBDOffsetY(), MAX_QP, iBaseQP-idQP );
     iMaxQP = Clip3( -rpcTempCU->getSlice()->getSPS()->getQpBDOffsetY(), MAX_QP, iBaseQP+idQP );
@@ -1326 +1278 @@
       iMinQP = iMinQP - 1;      
     }
-#endif
-#else
-    iMinQP = Clip3( MIN_QP, MAX_QP, iBaseQP-idQP );
-    iMaxQP = Clip3( MIN_QP, MAX_QP, iBaseQP+idQP );
-#if LOSSLESS_CODING
-    if ( (rpcTempCU->getSlice()->getSPS()->getUseLossless()) && (lowestQP < iMinQP) && rpcTempCU->getSlice()->getPPS()->getUseDQP() )
-    {
-      isAddLowestQP = true;
-      iMinQP = iMinQP - 1;
-    }
-#endif
 #endif
   }
@@ -1635 +1576 @@
     &&((uiPosY+pcCU->getHeight(uiAbsPartIdx))%uiGranularityWidth==0||(uiPosY+pcCU->getHeight(uiAbsPartIdx)==uiHeight));
   
-#if BURST_IPCM
   if(granularityBoundary && (!(pcCU->getIPCMFlag(uiAbsPartIdx) && ( pcCU->getNumSucIPCM() > 1 ))))
-#else
-  if(granularityBoundary)
-#endif
   {
     // The 1-terminating bit is added to all streams, so don't add it here when it's 1.
@@ -1731 +1668 @@
     iQpOffset = Int(floor( dQpOffset + 0.49999 ));
   }
-#if H0736_AVC_STYLE_QP_RANGE
   return Clip3(-pcCU->getSlice()->getSPS()->getQpBDOffsetY(), MAX_QP, iBaseQp+iQpOffset );
-#else
-  return Clip3( MIN_QP, MAX_QP, iBaseQp+iQpOffset );
-#endif
 }
 
@@ -1754 +1687 @@
   UInt uiBPelY   = uiTPelY + (g_uiMaxCUHeight>>uiDepth) - 1;
   
-#if BURST_IPCM
   if( getCheckBurstIPCMFlag() )
   {
@@ -1760 +1692 @@
     pcCU->setNumSucIPCM( countNumSucIPCM ( pcCU, uiAbsPartIdx ) );
   }
-#endif
 
   TComSlice * pcSlice = pcCU->getPic()->getSlice(pcCU->getPic()->getCurrSliceIdx());
@@ -1833 +1764 @@
       setdQPFlag(true);
     }
-#if BURST_IPCM
     pcCU->setNumSucIPCM(0);
     pcCU->setLastCUSucIPCMFlag(false);
-#endif
     for ( UInt uiPartUnitIdx = 0; uiPartUnitIdx < 4; uiPartUnitIdx++, uiAbsPartIdx+=uiQNumParts )
     {
@@ -1991 +1920 @@
 #endif
 
-#if FAST_DECISION_FOR_MRG_RD_COST
   Bool bestIsSkip = false;
-#endif
   
   for( UInt uiMergeCand = 0; uiMergeCand < numValidMergeCand; ++uiMergeCand )
@@ -2023 +1950 @@
 #endif
       {
-#if FAST_DECISION_FOR_MRG_RD_COST
         if( !(bestIsSkip && uiNoResidual == 0) )
         {
-#endif
           // set MC parameters
           rpcTempCU->setPredModeSubParts( MODE_SKIP, 0, uhDepth ); // interprets depth relative to LCU level
@@ -2088 +2013 @@
           else
           {
-#if FAST_DECISION_FOR_MRG_RD_COST
             if( bestIsSkip)
             {
@@ -2107 +2031 @@
             else
             {
-#endif
               if ( pcPredYuvTemp != m_ppcPredYuvTemp[uhDepth])
               {
@@ -2113 +2036 @@
                 pcPredYuvTemp = m_ppcPredYuvBest[uhDepth];
               }
-#if FAST_DECISION_FOR_MRG_RD_COST
             }
-#endif
           }
 #if HHI_VSO
@@ -2140 +2061 @@
           Bool bQtRootCbf = rpcTempCU->getQtRootCbf(0) == 1;
 
-#if H0736_AVC_STYLE_QP_RANGE
           Int orgQP = rpcTempCU->getQP( 0 );
           xCheckDQP( rpcTempCU );
           xCheckBestMode(rpcBestCU, rpcTempCU, uhDepth);
           rpcTempCU->initEstData( uhDepth, orgQP );
-#else
-          UInt uiOrgQP = rpcTempCU->getQP( 0 );
-          xCheckDQP( rpcTempCU );
-          xCheckBestMode(rpcBestCU, rpcTempCU, uhDepth);
-          rpcTempCU->initEstData( uhDepth, uiOrgQP );
-#endif
-
-#if FAST_DECISION_FOR_MRG_RD_COST
+
           if( m_pcEncCfg->getUseFastDecisionForMerge() && !bestIsSkip )
           {
             bestIsSkip = rpcBestCU->getQtRootCbf(0) == 0;
           }
-#endif
 
           if (!bQtRootCbf)
             break;
-#if FAST_DECISION_FOR_MRG_RD_COST
         }
-#endif
       }
     }
@@ -2515 +2425 @@
 }
 
-#if BURST_IPCM
 /** Check whether the last CU shares the same root as the current CU and is IPCM or not.  
  * \param pcCU
@@ -2607 +2516 @@
   return numSucIPCM;
 }
-#endif
 
 Void TEncCu::xCopyAMVPInfo (AMVPInfo* pSrc, AMVPInfo* pDst)

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

@@ -84 +84 @@
   //  Data : encoder control
   Bool                    m_bEncodeDQP;
-#if BURST_IPCM
   Bool                    m_checkBurstIPCMFlag;
-#endif
 
   //  Access channel
@@ -173 +171 @@
   Void setdQPFlag           ( Bool b )                { m_bEncodeDQP = b;           }
 
-#if BURST_IPCM
   Bool getCheckBurstIPCMFlag()                        { return m_checkBurstIPCMFlag;   }
   Void setCheckBurstIPCMFlag( Bool b )                { m_checkBurstIPCMFlag = b;      }
@@ -179 +176 @@
   Bool checkLastCUSucIPCM   ( TComDataCU* pcCU, UInt uiCurAbsPartIdx );
   Int  countNumSucIPCM      ( TComDataCU* pcCU, UInt uiCurAbsPartIdx );
-#endif
 
 #if ADAPTIVE_QP_SELECTION

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

@@ -52 +52 @@
 Void TEncEntropy::encodeSliceHeader ( TComSlice* pcSlice )
 {
-#if SAO_UNIT_INTERLEAVING
   if (pcSlice->getSPS()->getUseSAO())
   {
@@ -68 +67 @@
     }
   }
-#endif
 
   m_pcEntropyCoderIf->codeSliceHeader( pcSlice );
@@ -74 +72 @@
 }
 
-#if TILES_WPP_ENTRY_POINT_SIGNALLING
 Void  TEncEntropy::encodeTilesWPPEntryPoint( TComSlice* pSlice )
 {
   m_pcEntropyCoderIf->codeTilesWPPEntryPoint( pSlice );
 }
-#else
-Void TEncEntropy::encodeSliceHeaderSubstreamTable( TComSlice* pcSlice )
-{
-  m_pcEntropyCoderIf->codeSliceHeaderSubstreamTable( pcSlice );
-}
-#endif
 
 Void TEncEntropy::encodeTerminatingBit      ( UInt uiIsLast )
@@ -98 +89 @@
 }
 
-#if OL_FLUSH
 Void TEncEntropy::encodeFlush()
 {
@@ -107 +97 @@
   m_pcEntropyCoderIf->encodeStart();
 }
-#endif
 
 Void TEncEntropy::encodeSEI(const SEI& sei)
@@ -157 +146 @@
     uiAbsPartIdx = 0;
   }
-#if BURST_IPCM
   if( !bRD )
   {
@@ -165 +153 @@
     }
   }
-#endif
   m_pcEntropyCoderIf->codeSkipFlag( pcCU, uiAbsPartIdx );
 }
@@ -226 +213 @@
   //  m_pcEntropyCoderIf->codeAlfUvlc(pAlfParam->realfiltNo); 
 
-#if !LCU_SYNTAX_ALF
-  m_pcEntropyCoderIf->codeAlfFlag(pAlfParam->alf_pcr_region_flag);
-#endif
-#if !ALF_SINGLE_FILTER_SHAPE
-  m_pcEntropyCoderIf->codeAlfUvlc(pAlfParam->filter_shape); 
-#endif
   Int noFilters = min(pAlfParam->filters_per_group-1, 2);
   m_pcEntropyCoderIf->codeAlfUvlc(noFilters);
@@ -241 +222 @@
   else if (noFilters == 2)
   {
-#if LCU_SYNTAX_ALF
-#if ALF_16_BA_GROUPS
     Int numMergeFlags = 16;
-#else
-    Int numMergeFlags = 15;
-#endif
-#else
-#if ALF_16_BA_GROUPS
-    Int numMergeFlags = 16;
-#else
-    Int numMergeFlags = pAlfParam->alf_pcr_region_flag ? 16 : 15;
-#endif
-#endif
     for (Int i=1; i<numMergeFlags; i++) 
     {
@@ -285 +254 @@
   pDepthInt = pDepthIntTabShapes[ALFp->filter_shape];
   maxScanVal = 0;
-#if ALF_SINGLE_FILTER_SHAPE
   int minScanVal = MIN_SCAN_POS_CROSS;
-#else
-  int minScanVal = ( ALFp->filter_shape==ALF_STAR5x5 ) ? 0 : MIN_SCAN_POS_CROSS;
-#endif
 
   for(i = 0; i < sqrFiltLength; i++)
@@ -355 +320 @@
   // Coding parameters
   ALFp->minKStart = minKStart;
-#if !LCU_SYNTAX_ALF  
-  ALFp->maxScanVal = maxScanVal;
-#endif
   for(scanPos = minScanVal; scanPos < maxScanVal; scanPos++)
   {
@@ -363 +325 @@
   }
 
-#if LCU_SYNTAX_ALF
   if (ALFp->filters_per_group == 1)
   {
@@ -370 +331 @@
   else
   {
-#endif
   len += writeFilterCodingParams(minKStart, minScanVal, maxScanVal, kMinTab);
 
   // Filter coefficients
   len += writeFilterCoeffs(sqrFiltLength, filters_per_group, pDepthInt, ALFp->coeffmulti, kMinTab);
-#if LCU_SYNTAX_ALF
-  }
-#endif
+  }
   
   return len;
@@ -415 +373 @@
     {
       scanPos = pDepthInt[i] - 1;
-#if LCU_SYNTAX_ALF
       Int k = (filters_per_group == 1) ? kMinTab[i] : kMinTab[scanPos];
       golombEncode(FilterCoeff[ind][i], k);
-#else
-      golombEncode(FilterCoeff[ind][i], kMinTab[scanPos]);
-#endif
     }
   }
@@ -526 +480 @@
 #endif
 
-#if LCU_SYNTAX_ALF
 /** parse the fixed length code (smaller than one max value) in ALF
  * \param run: coded value
@@ -793 +746 @@
 
 }
-#endif
 
 
 Void TEncEntropy::encodeAlfParam(ALFParam* pAlfParam)
 {
-#if LCU_SYNTAX_ALF
   const Int numCoeff = (Int)ALF_MAX_NUM_COEF;
 
@@ -826 +777 @@
     }
   }
-#else
-  if (!pAlfParam->alf_flag)
-  {
-    return;
-  }
-  Int pos;
-  codeAux(pAlfParam);
-  codeFilt(pAlfParam);
-  
-  // filter parameters for chroma
-  m_pcEntropyCoderIf->codeAlfUvlc(pAlfParam->chroma_idc);
-  if(pAlfParam->chroma_idc)
-  {
-#if !ALF_SINGLE_FILTER_SHAPE
-    m_pcEntropyCoderIf->codeAlfUvlc(pAlfParam->filter_shape_chroma);
-#endif
-    // filter coefficients for chroma
-    for(pos=0; pos<pAlfParam->num_coeff_chroma; pos++)
-    {
-      m_pcEntropyCoderIf->codeAlfSvlc(pAlfParam->coeff_chroma[pos]);
-    }
-  }
-#endif
 }
 
@@ -907 +835 @@
     uiAbsPartIdx = 0;
   }
-#if BURST_IPCM
   if( !bRD )
   {
@@ -915 +842 @@
     }
   }
-#endif
 
 #if !RWTH_SDC_DLT_B0036
@@ -943 +869 @@
     uiAbsPartIdx = 0;
   }
-#if BURST_IPCM
   if( !bRD )
   {
@@ -951 +876 @@
     }
   }
-#endif
 
   m_pcEntropyCoderIf->codeSplitFlag( pcCU, uiAbsPartIdx, uiDepth );
@@ -969 +893 @@
     uiAbsPartIdx = 0;
   }
-#if BURST_IPCM
   if( !bRD )
   {
@@ -977 +900 @@
     }
   }
-#endif  
 #if RWTH_SDC_DLT_B0036
   if( !pcCU->getSlice()->isInterB() && pcCU->isIntra(uiAbsPartIdx) && pcCU->getSDCFlag(uiAbsPartIdx)  )
@@ -1031 +953 @@
   }
   
-#if BURST_IPCM
   Int numIPCM = 0;
   Bool firstIPCMFlag = false;
@@ -1047 +968 @@
   }
   m_pcEntropyCoderIf->codeIPCMInfo ( pcCU, uiAbsPartIdx, numIPCM, firstIPCMFlag);
-#else
-  m_pcEntropyCoderIf->codeIPCMInfo ( pcCU, uiAbsPartIdx );
-#endif
-
-}
-
-#if UNIFIED_TRANSFORM_TREE
+
+}
+
 Void TEncEntropy::xEncodeTransform( TComDataCU* pcCU,UInt offsetLuma, UInt offsetChroma, UInt uiAbsPartIdx, UInt absTUPartIdx, UInt uiDepth, UInt width, UInt height, UInt uiTrIdx, UInt uiInnerQuadIdx, UInt& uiYCbfFront3, UInt& uiUCbfFront3, UInt& uiVCbfFront3, Bool& bCodeDQP )
-#else
-Void TEncEntropy::xEncodeTransformSubdiv( TComDataCU* pcCU, UInt uiAbsPartIdx, UInt absTUPartIdx, UInt uiDepth, UInt uiInnerQuadIdx, UInt& uiYCbfFront3, UInt& uiUCbfFront3, UInt& uiVCbfFront3 )
-#endif
 {
   const UInt uiSubdiv = pcCU->getTransformIdx( uiAbsPartIdx ) + pcCU->getDepth( uiAbsPartIdx ) > uiDepth;
   const UInt uiLog2TrafoSize = g_aucConvertToBit[pcCU->getSlice()->getSPS()->getMaxCUWidth()]+2 - uiDepth;
-#if UNIFIED_TRANSFORM_TREE
   UInt cbfY = pcCU->getCbf( uiAbsPartIdx, TEXT_LUMA    , uiTrIdx );
   UInt cbfU = pcCU->getCbf( uiAbsPartIdx, TEXT_CHROMA_U, uiTrIdx );
@@ -1084 +997 @@
     }
   }
-#endif // UNIFIED_TRANSFORM_TREE
   {//CABAC
     if( pcCU->getPredictionMode(uiAbsPartIdx) == MODE_INTRA && pcCU->getPartitionSize(uiAbsPartIdx) == SIZE_NxN && uiDepth == pcCU->getDepth(uiAbsPartIdx) )
@@ -1164 +1076 @@
     if( uiSubdiv )
     {
-#if UNIFIED_TRANSFORM_TREE
       UInt size;
       width  >>= 1;
@@ -1170 +1081 @@
       size = width*height;
       uiTrIdx++;
-#endif // UNIFIED_TRANSFORM_TREE
       ++uiDepth;
-#if UNIFIED_TRANSFORM_TREE
       const UInt partNum = pcCU->getPic()->getNumPartInCU() >> (uiDepth << 1);
-#else
-      const UInt uiQPartNum = pcCU->getPic()->getNumPartInCU() >> (uiDepth << 1);
-#endif
       
       UInt uiCurrentCbfY = 0;
@@ -1182 +1088 @@
       UInt uiCurrentCbfV = 0;
       
-#if UNIFIED_TRANSFORM_TREE
       UInt nsAddr = 0;
       nsAddr = pcCU->getNSAbsPartIdx( uiLog2TrafoSize-1, uiAbsPartIdx, absTUPartIdx, 0, uiDepth - pcCU->getDepth( uiAbsPartIdx ) );
@@ -1198 +1103 @@
       nsAddr = pcCU->getNSAbsPartIdx( uiLog2TrafoSize-1, uiAbsPartIdx, absTUPartIdx, 3, uiDepth - pcCU->getDepth( uiAbsPartIdx ) );
       xEncodeTransform( pcCU, offsetLuma, offsetChroma, uiAbsPartIdx, nsAddr, uiDepth, width, height, uiTrIdx, 3, uiCurrentCbfY, uiCurrentCbfU, uiCurrentCbfV, bCodeDQP );      
-#else // UNIFIED_TRANSFORM_TREE
-      UInt nsAddr = 0;
-      nsAddr = pcCU->getNSAbsPartIdx( uiLog2TrafoSize-1, uiAbsPartIdx, absTUPartIdx, 0, uiDepth - pcCU->getDepth( uiAbsPartIdx ) );
-      xEncodeTransformSubdiv( pcCU, uiAbsPartIdx, nsAddr, uiDepth, 0, uiCurrentCbfY, uiCurrentCbfU, uiCurrentCbfV );
-
-      uiAbsPartIdx += uiQPartNum;
-      nsAddr = pcCU->getNSAbsPartIdx( uiLog2TrafoSize-1, uiAbsPartIdx, absTUPartIdx, 1, uiDepth - pcCU->getDepth( uiAbsPartIdx ) );
-      xEncodeTransformSubdiv( pcCU, uiAbsPartIdx, nsAddr, uiDepth, 1, uiCurrentCbfY, uiCurrentCbfU, uiCurrentCbfV );
-
-      uiAbsPartIdx += uiQPartNum;
-      nsAddr = pcCU->getNSAbsPartIdx( uiLog2TrafoSize-1, uiAbsPartIdx, absTUPartIdx, 2, uiDepth - pcCU->getDepth( uiAbsPartIdx ) );
-      xEncodeTransformSubdiv( pcCU, uiAbsPartIdx, nsAddr, uiDepth, 2, uiCurrentCbfY, uiCurrentCbfU, uiCurrentCbfV );
-
-      uiAbsPartIdx += uiQPartNum;
-      nsAddr = pcCU->getNSAbsPartIdx( uiLog2TrafoSize-1, uiAbsPartIdx, absTUPartIdx, 3, uiDepth - pcCU->getDepth( uiAbsPartIdx ) );
-      xEncodeTransformSubdiv( pcCU, uiAbsPartIdx, nsAddr, uiDepth, 3, uiCurrentCbfY, uiCurrentCbfU, uiCurrentCbfV );
-#endif // UNIFIED_TRANSFORM_TREE
       
       uiYCbfFront3 += uiCurrentCbfY;
@@ -1258 +1146 @@
       }
       
-#if UNIFIED_TRANSFORM_TREE
       if ( cbfY || cbfU || cbfV )
       {
@@ -1310 +1197 @@
         }
       }
-#endif // UNIFIED_TRANSFORM_TREE
-    }
-  }
-}
-
-#if !UNIFIED_TRANSFORM_TREE
-// transform index
-Void TEncEntropy::encodeTransformIdx( TComDataCU* pcCU, UInt uiAbsPartIdx, UInt uiDepth, Bool bRD )
-{
-  assert( !bRD ); // parameter bRD can be removed
-  if( bRD )
-  {
-    uiAbsPartIdx = 0;
-  }
-  
-  DTRACE_CABAC_VL( g_nSymbolCounter++ )
-  DTRACE_CABAC_T( "\tdecodeTransformIdx()\tCUDepth=" )
-  DTRACE_CABAC_V( uiDepth )
-  DTRACE_CABAC_T( "\n" )
-  UInt temp = 0;
-  UInt temp1 = 0;
-  UInt temp2 = 0;
-  xEncodeTransformSubdiv( pcCU, uiAbsPartIdx, uiAbsPartIdx, uiDepth, 0, temp, temp1, temp2 );
-}
-#endif // !UNIFIED_TRANSFORM_TREE
+    }
+  }
+}
+
 
 // Intra direction for Luma
@@ -1550 +1416 @@
 
 // texture
-#if !UNIFIED_TRANSFORM_TREE
-Void TEncEntropy::xEncodeCoeff( TComDataCU* pcCU, UInt uiLumaOffset, UInt uiChromaOffset, UInt uiAbsPartIdx, UInt uiDepth, UInt uiWidth, UInt uiHeight, UInt uiTrIdx, UInt uiCurrTrIdx, Bool& bCodeDQP )
-{
-  UInt uiLog2TrSize = g_aucConvertToBit[ pcCU->getSlice()->getSPS()->getMaxCUWidth() >> uiDepth ] + 2;
-  UInt uiCbfY = pcCU->getCbf( uiAbsPartIdx, TEXT_LUMA, uiTrIdx );
-  UInt uiCbfU = pcCU->getCbf( uiAbsPartIdx, TEXT_CHROMA_U, uiTrIdx );
-  UInt uiCbfV = pcCU->getCbf( uiAbsPartIdx, TEXT_CHROMA_V, uiTrIdx );
-
-  if( uiLog2TrSize == 2 )
-  {
-    UInt uiQPDiv = pcCU->getPic()->getNumPartInCU() >> ( ( uiDepth - 1 ) << 1 );
-    if( ( uiAbsPartIdx % uiQPDiv ) == 0 )
-    {
-      m_uiBakAbsPartIdx   = uiAbsPartIdx;
-      m_uiBakChromaOffset = uiChromaOffset;
-    }
-    else if( ( uiAbsPartIdx % uiQPDiv ) == (uiQPDiv - 1) )
-    {
-      uiCbfU = pcCU->getCbf( m_uiBakAbsPartIdx, TEXT_CHROMA_U, uiTrIdx );
-      uiCbfV = pcCU->getCbf( m_uiBakAbsPartIdx, TEXT_CHROMA_V, uiTrIdx );
-    }
-  }
-
-  if ( uiCbfY || uiCbfU || uiCbfV )
-  {
-    // dQP: only for LCU once
-    if ( pcCU->getSlice()->getPPS()->getUseDQP() )
-    {
-      if ( bCodeDQP )
-      {
-        encodeQP( pcCU, uiAbsPartIdx );
-        bCodeDQP = false;
-      }
-    }
-    UInt uiLumaTrMode, uiChromaTrMode;
-    pcCU->convertTransIdx( uiAbsPartIdx, pcCU->getTransformIdx( uiAbsPartIdx ), uiLumaTrMode, uiChromaTrMode );
-    const UInt uiStopTrMode = uiLumaTrMode;
-    
-    assert(1); // as long as quadtrees are not used for residual transform
-    
-    if( uiTrIdx == uiStopTrMode )
-    {
-      if( pcCU->getCbf( uiAbsPartIdx, TEXT_LUMA, uiTrIdx ) )
-      {
-        Int trWidth = uiWidth;
-        Int trHeight = uiHeight;
-        pcCU->getNSQTSize( uiTrIdx, uiAbsPartIdx, trWidth, trHeight );
-        m_pcEntropyCoderIf->codeCoeffNxN( pcCU, (pcCU->getCoeffY()+uiLumaOffset), uiAbsPartIdx, trWidth, trHeight, uiDepth, TEXT_LUMA );
-      }
-
-      uiWidth  >>= 1;
-      uiHeight >>= 1;
-
-      if( uiLog2TrSize == 2 )
-      {
-        UInt uiQPDiv = pcCU->getPic()->getNumPartInCU() >> ( ( uiDepth - 1 ) << 1 );
-        if( ( uiAbsPartIdx % uiQPDiv ) == (uiQPDiv - 1) )
-        {
-          uiWidth  <<= 1;
-          uiHeight <<= 1;
-          Int trWidth = uiWidth;
-          Int trHeight = uiHeight;
-          pcCU->getNSQTSize( uiTrIdx-1, uiAbsPartIdx, trWidth, trHeight );
-          if( pcCU->getCbf( m_uiBakAbsPartIdx, TEXT_CHROMA_U, uiTrIdx ) )
-          {
-            m_pcEntropyCoderIf->codeCoeffNxN( pcCU, (pcCU->getCoeffCb()+m_uiBakChromaOffset), m_uiBakAbsPartIdx, trWidth, trHeight, uiDepth, TEXT_CHROMA_U );
-          }
-          if( pcCU->getCbf( m_uiBakAbsPartIdx, TEXT_CHROMA_V, uiTrIdx ) )
-          {
-            m_pcEntropyCoderIf->codeCoeffNxN( pcCU, (pcCU->getCoeffCr()+m_uiBakChromaOffset), m_uiBakAbsPartIdx, trWidth, trHeight, uiDepth, TEXT_CHROMA_V );
-          }
-        }
-      }
-      else
-      {
-        Int trWidth = uiWidth;
-        Int trHeight = uiHeight;
-        pcCU->getNSQTSize( uiTrIdx, uiAbsPartIdx, trWidth, trHeight );
-        if( pcCU->getCbf( uiAbsPartIdx, TEXT_CHROMA_U, uiTrIdx ) )
-        {
-          m_pcEntropyCoderIf->codeCoeffNxN( pcCU, (pcCU->getCoeffCb()+uiChromaOffset), uiAbsPartIdx, trWidth, trHeight, uiDepth, TEXT_CHROMA_U );
-        }
-        if( pcCU->getCbf( uiAbsPartIdx, TEXT_CHROMA_V, uiTrIdx ) )
-        {
-          m_pcEntropyCoderIf->codeCoeffNxN( pcCU, (pcCU->getCoeffCr()+uiChromaOffset), uiAbsPartIdx, trWidth, trHeight, uiDepth, TEXT_CHROMA_V );
-        }
-      }
-    }
-    else
-    {
-      {
-        DTRACE_CABAC_VL( g_nSymbolCounter++ );
-        DTRACE_CABAC_T( "\tgoing down\tdepth=" );
-        DTRACE_CABAC_V( uiDepth );
-        DTRACE_CABAC_T( "\ttridx=" );
-        DTRACE_CABAC_V( uiTrIdx );
-        DTRACE_CABAC_T( "\n" );
-      }
-      if( uiCurrTrIdx <= uiTrIdx )
-        assert(1);
-      
-      UInt uiSize;
-      uiWidth  >>= 1;
-      uiHeight >>= 1;
-      uiSize = uiWidth*uiHeight;
-      uiDepth++;
-      uiTrIdx++;
-      
-      UInt uiQPartNum = pcCU->getPic()->getNumPartInCU() >> (uiDepth << 1);
-      UInt uiIdx      = uiAbsPartIdx;
-      
-      {
-        xEncodeCoeff( pcCU, uiLumaOffset, uiChromaOffset, uiIdx, uiDepth, uiWidth, uiHeight, uiTrIdx, uiCurrTrIdx, bCodeDQP );
-        uiLumaOffset += uiSize;  uiChromaOffset += (uiSize>>2);  uiIdx += uiQPartNum;
-
-        xEncodeCoeff( pcCU, uiLumaOffset, uiChromaOffset, uiIdx, uiDepth, uiWidth, uiHeight, uiTrIdx, uiCurrTrIdx, bCodeDQP );
-        uiLumaOffset += uiSize;  uiChromaOffset += (uiSize>>2);  uiIdx += uiQPartNum;
-
-        xEncodeCoeff( pcCU, uiLumaOffset, uiChromaOffset, uiIdx, uiDepth, uiWidth, uiHeight, uiTrIdx, uiCurrTrIdx, bCodeDQP );
-        uiLumaOffset += uiSize;  uiChromaOffset += (uiSize>>2);  uiIdx += uiQPartNum;
-
-        xEncodeCoeff( pcCU, uiLumaOffset, uiChromaOffset, uiIdx, uiDepth, uiWidth, uiHeight, uiTrIdx, uiCurrTrIdx, bCodeDQP );
-      }
-      {
-        DTRACE_CABAC_VL( g_nSymbolCounter++ );
-        DTRACE_CABAC_T( "\tgoing up\n" );
-      }
-    }
-  }
-}
-#endif // !UNIFIED_TRANSFORM_TREE
 
 /** encode coefficients
@@ -1718 +1453 @@
     DTRACE_CABAC_V( uiDepth )
     DTRACE_CABAC_T( "\n" )
-#if !UNIFIED_TRANSFORM_TREE
-    UInt temp = 0;
-    UInt temp1 = 0;
-    UInt temp2 = 0;
-    xEncodeTransformSubdiv( pcCU, uiAbsPartIdx, uiAbsPartIdx, uiDepth, 0, temp, temp1, temp2 );
-#endif // !UNIFIED_TRANSFORM_TREE
   }
   else
@@ -1747 +1476 @@
       }
     }
-#if !UNIFIED_TRANSFORM_TREE
-    encodeTransformIdx( pcCU, uiAbsPartIdx, pcCU->getDepth(uiAbsPartIdx) );
-#endif
   }
   
@@ -1768 +1494 @@
 #endif
 
-#if UNIFIED_TRANSFORM_TREE
   UInt temp = 0;
   UInt temp1 = 0;
   UInt temp2 = 0;
   xEncodeTransform( pcCU, uiLumaOffset, uiChromaOffset, uiAbsPartIdx, uiAbsPartIdx, uiDepth, uiWidth, uiHeight, 0, 0, temp, temp1, temp2, bCodeDQP );
-#else // UNIFIED_TRANSFORM_TREE
-  xEncodeCoeff( pcCU, uiLumaOffset, uiChromaOffset, uiAbsPartIdx, uiDepth, uiWidth, uiHeight, 0, uiLumaTrMode, bCodeDQP );
-#endif // UNIFIED_TRANSFORM_TREE
 
 #if FIX_MPI_B0065
@@ -1797 +1519 @@
 }
 
-#if SAO_UNIT_INTERLEAVING
 /** Encode SAO Offset
  * \param  saoLcuParam SAO LCU paramters
@@ -1985 +1706 @@
   }
 }
-#else
-/** Encode SAO for one partition
- * \param  pSaoParam, iPartIdx
- */
-Void TEncEntropy::encodeSaoOnePart(SAOParam* pSaoParam, Int iPartIdx, Int iYCbCr)
-{
-  SAOQTPart*  pAlfPart = NULL;
-  pAlfPart = &(pSaoParam->psSaoPart[iYCbCr][iPartIdx]); 
-
-  UInt uiSymbol;
-
-  if(!pAlfPart->bSplit)
-  {
-    if (pAlfPart->bEnableFlag)
-    {
-      uiSymbol = pAlfPart->iBestType + 1;
-    }
-    else
-    {
-      uiSymbol = 0;
-    }
-    
-    m_pcEntropyCoderIf->codeSaoUvlc(uiSymbol);
-
-    if (pAlfPart->bEnableFlag)
-    {
-      for(Int i=0; i< pAlfPart->iLength; i++)
-      {
-        m_pcEntropyCoderIf->codeSaoSvlc(pAlfPart->iOffset[i]);
-      }   
-    }
-    return;
-  }
-
-  //split
-  if (pAlfPart->PartLevel < pSaoParam->iMaxSplitLevel)
-  {
-    for (Int i=0;i<NUM_DOWN_PART;i++)
-    {
-      encodeSaoOnePart(pSaoParam, pAlfPart->DownPartsIdx[i], iYCbCr);
-    }
-  }
-}
-
-/** Encode quadtree split flag
- * \param  pSaoParam, iPartIdx
- */
-Void TEncEntropy::encodeQuadTreeSplitFlag(SAOParam* pSaoParam, Int iPartIdx, Int iYCbCr)
-{
-  SAOQTPart*  pSaoPart = NULL;
-  pSaoPart = &(pSaoParam->psSaoPart[iYCbCr][iPartIdx]);
-
-  if(pSaoPart->PartLevel < pSaoParam->iMaxSplitLevel)
-  {
-    //send one flag
-    m_pcEntropyCoderIf->codeSaoFlag( (pSaoPart->bSplit)?(1):(0)  );
-
-    if(pSaoPart->bSplit)
-    {
-      for (Int i=0;i<NUM_DOWN_PART;i++)
-      {
-        encodeQuadTreeSplitFlag(pSaoParam, pSaoPart->DownPartsIdx[i], iYCbCr);
-      }
-    } 
-  }
-}
-/** Encode SAO parameters
- * \param  pSaoParam
- */
-Void TEncEntropy::encodeSaoParam(SAOParam* pSaoParam)
-{
-  if (pSaoParam->bSaoFlag[0])
-  {
-    encodeQuadTreeSplitFlag(pSaoParam, 0, 0);
-    encodeSaoOnePart(pSaoParam, 0, 0);
-    m_pcEntropyCoderIf->codeSaoFlag(pSaoParam->bSaoFlag[1]); 
-    if (pSaoParam->bSaoFlag[1])
-    {
-      encodeQuadTreeSplitFlag(pSaoParam, 0, 1);
-      encodeSaoOnePart(pSaoParam, 0, 1);
-    }
-    m_pcEntropyCoderIf->codeSaoFlag(pSaoParam->bSaoFlag[2]); 
-    if (pSaoParam->bSaoFlag[2])
-    {
-      encodeQuadTreeSplitFlag(pSaoParam, 0, 2);
-      encodeSaoOnePart(pSaoParam, 0, 2);
-    }
-  }
-}
-#endif
 
 Int TEncEntropy::countNonZeroCoeffs( TCoeff* pcCoef, UInt uiSize )

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

@@ -90 +90 @@
   virtual Void codeTileMarkerFlag      ( TComSlice* pcSlice )                                  = 0;
 
-#if TILES_WPP_ENTRY_POINT_SIGNALLING
   virtual Void  codeTilesWPPEntryPoint  ( TComSlice* pSlice )     = 0;
-#else
-  virtual Void  codeSliceHeaderSubstreamTable( TComSlice* pcSlice )                             = 0;
-#endif
   virtual Void  codeTerminatingBit      ( UInt uilsLast )                                       = 0;
   virtual Void  codeSliceFinish         ()                                                      = 0;
-#if OL_FLUSH
   virtual Void  codeFlush               ()                                                      = 0;
   virtual Void  encodeStart             ()                                                      = 0;
-#endif
   
   virtual Void codeAlfCtrlDepth() = 0;
@@ -134 +128 @@
 #endif
   
-#if BURST_IPCM
   virtual Void codeIPCMInfo      ( TComDataCU* pcCU, UInt uiAbsPartIdx, Int numIPCM, Bool firstIPCMFlag) = 0;
-#else
-  virtual Void codeIPCMInfo      ( TComDataCU* pcCU, UInt uiAbsPartIdx ) = 0;
-#endif
 
   virtual Void codeTransformSubdivFlag( UInt uiSymbol, UInt uiCtx ) = 0;
@@ -155 +145 @@
   virtual Void codeAlfUvlc          ( UInt uiCode ) = 0;
   virtual Void codeAlfSvlc          ( Int   iCode ) = 0;
-#if LCU_SYNTAX_ALF
   virtual Void codeAlfFixedLengthIdx( UInt idx, UInt numFilterSetsInBuffer) = 0;
   virtual Void codeAPSAlflag(UInt uiCode) = 0;
-#endif
   /// set slice granularity
   virtual Void setSliceGranularity(Int iSliceGranularity) = 0;
@@ -169 +157 @@
   virtual Void codeSaoUvlc          ( UInt uiCode ) = 0;
   virtual Void codeSaoSvlc          ( Int   iCode ) = 0;
-#if SAO_UNIT_INTERLEAVING
   virtual Void codeSaoRun          ( UInt   uiCode, UInt uiMaxValue  ) = 0;
   virtual Void codeSaoMergeLeft    ( UInt   uiCode, UInt uiCompIdx  ) = 0;
@@ -175 +162 @@
   virtual Void codeSaoTypeIdx      ( UInt   uiCode) = 0;
   virtual Void codeSaoUflc         ( UInt   uiCode) = 0;
-#endif
   virtual Void estBit               (estBitsSbacStruct* pcEstBitsSbac, Int width, Int height, TextType eTType) = 0;
   
@@ -198 +184 @@
   UInt    m_uiBakAbsPartIdx;
   UInt    m_uiBakChromaOffset;
-#if UNIFIED_TRANSFORM_TREE
   UInt    m_bakAbsPartIdxCU;
-#endif
 
 public:
@@ -216 +200 @@
   Void    encodeSliceHeader         ( TComSlice* pcSlice );
   Void    encodeTileMarkerFlag       (TComSlice* pcSlice) {m_pcEntropyCoderIf->codeTileMarkerFlag(pcSlice);}
-#if TILES_WPP_ENTRY_POINT_SIGNALLING
   Void    encodeTilesWPPEntryPoint( TComSlice* pSlice );
-#else
-  Void    encodeSliceHeaderSubstreamTable( TComSlice* pcSlice );
-#endif
   Void    encodeTerminatingBit      ( UInt uiIsLast );
   Void    encodeSliceFinish         ();
-#if OL_FLUSH
   Void    encodeFlush               ();
   Void    encodeStart               ();
-#endif
-#if LCU_SYNTAX_ALF
   Void encodeAlfFlag(UInt code) {m_pcEntropyCoderIf->codeAlfFlag(code);}
   Void encodeAlfStoredFilterSetIdx(UInt idx, UInt numFilterSetsInBuffer);
@@ -236 +213 @@
   Int  getAlfRun(Int compIdx, AlfParamSet* pAlfParamSet, Int lcuIdxInSlice, Int lcuPos, Int startlcuPosX, Int endlcuPosX);
   Void encodeAPSAlfFlag(UInt code) {m_pcEntropyCoderIf->codeAPSAlflag(code);}
-#endif  
   Void encodeAlfParam(ALFParam* pAlfParam);
   
@@ -297 +273 @@
   Void encodeIntraDirModeChroma( TComDataCU* pcCU, UInt uiAbsPartIdx, Bool bRD = false );
   
-#if !UNIFIED_TRANSFORM_TREE
-  Void encodeTransformIdx      ( TComDataCU* pcCU, UInt uiAbsPartIdx, UInt uiDepth, Bool bRD = false );
-#endif
   Void encodeTransformSubdivFlag( UInt uiSymbol, UInt uiCtx );
   Void encodeQtCbf             ( TComDataCU* pcCU, UInt uiAbsPartIdx, TextType eType, UInt uiTrDepth );
@@ -320 +293 @@
 
 private:
-#if UNIFIED_TRANSFORM_TREE
   Void xEncodeTransform        ( TComDataCU* pcCU,UInt offsetLumaOffset, UInt offsetChroma, UInt uiAbsPartIdx, UInt absTUPartIdx, UInt uiDepth, UInt width, UInt height, UInt uiTrIdx, UInt uiInnerQuadIdx, UInt& uiYCbfFront3, UInt& uiUCbfFront3, UInt& uiVCbfFront3, Bool& bCodeDQP );
-#else
-  Void xEncodeTransformSubdiv  ( TComDataCU* pcCU, UInt uiAbsPartIdx, UInt absTUPartIdx, UInt uiDepth, UInt uiInnerQuadIdx, UInt& uiYCbfFront3, UInt& uiUCbfFront3, UInt& uiVCbfFront3 );
-  Void xEncodeCoeff            ( TComDataCU* pcCU, UInt uiLumaOffset, UInt uiChromaOffset, UInt uiAbsPartIdx, UInt uiDepth, UInt uiWidth, UInt uiHeight, UInt uiTrIdx, UInt uiCurrTrIdx, Bool& bCodeDQP );
-#endif // !UNIFIED_TRANSFORM_TREE
 public:
   Void encodeCoeff             ( TComDataCU* pcCU,                 UInt uiAbsPartIdx, UInt uiDepth, UInt uiWidth, UInt uiHeight, Bool& bCodeDQP );
@@ -345 +313 @@
   Int golombEncode(int coeff, int k);
   Int lengthGolomb(int coeffVal, int k);
-#if SAO_UNIT_INTERLEAVING
   Void    encodeSaoUnit(Int rx, Int ry, Int compIdx, SAOParam* saoParam, Int repeatedRow);
   Void    encodeSaoOffset(SaoLcuParam* saoLcuParam);
   Void    encodeSaoUnitInterleaving(Int rx, Int ry, SAOParam* saoParam, TComDataCU* cu, Int cuAddrInSlice, Int cuAddrUpInSlice, Bool lfCrossSliceBoundaryFlag);
   Void    encodeSaoParam         (TComAPS*  aps);
-#else
-  Void    encodeSaoOnePart       (SAOParam* pSaoParam, Int iPartIdx, Int iYCbCr);
-  Void    encodeQuadTreeSplitFlag(SAOParam* pSaoParam, Int iPartIdx, Int iYCbCr);
-  Void    encodeSaoParam         (SAOParam* pSaoParam);
-#endif
 
   static Int countNonZeroCoeffs( TCoeff* pcCoef, UInt uiSize );

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

@@ -159 +159 @@
   TComOutputBitstream  *pcBitstreamRedirect;
   pcBitstreamRedirect = new TComOutputBitstream;
-#if !REMOVE_TILE_DEPENDENCE
-  OutputNALUnit        *naluBuffered             = NULL;
-  Bool                  bIteratorAtListStart     = false;
-#endif
   AccessUnit::iterator  itLocationToPushSliceHeaderNALU; // used to store location where NALU containing slice header is to be inserted
   UInt                  uiOneBitstreamPerSliceLength = 0;
@@ -283 +279 @@
           pcSlice->setDefaultScalingList ();
         }
-#if SCALING_LIST
         pcSlice->getScalingList()->checkDcOfMatrix();
-#endif
         pcSlice->getScalingList()->setScalingListPresentFlag(pcSlice->checkDefaultScalingList());
         m_pcEncTop->getTrQuant()->setScalingList(pcSlice->getScalingList());
@@ -333 +327 @@
       pcSlice->applyReferencePictureSet(rcListPic, pcSlice->getRPS());
 
-#if H0566_TLA && H0566_TLA_SET_FOR_SWITCHING_POINTS
+#if H0566_TLA_SET_FOR_SWITCHING_POINTS
       if(pcSlice->getTLayer() > 0)
       {
@@ -354 +348 @@
       TComRefPicListModification* refPicListModification = pcSlice->getRefPicListModification();
       refPicListModification->setRefPicListModificationFlagL0( false );
-#if !H0137_0138_LIST_MODIFICATION
-      refPicListModification->setNumberOfRefPicListModificationsL0(0);
-#endif
       refPicListModification->setRefPicListModificationFlagL1( false );
-#if !H0137_0138_LIST_MODIFICATION
-      refPicListModification->setNumberOfRefPicListModificationsL1(0);
-#endif
       xSetRefPicListModificationsMvc( pcSlice, uiPOCCurr, iGOPid );
 
@@ -525 +513 @@
       }
 
-#if H0111_MVD_L1_ZERO
       Bool bGPBcheck=false;
       if ( pcSlice->getSliceType() == B_SLICE)
@@ -552 +539 @@
       }
       pcPic->getSlice(pcSlice->getSliceIdx())->setMvdL1ZeroFlag(pcSlice->getMvdL1ZeroFlag());
-#endif
 
       UInt uiNumSlices = 1;
@@ -581 +567 @@
     UInt uiEncCUAddr;
     
-#if !REMOVE_TILE_DEPENDENCE
-    if(pcSlice->getPPS()->getTileBehaviorControlPresentFlag() == 1)
-    {
-      pcPic->getPicSym()->setTileBoundaryIndependenceIdr( pcSlice->getPPS()->getTileBoundaryIndependenceIdr() );
-    }
-    else
-    {
-      pcPic->getPicSym()->setTileBoundaryIndependenceIdr( pcSlice->getPPS()->getSPS()->getTileBoundaryIndependenceIdr() );
-
-    }
-#endif
 
     if( pcSlice->getPPS()->getColumnRowInfoPresent() == 1 )    //derive the tile parameters from PPS
@@ -839 +814 @@
       Bool bLFCrossTileBoundary = (pcSlice->getPPS()->getTileBehaviorControlPresentFlag() == 1)?
                                   (pcSlice->getPPS()->getLFCrossTileBoundaryFlag()):(pcSlice->getPPS()->getSPS()->getLFCrossTileBoundaryFlag());
-#if DBL_CONTROL
       m_pcLoopFilter->setCfg(pcSlice->getPPS()->getDeblockingFilterControlPresent(), pcSlice->getLoopFilterDisable(), pcSlice->getLoopFilterBetaOffset(), pcSlice->getLoopFilterTcOffset(), bLFCrossTileBoundary);
-#else
-      m_pcLoopFilter->setCfg(pcSlice->getLoopFilterDisable(), pcSlice->getLoopFilterBetaOffset(), pcSlice->getLoopFilterTcOffset(), bLFCrossTileBoundary);
-#endif
       m_pcLoopFilter->loopFilterPic( pcPic );
 
@@ -861 +832 @@
       }
 
-#if LCU_SYNTAX_ALF
       AlfParamSet* alfSliceParams = NULL;
       std::vector<AlfCUCtrlInfo>* alfCUCtrlParam = NULL;
-#else
-      std::vector<AlfCUCtrlInfo> vAlfCUCtrlParam;
-#endif
       pcSlice = pcPic->getSlice(0);
 
       if(pcSlice->getSPS()->getUseALF())
       {
-#if LCU_SYNTAX_ALF
         m_pcAdaptiveLoopFilter->createPicAlfInfo(pcPic, uiNumSlices, pcSlice->getSliceQp());
         m_pcAdaptiveLoopFilter->initALFEnc(m_pcCfg->getALFParamInSlice(), m_pcCfg->getALFPicBasedEncode(), uiNumSlices, alfSliceParams, alfCUCtrlParam);
-#else
-        vAlfCUCtrlParam.resize(uiNumSlices);
-        m_pcAdaptiveLoopFilter->createPicAlfInfo(pcPic, uiNumSlices);
-#endif
       }
 
@@ -900 +862 @@
         }
 #endif
-#if NAL_REF_FLAG
 #if VIDYO_VPS_INTEGRATION|QC_MVHEVC_B0046
         OutputNALUnit nalu(NAL_UNIT_SPS, true, m_pcEncTop->getLayerId());
@@ -906 +867 @@
         OutputNALUnit nalu(NAL_UNIT_SPS, true, m_pcEncTop->getViewId(), m_pcEncTop->getIsDepth());
 #endif
-#else
-        OutputNALUnit nalu(NAL_UNIT_SPS, NAL_REF_IDC_PRIORITY_HIGHEST, m_pcEncTop->getViewId(), m_pcEncTop->getIsDepth());
-#endif
         m_pcEntropyCoder->setBitstream(&nalu.m_Bitstream);
-#if TILES_WPP_ENTRY_POINT_SIGNALLING
         pcSlice->getSPS()->setNumSubstreams( pcSlice->getPPS()->getNumSubstreams() );
-#endif
 #if HHI_MPI || OL_QTLIMIT_PREDCODING_B0068
         m_pcEntropyCoder->encodeSPS(pcSlice->getSPS(), m_pcEncTop->getIsDepth());
@@ -921 +877 @@
         accessUnit.push_back(new NALUnitEBSP(nalu));
 
-#if NAL_REF_FLAG
 #if VIDYO_VPS_INTEGRATION|QC_MVHEVC_B0046 
 #if QC_MVHEVC_B0046
@@ -930 +885 @@
 #else
         nalu = NALUnit(NAL_UNIT_PPS, true, m_pcEncTop->getViewId(), m_pcEncTop->getIsDepth());
-#endif
-#else
-        nalu = NALUnit(NAL_UNIT_PPS, NAL_REF_IDC_PRIORITY_HIGHEST, m_pcEncTop->getViewId(), m_pcEncTop->getIsDepth());
 #endif
         m_pcEntropyCoder->setBitstream(&nalu.m_Bitstream);
@@ -1057 +1009 @@
         m_pcEntropyCoder->resetEntropy      ();
         /* start slice NALunit */
-#if H0388
-#if NAL_REF_FLAG
         OutputNALUnit nalu( pcSlice->getNalUnitType(), pcSlice->isReferenced(),
 #if !VIDYO_VPS_INTEGRATION &!QC_MVHEVC_B0046
@@ -1064 +1014 @@
 #else
                            m_pcEncTop->getLayerId(), pcSlice->getTLayer() );
-#endif
-#else
-        OutputNALUnit nalu( pcSlice->getNalUnitType(), pcSlice->isReferenced() ? NAL_REF_IDC_PRIORITY_HIGHEST: NAL_REF_IDC_PRIORITY_LOWEST, 
-#if !VIDYO_VPS_INTEGRATION
-                           m_pcEncTop->getViewId(), m_pcEncTop->getIsDepth(), pcSlice->getTLayer() );
-#else
-                           m_pcEncTop->getLayerId(), pcSlice->getTLayer() );
-#endif
-#endif
-#else
-        OutputNALUnit nalu( pcSlice->getNalUnitType(), pcSlice->isReferenced() ? NAL_REF_IDC_PRIORITY_HIGHEST: NAL_REF_IDC_PRIORITY_LOWEST, 
-#if !VIDYO_VPS_INTEGRATION
-                           m_pcEncTop->getViewId(), m_pcEncTop->getIsDepth(), pcSlice->getTLayer(), true );
-#else
-                           m_pcEncTop->getLayerId(), pcSlice->getTLayer(), true );
-#endif
-
 #endif
             
@@ -1103 +1036 @@
           if (pcSlice->getSPS()->getUseALF())
           {
-#if LCU_SYNTAX_ALF
             if(pcSlice->getAlfEnabledFlag())
-#else
-            if(pcSlice->getAPS()->getAlfEnabled())
-#endif
             {
 
-#if LCU_SYNTAX_ALF
               if( pcSlice->getSPS()->getUseALFCoefInSlice())
               {
@@ -1122 +1050 @@
               {
                 AlfCUCtrlInfo& cAlfCUCtrlParam = (*alfCUCtrlParam)[pcSlice->getSliceIdx()];
-#else
-              AlfCUCtrlInfo& cAlfCUCtrlParam = vAlfCUCtrlParam[pcSlice->getSliceIdx()];
-#endif
               if(cAlfCUCtrlParam.cu_control_flag)
               {
@@ -1138 +1063 @@
               m_pcEntropyCoder->encodeAlfCtrlParam(cAlfCUCtrlParam, m_pcAdaptiveLoopFilter->getNumCUsInPic());
             
-#if LCU_SYNTAX_ALF
               }
-#endif            
             }
           }
@@ -1214 +1137 @@
           UInt uiTotalCodedSize = 0; // for padding calcs.
           UInt uiNumSubstreamsPerTile = iNumSubstreams;
-#if !REMOVE_TILE_DEPENDENCE
-#if WPP_SIMPLIFICATION
-         if (pcPic->getPicSym()->getTileBoundaryIndependenceIdr() && iNumSubstreams > 1)
-#else
-          if (pcPic->getPicSym()->getTileBoundaryIndependenceIdr() && pcSlice->getPPS()->getEntropyCodingSynchro())
-#endif
+          if (iNumSubstreams > 1)
+          {
             uiNumSubstreamsPerTile /= pcPic->getPicSym()->getNumTiles();
-#else
-#if WPP_SIMPLIFICATION
-          if (iNumSubstreams > 1)
-#else
-          if (pcSlice->getPPS()->getEntropyCodingSynchro())
-#endif
-          {
-            uiNumSubstreamsPerTile /= pcPic->getPicSym()->getNumTiles();
-          }
-#endif
+          }
           for ( UInt ui = 0 ; ui < iNumSubstreams; ui++ )
           {
@@ -1240 +1150 @@
             m_pcEntropyCoder->encodeSliceFinish();
             pcSubstreamsOut[ui].write( 1, 1 ); // stop bit.
-#if TILES_WPP_ENTRY_POINT_SIGNALLING
             pcSubstreamsOut[ui].writeAlignZero();
-#endif
             // Byte alignment is necessary between tiles when tiles are independent.
             uiTotalCodedSize += pcSubstreamsOut[ui].getNumberOfWrittenBits();
@@ -1269 +1177 @@
           m_pcEntropyCoder->setEntropyCoder   ( m_pcCavlcCoder, pcSlice );
           m_pcEntropyCoder->setBitstream(&nalu.m_Bitstream);
-#if TILES_WPP_ENTRY_POINT_SIGNALLING
           if (m_pcCfg->getTileLocationInSliceHeaderFlag()==0) 
           {
@@ -1275 +1182 @@
           }
           m_pcEntropyCoder->encodeTilesWPPEntryPoint( pcSlice );
-#else
-          m_pcEntropyCoder->encodeSliceHeaderSubstreamTable(pcSlice);
-#endif
           // Substreams...
           TComOutputBitstream *pcOut = pcBitstreamRedirect;
@@ -1309 +1213 @@
         uiBoundingAddrEntropySlice = m_uiStoredStartCUAddrForEncodingEntropySlice[uiStartCUAddrEntropySliceIdx];          
         uiNextCUAddr               = min(uiBoundingAddrSlice, uiBoundingAddrEntropySlice);
-#if !REMOVE_TILE_DEPENDENCE
-        Bool bNextCUInNewSlice     = (uiNextCUAddr >= uiRealEndAddress) || (uiNextCUAddr == m_uiStoredStartCUAddrForEncodingSlice[uiStartCUAddrSliceIdx]);
-#endif
         // If current NALU is the first NALU of slice (containing slice header) and more NALUs exist (due to multiple entropy slices) then buffer it.
         // If current NALU is the last NALU of slice and a NALU was buffered, then (a) Write current NALU (b) Update an write buffered NALU at approproate location in NALU list.
         Bool bNALUAlignedWrittenToList    = false; // used to ensure current NALU is not written more than once to the NALU list.
-#if !REMOVE_TILE_DEPENDENCE
-        if (pcSlice->getSPS()->getTileBoundaryIndependenceIdr() && !pcSlice->getSPS()->getTileBoundaryIndependenceIdr())
-        {
-          if (bNextCUInNewSlice)
-          {
-            if (!bEntropySlice) // there were no entropy slices
-            {
-              xWriteTileLocationToSliceHeader(nalu, pcBitstreamRedirect, pcSlice);
-            }
-            // (a) writing current NALU
-            writeRBSPTrailingBits(nalu.m_Bitstream);
-            accessUnit.push_back(new NALUnitEBSP(nalu));
-            bNALUAlignedWrittenToList = true;
-
-            // (b) update and write buffered NALU
-            if (bEntropySlice) // if entropy slices existed in the slice then perform concatenation for the buffered nalu-bitstream and buffered payload bitstream
-            {
-              // Perform bitstream concatenation of slice header and partial slice payload
-              xWriteTileLocationToSliceHeader((*naluBuffered), pcBitstreamRedirect, pcSlice);
-              if (bIteratorAtListStart)
-              {
-                itLocationToPushSliceHeaderNALU = accessUnit.begin();
-              }
-              else
-              {
-                itLocationToPushSliceHeaderNALU++;
-              }
-              accessUnit.insert(itLocationToPushSliceHeaderNALU, (new NALUnitEBSP((*naluBuffered))) );
-
-              // free buffered nalu
-              delete naluBuffered;
-              naluBuffered     = NULL;
-            }
-          }
-          else // another entropy slice exists
-          {
-            // Is this start-of-slice NALU? i.e. the one containing slice header. If Yes, then buffer it.
-            if (!bEntropySlice)
-            {
-              // store a pointer to where NALU for slice header is to be written in NALU list
-              itLocationToPushSliceHeaderNALU = accessUnit.end();
-              if (accessUnit.begin() == accessUnit.end())
-              {
-                bIteratorAtListStart = true;
-              }
-              else
-              {
-                bIteratorAtListStart = false;
-                itLocationToPushSliceHeaderNALU--;
-              }
-
-              // buffer nalu for later writing
-#if H0388
-              naluBuffered = new OutputNALUnit( pcSlice->getNalUnitType(), pcSlice->isReferenced() ? NAL_REF_IDC_PRIORITY_HIGHEST: NAL_REF_IDC_PRIORITY_LOWEST, m_pcEncTop->getViewId(), m_pcEncTop->getIsDepth(), pcSlice->getTLayer() );
-#else
-              naluBuffered = new OutputNALUnit(pcSlice->getNalUnitType(), pcSlice->isReferenced() ? NAL_REF_IDC_PRIORITY_HIGHEST: NAL_REF_IDC_PRIORITY_LOWEST, m_pcEncTop->getViewId(), m_pcEncTop->getIsDepth(), pcSlice->getTLayer(), true);
-#endif
-              copyNaluData( (*naluBuffered), nalu );
-
-              // perform byte-alignment to get appropriate bitstream length (used for explicit tile location signaling in slice header)
-              writeRBSPTrailingBits((*pcBitstreamRedirect));
-              bNALUAlignedWrittenToList = true; // This is not really a write to bitsream but buffered for later. The flag is set to prevent writing of current NALU to list.
-              uiOneBitstreamPerSliceLength += pcBitstreamRedirect->getNumberOfWrittenBits(); // length of bitstream after byte-alignment
-            }
-            else // write out entropy slice
-            {
-              writeRBSPTrailingBits(nalu.m_Bitstream);
-              accessUnit.push_back(new NALUnitEBSP(nalu));
-              bNALUAlignedWrittenToList = true; 
-              uiOneBitstreamPerSliceLength += nalu.m_Bitstream.getNumberOfWrittenBits(); // length of bitstream after byte-alignment
-            }
-          }
-        }
-        else
-        {
-#endif
         xWriteTileLocationToSliceHeader(nalu, pcBitstreamRedirect, pcSlice);
         writeRBSPTrailingBits(nalu.m_Bitstream);
@@ -1396 +1221 @@
         bNALUAlignedWrittenToList = true; 
         uiOneBitstreamPerSliceLength += nalu.m_Bitstream.getNumberOfWrittenBits(); // length of bitstream after byte-alignment
-#if !REMOVE_TILE_DEPENDENCE
-        }
-#endif
 
         if (!bNALUAlignedWrittenToList)
@@ -1417 +1239 @@
             TComAPS cAPS;
             allocAPS(&cAPS, pcSlice->getSPS());
-#if SAO_UNIT_INTERLEAVING
             cAPS.setSaoInterleavingFlag(m_pcCfg->getSaoInterleavingFlag());
-#endif
             // set entropy coder for RD
             m_pcEntropyCoder->setEntropyCoder ( m_pcCavlcCoder, pcSlice );
@@ -1445 +1265 @@
 
             // adaptive loop filter
-#if !LCU_SYNTAX_ALF
-            UInt64 uiDist, uiBits;
-#endif
             if ( pcSlice->getSPS()->getUseALF())
             {
@@ -1453 +1270 @@
               m_pcEntropyCoder->setBitstream    ( m_pcBitCounter );
               m_pcAdaptiveLoopFilter->startALFEnc(pcPic, m_pcEntropyCoder );
-#if LCU_SYNTAX_ALF
               AlfParamSet* pAlfEncParam = (pcSlice->getSPS()->getUseALFCoefInSlice())?( alfSliceParams ):( cAPS.getAlfParam());
 #if ALF_CHROMA_LAMBDA 
@@ -1477 +1293 @@
 #endif
 
-#else
-              ALFParam& cAlfParam = *( cAPS.getAlfParam());
-
-#if ALF_CHROMA_LAMBDA 
-#if HHI_INTERVIEW_SKIP
-              m_pcAdaptiveLoopFilter->ALFProcess( &cAlfParam, &vAlfCUCtrlParam, pcPic->getSlice(0)->getLambdaLuma(), pcPic->getSlice(0)->getLambdaChroma(), uiDist, uiBits, m_pcEncTop->getInterViewSkip());
-#else
-              m_pcAdaptiveLoopFilter->ALFProcess( &cAlfParam, &vAlfCUCtrlParam, pcPic->getSlice(0)->getLambdaLuma(), pcPic->getSlice(0)->getLambdaChroma(), uiDist, uiBits);
-#endif
-#else
-#if SAO_CHROMA_LAMBDA 
-#if HHI_INTERVIEW_SKIP
-              m_pcAdaptiveLoopFilter->ALFProcess( &cAlfParam, &vAlfCUCtrlParam, pcPic->getSlice(0)->getLambdaLuma(), uiDist, uiBits, m_pcEncTop->getInterViewSkip());
-#else
-              m_pcAdaptiveLoopFilter->ALFProcess( &cAlfParam, &vAlfCUCtrlParam, pcPic->getSlice(0)->getLambdaLuma(), uiDist, uiBits);
-#endif
-#else
-#if HHI_INTERVIEW_SKIP
-              m_pcAdaptiveLoopFilter->ALFProcess( &cAlfParam, &vAlfCUCtrlParam, pcPic->getSlice(0)->getLambdaLuma(), uiDist, uiBits, m_pcEncTop->getInterViewSkip());
-#else
-              m_pcAdaptiveLoopFilter->ALFProcess( &cAlfParam, &vAlfCUCtrlParam, pcPic->getSlice(0)->getLambda(), uiDist, uiBits);
-#endif
-#endif
-#endif
-#endif
               m_pcAdaptiveLoopFilter->endALFEnc();
 
@@ -1518 +1309 @@
               if (pcSlice->getSPS()->getUseALF())
               {
-#if LCU_SYNTAX_ALF
                 pcPic->getSlice(s)->setAlfEnabledFlag(  (pcSlice->getSPS()->getUseALFCoefInSlice())?(alfSliceParams[s].isEnabled[ALF_Y]):(cAPS.getAlfEnabled())   );
-#else
-                pcPic->getSlice(s)->setAlfEnabledFlag((cAPS.getAlfParam()->alf_flag==1)?true:false);
-#endif
               }
               if (pcSlice->getSPS()->getUseSAO())
@@ -1535 +1322 @@
         case ENCODE_APS:
           {
-#if NAL_REF_FLAG
 #if VIDYO_VPS_INTEGRATION | QC_MVHEVC_B0046
             OutputNALUnit nalu(NAL_UNIT_APS, true, m_pcEncTop->getLayerId());
 #else
             OutputNALUnit nalu(NAL_UNIT_APS, true, m_pcEncTop->getViewId(), m_pcEncTop->getIsDepth());
-#endif
-#else
-            OutputNALUnit nalu(NAL_UNIT_APS, NAL_REF_IDC_PRIORITY_HIGHEST, m_pcEncTop->getViewId(), m_pcEncTop->getIsDepth());
 #endif
             encodeAPS(&(vAPS[iCodedAPSIdx]), nalu.m_Bitstream, pcSliceForAPS);
@@ -1569 +1352 @@
         if(pcSlice->getSPS()->getUseALF())
         {
-#if LCU_SYNTAX_ALF
           m_pcAdaptiveLoopFilter->uninitALFEnc(alfSliceParams, alfCUCtrlParam);
-#endif
           m_pcAdaptiveLoopFilter->destroyPicAlfInfo();
         }
@@ -1601 +1382 @@
         digestStr = digestToString(sei_recon_picture_digest.digest);
 
-#if NAL_REF_FLAG
 #if VIDYO_VPS_INTEGRATION | QC_MVHEVC_B0046
         OutputNALUnit nalu(NAL_UNIT_SEI, false, m_pcEncTop->getLayerId());
 #else
         OutputNALUnit nalu(NAL_UNIT_SEI, false, m_pcEncTop->getViewId(), m_pcEncTop->getIsDepth());
-#endif
-#else
-        OutputNALUnit nalu(NAL_UNIT_SEI, NAL_REF_IDC_PRIORITY_LOWEST, m_pcEncTop->getViewId(), m_pcEncTop->getIsDepth());
 #endif
 
@@ -1663 +1440 @@
   {
     pAPS->createAlfParam();
-#if LCU_SYNTAX_ALF
     //alf Enabled flag in APS is false after pAPS->createAlfParam();
     if(!pSPS->getUseALFCoefInSlice())
@@ -1670 +1446 @@
       pAPS->getAlfParam()->createALFParam();
     }
-#else
-    m_pcAdaptiveLoopFilter->allocALFParam(pAPS->getAlfParam());
-#endif
   }
 }
@@ -1695 +1468 @@
     if(pAPS->getAlfParam() != NULL)
     {
-#if LCU_SYNTAX_ALF
       if(!pSPS->getUseALFCoefInSlice())
       {
         pAPS->getAlfParam()->releaseALFParam();
       }
-#else
-      m_pcAdaptiveLoopFilter->freeALFParam(pAPS->getAlfParam());
-#endif
       pAPS->destroyAlfParam();
     }
@@ -1728 +1497 @@
 
   cAPS.setSaoEnabled(pcSlice->getSPS()->getUseSAO() ? (cAPS.getSaoParam()->bSaoFlag[0] ):(false));
-#if LCU_SYNTAX_ALF
   cAPS.setAlfEnabled(pcSlice->getSPS()->getUseALF() ? (cAPS.getAlfParam()->isEnabled[0]):(false));
-#else
-  cAPS.setAlfEnabled(pcSlice->getSPS()->getUseALF() ? (cAPS.getAlfParam()->alf_flag ==1):(false));
-#endif
   cAPS.setLoopFilterOffsetInAPS(m_pcCfg->getLoopFilterOffsetInAPS());
   cAPS.setLoopFilterDisable(m_pcCfg->getLoopFilterDisable());
@@ -1771 +1536 @@
     m_pcEntropyCoder->encodeDFParams(pcAPS);
   }
-#if SAO_UNIT_INTERLEAVING
   m_pcEntropyCoder->encodeSaoParam(pcAPS);
-#else
-  if(pcAPS->getSaoEnabled())
-  {
-    m_pcEntropyCoder->encodeSaoParam(pcAPS->getSaoParam());
-  }
-#endif
-#if LCU_SYNTAX_ALF
   m_pcEntropyCoder->encodeAPSAlfFlag( pcAPS->getAlfEnabled()?1:0);
-#endif
   if(pcAPS->getAlfEnabled())
   {
@@ -1796 +1552 @@
   TComSlice* pcSlice = pcPic->getSlice(pcPic->getCurrSliceIdx());
   Bool bCalcDist = false;
-#if DBL_CONTROL
   m_pcLoopFilter->setCfg(pcSlice->getPPS()->getDeblockingFilterControlPresent(), pcSlice->getLoopFilterDisable(), m_pcCfg->getLoopFilterBetaOffset(), m_pcCfg->getLoopFilterTcOffset(), m_pcCfg->getLFCrossTileBoundaryFlag());
-#else
-  m_pcLoopFilter->setCfg(pcSlice->getLoopFilterDisable(), m_pcCfg->getLoopFilterBetaOffset(), m_pcCfg->getLoopFilterTcOffset(), m_pcCfg->getLFCrossTileBoundaryFlag());
-#endif
   m_pcLoopFilter->loopFilterPic( pcPic );
   
@@ -1817 +1569 @@
     m_pcAdaptiveLoopFilter->createPicAlfInfo(pcPic);
 
-#if LCU_SYNTAX_ALF
     AlfParamSet* alfParamSet;
     std::vector<AlfCUCtrlInfo>* alfCUCtrlParam = NULL;
@@ -1824 +1575 @@
     alfParamSet->createALFParam();
     m_pcAdaptiveLoopFilter->initALFEnc(false, true, 1, alfParamSet, alfCUCtrlParam);
-#else
-    ALFParam cAlfParam;
-    m_pcAdaptiveLoopFilter->allocALFParam(&cAlfParam);
-#endif    
     m_pcAdaptiveLoopFilter->startALFEnc(pcPic, m_pcEntropyCoder);
     
 
-#if LCU_SYNTAX_ALF
 
 #if ALF_CHROMA_LAMBDA 
@@ -1855 +1601 @@
 #endif
 
-#else
-#if ALF_CHROMA_LAMBDA  
-    m_pcAdaptiveLoopFilter->ALFProcess(&cAlfParam, NULL, pcSlice->getLambdaLuma(), pcSlice->getLambdaChroma(), ruiDist, ruiBits, m_pcEncTop->getInterViewSkip());
-#if HHI_INTERVIEW_SKIP
-#else
-    m_pcAdaptiveLoopFilter->ALFProcess(&cAlfParam, NULL, pcSlice->getLambdaLuma(), pcSlice->getLambdaChroma(), ruiDist, ruiBits);
-#endif
-#else
-#if SAO_CHROMA_LAMBDA 
-#if HHI_INTERVIEW_SKIP
-    m_pcAdaptiveLoopFilter->ALFProcess(&cAlfParam, NULL, pcSlice->getLambdaLuma(), ruiDist, ruiBits, m_pcEncTop->getInterViewSkip());
-#else
-    m_pcAdaptiveLoopFilter->ALFProcess(&cAlfParam, NULL, pcSlice->getLambdaLuma(), ruiDist, ruiBits);
-#endif
-#else
-#if HHI_INTERVIEW_SKIP
-    m_pcAdaptiveLoopFilter->ALFProcess(&cAlfParam, NULL, pcSlice->getLambda(), ruiDist, ruiBits, m_pcEncTop->getInterViewSkip());
-#else
-    m_pcAdaptiveLoopFilter->ALFProcess(&cAlfParam, NULL, pcSlice->getLambda(), ruiDist, ruiBits);
-#endif
-#endif
-
-#endif
-#endif
     m_pcAdaptiveLoopFilter->endALFEnc();
 
-#if LCU_SYNTAX_ALF
     alfParamSet->releaseALFParam();
     delete alfParamSet;
     delete alfCUCtrlParam;
-#else
-    m_pcAdaptiveLoopFilter->freeALFParam(&cAlfParam);
-#endif
     m_pcAdaptiveLoopFilter->PCMLFDisableProcess(pcPic);
     m_pcAdaptiveLoopFilter->destroyPicAlfInfo();
@@ -2039 +1757 @@
   {
   case NAL_UNIT_CODED_SLICE: return "SLICE";
-#if H0566_TLA
 #if !QC_REM_IDV_B0046
   case NAL_UNIT_CODED_SLICE_IDV: return "IDV";
@@ -2045 +1762 @@
   case NAL_UNIT_CODED_SLICE_CRA: return "CRA";
   case NAL_UNIT_CODED_SLICE_TLA: return "TLA";
-#else
-  case NAL_UNIT_CODED_SLICE_CDR: return "CDR";
-#endif
   case NAL_UNIT_CODED_SLICE_IDR: return "IDR";
   case NAL_UNIT_SEI: return "SEI";
@@ -2282 +1996 @@
       else
       { 
-#if H0566_TLA
       return NAL_UNIT_CODED_SLICE_CRA;
-#else
-      return NAL_UNIT_CODED_SLICE_CDR;
-#endif
       }
     }
@@ -2318 +2028 @@
     if( m_pcCfg->getDecodingRefreshType() == 1 )
     {
-#if H0566_TLA
       return NAL_UNIT_CODED_SLICE_CRA;
-#else
-      return NAL_UNIT_CODED_SLICE_CDR;
-#endif
     }
     else if( m_pcCfg->getDecodingRefreshType() == 2 )
@@ -2384 +2090 @@
 {
   {
-#if !TILES_WPP_ENTRY_POINT_SIGNALLING
-    Int iTransmitTileLocationInSliceHeader = (rpcSlice->getTileLocationCount()==0 || m_pcCfg->getTileLocationInSliceHeaderFlag()==0) ? 0 : 1;
-    rNalu.m_Bitstream.write(iTransmitTileLocationInSliceHeader, 1);   // write flag indicating whether tile location information communicated in slice header
-
-    if (iTransmitTileLocationInSliceHeader)
-    {
-      rNalu.m_Bitstream.write(rpcSlice->getTileLocationCount()-1, 5);   // write number of tiles
-
-      Int *aiDiff;
-      aiDiff = new Int [rpcSlice->getTileLocationCount()];
-
-      // Find largest number of bits required by Diff
-      Int iLastSize = 0, iDiffMax = 0, iDiffMin = 0;
-      for (UInt uiIdx=0; uiIdx<rpcSlice->getTileLocationCount(); uiIdx++)
-      {
-        Int iCurDiff, iCurSize;
-        if (uiIdx==0)
-        {
-          iCurDiff  = rpcSlice->getTileLocation( uiIdx );
-          iLastSize = rpcSlice->getTileLocation( uiIdx );
-        }
-        else
-        {
-          iCurSize  = rpcSlice->getTileLocation( uiIdx )  - rpcSlice->getTileLocation( uiIdx-1 );
-          iCurDiff  = iCurSize - iLastSize;
-          iLastSize = iCurSize;
-        }
-        // Store Diff so it may be written to slice header later without re-calculating.
-        aiDiff[uiIdx] = iCurDiff;
-
-        if (iCurDiff>iDiffMax)
-        {
-          iDiffMax = iCurDiff;
-        }
-        if (iCurDiff<iDiffMin)
-        {
-          iDiffMin = iCurDiff;
-        }
-      }
-
-      Int iDiffMinAbs, iDiffMaxAbs;
-      iDiffMinAbs = (iDiffMin<0) ? (-iDiffMin) : iDiffMin;
-      iDiffMaxAbs = (iDiffMax<0) ? (-iDiffMax) : iDiffMax;
-
-      Int iBitsUsedByDiff = 0, iDiffAbsLargest;
-      iDiffAbsLargest = (iDiffMinAbs < iDiffMaxAbs) ? iDiffMaxAbs : iDiffMinAbs;        
-      while (1)
-      {
-        if (iDiffAbsLargest >= (1 << iBitsUsedByDiff) )
-        {
-          iBitsUsedByDiff++;
-        }
-        else
-        {
-          break;
-        }
-      }
-      iBitsUsedByDiff++;
-
-      if (iBitsUsedByDiff > 32)
-      {
-        printf("\nDiff magnitude uses more than 32-bits");
-        assert ( 0 );
-        exit ( 0 ); // trying to catch any problems with using fixed bits for Diff information
-      }
-
-      rNalu.m_Bitstream.write( iBitsUsedByDiff-1, 5 ); // write number of bits used by Diff
-
-      // Write diff to slice header (rNalu)
-      for (UInt uiIdx=0; uiIdx<rpcSlice->getTileLocationCount(); uiIdx++)
-      {
-        Int iCurDiff = aiDiff[uiIdx];
-
-        // write sign of diff
-        if (uiIdx!=0)
-        {
-          if (iCurDiff<0)          
-          {
-            rNalu.m_Bitstream.write(1, 1);
-          }
-          else
-          {
-            rNalu.m_Bitstream.write(0, 1);
-          }
-        }
-
-        // write abs value of diff
-        Int iAbsDiff = (iCurDiff<0) ? (-iCurDiff) : iCurDiff;
-        if (iAbsDiff > ((((UInt64)1)<<32)-1))
-        {
-          printf("\niAbsDiff exceeds 32-bit limit");
-          exit(0);
-        }
-        rNalu.m_Bitstream.write( iAbsDiff, iBitsUsedByDiff-1 ); 
-      }
-
-      delete [] aiDiff;
-    }
-#endif
   }
 

branches/HTM-5.1-dev0/source/Lib/TLibEncoder/TEncSampleAdaptiveOffset.cpp

@@ -100 +100 @@
  * \param  *psQTPart, iPartIdx, dLambda
  */
-#if SAO_UNIT_INTERLEAVING
 Void TEncSampleAdaptiveOffset::rdoSaoOnePart(SAOQTPart *psQTPart, Int iPartIdx, Double dLambda)
 {
@@ -340 +339 @@
 }
 
-#else
-Void TEncSampleAdaptiveOffset::rdoSaoOnePart(SAOQTPart *psQTPart, Int iPartIdx, Double dLambda)
-{
-  Int iTypeIdx;
-  Int iNumTotalType = MAX_NUM_SAO_TYPE;
-  SAOQTPart*  pOnePart = &(psQTPart[iPartIdx]);
-
-  Int64 iEstDist;
-  Int64 iOffsetOrg;
-  Int64 iOffset;
-  Int64 iCount;
-  Int iClassIdx;
-  Int uiShift = g_uiBitIncrement << 1;
-
-  UInt uiDepth = pOnePart->PartLevel;
-
-  m_iDistOrg [iPartIdx] =  0;
-
-  for (iTypeIdx=-1; iTypeIdx<iNumTotalType; iTypeIdx++)
-  {
-    if( m_bUseSBACRD )
-    {
-      m_pcRDGoOnSbacCoder->load(m_pppcRDSbacCoder[uiDepth][CI_CURR_BEST]);
-      m_pcRDGoOnSbacCoder->resetBits();
-    }
-    else
-    {
-      m_pcEntropyCoder->resetEntropy();
-      m_pcEntropyCoder->resetBits();
-    }
-
-    iEstDist = 0;
-
-    m_pcEntropyCoder->m_pcEntropyCoderIf->codeSaoUvlc(iTypeIdx+1);
-
-    if (iTypeIdx>=0)
-    {
-
-      for(iClassIdx=1; iClassIdx < m_iNumClass[iTypeIdx]+1; iClassIdx++)
-      {
-        if(m_iCount [iPartIdx][iTypeIdx][iClassIdx])
-        {
-#if FULL_NBIT
-          m_iOffset[iPartIdx][iTypeIdx][iClassIdx] = (Int64) xRoundIbdi((Double)(m_iOffsetOrg[iPartIdx][iTypeIdx][iClassIdx]<<g_uiBitDepth-8) / (Double)(m_iCount [iPartIdx][iTypeIdx][iClassIdx]<<m_uiSaoBitIncrease));
-#else
-          m_iOffset[iPartIdx][iTypeIdx][iClassIdx] = (Int64) xRoundIbdi((Double)(m_iOffsetOrg[iPartIdx][iTypeIdx][iClassIdx]<<g_uiBitIncrement) / (Double)(m_iCount [iPartIdx][iTypeIdx][iClassIdx]<<m_uiSaoBitIncrease));
-#endif
-          m_iOffset[iPartIdx][iTypeIdx][iClassIdx] = Clip3(-m_iOffsetTh, m_iOffsetTh-1, (Int)m_iOffset[iPartIdx][iTypeIdx][iClassIdx]);
-          {
-            Int64 iterOffset, tempOffset;
-            Int64 tempDist, tempRate;
-            Double tempCost, tempMinCost;
-            UInt codeLength, tempValue;
-
-            iterOffset = m_iOffset[iPartIdx][iTypeIdx][iClassIdx];
-            m_iOffset[iPartIdx][iTypeIdx][iClassIdx] = 0;
-            tempMinCost = dLambda; // Assuming sending quantized value 0 results in zero offset and sending the value zero needs 1 bit. entropy coder can be used to measure the exact rate here. 
-
-            while (iterOffset != 0)
-            {
-              // Calculate the bits required for signalling the offset
-              codeLength = 1;
-              tempValue = (UInt)((iterOffset <= 0) ? ( (-iterOffset<<1) + 1 ) : (iterOffset<<1));
-              while( 1 != tempValue )
-              {
-                tempValue >>= 1;
-                codeLength += 2;
-              }
-              tempRate = (codeLength >> 1) + ((codeLength+1) >> 1);
-
-              // Do the dequntization before distorion calculation
-              tempOffset    =  iterOffset << m_uiSaoBitIncrease;
-              tempDist  = (( m_iCount [iPartIdx][iTypeIdx][iClassIdx]*tempOffset*tempOffset-m_iOffsetOrg[iPartIdx][iTypeIdx][iClassIdx]*tempOffset*2 ) >> uiShift);
-
-              tempCost = ((Double)tempDist + dLambda * (Double) tempRate);
-              if(tempCost < tempMinCost)
-              {
-                tempMinCost = tempCost;
-                m_iOffset[iPartIdx][iTypeIdx][iClassIdx] = iterOffset;
-              }
-              iterOffset = (iterOffset > 0) ? (iterOffset-1):(iterOffset+1);
-            }
-          }
-        }
-        else
-        {
-          m_iOffsetOrg[iPartIdx][iTypeIdx][iClassIdx] = 0;
-          m_iOffset[iPartIdx][iTypeIdx][iClassIdx] = 0;
-        }
-
-        iCount     =  m_iCount [iPartIdx][iTypeIdx][iClassIdx];
-        iOffset    =  m_iOffset[iPartIdx][iTypeIdx][iClassIdx] << m_uiSaoBitIncrease;
-        iOffsetOrg =  m_iOffsetOrg[iPartIdx][iTypeIdx][iClassIdx];
-        iEstDist   += (( iCount*iOffset*iOffset-iOffsetOrg*iOffset*2 ) >> uiShift);
-        m_pcEntropyCoder->m_pcEntropyCoderIf->codeSaoSvlc((Int)m_iOffset[iPartIdx][iTypeIdx][iClassIdx]);
-      }
-      m_iDist[iPartIdx][iTypeIdx] = iEstDist;
-      m_iRate[iPartIdx][iTypeIdx] = m_pcEntropyCoder->getNumberOfWrittenBits();
-
-      m_dCost[iPartIdx][iTypeIdx] = (Double)((Double)m_iDist[iPartIdx][iTypeIdx] + dLambda * (Double) m_iRate[iPartIdx][iTypeIdx]);
-
-      if(m_dCost[iPartIdx][iTypeIdx] < m_dCostPartBest[iPartIdx])
-      {
-        m_iDistOrg [iPartIdx] = 0;
-        m_dCostPartBest[iPartIdx] = m_dCost[iPartIdx][iTypeIdx];
-        m_iTypePartBest[iPartIdx] = iTypeIdx;
-        if( m_bUseSBACRD )
-          m_pcRDGoOnSbacCoder->store( m_pppcRDSbacCoder[pOnePart->PartLevel][CI_TEMP_BEST] );
-      }
-    }
-    else
-    {
-      if(m_iDistOrg[iPartIdx] < m_dCostPartBest[iPartIdx] )
-      {
-        m_dCostPartBest[iPartIdx] = (Double) m_iDistOrg[iPartIdx] + m_pcEntropyCoder->getNumberOfWrittenBits()*dLambda ; 
-        m_iTypePartBest[iPartIdx] = -1;
-        if( m_bUseSBACRD )
-          m_pcRDGoOnSbacCoder->store( m_pppcRDSbacCoder[pOnePart->PartLevel][CI_TEMP_BEST] );
-      }
-    }
-  }
-
-  pOnePart->bProcessed = true;
-  pOnePart->bSplit     = false;
-  pOnePart->iMinDist   =        m_iTypePartBest[iPartIdx] >= 0 ? m_iDist[iPartIdx][m_iTypePartBest[iPartIdx]] : m_iDistOrg[iPartIdx];
-  pOnePart->iMinRate   = (Int) (m_iTypePartBest[iPartIdx] >= 0 ? m_iRate[iPartIdx][m_iTypePartBest[iPartIdx]] : 0);
-  pOnePart->dMinCost   = pOnePart->iMinDist + dLambda * pOnePart->iMinRate;
-  pOnePart->iBestType  = m_iTypePartBest[iPartIdx];
-  if (pOnePart->iBestType != -1)
-  {
-    pOnePart->bEnableFlag =  1;
-    pOnePart->iLength = m_iNumClass[pOnePart->iBestType];
-    for (Int i=0; i<pOnePart->iLength ; i++)
-      pOnePart->iOffset[i] = (Int) m_iOffset[iPartIdx][pOnePart->iBestType][i+1];
-  }
-  else
-  {
-    pOnePart->bEnableFlag = 0;
-    pOnePart->iLength     = 0;
-  }
-}
-
-#endif
 /** Run partition tree disable
  */
@@ -488 +344 @@
 {
   SAOQTPart*  pOnePart= &(psQTPart[iPartIdx]);
-#if !SAO_UNIT_INTERLEAVING
-  pOnePart->bEnableFlag = false;
-#endif
   pOnePart->bSplit      = false;
   pOnePart->iLength     =  0;
@@ -556 +409 @@
       dCostFinal = dCostSplit;
       pOnePart->bSplit      = true;
-#if !SAO_UNIT_INTERLEAVING
-      pOnePart->bEnableFlag = false;
-#endif
       pOnePart->iLength     =  0;
       pOnePart->iBestType   = -1;
@@ -810 +660 @@
   Int x, y;
 
-#if SAO_UNIT_INTERLEAVING
   //--------- Band offset-----------//
   stats = ppStats[SAO_BO];
@@ -830 +679 @@
     pRec += stride;
   }
-#else
-  //--------- Band offset 0-----------//
-  stats = ppStats[SAO_BO_0];
-  count = ppCount[SAO_BO_0];
-  pOrg   = pOrgStart;
-  pRec   = pRecStart;
-  for (y=0; y< height; y++)
-  {
-    for (x=0; x< width; x++)
-    {
-      classIdx = m_ppLumaTableBo0[pRec[x]];
-      if (classIdx)
-      {
-        stats[classIdx] += (pOrg[x] - pRec[x]); 
-        count[classIdx] ++;
-      }
-    }
-    pOrg += stride;
-    pRec += stride;
-  }
-
-  //--------- Band offset 1-----------//
-  stats = ppStats[SAO_BO_1];
-  count = ppCount[SAO_BO_1];
-  pOrg   = pOrgStart;
-  pRec   = pRecStart;
-
-  for (y=0; y< height; y++)
-  {
-    for (x=0; x< width; x++)
-    {
-      classIdx = m_ppLumaTableBo1[pRec[x]];
-      if (classIdx)
-      {
-        stats[classIdx] += (pOrg[x] - pRec[x]); 
-        count[classIdx] ++;
-      }
-    }
-    pOrg += stride;
-    pRec += stride;
-  }
-#endif
   //---------- Edge offset 0--------------//
   stats = ppStats[SAO_EO_0];
@@ -1166 +973 @@
 
   Int iIsChroma = (iYCbCr!=0)? 1:0;
-#if SAO_UNIT_INTERLEAVING
   Int numSkipLine = iIsChroma? 2:4;
   if (m_saoInterleavingFlag == 0)
@@ -1172 +978 @@
     numSkipLine = 0;
   }
-#endif
 
   iPicWidthTmp  = m_iPicWidth  >> iIsChroma;
@@ -1194 +999 @@
 #endif
   {
-#if SAO_UNIT_INTERLEAVING
     iStats = m_iOffsetOrg[iPartIdx][SAO_BO];
     iCount = m_iCount    [iPartIdx][SAO_BO];
-#else
-    iStats = m_iOffsetOrg[iPartIdx][SAO_BO_0];
-    iCount = m_iCount    [iPartIdx][SAO_BO_0];
-#endif
 
     pOrg = getPicYuvAddr(m_pcPic->getPicYuvOrg(), iYCbCr, iAddr);
     pRec = getPicYuvAddr(m_pcPic->getPicYuvRec(), iYCbCr, iAddr);
 
-#if SAO_UNIT_INTERLEAVING
     iEndY   = (uiBPelY == iPicHeightTmp) ? iLcuHeight : iLcuHeight-numSkipLine;
     for (y=0; y<iEndY; y++)
-#else
-    for (y=0; y<iLcuHeight; y++)
-#endif
     {
       for (x=0; x<iLcuWidth; x++)
       {
-#if SAO_UNIT_INTERLEAVING
         iClassIdx = m_lumaTableBo[pRec[x]];
-#else
-        iClassIdx = m_ppLumaTableBo0[pRec[x]];
-#endif
         if (iClassIdx)
         {
@@ -1229 +1021 @@
     }
 
-#if !SAO_UNIT_INTERLEAVING
-    iStats = m_iOffsetOrg[iPartIdx][SAO_BO_1];
-    iCount = m_iCount    [iPartIdx][SAO_BO_1];
-
-    pOrg = getPicYuvAddr(m_pcPic->getPicYuvOrg(), iYCbCr, iAddr);
-    pRec = getPicYuvAddr(m_pcPic->getPicYuvRec(), iYCbCr, iAddr);
-
-    for (y=0; y<iLcuHeight; y++)
-    {
-      for (x=0; x<iLcuWidth; x++)
-      {
-        iClassIdx = m_ppLumaTableBo1[pRec[x]];
-        if (iClassIdx)
-        {
-          iStats[iClassIdx] += (pOrg[x] - pRec[x]); 
-          iCount[iClassIdx] ++;
-        }
-      }
-      pOrg += iStride;
-      pRec += iStride;
-    }
-#endif
   }
   Int iSignLeft;
@@ -1275 +1045 @@
       iStartX = (uiLPelX == 0) ? 1 : 0;
       iEndX   = (uiRPelX == iPicWidthTmp) ? iLcuWidth-1 : iLcuWidth;
-#if SAO_UNIT_INTERLEAVING
       for (y=0; y<iLcuHeight-numSkipLine; y++)
-#else
-      for (y=0; y<iLcuHeight; y++)
-#endif
       {
         iSignLeft = xSign(pRec[iStartX] - pRec[iStartX-1]);
@@ -1305 +1071 @@
 
       iStartY = (uiTPelY == 0) ? 1 : 0;
-#if SAO_UNIT_INTERLEAVING
       iEndY   = (uiBPelY == iPicHeightTmp) ? iLcuHeight-1 : iLcuHeight-numSkipLine;
-#else
-      iEndY   = (uiBPelY == iPicHeightTmp) ? iLcuHeight-1 : iLcuHeight;
-#endif
       if (uiTPelY == 0)
       {
@@ -1347 +1109 @@
 
       iStartY = (uiTPelY == 0) ? 1 : 0;
-#if SAO_UNIT_INTERLEAVING
       iEndY   = (uiBPelY == iPicHeightTmp) ? iLcuHeight-1 : iLcuHeight-numSkipLine;
-#else
-      iEndY   = (uiBPelY == iPicHeightTmp) ? iLcuHeight-1 : iLcuHeight;
-#endif
       if (uiTPelY == 0)
       {
@@ -1394 +1152 @@
 
       iStartY = (uiTPelY == 0) ? 1 : 0;
-#if SAO_UNIT_INTERLEAVING
       iEndY   = (uiBPelY == iPicHeightTmp) ? iLcuHeight-1 : iLcuHeight-numSkipLine;
-#else
-      iEndY   = (uiBPelY == iPicHeightTmp) ? iLcuHeight-1 : iLcuHeight;
-#endif
       if (iStartY == 1)
       {
@@ -1486 +1240 @@
           for (iTypeIdx=0; iTypeIdx<iNumTotalType; iTypeIdx++)
           {
-#if SAO_UNIT_INTERLEAVING
             for (iClassIdx=0; iClassIdx< (iTypeIdx < SAO_BO ? m_iNumClass[iTypeIdx] : SAO_MAX_BO_CLASSES) +1; iClassIdx++)
-#else
-            for (iClassIdx=0; iClassIdx<m_iNumClass[iTypeIdx]+1; iClassIdx++)
-#endif
             {
               m_iOffsetOrg[iPartIdx][iTypeIdx][iClassIdx] += m_iOffsetOrg[iDownPartIdx][iTypeIdx][iClassIdx];
@@ -1574 +1324 @@
   Double dCostFinal = 0;
 
-#if !SAO_UNIT_INTERLEAVING
-  Int iCb = 1;
-  Int iCr = 2;
-  Double dCostFinalCb = 0;
-  Double dCostFinalCr = 0;
-#endif
-
-#if SAO_UNIT_INTERLEAVING
+
   if ( m_saoInterleavingFlag)
   {
@@ -1616 +1359 @@
     }
   }
-#else
-  getSaoStats(pcSaoParam->psSaoPart[iY], iY);
-  runQuadTreeDecision(pcSaoParam->psSaoPart[iY], 0, dCostFinal, m_uiMaxSplitLevel, m_dLambdaLuma);
-  pcSaoParam->bSaoFlag[iY] = dCostFinal < m_iDistOrg[0] ? 1:0;
-  if(pcSaoParam->bSaoFlag[iY])
-  {
-    processSaoQuadTree(pcSaoParam->psSaoPart[iY], 0, 0);
-
-    resetStats();
-    getSaoStats(pcSaoParam->psSaoPart[iCb], iCb);
-    runQuadTreeDecision(pcSaoParam->psSaoPart[iCb], 0, dCostFinalCb, m_uiMaxSplitLevel, m_dLambdaChroma);
-    pcSaoParam->bSaoFlag[iCb] = dCostFinalCb < 0 ? 1:0;
-    if (pcSaoParam->bSaoFlag[iCb])
-    {
-      processSaoQuadTree(pcSaoParam->psSaoPart[iCb], 0, iCb);
-    }
-
-    resetStats();
-    getSaoStats(pcSaoParam->psSaoPart[iCr], iCr);
-    runQuadTreeDecision(pcSaoParam->psSaoPart[iCr], 0, dCostFinalCr, m_uiMaxSplitLevel, m_dLambdaChroma);
-    pcSaoParam->bSaoFlag[iCr] = dCostFinalCr < 0 ? 1:0;
-    if (pcSaoParam->bSaoFlag[iCr])
-    {
-      processSaoQuadTree(pcSaoParam->psSaoPart[iCr], 0, iCr);
-    }
-  }
-#endif
-}
-#if SAO_UNIT_INTERLEAVING
+}
 /** Check merge SAO unit
  * \param saoUnitCurr current SAO unit 
@@ -2260 +1975 @@
 }
 
-#endif
 
 //! \}

branches/HTM-5.1-dev0/source/Lib/TLibEncoder/TEncSampleAdaptiveOffset.h

@@ -101 +101 @@
   Void destroyEncBuffer();
   Void createEncBuffer();
-#if SAO_UNIT_INTERLEAVING
   Void assignSaoUnitSyntax(SaoLcuParam* saoLcuParam,  SAOQTPart* saoPart, Bool &oneUnitFlag, Int yCbCr);
   Void checkMerge(SaoLcuParam * lcuParamCurr,SaoLcuParam * lcuParamCheck, Int dir);
@@ -108 +107 @@
   Void setMaxNumOffsetsPerPic(Int iVal) {m_maxNumOffsetsPerPic = iVal; }
   Int  getMaxNumOffsetsPerPic() {return m_maxNumOffsetsPerPic; }
-#endif
 };
 

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

@@ -95 +95 @@
 , m_cALFUvlcSCModel           ( 1,             1,               NUM_ALF_UVLC_CTX              , m_contextModels + m_numContextModels, m_numContextModels)
 , m_cALFSvlcSCModel           ( 1,             1,               NUM_ALF_SVLC_CTX              , m_contextModels + m_numContextModels, m_numContextModels)
-#if AMP_CTX
 , m_cCUAMPSCModel             ( 1,             1,               NUM_CU_AMP_CTX                , m_contextModels + m_numContextModels, m_numContextModels)
-#else
-, m_cCUXPosiSCModel           ( 1,             1,               NUM_CU_X_POS_CTX              , m_contextModels + m_numContextModels, m_numContextModels)
-, m_cCUYPosiSCModel           ( 1,             1,               NUM_CU_Y_POS_CTX              , m_contextModels + m_numContextModels, m_numContextModels)
-#endif
 , m_cSaoFlagSCModel           ( 1,             1,               NUM_SAO_FLAG_CTX              , m_contextModels + m_numContextModels, m_numContextModels)
 , m_cSaoUvlcSCModel           ( 1,             1,               NUM_SAO_UVLC_CTX              , m_contextModels + m_numContextModels, m_numContextModels)
 , m_cSaoSvlcSCModel           ( 1,             1,               NUM_SAO_SVLC_CTX              , m_contextModels + m_numContextModels, m_numContextModels)
-#if SAO_UNIT_INTERLEAVING
 , m_cSaoMergeLeftSCModel      ( 1,             1,               NUM_SAO_MERGE_LEFT_FLAG_CTX   , m_contextModels + m_numContextModels, m_numContextModels)
 , m_cSaoMergeUpSCModel        ( 1,             1,               NUM_SAO_MERGE_UP_FLAG_CTX     , m_contextModels + m_numContextModels, m_numContextModels)
 , m_cSaoTypeIdxSCModel        ( 1,             1,               NUM_SAO_TYPE_IDX_CTX          , m_contextModels + m_numContextModels, m_numContextModels)
-#endif
 #if HHI_DMM_WEDGE_INTRA || HHI_DMM_PRED_TEX
 , m_cDmmFlagSCModel           ( 1,             1,               NUM_DMM_FLAG_CTX              , m_contextModels + m_numContextModels, m_numContextModels)
@@ -166 +159 @@
 #endif
   m_cCUPartSizeSCModel.initBuffer        ( eSliceType, iQp, (UChar*)INIT_PART_SIZE );
-#if AMP_CTX
   m_cCUAMPSCModel.initBuffer             ( eSliceType, iQp, (UChar*)INIT_CU_AMP_POS );
-#else
-  m_cCUXPosiSCModel.initBuffer           ( eSliceType, iQp, (UChar*)INIT_CU_X_POS );
-  m_cCUYPosiSCModel.initBuffer           ( eSliceType, iQp, (UChar*)INIT_CU_Y_POS );
-#endif
   m_cCUPredModeSCModel.initBuffer        ( eSliceType, iQp, (UChar*)INIT_PRED_MODE );
   m_cCUIntraPredSCModel.initBuffer       ( eSliceType, iQp, (UChar*)INIT_INTRA_PRED_MODE );
@@ -195 +183 @@
   m_cSaoUvlcSCModel.initBuffer           ( eSliceType, iQp, (UChar*)INIT_SAO_UVLC );
   m_cSaoSvlcSCModel.initBuffer           ( eSliceType, iQp, (UChar*)INIT_SAO_SVLC );
-#if SAO_UNIT_INTERLEAVING
   m_cSaoMergeLeftSCModel.initBuffer      ( eSliceType, iQp, (UChar*)INIT_SAO_MERGE_LEFT_FLAG );
   m_cSaoMergeUpSCModel.initBuffer        ( eSliceType, iQp, (UChar*)INIT_SAO_MERGE_UP_FLAG );
   m_cSaoTypeIdxSCModel.initBuffer        ( eSliceType, iQp, (UChar*)INIT_SAO_TYPE_IDX );
-#endif
 #if HHI_DMM_WEDGE_INTRA || HHI_DMM_PRED_TEX
   m_cDmmFlagSCModel.initBuffer           ( eSliceType, iQp, (UChar*)INIT_DMM_FLAG );
@@ -259 +245 @@
 #endif
       curCost += m_cCUPartSizeSCModel.calcCost        ( curSliceType, qp, (UChar*)INIT_PART_SIZE );
-#if AMP_CTX
       curCost += m_cCUAMPSCModel.calcCost             ( curSliceType, qp, (UChar*)INIT_CU_AMP_POS );
-#else
-      curCost += m_cCUXPosiSCModel.calcCost           ( curSliceType, qp, (UChar*)INIT_CU_X_POS );
-      curCost += m_cCUYPosiSCModel.calcCost           ( curSliceType, qp, (UChar*)INIT_CU_Y_POS );
-#endif
       curCost += m_cCUPredModeSCModel.calcCost        ( curSliceType, qp, (UChar*)INIT_PRED_MODE );
       curCost += m_cCUIntraPredSCModel.calcCost       ( curSliceType, qp, (UChar*)INIT_INTRA_PRED_MODE );
@@ -288 +269 @@
       curCost += m_cSaoUvlcSCModel.calcCost           ( curSliceType, qp, (UChar*)INIT_SAO_UVLC );
       curCost += m_cSaoSvlcSCModel.calcCost           ( curSliceType, qp, (UChar*)INIT_SAO_SVLC );
-#if SAO_UNIT_INTERLEAVING
       curCost += m_cSaoMergeLeftSCModel.calcCost      ( curSliceType, qp, (UChar*)INIT_SAO_MERGE_LEFT_FLAG );
       curCost += m_cSaoMergeUpSCModel.calcCost        ( curSliceType, qp, (UChar*)INIT_SAO_MERGE_UP_FLAG );
       curCost += m_cSaoTypeIdxSCModel.calcCost        ( curSliceType, qp, (UChar*)INIT_SAO_TYPE_IDX );
-#endif
 
       if (curCost < bestCost)
@@ -333 +312 @@
 #endif
   m_cCUPartSizeSCModel.initBuffer        ( eSliceType, iQp, (UChar*)INIT_PART_SIZE );
-#if AMP_CTX
   m_cCUAMPSCModel.initBuffer             ( eSliceType, iQp, (UChar*)INIT_CU_AMP_POS );
-#else
-  m_cCUXPosiSCModel.initBuffer           ( eSliceType, iQp, (UChar*)INIT_CU_X_POS );
-  m_cCUYPosiSCModel.initBuffer           ( eSliceType, iQp, (UChar*)INIT_CU_Y_POS );
-#endif
   m_cCUPredModeSCModel.initBuffer        ( eSliceType, iQp, (UChar*)INIT_PRED_MODE );
   m_cCUIntraPredSCModel.initBuffer       ( eSliceType, iQp, (UChar*)INIT_INTRA_PRED_MODE );
@@ -362 +336 @@
   m_cSaoUvlcSCModel.initBuffer           ( eSliceType, iQp, (UChar*)INIT_SAO_UVLC );
   m_cSaoSvlcSCModel.initBuffer           ( eSliceType, iQp, (UChar*)INIT_SAO_SVLC );
-#if SAO_UNIT_INTERLEAVING
   m_cSaoMergeLeftSCModel.initBuffer      ( eSliceType, iQp, (UChar*)INIT_SAO_MERGE_LEFT_FLAG );
   m_cSaoMergeUpSCModel.initBuffer        ( eSliceType, iQp, (UChar*)INIT_SAO_MERGE_UP_FLAG );
   m_cSaoTypeIdxSCModel.initBuffer        ( eSliceType, iQp, (UChar*)INIT_SAO_TYPE_IDX );
-#endif
 #if HHI_DMM_WEDGE_INTRA || HHI_DMM_PRED_TEX
   m_cDmmFlagSCModel.initBuffer           ( eSliceType, iQp, (UChar*)INIT_DMM_FLAG );
@@ -426 +398 @@
 }
 
-#if TILES_WPP_ENTRY_POINT_SIGNALLING
 Void TEncSbac::codeTilesWPPEntryPoint( TComSlice* pSlice )
 {
@@ -432 +403 @@
   return;
 }
-#else
-Void TEncSbac::codeSliceHeaderSubstreamTable( TComSlice* pcSlice )
-{
-  assert (0);
-}
-#endif
 
 Void TEncSbac::codeTerminatingBit( UInt uilsLast )
@@ -449 +414 @@
 }
 
-#if OL_FLUSH
 Void TEncSbac::codeFlush()
 {
@@ -459 +423 @@
   m_pcBinIf->start();
 }
-#endif
 
 Void TEncSbac::xWriteUnarySymbol( UInt uiSymbol, ContextModel* pcSCModel, Int iOffset )
@@ -557 +520 @@
   m_pcBinIf->encodeBinsEP( ( binValues << ruiGoRiceParam ) + uiCodeWord - ( uiQuotient << ruiGoRiceParam ), numBins + ruiGoRiceParam );
   
-#if EIGHT_BITS_RICE_CODE
   ruiGoRiceParam = g_aauiGoRiceUpdate[ ruiGoRiceParam ][ min<UInt>( uiSymbol, 23 ) ];
-#else
-  ruiGoRiceParam = g_aauiGoRiceUpdate[ ruiGoRiceParam ][ min<UInt>( uiSymbol, 15 ) ];
-#endif
   
   if( bExGolomb )
@@ -669 +628 @@
         if (eSize == SIZE_2NxN)
         {
-#if AMP_CTX           
           m_pcBinIf->encodeBin(1, m_cCUAMPSCModel.get( 0, 0, 0 ));
-#else
-          m_pcBinIf->encodeBin(1, m_cCUYPosiSCModel.get( 0, 0, 0 ));
-#endif
         }
         else
         {
-#if AMP_CTX
           m_pcBinIf->encodeBin(0, m_cCUAMPSCModel.get( 0, 0, 0 ));          
           m_pcBinIf->encodeBinEP((eSize == SIZE_2NxnU? 0: 1));
-#else
-          m_pcBinIf->encodeBin(0, m_cCUYPosiSCModel.get( 0, 0, 0 ));
-          m_pcBinIf->encodeBin((eSize == SIZE_2NxnU? 0: 1), m_cCUYPosiSCModel.get( 0, 0, 1 ));
-#endif
         }
       }
@@ -702 +652 @@
         if (eSize == SIZE_Nx2N)
         {
-#if AMP_CTX
           m_pcBinIf->encodeBin(1, m_cCUAMPSCModel.get( 0, 0, 0 ));
-#else
-          m_pcBinIf->encodeBin(1, m_cCUXPosiSCModel.get( 0, 0, 0 ));
-#endif
         }
         else
         {
-#if AMP_CTX
           m_pcBinIf->encodeBin(0, m_cCUAMPSCModel.get( 0, 0, 0 ));
           m_pcBinIf->encodeBinEP((eSize == SIZE_nLx2N? 0: 1));
-#else
-          m_pcBinIf->encodeBin(0, m_cCUXPosiSCModel.get( 0, 0, 0 ));
-          m_pcBinIf->encodeBin((eSize == SIZE_nLx2N? 0: 1), m_cCUXPosiSCModel.get( 0, 0, 1 ));
-#endif
         }
       }
@@ -851 +792 @@
 {
   UInt uiNumCand = MRG_MAX_NUM_CANDS;
-#if !MRG_IDX_CTX_RED
-  UInt auiCtx[4] = { 0, 1, 2, 3 };
-#endif
   UInt uiUnaryIdx = pcCU->getMergeIndex( uiAbsPartIdx );
   uiNumCand = pcCU->getSlice()->getMaxNumMergeCand();
@@ -876 +814 @@
     {
       const UInt uiSymbol = ui == uiUnaryIdx ? 0 : 1;
-#if MRG_IDX_CTX_RED
       if ( ui==0 )
       {
@@ -885 +822 @@
         m_pcBinIf->encodeBinEP( uiSymbol );
       }
-#else
-      m_pcBinIf->encodeBin( uiSymbol, m_cCUMergeIdxExtSCModel.get( 0, 0, auiCtx[ui] ) );
-#endif
       if( uiSymbol == 0 )
       {
@@ -1135 +1069 @@
   {
 #endif
-#if !LOGI_INTRA_NAME_3MPM
-  Int iIntraIdx = pcCU->getIntraSizeIdx(uiAbsPartIdx);
-#endif
 #if LGE_EDGE_INTRA_A0070
   Bool bCodeEdgeIntra = false;
@@ -1148 +1079 @@
 #endif
   
-#if LOGI_INTRA_NAME_3MPM
   Int uiPreds[3] = {-1, -1, -1};
-#else
-  Int uiPreds[2] = {-1, -1};
-#endif
   Int uiPredNum = pcCU->getIntraDirLumaPredictor(uiAbsPartIdx, uiPreds);  
 
@@ -1168 +1095 @@
   {
     m_pcBinIf->encodeBin( 1, m_cCUIntraPredSCModel.get( 0, 0, 0 ) );
-#if LOGI_INTRA_NAME_3MPM
     m_pcBinIf->encodeBinEP( uiPredIdx ? 1 : 0 );
     if (uiPredIdx)
@@ -1174 +1100 @@
       m_pcBinIf->encodeBinEP( uiPredIdx-1 );
     }
-#else
-    m_pcBinIf->encodeBinEP( uiPredIdx );
-#endif
   }
   else
@@ -1182 +1105 @@
     m_pcBinIf->encodeBin( 0, m_cCUIntraPredSCModel.get( 0, 0, 0 ) );
   
-#if LOGI_INTRA_NAME_3MPM
     if (uiPreds[0] > uiPreds[1])
     { 
@@ -1195 +1117 @@
       std::swap(uiPreds[1], uiPreds[2]);
     }
-#endif
 
     for(Int i = (uiPredNum - 1); i >= 0; i--)
@@ -1202 +1123 @@
     }
 
-#if LOGI_INTRA_NAME_3MPM
     m_pcBinIf->encodeBinsEP( uiDir, 5 );
 #if LGE_EDGE_INTRA_A0070
@@ -1208 +1128 @@
     if (uiDir == 31) m_pcBinIf->encodeBinsEP(0,1);
 #endif
-#else
-    if ( uiDir < 31 )
-    {
-      m_pcBinIf->encodeBinsEP( uiDir, g_aucIntraModeBitsAng[ iIntraIdx ] - 1 );
-    }
-    else
-    {
-      m_pcBinIf->encodeBinsEP( 31, 5 );
-      m_pcBinIf->encodeBinEP( uiDir - 31 );
-    }
-#endif
    }
 #if HHI_DMM_WEDGE_INTRA || HHI_DMM_PRED_TEX
@@ -1258 +1167 @@
       m_pcBinIf->encodeBin( 1, m_cCUChromaPredSCModel.get( 0, 0, 1 ));
     }
-#if  CHROMA_MODE_CODING
     m_pcBinIf->encodeBinsEP( uiIntraDirChroma, 2 );
-#else
-    xWriteUnaryMaxSymbol( uiIntraDirChroma, m_cCUChromaPredSCModel.get( 0, 0 ) + 1, 0, 3 );
-#endif
   }
   return;
@@ -1319 +1224 @@
 Void TEncSbac::codeMvd( TComDataCU* pcCU, UInt uiAbsPartIdx, RefPicList eRefList )
 {
-#if H0111_MVD_L1_ZERO
   if(pcCU->getSlice()->getMvdL1ZeroFlag() && eRefList == REF_PIC_LIST_1 && pcCU->getInterDir(uiAbsPartIdx)==3)
   {
     return;
   }
-#endif
 
   const TComCUMvField* pcCUMvField = pcCU->getCUMvField( eRefList );
@@ -1377 +1280 @@
   Int iDQp  = pcCU->getQP( uiAbsPartIdx ) - pcCU->getRefQP( uiAbsPartIdx );
   
-#if H0736_AVC_STYLE_QP_RANGE
   Int qpBdOffsetY =  pcCU->getSlice()->getSPS()->getQpBDOffsetY();
   iDQp = (iDQp + 78 + qpBdOffsetY + (qpBdOffsetY/2)) % (52 + qpBdOffsetY) - 26 - (qpBdOffsetY/2);
-#else
-#if LOSSLESS_CODING
-  if(pcCU->getSlice()->getSPS()->getUseLossless())
-  {
-    if(iDQp > 25)
-    {
-      iDQp = iDQp - 52;
-    }
-    if(iDQp < -26)
-    {
-      iDQp = iDQp + 52;
-    }
-  }
-#endif
-#endif
 
   if ( iDQp == 0 )
@@ -1405 +1292 @@
    
     UInt uiSign = (iDQp > 0 ? 0 : 1);
-#if !H0736_AVC_STYLE_QP_RANGE
-    UInt uiQpBdOffsetY = 6*(g_uiBitIncrement + g_uiBitDepth - 8);
-#endif
 
     m_pcBinIf->encodeBinEP(uiSign);
 
-#if H0736_AVC_STYLE_QP_RANGE
     assert(iDQp >= -(26+(qpBdOffsetY/2)));
     assert(iDQp <=  (25+(qpBdOffsetY/2)));
 
     UInt uiMaxAbsDQpMinus1 = 24 + (qpBdOffsetY/2) + (uiSign);
-#else
-    assert(iDQp >= -(26+(Int)(uiQpBdOffsetY/2)));
-    assert(iDQp <=  (25+(Int)(uiQpBdOffsetY/2)));
-
-    UInt uiMaxAbsDQpMinus1 = 24 + (uiQpBdOffsetY/2) + (uiSign);
-#endif
     UInt uiAbsDQpMinus1 = (UInt)((iDQp > 0)? iDQp  : (-iDQp)) - 1;
     xWriteUnaryMaxSymbol( uiAbsDQpMinus1, &m_cCUDeltaQpSCModel.get( 0, 0, 1 ), 1, uiMaxAbsDQpMinus1);
@@ -1447 +1324 @@
 }
 
-#if BURST_IPCM
 /** Code I_PCM information. 
  * \param pcCU pointer to CU
@@ -1456 +1332 @@
  */
 Void TEncSbac::codeIPCMInfo( TComDataCU* pcCU, UInt uiAbsPartIdx, Int numIPCM, Bool firstIPCMFlag)
-#else
-/** Code I_PCM information. 
- * \param pcCU pointer to CU
- * \param uiAbsPartIdx CU index
- * \returns Void
- *
- * If I_PCM flag indicates that the CU is I_PCM, code its PCM alignment bits and codes.  
- */
-Void TEncSbac::codeIPCMInfo( TComDataCU* pcCU, UInt uiAbsPartIdx)
-#endif
 {
   UInt uiIPCM = (pcCU->getIPCMFlag(uiAbsPartIdx) == true)? 1 : 0;
 
-#if BURST_IPCM
   Bool writePCMSampleFlag = pcCU->getIPCMFlag(uiAbsPartIdx);
 
@@ -1482 +1347 @@
     }
   }
-#else
-  m_pcBinIf->encodeBinTrm (uiIPCM);
-#endif
-
-#if BURST_IPCM
+
   if (writePCMSampleFlag)
-#else
-  if (uiIPCM)
-#endif
-  {
-#if !BURST_IPCM
-    m_pcBinIf->encodePCMAlignBits();
-#endif
+  {
     UInt uiMinCoeffSize = pcCU->getPic()->getMinCUWidth()*pcCU->getPic()->getMinCUHeight();
     UInt uiLumaOffset   = uiMinCoeffSize*uiAbsPartIdx;
@@ -1551 +1406 @@
       piPCMSample += uiWidth;
     }
-#if BURST_IPCM
     numIPCM--;
     if(numIPCM == 0)
@@ -1557 +1411 @@
       m_pcBinIf->resetBac();
     }
-#else
-    m_pcBinIf->resetBac();
-#endif
   }
 }
@@ -1603 +1454 @@
 
   // posX
-#if LAST_CTX_REDUCTION
   Int widthCtx = eTType? 4: width;
   const UInt *puiCtxIdxX = g_uiLastCtx + ( g_aucConvertToBit[ widthCtx ] * ( g_aucConvertToBit[ widthCtx ] + 3 ) );
-#else
-  const UInt *puiCtxIdxX = g_uiLastCtx + ( g_aucConvertToBit[ width ] * ( g_aucConvertToBit[ width ] + 3 ) );
-#endif
   for( uiCtxLast = 0; uiCtxLast < uiGroupIdxX; uiCtxLast++ )
   {
-#if LAST_CTX_REDUCTION
     if (eTType)
     {
@@ -1618 +1464 @@
     else
     {
-#endif
       m_pcBinIf->encodeBin( 1, *( pCtxX + puiCtxIdxX[ uiCtxLast ] ) );
-#if LAST_CTX_REDUCTION
-    }
-#endif
+    }
   }
   if( uiGroupIdxX < g_uiGroupIdx[ width - 1 ])
   {
-#if LAST_CTX_REDUCTION
     if ( eTType )
     {
@@ -1633 +1475 @@
     else
     {
-#endif
       m_pcBinIf->encodeBin( 0, *( pCtxX + puiCtxIdxX[ uiCtxLast ] ) );
-#if LAST_CTX_REDUCTION
-    }
-#endif
+    }
   }
 
   // posY
-#if LAST_CTX_REDUCTION
   Int heightCtx = eTType? 4: height;
   const UInt *puiCtxIdxY = g_uiLastCtx + ( g_aucConvertToBit[ heightCtx ] * ( g_aucConvertToBit[ heightCtx ] + 3 ) );
-#else
-  const UInt *puiCtxIdxY = g_uiLastCtx + ( g_aucConvertToBit[ height ] * ( g_aucConvertToBit[ height ] + 3 ) );
-#endif
   for( uiCtxLast = 0; uiCtxLast < uiGroupIdxY; uiCtxLast++ )
   {
-#if LAST_CTX_REDUCTION
     if (eTType)
     {
@@ -1656 +1490 @@
     else
     {
-#endif
       m_pcBinIf->encodeBin( 1, *( pCtxY + puiCtxIdxY[ uiCtxLast ] ) );
-#if LAST_CTX_REDUCTION
-    }
-#endif
+    }
   }
   if( uiGroupIdxY < g_uiGroupIdx[ height - 1 ])
   {
-#if LAST_CTX_REDUCTION
     if (eTType)
     {
@@ -1671 +1501 @@
     else
     {
-#endif
       m_pcBinIf->encodeBin( 0, *( pCtxY + puiCtxIdxY[ uiCtxLast ] ) );
-#if LAST_CTX_REDUCTION
-    }
-#endif
+    }
     }
   if ( uiGroupIdxX > 3 )
@@ -1765 +1592 @@
   }
   
-#if MULTIBITS_DATA_HIDING
   UInt const tsig = pcCU->getSlice()->getPPS()->getTSIG();
 #if LOSSLESS_CODING
@@ -1780 +1606 @@
   Bool beValid = pcCU->getSlice()->getPPS()->getSignHideFlag() > 0;
 #endif
-#endif
 
   // Find position of last coefficient
@@ -1790 +1615 @@
   {
     scanCG = g_auiSigLastScan[ uiScanIdx ][ uiLog2BlockSize > 3 ? uiLog2BlockSize-2-1 : 0 ];
-#if MULTILEVEL_SIGMAP_EXT
     if( uiLog2BlockSize == 3 )
     {
@@ -1799 +1623 @@
       scanCG = g_sigLastScanCG32x32;
     }
-#endif
   }
   else
@@ -1809 +1632 @@
   const UInt uiNumBlkSide = uiWidth >> uiShift;
 
-#if !MULTILEVEL_SIGMAP_EXT
-  if( blockType > 3 )
-  {
-#endif
     ::memset( uiSigCoeffGroupFlag, 0, sizeof(UInt) * MLS_GRP_NUM );
 
@@ -1823 +1642 @@
       UInt uiPosX    = posLast - ( uiPosY << uiLog2BlockSize );
       UInt uiBlkIdx  = uiNumBlkSide * (uiPosY >> uiShift) + (uiPosX >> uiShift);
-#if MULTILEVEL_SIGMAP_EXT
       if( uiWidth == 8 && uiHeight == 8 && (uiScanIdx == SCAN_HOR || uiScanIdx == SCAN_VER) )
       {
@@ -1835 +1653 @@
         }
       }
-#endif
       if( pcCoef[ posLast ] )
       {
@@ -1844 +1661 @@
     }
     while ( uiNumSig > 0 );
-#if !MULTILEVEL_SIGMAP_EXT
-  }
-  else
-  {
-  
-  do
-  {
-    posLast = scan[ ++scanPosLast ];
-    uiNumSig -= ( pcCoef[ posLast ] != 0 );
-  }
-  while ( uiNumSig > 0 );
-
-  }
-#endif
 
   // Code position of last coefficient
@@ -1882 +1685 @@
     UInt coeffSigns = 0;
 
-#if MULTIBITS_DATA_HIDING
     Int lastNZPosInCG = -1, firstNZPosInCG = SCAN_SET_SIZE;
-#endif
 
     if( iScanPosSig == scanPosLast )
@@ -1891 +1692 @@
       coeffSigns    = ( pcCoef[ posLast ] < 0 );
       numNonZero    = 1;
-#if MULTIBITS_DATA_HIDING
       lastNZPosInCG  = iScanPosSig;
       firstNZPosInCG = iScanPosSig;
-#endif
       iScanPosSig--;
     }
 
-#if !MULTILEVEL_SIGMAP_EXT
-    if( blockType > 3 )
-    {
-#endif
       // encode significant_coeffgroup_flag
       Int iCGBlkPos = scanCG[ iSubSet ];
       Int iCGPosY   = iCGBlkPos / uiNumBlkSide;
       Int iCGPosX   = iCGBlkPos - (iCGPosY * uiNumBlkSide);
-#if MULTILEVEL_SIGMAP_EXT
       if( uiWidth == 8 && uiHeight == 8 && (uiScanIdx == SCAN_HOR || uiScanIdx == SCAN_VER) )
       {
@@ -1912 +1706 @@
         iCGPosX = (uiScanIdx == SCAN_VER ? iCGBlkPos : 0);
       }
-#endif
-#if !REMOVE_INFER_SIGGRP
-      Bool bInferredCGFlag = false;
-#endif
-#if REMOVE_INFER_SIGGRP
       if( iSubSet == iLastScanSet || iSubSet == 0)
-#else      
-      if( iSubSet == iLastScanSet )
-#endif
       {
         uiSigCoeffGroupFlag[ iCGBlkPos ] = 1;
@@ -1926 +1712 @@
       else
       {
-#if !REMOVE_INFER_SIGGRP
-#if MULTILEVEL_SIGMAP_EXT
-        if( !TComTrQuant::bothCGNeighboursOne( uiSigCoeffGroupFlag, iCGPosX, iCGPosY, uiScanIdx, uiWidth, uiHeight ) && ( iSubSet ) )
-#else
-        if( !TComTrQuant::bothCGNeighboursOne( uiSigCoeffGroupFlag, iCGPosX, iCGPosY, uiWidth, uiHeight ) && ( iSubSet ) )
-#endif
-        {
-#endif
           UInt uiSigCoeffGroup   = (uiSigCoeffGroupFlag[ iCGBlkPos ] != 0);
-#if MULTILEVEL_SIGMAP_EXT
           UInt uiCtxSig  = TComTrQuant::getSigCoeffGroupCtxInc( uiSigCoeffGroupFlag, iCGPosX, iCGPosY, uiScanIdx, uiWidth, uiHeight );
-#else
-          UInt uiCtxSig  = TComTrQuant::getSigCoeffGroupCtxInc( uiSigCoeffGroupFlag, iCGPosX, iCGPosY, uiWidth, uiHeight );
-#endif
           m_pcBinIf->encodeBin( uiSigCoeffGroup, baseCoeffGroupCtx[ uiCtxSig ] );
-#if !REMOVE_INFER_SIGGRP
-        }
-        else
-        {
-          uiSigCoeffGroupFlag[ iCGBlkPos ] = 1;
-          bInferredCGFlag = true;
-        }
-#endif
       }
       
@@ -1961 +1727 @@
           uiPosX    = uiBlkPos - ( uiPosY << uiLog2BlockSize );
           uiSig     = (pcCoef[ uiBlkPos ] != 0);
-#if REMOVE_INFER_SIGGRP
           if( iScanPosSig > iSubPos || iSubSet == 0 || numNonZero )
-#else
-          if( iScanPosSig > iSubPos || bInferredCGFlag || numNonZero )
-#endif
           {
             uiCtxSig  = TComTrQuant::getSigCtxInc( pcCoef, uiPosX, uiPosY, blockType, uiWidth, uiHeight, eTType );
@@ -1975 +1737 @@
             coeffSigns = 2 * coeffSigns + ( pcCoef[ uiBlkPos ] < 0 );
             numNonZero++;
-#if MULTIBITS_DATA_HIDING
             if( lastNZPosInCG == -1 )
             {
@@ -1981 +1742 @@
             }
             firstNZPosInCG = iScanPosSig;
-#endif
           }
         }
@@ -1989 +1749 @@
         iScanPosSig = iSubPos - 1;
       }
-#if !MULTILEVEL_SIGMAP_EXT
-    } 
-    else
-    {
-
-    for( ; iScanPosSig >= iSubPos; iScanPosSig-- )
-    {
-      UInt  uiBlkPos  = scan[ iScanPosSig ]; 
-      UInt  uiPosY    = uiBlkPos >> uiLog2BlockSize;
-      UInt  uiPosX    = uiBlkPos - ( uiPosY << uiLog2BlockSize );
-      UInt  uiSig     = 0; 
-      if( pcCoef[ uiBlkPos ] != 0 )
-      {
-        uiSig = 1;
-        absCoeff[ numNonZero ] = abs( pcCoef[ uiBlkPos ] );
-        coeffSigns = 2 * coeffSigns + ( pcCoef[ uiBlkPos ] < 0 );
-        numNonZero++;
-#if MULTIBITS_DATA_HIDING
-        if( lastNZPosInCG == -1 )
-        {
-          lastNZPosInCG = iScanPosSig;
-        }
-        firstNZPosInCG = iScanPosSig;
-#endif
-      }      
-      UInt  uiCtxSig  = TComTrQuant::getSigCtxInc( pcCoef, uiPosX, uiPosY, blockType, uiWidth, uiHeight, eTType );
-      m_pcBinIf->encodeBin( uiSig, baseCtx[ uiCtxSig ] );
-    }
-
-    }
-#endif
 
     if( numNonZero > 0 )
     {
-#if MULTIBITS_DATA_HIDING
       Bool signHidden = ( lastNZPosInCG - firstNZPosInCG >= (Int)tsig );
-#endif  // MULTIBITS_DATA_HIDING
 
       UInt c1 = 1;
-#if !RESTRICT_GR1GR2FLAG_NUMBER
-      UInt c2 = 0;
-#endif
-#if LEVEL_CTX_LUMA_RED
       UInt uiCtxSet = (iSubSet > 0 && eTType==TEXT_LUMA) ? 2 : 0;
-#else
-      UInt uiCtxSet = (iSubSet > 0 && eTType==TEXT_LUMA) ? 3 : 0;
-#endif
       
       if( uiNumOne > 0 )
       {
         uiCtxSet++;
-#if !LEVEL_CTX_LUMA_RED
-        if( uiNumOne > 3 && eTType==TEXT_LUMA)
-        {
-          uiCtxSet++;
-        }
-#endif
       }
       
@@ -2051 +1765 @@
       ContextModel *baseCtxMod = ( eTType==TEXT_LUMA ) ? m_cCUOneSCModel.get( 0, 0 ) + 4 * uiCtxSet : m_cCUOneSCModel.get( 0, 0 ) + NUM_ONE_FLAG_CTX_LUMA + 4 * uiCtxSet;
       
-#if RESTRICT_GR1GR2FLAG_NUMBER
       Int numC1Flag = min(numNonZero, C1FLAG_NUMBER);
       Int firstC2FlagIdx = -1;
       for( Int idx = 0; idx < numC1Flag; idx++ )
-#else
-      for ( Int idx = 0; idx < numNonZero; idx++ )
-#endif
       {
         UInt uiSymbol = absCoeff[ idx ] > 1;
@@ -2065 +1775 @@
           c1 = 0;
 
-#if RESTRICT_GR1GR2FLAG_NUMBER
           if (firstC2FlagIdx == -1)
           {
             firstC2FlagIdx = idx;
           }
-#endif
         }
         else if( (c1 < 3) && (c1 > 0) )
@@ -2081 +1789 @@
       {
 
-#if RESTRICT_GR1GR2FLAG_NUMBER
         baseCtxMod = ( eTType==TEXT_LUMA ) ? m_cCUAbsSCModel.get( 0, 0 ) + uiCtxSet : m_cCUAbsSCModel.get( 0, 0 ) + NUM_ABS_FLAG_CTX_LUMA + uiCtxSet;
         if ( firstC2FlagIdx != -1)
@@ -2088 +1795 @@
           m_pcBinIf->encodeBin( symbol, baseCtxMod[0] );
         }
-#else    
-        baseCtxMod = ( eTType==TEXT_LUMA ) ? m_cCUAbsSCModel.get( 0, 0 ) + 3 * uiCtxSet : m_cCUAbsSCModel.get( 0, 0 ) + NUM_ABS_FLAG_CTX_LUMA + 3 * uiCtxSet;
+      }
+      
+      if( beValid && signHidden )
+      {
+        m_pcBinIf->encodeBinsEP( (coeffSigns >> 1), numNonZero-1 );
+      }
+      else
+      {
+        m_pcBinIf->encodeBinsEP( coeffSigns, numNonZero );
+      }
+      
+      Int iFirstCoeff2 = 1;    
+      if (c1 == 0 || numNonZero > C1FLAG_NUMBER)
+      {
         for ( Int idx = 0; idx < numNonZero; idx++ )
         {
-          if( absCoeff[ idx ] > 1 )
-          {
-            UInt symbol = absCoeff[ idx ] > 2;
-            m_pcBinIf->encodeBin( symbol, baseCtxMod[c2] );
-            c2 += (c2 < 2);
-            uiNumOne++;
-          }
-        }
-#endif
-      }
-      
-#if MULTIBITS_DATA_HIDING
-      if( beValid && signHidden )
-      {
-        m_pcBinIf->encodeBinsEP( (coeffSigns >> 1), numNonZero-1 );
-      }
-      else
-      {
-        m_pcBinIf->encodeBinsEP( coeffSigns, numNonZero );
-      }
-#else
-      m_pcBinIf->encodeBinsEP( coeffSigns, numNonZero );
-#endif
-      
-#if RESTRICT_GR1GR2FLAG_NUMBER
-      Int iFirstCoeff2 = 1;    
-      if (c1 == 0 || numNonZero > C1FLAG_NUMBER)
-#else
-      if (c1 == 0)
-#endif
-      {
-        for ( Int idx = 0; idx < numNonZero; idx++ )
-        {
-#if RESTRICT_GR1GR2FLAG_NUMBER
           UInt baseLevel  = (idx < C1FLAG_NUMBER)? (2 + iFirstCoeff2 ) : 1;
 
@@ -2137 +1822 @@
             uiNumOne++;
           }
-#else
-          if ( absCoeff[ idx ] > 2 )
-          {
-            xWriteGoRiceExGolomb( absCoeff[ idx ]  - 3, uiGoRiceParam );            
-          }
-#endif
         }        
       }
@@ -2273 +1952 @@
   }
 }
-#if SAO_UNIT_INTERLEAVING
 /** Code SAO band position 
  * \param uiCode
@@ -2333 +2011 @@
   }
 }
-#endif
 /*!
  ****************************************************************************
@@ -2442 +2119 @@
   const UInt *puiCtxIdx;
   Int ctx;
-#if LAST_CTX_REDUCTION
   Int widthCtx = eTType? 4 : width;
   puiCtxIdx = g_uiLastCtx + (g_aucConvertToBit[ widthCtx ]*(g_aucConvertToBit[ widthCtx ]+3));
-#else  
-  puiCtxIdx = g_uiLastCtx + (g_aucConvertToBit[ width ]*(g_aucConvertToBit[ width ]+3));
-#endif
   ContextModel *pCtxX      = m_cCuCtxLastX.get( 0, eTType );
   for (ctx = 0; ctx < g_uiGroupIdx[ width - 1 ]; ctx++)
   {
     Int ctxOffset = puiCtxIdx[ ctx ];
-#if LAST_CTX_REDUCTION
     if (eTType)
     {
@@ -2461 +2133 @@
     else
     {
-#endif
       pcEstBitsSbac->lastXBits[ ctx ] = iBitsX + pCtxX[ ctxOffset ].getEntropyBits( 0 );
       iBitsX += pCtxX[ ctxOffset ].getEntropyBits( 1 );
-#if LAST_CTX_REDUCTION
-    }
-#endif
+    }
     }
   pcEstBitsSbac->lastXBits[ctx] = iBitsX;
 
-#if LAST_CTX_REDUCTION
   Int heightCtx = eTType? 4 : height;
   puiCtxIdx = g_uiLastCtx + (g_aucConvertToBit[ heightCtx ]*(g_aucConvertToBit[ heightCtx ]+3));
-#else
-  puiCtxIdx = g_uiLastCtx + (g_aucConvertToBit[ height ]*(g_aucConvertToBit[ height ]+3));
-#endif
   ContextModel *pCtxY      = m_cCuCtxLastY.get( 0, eTType );
   for (ctx = 0; ctx < g_uiGroupIdx[ height - 1 ]; ctx++)
   {
     Int ctxOffset = puiCtxIdx[ ctx ];
-#if LAST_CTX_REDUCTION
     if (eTType)
     {
@@ -2489 +2153 @@
     else
     {
-#endif
       pcEstBitsSbac->lastYBits[ ctx ] = iBitsY + pCtxY[ ctxOffset ].getEntropyBits( 0 );
       iBitsY += pCtxY[ ctxOffset ].getEntropyBits( 1 );
-#if LAST_CTX_REDUCTION
-    }
-#endif
+    }
     }
   pcEstBitsSbac->lastYBits[ctx] = iBitsY;

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

@@ -111 +111 @@
   Void  codeSliceHeader         ( TComSlice* pcSlice );
   Void codeTileMarkerFlag(TComSlice* pcSlice) {printf("Not supported\n"); assert(0); exit(1);}
-#if TILES_WPP_ENTRY_POINT_SIGNALLING
   Void  codeTilesWPPEntryPoint( TComSlice* pSlice );
-#else
-  Void  codeSliceHeaderSubstreamTable( TComSlice* pcSlice );
-#endif
   Void  codeTerminatingBit      ( UInt uilsLast      );
   Void  codeSliceFinish         ();
-#if OL_FLUSH
   Void  codeFlush               ();
   Void  encodeStart             ();
-#endif
   
   Void  codeAlfFlag       ( UInt uiCode );
@@ -127 +121 @@
   Void  codeAlfSvlc       ( Int  uiCode );
   Void  codeAlfCtrlDepth  ();
-#if LCU_SYNTAX_ALF
   Void codeAPSAlflag(UInt uiCode) {assert (0);  return;}
   Void codeAlfFixedLengthIdx( UInt idx, UInt maxValue){ assert (0);  return;}
-#endif
 
   Void codeAlfCtrlFlag       ( UInt uiSymbol );
@@ -137 +129 @@
   Void  codeSaoUvlc       ( UInt uiCode );
   Void  codeSaoSvlc       ( Int  uiCode );
-#if SAO_UNIT_INTERLEAVING
   Void  codeSaoRun        ( UInt  uiCode, UInt uiMaxValue  ) {;}
   Void  codeSaoMergeLeft  ( UInt  uiCode, UInt uiCompIdx );
@@ -143 +134 @@
   Void  codeSaoTypeIdx    ( UInt  uiCode);
   Void  codeSaoUflc       ( UInt  uiCode);
-#endif
   Void  codeScalingList      ( TComScalingList* scalingList     ){ assert (0);  return;};
   
@@ -228 +218 @@
   Void codePartSize      ( TComDataCU* pcCU, UInt uiAbsPartIdx, UInt uiDepth );
   Void codePredMode      ( TComDataCU* pcCU, UInt uiAbsPartIdx );
-#if BURST_IPCM
   Void codeIPCMInfo      ( TComDataCU* pcCU, UInt uiAbsPartIdx, Int numIPCM, Bool firstIPCMFlag);
-#else
-  Void codeIPCMInfo      ( TComDataCU* pcCU, UInt uiAbsPartIdx );
-#endif
   Void codeTransformSubdivFlag ( UInt uiSymbol, UInt uiCtx );
   Void codeQtCbf               ( TComDataCU* pcCU, UInt uiAbsPartIdx, TextType eType, UInt uiTrDepth );
@@ -305 +291 @@
   ContextModel3DBuffer m_cALFUvlcSCModel;
   ContextModel3DBuffer m_cALFSvlcSCModel;
-#if AMP_CTX
   ContextModel3DBuffer m_cCUAMPSCModel;
-#else
-  ContextModel3DBuffer m_cCUXPosiSCModel;
-  ContextModel3DBuffer m_cCUYPosiSCModel;
-#endif
   ContextModel3DBuffer m_cSaoFlagSCModel;
   ContextModel3DBuffer m_cSaoUvlcSCModel;
   ContextModel3DBuffer m_cSaoSvlcSCModel;
-#if SAO_UNIT_INTERLEAVING
   ContextModel3DBuffer m_cSaoMergeLeftSCModel;
   ContextModel3DBuffer m_cSaoMergeUpSCModel;
   ContextModel3DBuffer m_cSaoTypeIdxSCModel;
-#endif
 
 #if HHI_DMM_WEDGE_INTRA || HHI_DMM_PRED_TEX

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

@@ -1080 +1080 @@
   pcCU       ->setTrIdxSubParts ( uiTrDepth, uiAbsPartIdx, uiFullDepth );
 
-#if H0736_AVC_STYLE_QP_RANGE
   m_pcTrQuant->setQPforQuant    ( pcCU->getQP( 0 ), !pcCU->getSlice()->getDepth(), pcCU->getSlice()->getSliceType(), TEXT_LUMA, pcCU->getSlice()->getSPS()->getQpBDOffsetY(), 0 );
-#else
-  m_pcTrQuant->setQPforQuant    ( pcCU->getQP( 0 ), !pcCU->getSlice()->getDepth(), pcCU->getSlice()->getSliceType(), TEXT_LUMA, 0 );
-#endif
 
 #if RDOQ_CHROMA_LAMBDA 
@@ -1278 +1274 @@
     UInt uiAbsSum = 0;
 
-#if H0736_AVC_STYLE_QP_RANGE
     if(eText == TEXT_CHROMA_U)
     {
@@ -1287 +1282 @@
       m_pcTrQuant->setQPforQuant     ( pcCU->getQP( 0 ), !pcCU->getSlice()->getDepth(), pcCU->getSlice()->getSliceType(), TEXT_CHROMA, pcCU->getSlice()->getSPS()->getQpBDOffsetC(), pcCU->getSlice()->getPPS()->getChromaQpOffset2nd() );
     }
-#else
-    if(eText == TEXT_CHROMA_U)
-      m_pcTrQuant->setQPforQuant     ( pcCU->getQP( 0 ), !pcCU->getSlice()->getDepth(), pcCU->getSlice()->getSliceType(), TEXT_CHROMA, pcCU->getSlice()->getPPS()->getChromaQpOffset() );
-    else
-      m_pcTrQuant->setQPforQuant     ( pcCU->getQP( 0 ), !pcCU->getSlice()->getDepth(), pcCU->getSlice()->getSliceType(), TEXT_CHROMA, pcCU->getSlice()->getPPS()->getChromaQpOffset2nd() );
-#endif
 
 #if RDOQ_CHROMA_LAMBDA 
@@ -2041 +2030 @@
     
     //===== determine set of modes to be tested (using prediction signal only) =====
-#if LOGI_INTRA_NAME_3MPM
     Int numModesAvailable     = 35; //total number of Intra modes
-#else
-    Int numModesAvailable     = g_aucIntraModeNumAng[uiWidthBit];
-#endif
     Pel* piOrg         = pcOrgYuv ->getLumaAddr( uiPU, uiWidth );
     Pel* piPred        = pcPredYuv->getLumaAddr( uiPU, uiWidth );
@@ -2159 +2144 @@
     
 #if FAST_UDI_USE_MPM
-#if LOGI_INTRA_NAME_3MPM
       Int uiPreds[3] = {-1, -1, -1};
-#else
-      Int uiPreds[2] = {-1, -1};
-#endif
       Int iMode = -1;
       Int numCand = pcCU->getIntraDirLumaPredictor( uiPartOffset, uiPreds, &iMode );
-#if LOGI_INTRA_NAME_3MPM
       if( iMode >= 0 )
       {
         numCand = iMode;
       }
-#else
-      if( iMode >= 0 )
-      {
-        numCand = 1;
-        uiPreds[0] = iMode;
-      }
-#endif
       
       for( Int j=0; j < numCand; j++)
@@ -3169 +3142 @@
   PartSize      ePartSize = pcCU->getPartitionSize( 0 );
 
-#if H0111_MVD_L1_ZERO
   Int           bestBiPRefIdxL1 = 0;
   Int           bestBiPMvpL1 = 0;
   UInt          biPDistTemp = MAX_INT;
-#endif
 
 #if ZERO_MVD_EST
@@ -3212 +3183 @@
     UInt          auiZeroMvdBits[3];
 #endif
-#if H0111_MVD_L1_ZERO
     UInt          bestBiPDist = MAX_INT;
-#endif
 
     UInt          uiCostTempL0[MAX_NUM_REF];
@@ -3274 +3243 @@
           if ( iRefIdxTemp == pcCU->getSlice()->getNumRefIdx(eRefPicList)-1 ) uiBitsTemp--;
         }
-#if H0111_MVD_L1_ZERO
 #if ZERO_MVD_EST
         xEstimateMvPredAMVP( pcCU, pcOrgYuv, iPartIdx, eRefPicList, iRefIdxTemp, cMvPred[iRefList][iRefIdxTemp], false, &biPDistTemp, &uiZeroMvdDistTemp);
 #else
         xEstimateMvPredAMVP( pcCU, pcOrgYuv, iPartIdx, eRefPicList, iRefIdxTemp, cMvPred[iRefList][iRefIdxTemp], false, &biPDistTemp);
-#endif
-#else
-#if ZERO_MVD_EST
-        xEstimateMvPredAMVP( pcCU, pcOrgYuv, iPartIdx, eRefPicList, iRefIdxTemp, cMvPred[iRefList][iRefIdxTemp], false, &uiZeroMvdDistTemp);
-#else
-        xEstimateMvPredAMVP( pcCU, pcOrgYuv, iPartIdx, eRefPicList, iRefIdxTemp, cMvPred[iRefList][iRefIdxTemp]);
-#endif
 #endif
         aaiMvpIdx[iRefList][iRefIdxTemp] = pcCU->getMVPIdx(eRefPicList, uiPartAddr);
         aaiMvpNum[iRefList][iRefIdxTemp] = pcCU->getMVPNum(eRefPicList, uiPartAddr);
         
-#if H0111_MVD_L1_ZERO
         if(pcCU->getSlice()->getMvdL1ZeroFlag() && iRefList==1 && biPDistTemp < bestBiPDist)
         {
@@ -3297 +3257 @@
           bestBiPRefIdxL1 = iRefIdxTemp;
         }
-#endif
 
 #if H3D_IVMP
@@ -3410 +3369 @@
             pcCU->getCUMvField(eRefPicList)->setAllRefIdx( iRefIdx[iRefList], ePartSize, uiPartAddr, 0, iPartIdx );
 
-#if H0111_MVD_L1_ZERO
             if(!pcCU->getSlice()->getMvdL1ZeroFlag())
             {
-#endif
               // storing list 1 prediction signal for iterative bi-directional prediction
               if ( eRefPicList == REF_PIC_LIST_1 )
@@ -3433 +3390 @@
 #endif
               }
-#if H0111_MVD_L1_ZERO
             }
-#endif
           }
       }
@@ -3457 +3412 @@
       ::memcpy(aaiMvpIdxBi, aaiMvpIdx, sizeof(aaiMvpIdx));
       
-#if H0111_MVD_L1_ZERO
       UInt uiMotBits[2];
 
@@ -3502 +3456 @@
         uiBits[2] = uiMbBits[2] + uiMotBits[0] + uiMotBits[1];
       }
-#else    
-      UInt uiMotBits[2] = { uiBits[0] - uiMbBits[0], uiBits[1] - uiMbBits[1] };
-      uiBits[2] = uiMbBits[2] + uiMotBits[0] + uiMotBits[1];
-#endif      
 
       // 4-times iteration (default)
@@ -3511 +3461 @@
       
       // fast encoder setting: only one iteration
-#if H0111_MVD_L1_ZERO
       if ( m_pcEncCfg->getUseFastEnc() || pcCU->getSlice()->getMvdL1ZeroFlag())
-#else
-      if ( m_pcEncCfg->getUseFastEnc() )
-#endif
       {
         iNumIter = 1;
@@ -3530 +3476 @@
         RefPicList  eRefPicList = ( iRefList ? REF_PIC_LIST_1 : REF_PIC_LIST_0 );
 
-#if H0111_MVD_L1_ZERO
         if(pcCU->getSlice()->getMvdL1ZeroFlag())
         {
@@ -3536 +3481 @@
           eRefPicList = REF_PIC_LIST_0;
         }
-#endif
 
         Bool bChanged = false;
@@ -3606 +3550 @@
             uiBits[2]           = uiBitsTemp;
             
-#if H0111_MVD_L1_ZERO
             if(iNumIter!=1)
             {
-#endif
               //  Set motion
               pcCU->getCUMvField( eRefPicList )->setAllMv( cMvBi[iRefList], ePartSize, uiPartAddr, 0, iPartIdx );
@@ -3620 +3562 @@
               motionCompensation( pcCU, pcYuvPred, eRefPicList, iPartIdx );
 #endif
-#if H0111_MVD_L1_ZERO
             }
-#endif
           }
         } // for loop-iRefIdxTemp
@@ -3632 +3572 @@
             xCopyAMVPInfo(&aacAMVPInfo[0][iRefIdxBi[0]], pcCU->getCUMvField(REF_PIC_LIST_0)->getAMVPInfo());
             xCheckBestMVP(pcCU, REF_PIC_LIST_0, cMvBi[0], cMvPredBi[0][iRefIdxBi[0]], aaiMvpIdxBi[0][iRefIdxBi[0]], uiBits[2], uiCostBi);
-#if H0111_MVD_L1_ZERO
             if(!pcCU->getSlice()->getMvdL1ZeroFlag())
             {
-#endif
               xCopyAMVPInfo(&aacAMVPInfo[1][iRefIdxBi[1]], pcCU->getCUMvField(REF_PIC_LIST_1)->getAMVPInfo());
               xCheckBestMVP(pcCU, REF_PIC_LIST_1, cMvBi[1], cMvPredBi[1][iRefIdxBi[1]], aaiMvpIdxBi[1][iRefIdxBi[1]], uiBits[2], uiCostBi);
-#if H0111_MVD_L1_ZERO
             }
-#endif
           }
           break;
@@ -3986 +3922 @@
 
 // AMVP
-#if H0111_MVD_L1_ZERO
 #if ZERO_MVD_EST
 Void TEncSearch::xEstimateMvPredAMVP( TComDataCU* pcCU, TComYuv* pcOrgYuv, UInt uiPartIdx, RefPicList eRefPicList, Int iRefIdx, TComMv& rcMvPred, Bool bFilled, UInt* puiDistBiP, UInt* puiDist  )
 #else
 Void TEncSearch::xEstimateMvPredAMVP( TComDataCU* pcCU, TComYuv* pcOrgYuv, UInt uiPartIdx, RefPicList eRefPicList, Int iRefIdx, TComMv& rcMvPred, Bool bFilled, UInt* puiDistBiP )
-#endif
-#else
-#if ZERO_MVD_EST
-Void TEncSearch::xEstimateMvPredAMVP( TComDataCU* pcCU, TComYuv* pcOrgYuv, UInt uiPartIdx, RefPicList eRefPicList, Int iRefIdx, TComMv& rcMvPred, Bool bFilled, UInt* puiDist )
-#else
-Void TEncSearch::xEstimateMvPredAMVP( TComDataCU* pcCU, TComYuv* pcOrgYuv, UInt uiPartIdx, RefPicList eRefPicList, Int iRefIdx, TComMv& rcMvPred, Bool bFilled )
-#endif
 #endif
 {
@@ -4029 +3957 @@
     pcCU->setMVPNumSubParts( pcAMVPInfo->iN, eRefPicList, uiPartAddr, uiPartIdx, pcCU->getDepth(uiPartAddr));
 
-#if H0111_MVD_L1_ZERO
     if(pcCU->getSlice()->getMvdL1ZeroFlag() && eRefPicList==REF_PIC_LIST_1)
     {
@@ -4047 +3974 @@
 #endif
     }
-#endif
     return;
   }
@@ -4087 +4013 @@
         cBestMv   = pcAMVPInfo->m_acMvCand[i];
         iBestIdx  = i;
-        #if H0111_MVD_L1_ZERO
         (*puiDistBiP) = uiTmpCost;
-        #endif
         #if ZERO_MVD_EST
         (*puiDist) = uiDist;
@@ -4976 +4900 @@
   
   //  Residual coding.
-#if H0736_AVC_STYLE_QP_RANGE
   Int    qp, qpBest = 0, qpMin, qpMax;
-#else
-  UInt    uiQp, uiQpBest = 0, uiQpMin, uiQpMax;
-#endif
   Double  dCost, dCostBest = MAX_DOUBLE;
   
@@ -4992 +4912 @@
   while((uiWidth>>uiMaxTrMode) < (g_uiMaxCUWidth>>g_uiMaxCUDepth)) uiMaxTrMode--;
   
-#if H0736_AVC_STYLE_QP_RANGE
   qpMin =  bHighPass ? Clip3( -pcCU->getSlice()->getSPS()->getQpBDOffsetY(), MAX_QP, pcCU->getQP(0) - m_iMaxDeltaQP ) : pcCU->getQP( 0 );
   qpMax =  bHighPass ? Clip3( -pcCU->getSlice()->getSPS()->getQpBDOffsetY(), MAX_QP, pcCU->getQP(0) + m_iMaxDeltaQP ) : pcCU->getQP( 0 );
-#else
-  uiQpMin      = bHighPass ? min( MAX_QP, max( MIN_QP, pcCU->getQP(0) - m_iMaxDeltaQP ) ) : pcCU->getQP( 0 );
-  uiQpMax      = bHighPass ? min( MAX_QP, max( MIN_QP, pcCU->getQP(0) + m_iMaxDeltaQP ) ) : pcCU->getQP( 0 );
-#endif
 
   #if HHI_INTERVIEW_SKIP
@@ -5037 +4952 @@
 #endif
 
-#if H0736_AVC_STYLE_QP_RANGE
   for ( qp = qpMin; qp <= qpMax; qp++ )
-#else
-  for ( uiQp = uiQpMin; uiQp <= uiQpMax; uiQp++ )
-#endif
   {
     dCost = 0.;
@@ -5158 +5069 @@
       }
       
-#if H0736_AVC_STYLE_QP_RANGE
       if( qpMin != qpMax && qp != qpMax )
-#else
-      if( uiQpMin != uiQpMax && uiQp != uiQpMax )
-#endif
       {
         const UInt uiQPartNum = pcCU->getPic()->getNumPartInCU() >> (pcCU->getDepth(0) << 1);
@@ -5181 +5088 @@
       uiDistortionBest = uiDistortion;
       dCostBest        = dCost;
-#if H0736_AVC_STYLE_QP_RANGE
       qpBest           = qp;
-#else
-      uiQpBest         = uiQp;
-#endif      
       if( m_bUseSBACRD )
       {
@@ -5209 +5112 @@
   assert ( dCostBest != MAX_DOUBLE );
   
-#if H0736_AVC_STYLE_QP_RANGE
   if( qpMin != qpMax && qpBest != qpMax )
-#else
-  if( uiQpMin != uiQpMax && uiQpBest != uiQpMax )
-#endif
   {
     if( m_bUseSBACRD )
@@ -5304 +5203 @@
   }
   
-#if H0736_AVC_STYLE_QP_RANGE
   pcCU->setQPSubParts( qpBest, 0, pcCU->getDepth(0) );
-#else
-  pcCU->setQPSubParts( uiQpBest, 0, pcCU->getDepth(0) );
-#endif
 
   // set Model
@@ -5337 +5232 @@
   const UInt uiLog2TrSize = g_aucConvertToBit[pcCU->getSlice()->getSPS()->getMaxCUWidth() >> uiDepth]+2;
   
-#if G519_TU_AMP_NSQT_HARMONIZATION
   UInt SplitFlag = ((pcCU->getSlice()->getSPS()->getQuadtreeTUMaxDepthInter() == 1) && pcCU->getPredictionMode(uiAbsPartIdx) == MODE_INTER && ( pcCU->getPartitionSize(uiAbsPartIdx) != SIZE_2Nx2N ));
-#else
-  UInt SplitFlag = ((pcCU->getSlice()->getSPS()->getQuadtreeTUMaxDepthInter() == 1) && pcCU->getPredictionMode(uiAbsPartIdx) == MODE_INTER && ( pcCU->getPartitionSize(uiAbsPartIdx) == SIZE_2NxN || pcCU->getPartitionSize(uiAbsPartIdx) == SIZE_Nx2N));
-#endif
   Bool bCheckFull;
   if ( SplitFlag && uiDepth == pcCU->getDepth(uiAbsPartIdx) && ( uiLog2TrSize >  pcCU->getQuadtreeTULog2MinSizeInCU(uiAbsPartIdx) ) )
@@ -5406 +5297 @@
     }
 
-#if H0736_AVC_STYLE_QP_RANGE
     m_pcTrQuant->setQPforQuant( pcCU->getQP( 0 ), false, pcCU->getSlice()->getSliceType(), TEXT_LUMA, pcCU->getSlice()->getSPS()->getQpBDOffsetY(), 0 );
-#else
-    m_pcTrQuant->setQPforQuant( pcCU->getQP( 0 ), false, pcCU->getSlice()->getSliceType(), TEXT_LUMA, 0 );
-#endif
 
 #if RDOQ_CHROMA_LAMBDA 
@@ -5430 +5317 @@
       }
 
-#if H0736_AVC_STYLE_QP_RANGE
       m_pcTrQuant->setQPforQuant( pcCU->getQP( 0 ), false, pcCU->getSlice()->getSliceType(), TEXT_CHROMA, pcCU->getSlice()->getSPS()->getQpBDOffsetC(), pcCU->getSlice()->getPPS()->getChromaQpOffset() );
-#else
-      m_pcTrQuant->setQPforQuant( pcCU->getQP( 0 ), false, pcCU->getSlice()->getSliceType(), TEXT_CHROMA, pcCU->getSlice()->getPPS()->getChromaQpOffset() );
-#endif
 
 #if RDOQ_CHROMA_LAMBDA 
@@ -5445 +5328 @@
 #endif        
                                  trWidthC, trHeightC, uiAbsSumU, TEXT_CHROMA_U, uiAbsPartIdx );
-#if H0736_AVC_STYLE_QP_RANGE
       m_pcTrQuant->setQPforQuant( pcCU->getQP( 0 ), false, pcCU->getSlice()->getSliceType(), TEXT_CHROMA, pcCU->getSlice()->getSPS()->getQpBDOffsetC(), pcCU->getSlice()->getPPS()->getChromaQpOffset2nd() );
-#else
-      m_pcTrQuant->setQPforQuant( pcCU->getQP( 0 ), false, pcCU->getSlice()->getSliceType(), TEXT_CHROMA, pcCU->getSlice()->getPPS()->getChromaQpOffset2nd() );
-#endif
       m_pcTrQuant->transformNxN( pcCU, pcResi->getCrAddr(absTUPartIdxC), pcResi->getCStride(), pcCoeffCurrV, 
 #if ADAPTIVE_QP_SELECTION
@@ -5548 +5427 @@
       Pel *pcResiCurrY = m_pcQTTempTComYuv[ uiQTTempAccessLayer ].getLumaAddr( absTUPartIdx );
 
-#if H0736_AVC_STYLE_QP_RANGE
       m_pcTrQuant->setQPforQuant( pcCU->getQP( 0 ), false, pcCU->getSlice()->getSliceType(), TEXT_LUMA, pcCU->getSlice()->getSPS()->getQpBDOffsetY(), 0 );
-#else
-      m_pcTrQuant->setQPforQuant( pcCU->getQP( 0 ), false, pcCU->getSlice()->getSliceType(), TEXT_LUMA, 0 );
-#endif
 
       Int scalingListType = 3 + g_eTTable[(Int)TEXT_LUMA];
@@ -5705 +5580 @@
         Pel *pcResiCurrU = m_pcQTTempTComYuv[uiQTTempAccessLayer].getCbAddr( absTUPartIdxC );
 
-#if H0736_AVC_STYLE_QP_RANGE
         m_pcTrQuant->setQPforQuant( pcCU->getQP( 0 ), false, pcCU->getSlice()->getSliceType(), TEXT_CHROMA, pcCU->getSlice()->getSPS()->getQpBDOffsetC(), pcCU->getSlice()->getPPS()->getChromaQpOffset() );
-#else
-        m_pcTrQuant->setQPforQuant( pcCU->getQP( 0 ), false, pcCU->getSlice()->getSliceType(), TEXT_CHROMA, pcCU->getSlice()->getPPS()->getChromaQpOffset() );
-#endif
 
         Int scalingListType = 3 + g_eTTable[(Int)TEXT_CHROMA_U];
@@ -5794 +5665 @@
         if( !uiAbsSumU )
         {
-#if H0736_AVC_STYLE_QP_RANGE
           m_pcTrQuant->setQPforQuant( pcCU->getQP( 0 ), false, pcCU->getSlice()->getSliceType(), TEXT_CHROMA, pcCU->getSlice()->getSPS()->getQpBDOffsetC(), pcCU->getSlice()->getPPS()->getChromaQpOffset2nd() );
-#else
-          m_pcTrQuant->setQPforQuant( pcCU->getQP( 0 ), false, pcCU->getSlice()->getSliceType(), TEXT_CHROMA, pcCU->getSlice()->getPPS()->getChromaQpOffset2nd() );
-#endif
         }
         Int scalingListType = 3 + g_eTTable[(Int)TEXT_CHROMA_V];

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

@@ -464 +464 @@
                                     TComMv&     rcMvPred,
                                     Bool        bFilled = false
-                                  #if H0111_MVD_L1_ZERO
                                   , UInt*       puiDistBiP = NULL
-                                  #endif
                                   #if ZERO_MVD_EST
                                   , UInt*       puiDist = NULL

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

@@ -185 +185 @@
   rpcSlice->initSlice();
   rpcSlice->initTiles();
-#if H0388
   rpcSlice->setPicOutputFlag( true );
-#endif
   rpcSlice->setPOC( uiPOCCurr );
   
@@ -262 +260 @@
   {
 #if LOSSLESS_CODING
-#if H0736_AVC_STYLE_QP_RANGE
     if (!(( m_pcCfg->getMaxDeltaQP() == 0 ) && (dQP == -rpcSlice->getSPS()->getQpBDOffsetY() ) && (rpcSlice->getSPS()->getUseLossless()))) 
-#else
-    if (!(( m_pcCfg->getMaxDeltaQP() == 0 ) && (dQP == 0 ) && (rpcSlice->getSPS()->getUseLossless())))
-#endif
 #endif
     {
@@ -334 +328 @@
     }
     
-#if H0736_AVC_STYLE_QP_RANGE
     iQP = max( -pSPS->getQpBDOffsetY(), min( MAX_QP, (Int) floor( dQP + 0.5 ) ) );
-#else
-    iQP = max( MIN_QP, min( MAX_QP, (Int)floor( dQP + 0.5 ) ) );
-#endif
 
     m_pdRdPicLambda[iDQpIdx] = dLambda;
@@ -360 +350 @@
 // for RDO
   // in RdCost there is only one lambda because the luma and chroma bits are not separated, instead we weight the distortion of chroma.
-#if H0736_AVC_STYLE_QP_RANGE
   Double weight = 1.0;
   if(iQP >= 0)
@@ -366 +355 @@
     weight = pow( 2.0, (iQP-g_aucChromaScale[iQP])/3.0 );  // takes into account of the chroma qp mapping without chroma qp Offset
   }
-#else
-  Double weight = pow( 2.0, (iQP-g_aucChromaScale[iQP])/3.0 );  // takes into account of the chroma qp mapping without chroma qp Offset
-#endif
   m_pcRdCost ->setChromaDistortionWeight( weight );     
 #endif
@@ -432 +418 @@
   
   rpcSlice->setLoopFilterOffsetInAPS( m_pcCfg->getLoopFilterOffsetInAPS() );
-#if DBL_CONTROL
   if (rpcSlice->getPPS()->getDeblockingFilterControlPresent())
   {
-#endif
     rpcSlice->setInheritDblParamFromAPS( m_pcCfg->getLoopFilterOffsetInAPS() ? 1 : 0 );
     rpcSlice->setLoopFilterDisable( m_pcCfg->getLoopFilterDisable() );
@@ -443 +427 @@
       rpcSlice->setLoopFilterTcOffset( m_pcCfg->getLoopFilterTcOffset() );
     }
-#if DBL_CONTROL
-  }
-#endif
+  }
 
   rpcSlice->setDepth            ( iDepth );
@@ -455 +437 @@
   }
   rpcSlice->setTLayer( pcPic->getTLayer() );
-#if !H0566_TLA
-  rpcSlice->setTLayerSwitchingFlag( pPPS->getTLayerSwitchingFlag( pcPic->getTLayer() ) );
-#endif
 
   assert( m_apcPicYuvPred );
@@ -558 +537 @@
     // in RdCost there is only one lambda because the luma and chroma bits are not separated, instead we weight the distortion of chroma.
     int iQP = m_piRdPicQp    [uiQpIdx];
-#if H0736_AVC_STYLE_QP_RANGE
     Double weight = 1.0;
     if(iQP >= 0)
@@ -564 +542 @@
       weight = pow( 2.0, (iQP-g_aucChromaScale[iQP])/3.0 );  // takes into account of the chroma qp mapping without chroma qp Offset
     }
-#else
-    Double weight = pow( 2.0, (iQP-g_aucChromaScale[iQP])/3.0 );  // takes into account of the chroma qp mapping without chroma qp Offset
-#endif
     m_pcRdCost    ->setChromaDistortionWeight( weight );     
 #endif
@@ -614 +589 @@
   // in RdCost there is only one lambda because the luma and chroma bits are not separated, instead we weight the distortion of chroma.
   int iQP = m_piRdPicQp    [uiQpIdxBest];
-#if H0736_AVC_STYLE_QP_RANGE
   Double weight = 1.0;
   if(iQP >= 0)
@@ -620 +594 @@
     weight = pow( 2.0, (iQP-g_aucChromaScale[iQP])/3.0 );  // takes into account of the chroma qp mapping without chroma qp Offset
   }
-#else
-  Double weight = pow( 2.0, (iQP-g_aucChromaScale[iQP])/3.0 );  // takes into account of the chroma qp mapping without chroma qp Offset
-#endif
   m_pcRdCost ->setChromaDistortionWeight( weight );     
 #endif
@@ -832 +803 @@
   //UInt uiHeightInLCUs = rpcPic->getPicSym()->getFrameHeightInCU();
   UInt uiCol=0, uiLin=0, uiSubStrm=0;
-#if !REMOVE_TILE_DEPENDENCE
-  Int  iBreakDep      = 0;
-#endif
   UInt uiTileCol      = 0;
   UInt uiTileStartLCU = 0;
@@ -869 +837 @@
     if( m_pcCfg->getUseSBACRD() )
     {
-#if !REMOVE_TILE_DEPENDENCE
-      iBreakDep = rpcPic->getPicSym()->getTileBoundaryIndependenceIdr();
-#endif
       uiTileCol = rpcPic->getPicSym()->getTileIdxMap(uiCUAddr) % (rpcPic->getPicSym()->getNumColumnsMinus1()+1); // what column of tiles are we in?
       uiTileStartLCU = rpcPic->getPicSym()->getTComTile(rpcPic->getPicSym()->getTileIdxMap(uiCUAddr))->getFirstCUAddr();
@@ -878 +843 @@
       uiCol     = uiCUAddr % uiWidthInLCUs;
       uiLin     = uiCUAddr / uiWidthInLCUs;
-#if !REMOVE_TILE_DEPENDENCE
-#if WPP_SIMPLIFICATION
-      if (iBreakDep && pcSlice->getPPS()->getNumSubstreams() > 1)
-#else
-      if (iBreakDep && pcSlice->getPPS()->getEntropyCodingSynchro())
-#endif
-#else
-#if WPP_SIMPLIFICATION
       if (pcSlice->getPPS()->getNumSubstreams() > 1)
-#else
-      if (pcSlice->getPPS()->getEntropyCodingSynchro())
-#endif
-#endif
       {
         // independent tiles => substreams are "per tile".  iNumSubstreams has already been multiplied.
@@ -902 +855 @@
         uiSubStrm = uiLin % iNumSubstreams;
       }
-#if WPP_SIMPLIFICATION
       if ( pcSlice->getPPS()->getNumSubstreams() > 1 && (uiCol == uiTileLCUX) )
-#else
-      if ( pcSlice->getPPS()->getEntropyCodingSynchro() && (uiCol == uiTileLCUX) )
-#endif
       {
         // We'll sync if the TR is available.
@@ -913 +862 @@
         UInt uiMaxParts = 1<<(pcSlice->getSPS()->getMaxCUDepth()<<1);
         TComDataCU *pcCUTR = NULL;
-#if WPP_SIMPLIFICATION
         if ( pcCUUp && ((uiCUAddr%uiWidthInCU+1) < uiWidthInCU)  )
         {
           pcCUTR = rpcPic->getCU( uiCUAddr - uiWidthInCU + 1 );
         }
-#else
-        if ( pcCUUp && ((uiCUAddr%uiWidthInCU+pcSlice->getPPS()->getEntropyCodingSynchro()) < uiWidthInCU)  )
-        {
-          pcCUTR = rpcPic->getCU( uiCUAddr - uiWidthInCU + pcSlice->getPPS()->getEntropyCodingSynchro() );
-        }
-#endif
         if ( ((pcCUTR==NULL) || (pcCUTR->getSlice()==NULL) || 
              (pcCUTR->getSCUAddr()+uiMaxParts-1 < pcSlice->getSliceCurStartCUAddr()) ||
-#if !REMOVE_TILE_DEPENDENCE
-             (rpcPic->getPicSym()->getTileBoundaryIndependenceIdr() && (rpcPic->getPicSym()->getTileIdxMap( pcCUTR->getAddr() ) != rpcPic->getPicSym()->getTileIdxMap(uiCUAddr)))
-#else
              ((rpcPic->getPicSym()->getTileIdxMap( pcCUTR->getAddr() ) != rpcPic->getPicSym()->getTileIdxMap(uiCUAddr)))
-#endif
              )||
              ((pcCUTR==NULL) || (pcCUTR->getSlice()==NULL) || 
              (pcCUTR->getSCUAddr()+uiMaxParts-1 < pcSlice->getEntropySliceCurStartCUAddr()) ||
-#if !REMOVE_TILE_DEPENDENCE
-             (rpcPic->getPicSym()->getTileBoundaryIndependenceIdr() && (rpcPic->getPicSym()->getTileIdxMap( pcCUTR->getAddr() ) != rpcPic->getPicSym()->getTileIdxMap(uiCUAddr)))
-#else
              ((rpcPic->getPicSym()->getTileIdxMap( pcCUTR->getAddr() ) != rpcPic->getPicSym()->getTileIdxMap(uiCUAddr)))
-#endif
              )
            )
@@ -975 +909 @@
 #endif
     }
-#if !REMOVE_TILE_DEPENDENCE
-    if( (rpcPic->getPicSym()->getTileBoundaryIndependenceIdr()==0) && (rpcPic->getPicSym()->getNumColumnsMinus1()!=0) )
-    {
-      // Synchronize cabac probabilities with LCU among Tiles
-      if( (uiTileLCUX != 0) &&
-          (uiCUAddr == rpcPic->getPicSym()->getTComTile(rpcPic->getPicSym()->getTileIdxMap(uiCUAddr))->getFirstCUAddr()) )
-      { 
-        TComDataCU *pcCULeft = pcCU->getCULeft();
-        UInt uiMaxParts = 1<<(pcSlice->getSPS()->getMaxCUDepth()<<1);
-
-        if ( (true/*bEnforceSliceRestriction*/ &&
-              ((pcCULeft==NULL) || (pcCULeft->getSlice()==NULL) || 
-               ((pcCULeft->getSCUAddr()+uiMaxParts-1) < pcSlice->getSliceCurStartCUAddr()) 
-              )
-             )||
-             (true/*bEnforceEntropySliceRestriction*/ &&
-              ((pcCULeft==NULL) || (pcCULeft->getSlice()==NULL) || 
-               ((pcCULeft->getSCUAddr()+uiMaxParts-1) < pcSlice->getEntropySliceCurStartCUAddr())
-              )
-             )
-           )
-        {
-          // Left not available.
-        }
-        else
-        {
-          // Left is available, we use it.
-          ppppcRDSbacCoders[uiSubStrm][0][CI_CURR_BEST]->loadContexts( &m_pcBufferLowLatSbacCoders[uiTileCol-1] );
-          m_pppcRDSbacCoder[0][CI_CURR_BEST]->loadContexts( ppppcRDSbacCoders[uiSubStrm][0][CI_CURR_BEST] ); //this load is used to simplify the code
-        }
-      }
-    }
-#endif
     // if RD based on SBAC is used
     if( m_pcCfg->getUseSBACRD() )
@@ -1045 +946 @@
        
          //Store probabilties of second LCU in line into buffer
-#if WPP_SIMPLIFICATION
         if (pcSlice->getPPS()->getNumSubstreams() > 1 && uiCol == uiTileLCUX+1)
-#else
-        if (pcSlice->getPPS()->getEntropyCodingSynchro() && uiCol == uiTileLCUX+pcSlice->getPPS()->getEntropyCodingSynchro())
-#endif
         {
           m_pcBufferSbacCoders[uiTileCol].loadContexts(ppppcRDSbacCoders[uiSubStrm][0][CI_CURR_BEST]);
         }
       }
-#if !REMOVE_TILE_DEPENDENCE
-      if( (rpcPic->getPicSym()->getTileBoundaryIndependenceIdr()==0) && (rpcPic->getPicSym()->getNumColumnsMinus1()!=0) )
-      {
-         //Store probabilties for next tile
-        if( (uiLin == (rpcPic->getPicSym()->getTComTile(rpcPic->getPicSym()->getTileIdxMap(uiCUAddr))->getFirstCUAddr() / uiWidthInLCUs )) && 
-            (uiCol == rpcPic->getPicSym()->getTComTile(rpcPic->getPicSym()->getTileIdxMap(uiCUAddr))->getRightEdgePosInCU()) )
-        {
-          m_pcBufferLowLatSbacCoders[uiTileCol].loadContexts(ppppcRDSbacCoders[uiSubStrm][0][CI_CURR_BEST]);
-        }
-      }
-#endif
     }
     // other case: encodeCU is not called
@@ -1148 +1034 @@
   UInt uiWidthInLCUs  = rpcPic->getPicSym()->getFrameWidthInCU();
   UInt uiCol=0, uiLin=0, uiSubStrm=0;
-#if !REMOVE_TILE_DEPENDENCE
-  Int  iBreakDep      = 0;
-#endif
   UInt uiTileCol      = 0;
   UInt uiTileStartLCU = 0;
@@ -1166 +1049 @@
     if( m_pcCfg->getUseSBACRD() )
     {
-#if !REMOVE_TILE_DEPENDENCE
-      iBreakDep = rpcPic->getPicSym()->getTileBoundaryIndependenceIdr();
-#endif
       uiTileCol = rpcPic->getPicSym()->getTileIdxMap(uiCUAddr) % (rpcPic->getPicSym()->getNumColumnsMinus1()+1); // what column of tiles are we in?
       uiTileStartLCU = rpcPic->getPicSym()->getTComTile(rpcPic->getPicSym()->getTileIdxMap(uiCUAddr))->getFirstCUAddr();
@@ -1175 +1055 @@
       uiCol     = uiCUAddr % uiWidthInLCUs;
       uiLin     = uiCUAddr / uiWidthInLCUs;
-#if !REMOVE_TILE_DEPENDENCE
-#if WPP_SIMPLIFICATION
-      if (iBreakDep && pcSlice->getPPS()->getNumSubstreams() > 1)
-#else
-      if (iBreakDep && pcSlice->getPPS()->getEntropyCodingSynchro())
-#endif
-#else
-#if WPP_SIMPLIFICATION
       if (pcSlice->getPPS()->getNumSubstreams() > 1)
-#else
-      if (pcSlice->getPPS()->getEntropyCodingSynchro())
-#endif
-#endif
       {
         // independent tiles => substreams are "per tile".  iNumSubstreams has already been multiplied.
@@ -1203 +1071 @@
 
       // Synchronize cabac probabilities with upper-right LCU if it's available and we're at the start of a line.
-#if WPP_SIMPLIFICATION
       if (pcSlice->getPPS()->getNumSubstreams() > 1 && (uiCol == uiTileLCUX))
-#else
-      if (pcSlice->getPPS()->getEntropyCodingSynchro() && (uiCol == uiTileLCUX))
-#endif
       {
         // We'll sync if the TR is available.
@@ -1214 +1078 @@
         UInt uiMaxParts = 1<<(pcSlice->getSPS()->getMaxCUDepth()<<1);
         TComDataCU *pcCUTR = NULL;
-#if WPP_SIMPLIFICATION
         if ( pcCUUp && ((uiCUAddr%uiWidthInCU+1) < uiWidthInCU)  )
         {
           pcCUTR = rpcPic->getCU( uiCUAddr - uiWidthInCU + 1 );
         }
-#else
-        if ( pcCUUp && ((uiCUAddr%uiWidthInCU+pcSlice->getPPS()->getEntropyCodingSynchro()) < uiWidthInCU)  )
-        {
-          pcCUTR = rpcPic->getCU( uiCUAddr - uiWidthInCU + pcSlice->getPPS()->getEntropyCodingSynchro() );
-        }
-#endif
         if ( (true/*bEnforceSliceRestriction*/ &&
              ((pcCUTR==NULL) || (pcCUTR->getSlice()==NULL) || 
              (pcCUTR->getSCUAddr()+uiMaxParts-1 < pcSlice->getSliceCurStartCUAddr()) ||
-#if !REMOVE_TILE_DEPENDENCE
-             (rpcPic->getPicSym()->getTileBoundaryIndependenceIdr() && (rpcPic->getPicSym()->getTileIdxMap( pcCUTR->getAddr() ) != rpcPic->getPicSym()->getTileIdxMap(uiCUAddr)))
-#else
              ((rpcPic->getPicSym()->getTileIdxMap( pcCUTR->getAddr() ) != rpcPic->getPicSym()->getTileIdxMap(uiCUAddr)))
-#endif
              ))||
              (true/*bEnforceEntropySliceRestriction*/ &&
              ((pcCUTR==NULL) || (pcCUTR->getSlice()==NULL) || 
              (pcCUTR->getSCUAddr()+uiMaxParts-1 < pcSlice->getEntropySliceCurStartCUAddr()) ||
-#if !REMOVE_TILE_DEPENDENCE
-             (rpcPic->getPicSym()->getTileBoundaryIndependenceIdr() && (rpcPic->getPicSym()->getTileIdxMap( pcCUTR->getAddr() ) != rpcPic->getPicSym()->getTileIdxMap(uiCUAddr)))
-#else
              ((rpcPic->getPicSym()->getTileIdxMap( pcCUTR->getAddr() ) != rpcPic->getPicSym()->getTileIdxMap(uiCUAddr)))
-#endif
              ))
            )
@@ -1275 +1124 @@
         // When tiles are independent, we have "substreams per tile".  Each substream has already been terminated, and we no longer
         // have to perform it here.
-#if WPP_SIMPLIFICATION
         if (pcSlice->getPPS()->getNumSubstreams() > 1)
-#else
-        if (pcSlice->getPPS()->getEntropyCodingSynchro())
-#endif
         {
           ; // do nothing.
@@ -1329 +1174 @@
 
     TComDataCU*& pcCU = rpcPic->getCU( uiCUAddr );    
-#if !REMOVE_TILE_DEPENDENCE
-    if( (rpcPic->getPicSym()->getTileBoundaryIndependenceIdr()==0) && (rpcPic->getPicSym()->getNumColumnsMinus1()!=0) )
-    {    
-      // Synchronize cabac probabilities with LCU among Tiles
-      if( (uiTileLCUX != 0) &&
-          (uiCUAddr == rpcPic->getPicSym()->getTComTile(rpcPic->getPicSym()->getTileIdxMap(uiCUAddr))->getFirstCUAddr()) )
-      {
-        TComDataCU *pcCULeft = pcCU->getCULeft();
-        UInt uiMaxParts = 1<<(pcSlice->getSPS()->getMaxCUDepth()<<1);
-
-        if ( (true/*bEnforceSliceRestriction*/ &&
-              ((pcCULeft==NULL) || (pcCULeft->getSlice()==NULL) || 
-               ((pcCULeft->getSCUAddr()+uiMaxParts-1) < pcSlice->getSliceCurStartCUAddr()) 
-              )
-             )||
-             (true/*bEnforceEntropySliceRestriction*/ &&
-              ((pcCULeft==NULL) || (pcCULeft->getSlice()==NULL) || 
-               ((pcCULeft->getSCUAddr()+uiMaxParts-1) < pcSlice->getEntropySliceCurStartCUAddr())
-              )
-             )
-           )
-        {
-          // Left not available.
-        }
-        else
-        {
-          // Left is available, we use it.
-          pcSbacCoders[uiSubStrm].loadContexts( &m_pcBufferLowLatSbacCoders[uiTileCol-1] );
-          m_pcSbacCoder->loadContexts(&pcSbacCoders[uiSubStrm]);  //this load is used to simplify the code (avoid to change all the call to m_pcSbacCoder)
-        }
-      }
-    }
-#endif
-
-#if SAO_UNIT_INTERLEAVING
+
     if ( pcSlice->getSPS()->getUseSAO() && pcSlice->getAPS()->getSaoInterleavingFlag() && pcSlice->getSaoEnabledFlag() )
     {
@@ -1373 +1184 @@
       m_pcEntropyCoder->encodeSaoUnitInterleaving( rx, ry, pcSlice->getAPS()->getSaoParam(),pcCU, iCUAddrInSlice, iCUAddrUpInSlice, pcSlice->getSPS()->getLFCrossSliceBoundaryFlag());
     }
-#endif
 #if ENC_DEC_TRACE
     g_bJustDoIt = g_bEncDecTraceEnable;
@@ -1395 +1205 @@
 
        //Store probabilties of second LCU in line into buffer
-#if WPP_SIMPLIFICATION
       if (pcSlice->getPPS()->getNumSubstreams() > 1 && (uiCol == uiTileLCUX+1))
-#else
-      if (pcSlice->getPPS()->getEntropyCodingSynchro() && (uiCol == uiTileLCUX+pcSlice->getPPS()->getEntropyCodingSynchro()))
-#endif
       {
         m_pcBufferSbacCoders[uiTileCol].loadContexts( &pcSbacCoders[uiSubStrm] );
       }
     }
-#if !REMOVE_TILE_DEPENDENCE
-    if( (rpcPic->getPicSym()->getTileBoundaryIndependenceIdr()==0) && (rpcPic->getPicSym()->getNumColumnsMinus1()!=0) )
-    {
-      pcSbacCoders[uiSubStrm].load(m_pcSbacCoder);   //load back status of the entropy coder after encoding the LCU into relevant bitstream entropy coder
-       //Store probabilties for next tile
-      if( (uiLin == (rpcPic->getPicSym()->getTComTile(rpcPic->getPicSym()->getTileIdxMap(uiCUAddr))->getFirstCUAddr() / uiWidthInLCUs )) && 
-          (uiCol == rpcPic->getPicSym()->getTComTile(rpcPic->getPicSym()->getTileIdxMap(uiCUAddr))->getRightEdgePosInCU()) )
-      {
-        m_pcBufferLowLatSbacCoders[uiTileCol].loadContexts( &pcSbacCoders[uiSubStrm] );
-      }
-    }
-#endif
 
 #if OL_QTLIMIT_PREDCODING_B0068
@@ -1445 +1239 @@
   TComSlice* pcSlice = rpcPic->getSlice(getSliceIdx());
   UInt uiStartCUAddrSlice, uiBoundingCUAddrSlice;
-#if FIXED_NUMBER_OF_TILES_SLICE_MODE
   UInt tileIdxIncrement;
   UInt tileIdx;
@@ -1451 +1244 @@
   UInt tileHeightInLcu;
   UInt tileTotalCount;
-#endif
 
   uiStartCUAddrSlice        = pcSlice->getSliceCurStartCUAddr();
@@ -1469 +1261 @@
       uiBoundingCUAddrSlice    = pcSlice->getSliceCurEndCUAddr();
       break;
-#if FIXED_NUMBER_OF_TILES_SLICE_MODE
     case AD_HOC_SLICES_FIXED_NUMBER_OF_TILES_IN_SLICE:
       tileIdx                = rpcPic->getPicSym()->getTileIdxMap(
@@ -1489 +1280 @@
       uiBoundingCUAddrSlice    = ((uiStartCUAddrSlice + uiCUAddrIncrement) < uiNumberOfCUsInFrame*rpcPic->getNumPartInCU()) ? (uiStartCUAddrSlice + uiCUAddrIncrement) : uiNumberOfCUsInFrame*rpcPic->getNumPartInCU();
       break;
-#endif
     default:
       uiCUAddrIncrement        = rpcPic->getNumCUsInFrame();
@@ -1506 +1296 @@
       uiBoundingCUAddrSlice    = ((uiStartCUAddrSlice + uiCUAddrIncrement) < uiNumberOfCUsInFrame*rpcPic->getNumPartInCU()) ? (uiStartCUAddrSlice + uiCUAddrIncrement) : uiNumberOfCUsInFrame*rpcPic->getNumPartInCU();
       break;
-#if FIXED_NUMBER_OF_TILES_SLICE_MODE
     case AD_HOC_SLICES_FIXED_NUMBER_OF_TILES_IN_SLICE:
       tileIdx                = rpcPic->getPicSym()->getTileIdxMap(
@@ -1526 +1315 @@
       uiBoundingCUAddrSlice    = ((uiStartCUAddrSlice + uiCUAddrIncrement) < uiNumberOfCUsInFrame*rpcPic->getNumPartInCU()) ? (uiStartCUAddrSlice + uiCUAddrIncrement) : uiNumberOfCUsInFrame*rpcPic->getNumPartInCU();
       break;
-#endif
     default:
       uiCUAddrIncrement        = rpcPic->getNumCUsInFrame();
@@ -1535 +1323 @@
   }
 
-#if COMPLETE_SLICES_IN_TILE
   Bool tileBoundary = false;
   if ((m_pcCfg->getSliceMode() == AD_HOC_SLICES_FIXED_NUMBER_OF_LCU_IN_SLICE || m_pcCfg->getSliceMode() == AD_HOC_SLICES_FIXED_NUMBER_OF_BYTES_IN_SLICE) && 
@@ -1558 +1345 @@
     }
   }
-#endif
 
   // Entropy slice
@@ -1663 +1449 @@
       || (m_pcCfg->getSliceMode()==0 && m_pcCfg->getEntropySliceMode()==SHARP_FIXED_NUMBER_OF_LCU_IN_ENTROPY_SLICE)
       || (m_pcCfg->getSliceMode()==AD_HOC_SLICES_FIXED_NUMBER_OF_LCU_IN_SLICE && m_pcCfg->getEntropySliceMode()==0) 
-#if FIXED_NUMBER_OF_TILES_SLICE_MODE
       || (m_pcCfg->getSliceMode()==AD_HOC_SLICES_FIXED_NUMBER_OF_TILES_IN_SLICE && m_pcCfg->getEntropySliceMode()==SHARP_FIXED_NUMBER_OF_LCU_IN_ENTROPY_SLICE)
       || (m_pcCfg->getSliceMode()==AD_HOC_SLICES_FIXED_NUMBER_OF_TILES_IN_SLICE && m_pcCfg->getEntropySliceMode()==0) 
-#endif
-#if COMPLETE_SLICES_IN_TILE
       || tileBoundary
-#endif
 )
     {

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

@@ -103 +103 @@
   if (m_bUseSAO)
   {
-#if SAO_UNIT_INTERLEAVING
     m_cEncSAO.setSaoInterleavingFlag(getSaoInterleavingFlag());
     m_cEncSAO.setMaxNumOffsetsPerPic(getMaxNumOffsetsPerPic());
-#endif
     m_cEncSAO.create( getSourceWidth(), getSourceHeight(), g_uiMaxCUWidth, g_uiMaxCUHeight, g_uiMaxCUDepth );
     m_cEncSAO.createEncBuffer();
@@ -128 +126 @@
   if(m_bUseALF)
   {
-#if LCU_SYNTAX_ALF
     m_cAdaptiveLoopFilter.setAlfCoefInSlice(m_bALFParamInSlice);
     m_cAdaptiveLoopFilter.createAlfGlobalBuffers();
-#else
-    m_cAdaptiveLoopFilter.setGOPSize( getGOPSize() );
-    m_cAdaptiveLoopFilter.createAlfGlobalBuffers(m_iALFEncodePassReduction);
-#endif
   }
 
@@ -333 +326 @@
   // initialize PPS
   m_cPPS.setSPS(&m_cSPS);
-#if RPS_IN_SPS
   m_cSPS.setRPSList(&m_RPSList);
-#else
-  m_cPPS.setRPSList(&m_RPSList);
-#endif
   xInitPPS();
   xInitRPS();
@@ -384 +373 @@
     m_cAdaptiveLoopFilter.setALFEncodePassReduction( m_iALFEncodePassReduction );
     m_cAdaptiveLoopFilter.setALFMaxNumberFilters( m_iALFMaxNumberFilters );
-#if LCU_SYNTAX_ALF
     m_cAdaptiveLoopFilter.initPicQuadTreePartition(m_bALFPicBasedEncode );   
-#endif
   }
 
@@ -553 +540 @@
   TComSlice::sortPicList(m_cListPic);
   
-#if H0567_DPB_PARAMETERS_PER_TEMPORAL_LAYER
   if (m_cListPic.size() >= (UInt)(m_iGOPSize + getMaxDecPicBuffering(MAX_TLAYER-1) + 2) )
-#else
-  if (m_cListPic.size() >= (UInt)(m_iGOPSize + getMaxNumberOfReferencePictures() + 2) )
-#endif
   {
     TComList<TComPic*>::iterator iterPic  = m_cListPic.begin();
@@ -611 +594 @@
   m_cSPS.setPicWidthInLumaSamples         ( m_iSourceWidth      );
   m_cSPS.setPicHeightInLumaSamples        ( m_iSourceHeight     );
-#if PIC_CROPPING
   m_cSPS.setPicCroppingFlag( m_croppingMode!= 0 );
   if (m_croppingMode != 0)
@@ -620 +602 @@
     m_cSPS.setPicCropBottomOffset( m_cropBottom );
   }
-#else
-  m_cSPS.setPad           ( m_aiPad             );
-#endif
   m_cSPS.setMaxCUWidth    ( g_uiMaxCUWidth      );
   m_cSPS.setMaxCUHeight   ( g_uiMaxCUHeight     );
@@ -629 +608 @@
   m_cSPS.setMaxTrDepth    ( 1                   );
   
-#if !H0567_DPB_PARAMETERS_PER_TEMPORAL_LAYER
-  m_cSPS.setMaxNumberOfReferencePictures(m_maxNumberOfReferencePictures);
-  m_cSPS.setNumReorderFrames(m_numReorderFrames);
-#endif
   m_cSPS.setPCMLog2MinSize (m_uiPCMLog2MinSize);
   m_cSPS.setUsePCM        ( m_usePCM           );
@@ -638 +613 @@
 
   m_cSPS.setUseALF        ( m_bUseALF           );
-#if LCU_SYNTAX_ALF
   if(m_bUseALF)
   {
     m_cSPS.setUseALFCoefInSlice(m_bALFParamInSlice);
   }
-#endif
   
 #if RWTH_SDC_DLT_B0036
@@ -657 +630 @@
   m_cSPS.setUseLossless   ( m_useLossless  );
 #endif
-#if !PIC_CROPPING
-  m_cSPS.setUsePAD        ( m_bUsePAD           );
-#endif
   m_cSPS.setUseLMChroma   ( m_bUseLMChroma           );  
   
@@ -696 +666 @@
   m_cSPS.setBitDepth    ( g_uiBitDepth        );
   m_cSPS.setBitIncrement( g_uiBitIncrement    );
-#if H0736_AVC_STYLE_QP_RANGE
   m_cSPS.setQpBDOffsetY ( (Int)(6*(g_uiBitDepth + g_uiBitIncrement - 8)) );
   m_cSPS.setQpBDOffsetC ( (Int)(6*(g_uiBitDepth + g_uiBitIncrement - 8)) );
-#endif
 
   m_cSPS.setLFCrossSliceBoundaryFlag( m_bLFCrossSliceBoundaryFlag );
   m_cSPS.setUseSAO( m_bUseSAO );
 
-#if !H0566_TLA
-  if ( m_bTLayering )
-  {
-    Int iMaxTLayers = 1;
-    for ( i = 1; ; i++)
-    {
-      iMaxTLayers = i;
-      if ( (m_iGOPSize >> i) == 0 ) 
-      {
-        break;
-      }
-    }
-  
-    m_cSPS.setMaxTLayers( (UInt)iMaxTLayers );
-
-    Bool bTemporalIdNestingFlag = true;
-    for ( i = 0; i < m_cSPS.getMaxTLayers()-1; i++ )
-    {
-      if ( !m_abTLayerSwitchingFlag[i] )
-      {
-        bTemporalIdNestingFlag = false;
-        break;
-      }
-    }
-
-    m_cSPS.setTemporalIdNestingFlag( bTemporalIdNestingFlag );
-  }
-  else
-  {
-    m_cSPS.setMaxTLayers( 1 );
-    m_cSPS.setTemporalIdNestingFlag( false );
-  }
-#else
   m_cSPS.setMaxTLayers( m_maxTempLayer );
   m_cSPS.setTemporalIdNestingFlag( false );
-#endif
-#if H0567_DPB_PARAMETERS_PER_TEMPORAL_LAYER
   for ( i = 0; i < m_cSPS.getMaxTLayers(); i++ )
   {
@@ -746 +679 @@
     m_cSPS.setNumReorderPics(m_numReorderPics[i], i);
   }
-#endif
   m_cSPS.setPCMBitDepthLuma (g_uiPCMBitDepthLuma);
   m_cSPS.setPCMBitDepthChroma (g_uiPCMBitDepthChroma);
@@ -753 +685 @@
   m_cSPS.setLFCrossTileBoundaryFlag( m_bLFCrossTileBoundaryFlag );
   m_cSPS.setUniformSpacingIdr( m_iUniformSpacingIdr );
-#if !REMOVE_TILE_DEPENDENCE
-  m_cSPS.setTileBoundaryIndependenceIdr( m_iTileBoundaryIndependenceIdr );
-#endif
   m_cSPS.setNumColumnsMinus1( m_iNumColumnsMinus1 );
   m_cSPS.setNumRowsMinus1( m_iNumRowsMinus1 );
@@ -827 +756 @@
   m_cPPS.setConstrainedIntraPred( m_bUseConstrainedIntraPred );
   m_cPPS.setSliceGranularity(m_iSliceGranularity);
-#if !H0566_TLA
-  if ( m_cSPS.getTemporalIdNestingFlag() ) 
-  {
-    m_cPPS.setNumTLayerSwitchingFlags( 0 );
-    for ( UInt i = 0; i < m_cSPS.getMaxTLayers() - 1; i++ )
-    {
-      m_cPPS.setTLayerSwitchingFlag( i, true );
-    }
-  }
-  else
-  {
-    m_cPPS.setNumTLayerSwitchingFlags( m_cSPS.getMaxTLayers() - 1 );
-    for ( UInt i = 0; i < m_cPPS.getNumTLayerSwitchingFlags(); i++ )
-    {
-      m_cPPS.setTLayerSwitchingFlag( i, m_abTLayerSwitchingFlag[i] );
-    }
-  }   
-#endif
   Bool bUseDQP = (getMaxCuDQPDepth() > 0)? true : false;
 
 #if LOSSLESS_CODING
-#if H0736_AVC_STYLE_QP_RANGE
   Int lowestQP = - m_cSPS.getQpBDOffsetY();
-#else
-  Int lowestQP = 0;
-#endif
 
   if(getUseLossless())
@@ -903 +810 @@
 
   m_cPPS.setEntropyCodingMode( 1 ); // In the PPS now, but also remains in slice header!
-#if !WPP_SIMPLIFICATION
-  m_cPPS.setEntropyCodingSynchro(m_iWaveFrontSynchro);
-  m_cPPS.setCabacIstateReset(m_iWaveFrontFlush != 0);
-#endif
   m_cPPS.setNumSubstreams(m_iWaveFrontSubstreams);
   m_cPPS.setUseWP( m_bUseWeightPred );
   m_cPPS.setWPBiPredIdc( m_uiBiPredIdc );
   m_cPPS.setEnableTMVPFlag( m_bEnableTMVP );
-#if H0388
   m_cPPS.setOutputFlagPresentFlag( false );
-#endif
-#if MULTIBITS_DATA_HIDING
   m_cPPS.setSignHideFlag(getSignHideFlag());
   m_cPPS.setTSIG(getTSIG());
-#endif
-#if DBL_CONTROL
   m_cPPS.setDeblockingFilterControlPresent (m_DeblockingFilterControlPresent );
-#endif
-#if PARALLEL_MERGE
   m_cPPS.setLog2ParallelMergeLevelMinus2      (LOG2_PARALLEL_MERGE_LEVEL_MINUS2);
-#endif
 #if CABAC_INIT_FLAG
   m_cPPS.setCabacInitPresentFlag(CABAC_INIT_PRESENT_FLAG);
@@ -1102 +997 @@
     m_cPPS.setColumnRowInfoPresent( m_iColumnRowInfoPresent );
     m_cPPS.setUniformSpacingIdr( m_iUniformSpacingIdr );
-#if !REMOVE_TILE_DEPENDENCE
-    m_cPPS.setTileBoundaryIndependenceIdr( m_iTileBoundaryIndependenceIdr );
-#endif
     m_cPPS.setNumColumnsMinus1( m_iNumColumnsMinus1 );
     m_cPPS.setNumRowsMinus1( m_iNumRowsMinus1 );

branches/HTM-5.1-dev0/source/Lib/TLibExtractor/TExtrTop.cpp

@@ -77 +77 @@
   {
      TComSPS cSPS;
-#if RPS_IN_SPS
      TComRPSList cRPS;
      cSPS.setRPSList( &cRPS );
-#endif
 #if HHI_MPI || OL_QTLIMIT_PREDCODING_B0068
 #if VIDYO_VPS_INTEGRATION

branches/HTM-5.1-dev0/source/Lib/TLibVideoIO/TVideoIOYuv.cpp

@@ -413 +413 @@
  * @return true for success, false in case of error
  */
-#if PIC_CROPPING
 Bool TVideoIOYuv::write( TComPicYuv* pPicYuv, Int cropLeft, Int cropRight, Int cropTop, Int cropBottom )
-#else
-bool TVideoIOYuv::write( TComPicYuv* pPicYuv, Int aiPad[2] )
-#endif
 {
   // compute actual YUV frame size excluding padding size
   Int   iStride = pPicYuv->getStride();
-#if PIC_CROPPING
   UInt  width  = pPicYuv->getWidth()  - cropLeft - cropRight;
   UInt  height = pPicYuv->getHeight() - cropTop  - cropBottom;
-#else
-  unsigned int width  = pPicYuv->getWidth() - aiPad[0];
-  unsigned int height = pPicYuv->getHeight() - aiPad[1];
-#endif
   bool is16bit = m_fileBitdepth > 8;
   TComPicYuv *dstPicYuv = NULL;
@@ -456 +447 @@
     dstPicYuv = pPicYuv;
   }
-#if PIC_CROPPING
   // location of upper left pel in a plane
   Int planeOffset = 0; //cropLeft + cropTop * iStride;
   
   if (! writePlane(m_cHandle, dstPicYuv->getLumaAddr() + planeOffset, is16bit, iStride, width, height))
-#else
-  if (! writePlane(m_cHandle, dstPicYuv->getLumaAddr(), is16bit, iStride, width, height))
-#endif
   {
     retval=false; 
@@ -472 +459 @@
   height >>= 1;
   iStride >>= 1;
-#if PIC_CROPPING
   cropLeft >>= 1;
   cropRight >>= 1;
@@ -479 +465 @@
 
   if (! writePlane(m_cHandle, dstPicYuv->getCbAddr() + planeOffset, is16bit, iStride, width, height))
-#else
-  if (! writePlane(m_cHandle, dstPicYuv->getCbAddr(), is16bit, iStride, width, height))
-#endif
   {
     retval=false; 
     goto exit;
   }
-#if PIC_CROPPING
   if (! writePlane(m_cHandle, dstPicYuv->getCrAddr() + planeOffset, is16bit, iStride, width, height))
-#else
-  if (! writePlane(m_cHandle, dstPicYuv->getCrAddr(), is16bit, iStride, width, height))
-#endif
   {
     retval=false; 

branches/HTM-5.1-dev0/source/Lib/TLibVideoIO/TVideoIOYuv.h

@@ -69 +69 @@
   
   bool  read  ( TComPicYuv*   pPicYuv, Int aiPad[2], Bool bRewind = false );     ///< read  one YUV frame with padding parameter
-#if PIC_CROPPING
   Bool  write( TComPicYuv*    pPicYuv, Int cropLeft=0, Int cropRight=0, Int cropTop=0, Int cropBottom=0 );
-#else
-  bool  write ( TComPicYuv*   pPicYuv, Int aiPad[2] );     ///< write one YUV frame with padding parameter
-#endif
   
   bool  isEof ();                                           ///< check for end-of-file