Index: branches/SHM-dev/cfg/encoder_intra_he10.cfg
===================================================================
--- branches/SHM-dev/cfg/encoder_intra_he10.cfg	(revision 991)
+++ 	(revision )
@@ -1,100 +1,0 @@
-#======== File I/O =====================
-BitstreamFile                 : str.bin
-#ReconFile                     : rec.yuv
-
-#======== Unit definition ================
-MaxCUWidth                    : 64          # Maximum coding unit width in pixel
-MaxCUHeight                   : 64          # Maximum coding unit height in pixel
-MaxPartitionDepth             : 4           # Maximum coding unit depth
-QuadtreeTULog2MaxSize         : 5           # Log2 of maximum transform size for
-                                            # quadtree-based TU coding (2...6)
-QuadtreeTULog2MinSize         : 2           # Log2 of minimum transform size for
-                                            # quadtree-based TU coding (2...6)
-QuadtreeTUMaxDepthInter       : 3
-QuadtreeTUMaxDepthIntra       : 3
-
-#======== Coding Structure =============
-#IntraPeriod                   : 1           # Period of I-Frame ( -1 = only first)
-DecodingRefreshType           : 0           # Random Accesss 0:none, 1:CDR, 2:IDR
-GOPSize                       : 1           # GOP Size (number of B slice = GOPSize-1)
-#        Type POC QPoffset QPfactor temporal_id #ref_pics_active #ref_pics reference pictures 
-Frame1:  B    1   0        1        0           4                0         
-
-#=========== Motion Search =============
-FastSearch                    : 1           # 0:Full search  1:EPZS
-SearchRange                   : 64          # (0: Search range is a Full frame)
-HadamardME                    : 1           # Use of hadamard measure for fractional ME
-FEN                           : 1           # Fast encoder decision
-FDM                           : 1           # Fast Decision for Merge RD cost
-
-#======== Quantization =============
-#QP                            : 32          # Quantization parameter(0-51)
-MaxDeltaQP                    : 0           # CU-based multi-QP optimization
-MaxCuDQPDepth                 : 0           # Max depth of a minimum CuDQP for sub-LCU-level delta QP
-DeltaQpRD                     : 0           # Slice-based multi-QP optimization
-RDOQ                          : 1           # RDOQ
-
-#=========== Deblock Filter ============
-DeblockingFilterControlPresent: 0           # Dbl control params present (0=not present, 1=present)
-LoopFilterOffsetInPPS         : 0           # Dbl params in PPS or SliceHeader (0=SliceHeader, 1=PPS)
-LoopFilterDisable             : 0           # Disable deblocking filter in slice header (0=Filter, 1=No Filter)
-LoopFilterBetaOffset_div2     : 0           # Range: -13 ~ 13
-LoopFilterTcOffset_div2       : 0           # Range: -13 ~ 13
-
-#=========== Misc. ============
-#InternalBitDepth             : 10          # codec operating bit-depth
-
-#=========== Coding Tools =================
-SAO                           : 1           # Sample adaptive offset  (0: OFF, 1: ON)
-AMP                           : 1           # Asymmetric motion partitions (0: OFF, 1: ON)
-TransformSkip                 : 1           # Transform skipping (0: OFF, 1: ON)
-TransformSkipFast             : 1           # Fast Transform skipping (0: OFF, 1: ON)
-SAOLcuBoundary                : 0           # SAOLcuBoundary using non-deblocked pixels (0: OFF, 1: ON)
-
-#============ Slices ================
-SliceMode                : 0                # 0: Disable all slice options.
-                                            # 1: Enforce maximum number of LCU in an slice,
-                                            # 2: Enforce maximum number of bytes in an 'slice'
-                                            # 3: Enforce maximum number of tiles in a slice
-SliceArgument            : 1500             # Argument for 'SliceMode'.
-                                            # If SliceMode==1 it represents max. SliceGranularity-sized blocks per slice.
-                                            # If SliceMode==2 it represents max. bytes per slice.
-                                            # If SliceMode==3 it represents max. tiles per slice.
-
-LFCrossSliceBoundaryFlag : 1                # In-loop filtering, including ALF and DB, is across or not across slice boundary.
-                                            # 0:not across, 1: across
-
-#============ PCM ================
-PCMEnabledFlag                      : 0                # 0: No PCM mode
-PCMLog2MaxSize                      : 5                # Log2 of maximum PCM block size.
-PCMLog2MinSize                      : 3                # Log2 of minimum PCM block size.
-PCMInputBitDepthFlag                : 1                # 0: PCM bit-depth is internal bit-depth. 1: PCM bit-depth is input bit-depth.
-PCMFilterDisableFlag                : 0                # 0: Enable loop filtering on I_PCM samples. 1: Disable loop filtering on I_PCM samples.
-
-#============ Tiles ================
-UniformSpacingIdc                   : 0                # 0: the column boundaries are indicated by ColumnWidth array, the row boundaries are indicated by RowHeight array
-                                                       # 1: the column and row boundaries are distributed uniformly
-NumTileColumnsMinus1                : 0                # Number of columns in a picture minus 1
-ColumnWidthArray                    : 2 3              # Array containing ColumnWidth values in units of LCU (from left to right in picture)   
-NumTileRowsMinus1                   : 0                # Number of rows in a picture minus 1
-RowHeightArray                      : 2                # Array containing RowHeight values in units of LCU (from top to bottom in picture)
-
-LFCrossTileBoundaryFlag           : 1                  # In-loop filtering is across or not across tile boundary.
-                                                       # 0:not across, 1: across 
-
-#============ WaveFront ================
-#WaveFrontSynchro                    : 0                # 0:  No WaveFront synchronisation (WaveFrontSubstreams must be 1 in this case).
-                                                       # >0: WaveFront synchronises with the LCU above and to the right by this many LCUs.
-
-#=========== Quantization Matrix =================
-ScalingList                   : 0                      # ScalingList 0 : off, 1 : default, 2 : file read
-ScalingListFile               : scaling_list.txt       # Scaling List file name. If file is not exist, use Default Matrix.
-
-#============ Lossless ================
-LosslessCuEnabled                   : 0                # 1: Set "qpprime_y_zero_transquant_bypass_flag=1" and enable the lossless mode as well as the RD-based mode selection process.
-TransquantBypassEnableFlag: 0  # Value of PPS flag.
-CUTransquantBypassFlagValue: 0 # Constant lossless-value signaling per CU, if TransquantBypassEnableFlag is 1.
-
-                                                        
-### DO NOT ADD ANYTHING BELOW THIS LINE ###
-### DO NOT DELETE THE EMPTY LINE BELOW ###
Index: branches/SHM-dev/cfg/encoder_intra_scalable.cfg
===================================================================
--- branches/SHM-dev/cfg/encoder_intra_scalable.cfg	(revision 1029)
+++ branches/SHM-dev/cfg/encoder_intra_scalable.cfg	(revision 1029)
@@ -0,0 +1,107 @@
+#======== File I/O =====================
+BitstreamFile                 : str.bin
+#ReconFile                     : rec.yuv
+
+#======== Profile ================
+NumProfileTierLevel           : 3
+Profile0                      : main                # Profile for BL (NOTE01: this profile applies to whole layers but only BL is outputted)
+                                                    #                (NOTE02: this profile has no effect when NonHEVCBase is set to 1)
+Profile1                      : main                # Profile for BL (NOTE01: this profile applies to HEVC BL only)
+                                                    #                (NOTE02: When NonHEVCBase is set to 1, this profile & associated level should be updated appropriately)
+Profile2                      : scalable-main       # Scalable profile
+
+#======== Unit definition ================
+MaxCUWidth                    : 64          # Maximum coding unit width in pixel
+MaxCUHeight                   : 64          # Maximum coding unit height in pixel
+MaxPartitionDepth             : 4           # Maximum coding unit depth
+QuadtreeTULog2MaxSize         : 5           # Log2 of maximum transform size for
+                                            # quadtree-based TU coding (2...6)
+QuadtreeTULog2MinSize         : 2           # Log2 of minimum transform size for
+                                            # quadtree-based TU coding (2...6)
+QuadtreeTUMaxDepthInter       : 3
+QuadtreeTUMaxDepthIntra       : 3
+
+#======== Coding Structure =============
+#IntraPeriod                   : 1           # Period of I-Frame ( -1 = only first)
+DecodingRefreshType           : 0           # Random Accesss 0:none, 1:CRA, 2:IDR, 3:Recovery Point SEI
+GOPSize                       : 1           # GOP Size (number of B slice = GOPSize-1)
+#        Type POC QPoffset QPfactor tcOffsetDiv2 betaOffsetDiv2  temporal_id #ref_pics_active #ref_pics reference pictures 
+
+#=========== Motion Search =============
+FastSearch                    : 1           # 0:Full search  1:TZ search
+SearchRange                   : 64          # (0: Search range is a Full frame)
+HadamardME                    : 1           # Use of hadamard measure for fractional ME
+FEN                           : 1           # Fast encoder decision
+FDM                           : 1           # Fast Decision for Merge RD cost
+
+#======== Quantization =============
+#QP                            : 32          # Quantization parameter(0-51)
+MaxDeltaQP                    : 0           # CU-based multi-QP optimization
+MaxCuDQPDepth                 : 0           # Max depth of a minimum CuDQP for sub-LCU-level delta QP
+DeltaQpRD                     : 0           # Slice-based multi-QP optimization
+RDOQ                          : 1           # RDOQ
+RDOQTS                        : 1           # RDOQ for transform skip
+
+#=========== Deblock Filter ============
+DeblockingFilterControlPresent: 0           # Dbl control params present (0=not present, 1=present)
+LoopFilterOffsetInPPS         : 0           # Dbl params: 0=varying params in SliceHeader, param = base_param + GOP_offset_param; 1=constant params in PPS, param = base_param)
+LoopFilterDisable             : 0           # Disable deblocking filter (0=Filter, 1=No Filter)
+LoopFilterBetaOffset_div2     : 0           # base_param: -6 ~ 6
+LoopFilterTcOffset_div2       : 0           # base_param: -6 ~ 6
+DeblockingFilterMetric        : 0           # blockiness metric (automatically configures deblocking parameters in bitstream)
+
+#=========== Misc. ============
+#InternalBitDepth             : 8           # codec operating bit-depth
+
+#=========== Coding Tools =================
+SAO                           : 1           # Sample adaptive offset  (0: OFF, 1: ON)
+AMP                           : 1           # Asymmetric motion partitions (0: OFF, 1: ON)
+TransformSkip                 : 1           # Transform skipping (0: OFF, 1: ON)
+TransformSkipFast             : 1           # Fast Transform skipping (0: OFF, 1: ON)
+SAOLcuBoundary                : 0           # SAOLcuBoundary using non-deblocked pixels (0: OFF, 1: ON)
+
+#============ Slices ================
+SliceMode                : 0                # 0: Disable all slice options.
+                                            # 1: Enforce maximum number of LCU in an slice,
+                                            # 2: Enforce maximum number of bytes in an 'slice'
+                                            # 3: Enforce maximum number of tiles in a slice
+SliceArgument            : 1500             # Argument for 'SliceMode'.
+                                            # If SliceMode==1 it represents max. SliceGranularity-sized blocks per slice.
+                                            # If SliceMode==2 it represents max. bytes per slice.
+                                            # If SliceMode==3 it represents max. tiles per slice.
+
+LFCrossSliceBoundaryFlag : 1                # In-loop filtering, including ALF and DB, is across or not across slice boundary.
+                                            # 0:not across, 1: across
+
+#============ PCM ================
+PCMEnabledFlag                      : 0                # 0: No PCM mode
+PCMLog2MaxSize                      : 5                # Log2 of maximum PCM block size.
+PCMLog2MinSize                      : 3                # Log2 of minimum PCM block size.
+PCMInputBitDepthFlag                : 1                # 0: PCM bit-depth is internal bit-depth. 1: PCM bit-depth is input bit-depth.
+PCMFilterDisableFlag                : 0                # 0: Enable loop filtering on I_PCM samples. 1: Disable loop filtering on I_PCM samples.
+
+#============ Tiles ================
+TileUniformSpacing                  : 0                # 0: the column boundaries are indicated by TileColumnWidth array, the row boundaries are indicated by TileRowHeight array
+                                                       # 1: the column and row boundaries are distributed uniformly
+NumTileColumnsMinus1                : 0                # Number of tile columns in a picture minus 1
+TileColumnWidthArray                : 2 3              # Array containing tile column width values in units of CTU (from left to right in picture)   
+NumTileRowsMinus1                   : 0                # Number of tile rows in a picture minus 1
+TileRowHeightArray                  : 2                # Array containing tile row height values in units of CTU (from top to bottom in picture)
+
+LFCrossTileBoundaryFlag             : 1                # In-loop filtering is across or not across tile boundary.
+                                                       # 0:not across, 1: across 
+
+#============ WaveFront ================
+#WaveFrontSynchro                    : 0                # 0:  No WaveFront synchronisation (WaveFrontSubstreams must be 1 in this case).
+                                                       # >0: WaveFront synchronises with the LCU above and to the right by this many LCUs.
+
+#=========== Quantization Matrix =================
+ScalingList                   : 0                      # ScalingList 0 : off, 1 : default, 2 : file read
+ScalingListFile               : scaling_list.txt       # Scaling List file name. If file is not exist, use Default Matrix.
+
+#============ Lossless ================
+TransquantBypassEnableFlag : 0                         # Value of PPS flag.
+CUTransquantBypassFlagForce: 0                         # Force transquant bypass mode, when transquant_bypass_enable_flag is enabled
+
+### DO NOT ADD ANYTHING BELOW THIS LINE ###
+### DO NOT DELETE THE EMPTY LINE BELOW ###
Index: branches/SHM-dev/cfg/encoder_intra_scalable10.cfg
===================================================================
--- branches/SHM-dev/cfg/encoder_intra_scalable10.cfg	(revision 1029)
+++ branches/SHM-dev/cfg/encoder_intra_scalable10.cfg	(revision 1029)
@@ -0,0 +1,106 @@
+#======== File I/O =====================
+BitstreamFile                 : str.bin
+
+#======== Profile ================
+NumProfileTierLevel           : 3
+Profile0                      : main10                # Profile for BL (NOTE01: this profile applies to whole layers but only BL is outputted)
+                                                      #                (NOTE02: this profile has no effect when NonHEVCBase is set to 1)
+Profile1                      : main10                # Profile for BL (NOTE01: this profile applies to HEVC BL only)
+                                                      #                (NOTE02: When NonHEVCBase is set to 1, this profile & associated level should be updated appropriately)
+Profile2                      : scalable-main10       # Scalable profile
+
+#======== Unit definition ================
+MaxCUWidth                    : 64          # Maximum coding unit width in pixel
+MaxCUHeight                   : 64          # Maximum coding unit height in pixel
+MaxPartitionDepth             : 4           # Maximum coding unit depth
+QuadtreeTULog2MaxSize         : 5           # Log2 of maximum transform size for
+                                            # quadtree-based TU coding (2...6)
+QuadtreeTULog2MinSize         : 2           # Log2 of minimum transform size for
+                                            # quadtree-based TU coding (2...6)
+QuadtreeTUMaxDepthInter       : 3
+QuadtreeTUMaxDepthIntra       : 3
+
+#======== Coding Structure =============
+#IntraPeriod                   : 1           # Period of I-Frame ( -1 = only first)
+DecodingRefreshType           : 0           # Random Accesss 0:none, 1:CRA, 2:IDR, 3:Recovery Point SEI
+GOPSize                       : 1           # GOP Size (number of B slice = GOPSize-1)
+#        Type POC QPoffset QPfactor tcOffsetDiv2 betaOffsetDiv2  temporal_id #ref_pics_active #ref_pics reference pictures  
+
+#=========== Motion Search =============
+FastSearch                    : 1           # 0:Full search  1:TZ search
+SearchRange                   : 64          # (0: Search range is a Full frame)
+HadamardME                    : 1           # Use of hadamard measure for fractional ME
+FEN                           : 1           # Fast encoder decision
+FDM                           : 1           # Fast Decision for Merge RD cost
+
+#======== Quantization =============
+#QP                            : 32          # Quantization parameter(0-51)
+MaxDeltaQP                    : 0           # CU-based multi-QP optimization
+MaxCuDQPDepth                 : 0           # Max depth of a minimum CuDQP for sub-LCU-level delta QP
+DeltaQpRD                     : 0           # Slice-based multi-QP optimization
+RDOQ                          : 1           # RDOQ
+RDOQTS                        : 1           # RDOQ for transform skip
+
+#=========== Deblock Filter ============
+DeblockingFilterControlPresent: 0           # Dbl control params present (0=not present, 1=present)
+LoopFilterOffsetInPPS         : 0           # Dbl params: 0=varying params in SliceHeader, param = base_param + GOP_offset_param; 1=constant params in PPS, param = base_param)
+LoopFilterDisable             : 0           # Disable deblocking filter (0=Filter, 1=No Filter)
+LoopFilterBetaOffset_div2     : 0           # base_param: -6 ~ 6
+LoopFilterTcOffset_div2       : 0           # base_param: -6 ~ 6
+DeblockingFilterMetric        : 0           # blockiness metric (automatically configures deblocking parameters in bitstream)
+
+#=========== Misc. ============
+#InternalBitDepth             : 10          # codec operating bit-depth
+
+#=========== Coding Tools =================
+SAO                           : 1           # Sample adaptive offset  (0: OFF, 1: ON)
+AMP                           : 1           # Asymmetric motion partitions (0: OFF, 1: ON)
+TransformSkip                 : 1           # Transform skipping (0: OFF, 1: ON)
+TransformSkipFast             : 1           # Fast Transform skipping (0: OFF, 1: ON)
+SAOLcuBoundary                : 0           # SAOLcuBoundary using non-deblocked pixels (0: OFF, 1: ON)
+
+#============ Slices ================
+SliceMode                : 0                # 0: Disable all slice options.
+                                            # 1: Enforce maximum number of LCU in an slice,
+                                            # 2: Enforce maximum number of bytes in an 'slice'
+                                            # 3: Enforce maximum number of tiles in a slice
+SliceArgument            : 1500             # Argument for 'SliceMode'.
+                                            # If SliceMode==1 it represents max. SliceGranularity-sized blocks per slice.
+                                            # If SliceMode==2 it represents max. bytes per slice.
+                                            # If SliceMode==3 it represents max. tiles per slice.
+
+LFCrossSliceBoundaryFlag : 1                # In-loop filtering, including ALF and DB, is across or not across slice boundary.
+                                            # 0:not across, 1: across
+
+#============ PCM ================
+PCMEnabledFlag                      : 0                # 0: No PCM mode
+PCMLog2MaxSize                      : 5                # Log2 of maximum PCM block size.
+PCMLog2MinSize                      : 3                # Log2 of minimum PCM block size.
+PCMInputBitDepthFlag                : 1                # 0: PCM bit-depth is internal bit-depth. 1: PCM bit-depth is input bit-depth.
+PCMFilterDisableFlag                : 0                # 0: Enable loop filtering on I_PCM samples. 1: Disable loop filtering on I_PCM samples.
+
+#============ Tiles ================
+TileUniformSpacing                  : 0                # 0: the column boundaries are indicated by TileColumnWidth array, the row boundaries are indicated by TileRowHeight array
+                                                       # 1: the column and row boundaries are distributed uniformly
+NumTileColumnsMinus1                : 0                # Number of tile columns in a picture minus 1
+TileColumnWidthArray                : 2 3              # Array containing tile column width values in units of CTU (from left to right in picture)   
+NumTileRowsMinus1                   : 0                # Number of tile rows in a picture minus 1
+TileRowHeightArray                  : 2                # Array containing tile row height values in units of CTU (from top to bottom in picture)
+
+LFCrossTileBoundaryFlag             : 1                # In-loop filtering is across or not across tile boundary.
+                                                       # 0:not across, 1: across 
+
+#============ WaveFront ================
+#WaveFrontSynchro                    : 0                # 0:  No WaveFront synchronisation (WaveFrontSubstreams must be 1 in this case).
+                                                       # >0: WaveFront synchronises with the LCU above and to the right by this many LCUs.
+
+#=========== Quantization Matrix =================
+ScalingList                   : 0                      # ScalingList 0 : off, 1 : default, 2 : file read
+ScalingListFile               : scaling_list.txt       # Scaling List file name. If file is not exist, use Default Matrix.
+
+#============ Lossless ================
+TransquantBypassEnableFlag : 0                         # Value of PPS flag.
+CUTransquantBypassFlagForce: 0                         # Force transquant bypass mode, when transquant_bypass_enable_flag is enabled
+
+### DO NOT ADD ANYTHING BELOW THIS LINE ###
+### DO NOT DELETE THE EMPTY LINE BELOW ###
Index: branches/SHM-dev/cfg/encoder_lowdelay_P_he10.cfg
===================================================================
--- branches/SHM-dev/cfg/encoder_lowdelay_P_he10.cfg	(revision 991)
+++ 	(revision )
@@ -1,104 +1,0 @@
-#======== File I/O =====================
-BitstreamFile                 : str.bin
-#ReconFile                     : rec.yuv
-
-#======== Unit definition ================
-MaxCUWidth                    : 64          # Maximum coding unit width in pixel
-MaxCUHeight                   : 64          # Maximum coding unit height in pixel
-MaxPartitionDepth             : 4           # Maximum coding unit depth
-QuadtreeTULog2MaxSize         : 5           # Log2 of maximum transform size for
-                                            # quadtree-based TU coding (2...6)
-QuadtreeTULog2MinSize         : 2           # Log2 of minimum transform size for
-                                            # quadtree-based TU coding (2...6)
-QuadtreeTUMaxDepthInter       : 3
-QuadtreeTUMaxDepthIntra       : 3
-
-#======== Coding Structure =============
-#IntraPeriod                   : -1          # Period of I-Frame ( -1 = only first)
-DecodingRefreshType           : 0           # Random Accesss 0:none, 1:CDR, 2:IDR
-GOPSize                       : 4           # GOP Size (number of B slice = GOPSize-1)
-#        Type POC QPoffset QPfactor temporal_id #ref_pics_active #ref_pics reference pictures predict deltaRPS #ref_idcs reference idcs 
-Frame1:  P    1   3        0.4624   0           4                4         -1 -5 -9 -13       0
-Frame2:  P    2   2        0.4624   0           4                4         -1 -2 -6 -10       1      -1       5         1 1 1 0 1
-Frame3:  P    3   3        0.4624   0           4                4         -1 -3 -7 -11       1      -1       5         0 1 1 1 1            
-Frame4:  P    4   1        0.578    0           4                4         -1 -4 -8 -12       1      -1       5         0 1 1 1 1
-ListCombination               : 1           # Use combined list for uni-prediction in B-slices
-
-#=========== Motion Search =============
-FastSearch                    : 1           # 0:Full search  1:EPZS
-SearchRange                   : 64          # (0: Search range is a Full frame)
-BipredSearchRange             : 4           # Search range for bi-prediction refinement
-HadamardME                    : 1           # Use of hadamard measure for fractional ME
-FEN                           : 1           # Fast encoder decision
-FDM                           : 1           # Fast Decision for Merge RD cost
-
-#======== Quantization =============
-#QP                            : 32          # Quantization parameter(0-51)
-MaxDeltaQP                    : 0           # CU-based multi-QP optimization
-MaxCuDQPDepth                 : 0           # Max depth of a minimum CuDQP for sub-LCU-level delta QP
-DeltaQpRD                     : 0           # Slice-based multi-QP optimization
-RDOQ                          : 1           # RDOQ
-TransformSkip                 : 1           # Transform skipping (0: OFF, 1: ON)
-TransformSkipFast             : 1           # Fast Transform skipping (0: OFF, 1: ON)
-
-#=========== Deblock Filter ============
-DeblockingFilterControlPresent: 0           # Dbl control params present (0=not present, 1=present)
-LoopFilterOffsetInPPS         : 0           # Dbl params in PPS or SliceHeader (0=SliceHeader, 1=PPS)
-LoopFilterDisable             : 0           # Disable deblocking filter in slice header (0=Filter, 1=No Filter)
-LoopFilterBetaOffset_div2     : 0           # Range: -13 ~ 13
-LoopFilterTcOffset_div2       : 0           # Range: -13 ~ 13
-
-#=========== Misc. ============
-#InternalBitDepth             : 10          # internal bit-depth = BitDepth + BitIncrement
-
-#=========== Coding Tools =================
-SAO                           : 1           # Sample adaptive offset  (0: OFF, 1: ON)
-AMP                           : 1           # Asymmetric motion partitions (0: OFF, 1: ON)
-SAOLcuBoundary                : 0           # SAOLcuBoundary using non-deblocked pixels (0: OFF, 1: ON)
-
-#============ Slices ================
-SliceMode                : 0                # 0: Disable all slice options.
-                                            # 1: Enforce maximum number of LCU in an slice,
-                                            # 2: Enforce maximum number of bytes in an 'slice'
-                                            # 3: Enforce maximum number of tiles in a slice
-SliceArgument            : 1500             # Argument for 'SliceMode'.
-                                            # If SliceMode==1 it represents max. SliceGranularity-sized blocks per slice.
-                                            # If SliceMode==2 it represents max. bytes per slice.
-                                            # If SliceMode==3 it represents max. tiles per slice.
-
-LFCrossSliceBoundaryFlag : 1                # In-loop filtering, including ALF and DB, is across or not across slice boundary.
-                                            # 0:not across, 1: across
-
-#============ PCM ================
-PCMEnabledFlag                      : 0                # 0: No PCM mode
-PCMLog2MaxSize                      : 5                # Log2 of maximum PCM block size.
-PCMLog2MinSize                      : 3                # Log2 of minimum PCM block size.
-PCMInputBitDepthFlag                : 1                # 0: PCM bit-depth is internal bit-depth. 1: PCM bit-depth is input bit-depth.
-PCMFilterDisableFlag                : 0                # 0: Enable loop filtering on I_PCM samples. 1: Disable loop filtering on I_PCM samples.
-
-#============ Tiles ================
-UniformSpacingIdc                   : 0                # 0: the column boundaries are indicated by ColumnWidth array, the row boundaries are indicated by RowHeight array
-                                                       # 1: the column and row boundaries are distributed uniformly
-NumTileColumnsMinus1                : 0                # Number of columns in a picture minus 1
-ColumnWidthArray                    : 2 3              # Array containing ColumnWidth values in units of LCU (from left to right in picture)   
-NumTileRowsMinus1                   : 0                # Number of rows in a picture minus 1
-RowHeightArray                      : 2                # Array containing RowHeight values in units of LCU (from top to bottom in picture)
-
-LFCrossTileBoundaryFlag           : 1                  # In-loop filtering is across or not across tile boundary.
-                                                       # 0:not across, 1: across                                                       
-
-#============ WaveFront ================
-#WaveFrontSynchro                    : 0                # 0:  No WaveFront synchronisation (WaveFrontSubstreams must be 1 in this case).
-                                                       # >0: WaveFront synchronises with the LCU above and to the right by this many LCUs.
-
-#=========== Quantization Matrix =================
-ScalingList                   : 0                      # ScalingList 0 : off, 1 : default, 2 : file read
-ScalingListFile               : scaling_list.txt       # Scaling List file name. If file is not exist, use Default Matrix.
-
-#============ Lossless ================
-LosslessCuEnabled                   : 0                # 1: Set "qpprime_y_zero_transquant_bypass_flag=1" and enable the lossless mode as well as the RD-based mode selection process.
-TransquantBypassEnableFlag: 0  # Value of PPS flag.
-CUTransquantBypassFlagValue: 0 # Constant lossless-value signaling per CU, if TransquantBypassEnableFlag is 1.
-
-### DO NOT ADD ANYTHING BELOW THIS LINE ###
-### DO NOT DELETE THE EMPTY LINE BELOW ###
Index: branches/SHM-dev/cfg/encoder_lowdelay_P_scalable.cfg
===================================================================
--- branches/SHM-dev/cfg/encoder_lowdelay_P_scalable.cfg	(revision 1029)
+++ branches/SHM-dev/cfg/encoder_lowdelay_P_scalable.cfg	(revision 1029)
@@ -0,0 +1,121 @@
+#======== File I/O =====================
+BitstreamFile                 : str.bin
+#ReconFile                     : rec.yuv
+
+#======== Profile ================
+NumProfileTierLevel           : 3
+Profile0                      : main                # Profile for BL (NOTE01: this profile applies to whole layers but only BL is outputted)
+                                                    #                (NOTE02: this profile has no effect when NonHEVCBase is set to 1)
+Profile1                      : main                # Profile for BL (NOTE01: this profile applies to HEVC BL only)
+                                                    #                (NOTE02: When NonHEVCBase is set to 1, this profile & associated level should be updated appropriately)
+Profile2                      : scalable-main       # Scalable profile
+
+#======== Unit definition ================
+MaxCUWidth                    : 64          # Maximum coding unit width in pixel
+MaxCUHeight                   : 64          # Maximum coding unit height in pixel
+MaxPartitionDepth             : 4           # Maximum coding unit depth
+QuadtreeTULog2MaxSize         : 5           # Log2 of maximum transform size for
+                                            # quadtree-based TU coding (2...6)
+QuadtreeTULog2MinSize         : 2           # Log2 of minimum transform size for
+                                            # quadtree-based TU coding (2...6)
+QuadtreeTUMaxDepthInter       : 3
+QuadtreeTUMaxDepthIntra       : 3
+
+#======== Coding Structure =============
+#IntraPeriod                   : -1          # Period of I-Frame ( -1 = only first)
+DecodingRefreshType           : 0           # Random Accesss 0:none, 1:CRA, 2:IDR, 3:Recovery Point SEI
+GOPSize                       : 4           # GOP Size (number of B slice = GOPSize-1)
+#        Type POC QPoffset QPfactor tcOffsetDiv2 betaOffsetDiv2  temporal_id #ref_pics_active #ref_pics reference pictures predict deltaRPS #ref_idcs reference idcs 
+Frame1:  P    1   3        0.4624   0            0               0           4                4         -1 -5 -9 -13       0
+Frame2:  P    2   2        0.4624   0            0               0           4                4         -1 -2 -6 -10       1      -1       5         1 1 1 0 1
+Frame3:  P    3   3        0.4624   0            0               0           4                4         -1 -3 -7 -11       1      -1       5         0 1 1 1 1            
+Frame4:  P    4   1        0.578    0            0               0           4                4         -1 -4 -8 -12       1      -1       5         0 1 1 1 1
+
+#=========== Motion Search =============
+FastSearch                    : 1           # 0:Full search  1:TZ search
+SearchRange                   : 64          # (0: Search range is a Full frame)
+BipredSearchRange             : 4           # Search range for bi-prediction refinement
+HadamardME                    : 1           # Use of hadamard measure for fractional ME
+FEN                           : 1           # Fast encoder decision
+FDM                           : 1           # Fast Decision for Merge RD cost
+
+#======== Quantization =============
+#QP                            : 32          # Quantization parameter(0-51)
+MaxDeltaQP                    : 0           # CU-based multi-QP optimization
+MaxCuDQPDepth                 : 0           # Max depth of a minimum CuDQP for sub-LCU-level delta QP
+DeltaQpRD                     : 0           # Slice-based multi-QP optimization
+RDOQ                          : 1           # RDOQ
+RDOQTS                        : 1           # RDOQ for transform skip
+TransformSkip                 : 1           # Transform skipping (0: OFF, 1: ON)
+TransformSkipFast             : 1           # Fast Transform skipping (0: OFF, 1: ON)
+
+#=========== Deblock Filter ============
+DeblockingFilterControlPresent: 0           # Dbl control params present (0=not present, 1=present)
+LoopFilterOffsetInPPS         : 0           # Dbl params: 0=varying params in SliceHeader, param = base_param + GOP_offset_param; 1=constant params in PPS, param = base_param)
+LoopFilterDisable             : 0           # Disable deblocking filter (0=Filter, 1=No Filter)
+LoopFilterBetaOffset_div2     : 0           # base_param: -6 ~ 6
+LoopFilterTcOffset_div2       : 0           # base_param: -6 ~ 6
+DeblockingFilterMetric        : 0           # blockiness metric (automatically configures deblocking parameters in bitstream)
+
+#=========== Misc. ============
+#InternalBitDepth             : 8           # codec operating bit-depth
+
+#=========== Coding Tools =================
+SAO                           : 1           # Sample adaptive offset  (0: OFF, 1: ON)
+AMP                           : 1           # Asymmetric motion partitions (0: OFF, 1: ON)
+SAOLcuBoundary                : 0           # SAOLcuBoundary using non-deblocked pixels (0: OFF, 1: ON)
+
+#============ Slices ================
+SliceMode                : 0                # 0: Disable all slice options.
+                                            # 1: Enforce maximum number of LCU in an slice,
+                                            # 2: Enforce maximum number of bytes in an 'slice'
+                                            # 3: Enforce maximum number of tiles in a slice
+SliceArgument            : 1500             # Argument for 'SliceMode'.
+                                            # If SliceMode==1 it represents max. SliceGranularity-sized blocks per slice.
+                                            # If SliceMode==2 it represents max. bytes per slice.
+                                            # If SliceMode==3 it represents max. tiles per slice.
+
+LFCrossSliceBoundaryFlag : 1                # In-loop filtering, including ALF and DB, is across or not across slice boundary.
+                                            # 0:not across, 1: across
+
+#============ PCM ================
+PCMEnabledFlag                      : 0                # 0: No PCM mode
+PCMLog2MaxSize                      : 5                # Log2 of maximum PCM block size.
+PCMLog2MinSize                      : 3                # Log2 of minimum PCM block size.
+PCMInputBitDepthFlag                : 1                # 0: PCM bit-depth is internal bit-depth. 1: PCM bit-depth is input bit-depth.
+PCMFilterDisableFlag                : 0                # 0: Enable loop filtering on I_PCM samples. 1: Disable loop filtering on I_PCM samples.
+
+#============ Tiles ================
+TileUniformSpacing                  : 0                # 0: the column boundaries are indicated by TileColumnWidth array, the row boundaries are indicated by TileRowHeight array
+                                                       # 1: the column and row boundaries are distributed uniformly
+NumTileColumnsMinus1                : 0                # Number of tile columns in a picture minus 1
+TileColumnWidthArray                : 2 3              # Array containing tile column width values in units of CTU (from left to right in picture)   
+NumTileRowsMinus1                   : 0                # Number of tile rows in a picture minus 1
+TileRowHeightArray                  : 2                # Array containing tile row height values in units of CTU (from top to bottom in picture)
+
+LFCrossTileBoundaryFlag             : 1                # In-loop filtering is across or not across tile boundary.
+                                                       # 0:not across, 1: across 
+
+#============ WaveFront ================
+#WaveFrontSynchro                    : 0                # 0:  No WaveFront synchronisation (WaveFrontSubstreams must be 1 in this case).
+                                                       # >0: WaveFront synchronises with the LCU above and to the right by this many LCUs.
+
+#=========== Quantization Matrix =================
+ScalingList                   : 0                      # ScalingList 0 : off, 1 : default, 2 : file read
+ScalingListFile               : scaling_list.txt       # Scaling List file name. If file is not exist, use Default Matrix.
+
+#============ Lossless ================
+TransquantBypassEnableFlag : 0                         # Value of PPS flag.
+CUTransquantBypassFlagForce: 0                         # Force transquant bypass mode, when transquant_bypass_enable_flag is enabled
+
+#============ Rate Control ======================
+#RateControl                         : 0                # Rate control: enable rate control
+#TargetBitrate                       : 1000000          # Rate control: target bitrate, in bps
+#KeepHierarchicalBit                 : 2                # Rate control: 0: equal bit allocation; 1: fixed ratio bit allocation; 2: adaptive ratio bit allocation
+#LCULevelRateControl                 : 1                # Rate control: 1: LCU level RC; 0: picture level RC
+#RCLCUSeparateModel                  : 1                # Rate control: use LCU level separate R-lambda model
+#InitialQP                           : 0                # Rate control: initial QP
+#RCForceIntraQP                      : 0                # Rate control: force intra QP to be equal to initial QP
+
+### DO NOT ADD ANYTHING BELOW THIS LINE ###
+### DO NOT DELETE THE EMPTY LINE BELOW ###
Index: branches/SHM-dev/cfg/encoder_lowdelay_P_scalable10.cfg
===================================================================
--- branches/SHM-dev/cfg/encoder_lowdelay_P_scalable10.cfg	(revision 1029)
+++ branches/SHM-dev/cfg/encoder_lowdelay_P_scalable10.cfg	(revision 1029)
@@ -0,0 +1,121 @@
+#======== File I/O =====================
+BitstreamFile                 : str.bin
+#ReconFile                     : rec.yuv
+
+#======== Profile ================
+NumProfileTierLevel           : 3
+Profile0                      : main10                # Profile for BL (NOTE01: this profile applies to whole layers but only BL is outputted)
+                                                      #                (NOTE02: this profile has no effect when NonHEVCBase is set to 1)
+Profile1                      : main10                # Profile for BL (NOTE01: this profile applies to HEVC BL only)
+                                                      #                (NOTE02: When NonHEVCBase is set to 1, this profile & associated level should be updated appropriately)
+Profile2                      : scalable-main10       # Scalable profile
+
+#======== Unit definition ================
+MaxCUWidth                    : 64          # Maximum coding unit width in pixel
+MaxCUHeight                   : 64          # Maximum coding unit height in pixel
+MaxPartitionDepth             : 4           # Maximum coding unit depth
+QuadtreeTULog2MaxSize         : 5           # Log2 of maximum transform size for
+                                            # quadtree-based TU coding (2...6)
+QuadtreeTULog2MinSize         : 2           # Log2 of minimum transform size for
+                                            # quadtree-based TU coding (2...6)
+QuadtreeTUMaxDepthInter       : 3
+QuadtreeTUMaxDepthIntra       : 3
+
+#======== Coding Structure =============
+#IntraPeriod                   : -1          # Period of I-Frame ( -1 = only first)
+DecodingRefreshType           : 0           # Random Accesss 0:none, 1:CRA, 2:IDR, 3:Recovery Point SEI
+GOPSize                       : 4           # GOP Size (number of B slice = GOPSize-1)
+#        Type POC QPoffset QPfactor tcOffsetDiv2 betaOffsetDiv2  temporal_id #ref_pics_active #ref_pics reference pictures predict deltaRPS #ref_idcs reference idcs 
+Frame1:  P    1   3        0.4624   0            0               0           4                4         -1 -5 -9 -13       0
+Frame2:  P    2   2        0.4624   0            0               0           4                4         -1 -2 -6 -10       1      -1       5         1 1 1 0 1
+Frame3:  P    3   3        0.4624   0            0               0           4                4         -1 -3 -7 -11       1      -1       5         0 1 1 1 1            
+Frame4:  P    4   1        0.578    0            0               0           4                4         -1 -4 -8 -12       1      -1       5         0 1 1 1 1
+
+#=========== Motion Search =============
+FastSearch                    : 1           # 0:Full search  1:TZ search
+SearchRange                   : 64          # (0: Search range is a Full frame)
+BipredSearchRange             : 4           # Search range for bi-prediction refinement
+HadamardME                    : 1           # Use of hadamard measure for fractional ME
+FEN                           : 1           # Fast encoder decision
+FDM                           : 1           # Fast Decision for Merge RD cost
+
+#======== Quantization =============
+#QP                            : 32          # Quantization parameter(0-51)
+MaxDeltaQP                    : 0           # CU-based multi-QP optimization
+MaxCuDQPDepth                 : 0           # Max depth of a minimum CuDQP for sub-LCU-level delta QP
+DeltaQpRD                     : 0           # Slice-based multi-QP optimization
+RDOQ                          : 1           # RDOQ
+RDOQTS                        : 1           # RDOQ for transform skip
+TransformSkip                 : 1           # Transform skipping (0: OFF, 1: ON)
+TransformSkipFast             : 1           # Fast Transform skipping (0: OFF, 1: ON)
+
+#=========== Deblock Filter ============
+DeblockingFilterControlPresent: 0           # Dbl control params present (0=not present, 1=present)
+LoopFilterOffsetInPPS         : 0           # Dbl params: 0=varying params in SliceHeader, param = base_param + GOP_offset_param; 1=constant params in PPS, param = base_param)
+LoopFilterDisable             : 0           # Disable deblocking filter (0=Filter, 1=No Filter)
+LoopFilterBetaOffset_div2     : 0           # base_param: -6 ~ 6
+LoopFilterTcOffset_div2       : 0           # base_param: -6 ~ 6
+DeblockingFilterMetric        : 0           # blockiness metric (automatically configures deblocking parameters in bitstream)
+
+#=========== Misc. ============
+#InternalBitDepth             : 10          # codec operating bit-depth
+
+#=========== Coding Tools =================
+SAO                           : 1           # Sample adaptive offset  (0: OFF, 1: ON)
+AMP                           : 1           # Asymmetric motion partitions (0: OFF, 1: ON)
+SAOLcuBoundary                : 0           # SAOLcuBoundary using non-deblocked pixels (0: OFF, 1: ON)
+
+#============ Slices ================
+SliceMode                : 0                # 0: Disable all slice options.
+                                            # 1: Enforce maximum number of LCU in an slice,
+                                            # 2: Enforce maximum number of bytes in an 'slice'
+                                            # 3: Enforce maximum number of tiles in a slice
+SliceArgument            : 1500             # Argument for 'SliceMode'.
+                                            # If SliceMode==1 it represents max. SliceGranularity-sized blocks per slice.
+                                            # If SliceMode==2 it represents max. bytes per slice.
+                                            # If SliceMode==3 it represents max. tiles per slice.
+
+LFCrossSliceBoundaryFlag : 1                # In-loop filtering, including ALF and DB, is across or not across slice boundary.
+                                            # 0:not across, 1: across
+
+#============ PCM ================
+PCMEnabledFlag                      : 0                # 0: No PCM mode
+PCMLog2MaxSize                      : 5                # Log2 of maximum PCM block size.
+PCMLog2MinSize                      : 3                # Log2 of minimum PCM block size.
+PCMInputBitDepthFlag                : 1                # 0: PCM bit-depth is internal bit-depth. 1: PCM bit-depth is input bit-depth.
+PCMFilterDisableFlag                : 0                # 0: Enable loop filtering on I_PCM samples. 1: Disable loop filtering on I_PCM samples.
+
+#============ Tiles ================
+TileUniformSpacing                  : 0                # 0: the column boundaries are indicated by TileColumnWidth array, the row boundaries are indicated by TileRowHeight array
+                                                       # 1: the column and row boundaries are distributed uniformly
+NumTileColumnsMinus1                : 0                # Number of tile columns in a picture minus 1
+TileColumnWidthArray                : 2 3              # Array containing tile column width values in units of CTU (from left to right in picture)   
+NumTileRowsMinus1                   : 0                # Number of tile rows in a picture minus 1
+TileRowHeightArray                  : 2                # Array containing tile row height values in units of CTU (from top to bottom in picture)
+
+LFCrossTileBoundaryFlag             : 1                # In-loop filtering is across or not across tile boundary.
+                                                       # 0:not across, 1: across 
+
+#============ WaveFront ================
+#WaveFrontSynchro                    : 0                # 0:  No WaveFront synchronisation (WaveFrontSubstreams must be 1 in this case).
+                                                       # >0: WaveFront synchronises with the LCU above and to the right by this many LCUs.
+
+#=========== Quantization Matrix =================
+ScalingList                   : 0                      # ScalingList 0 : off, 1 : default, 2 : file read
+ScalingListFile               : scaling_list.txt       # Scaling List file name. If file is not exist, use Default Matrix.
+
+#============ Lossless ================
+TransquantBypassEnableFlag : 0                         # Value of PPS flag.
+CUTransquantBypassFlagForce: 0                         # Force transquant bypass mode, when transquant_bypass_enable_flag is enabled
+
+#============ Rate Control ======================
+#RateControl                         : 0                # Rate control: enable rate control
+#TargetBitrate                       : 1000000          # Rate control: target bitrate, in bps
+#KeepHierarchicalBit                 : 2                # Rate control: 0: equal bit allocation; 1: fixed ratio bit allocation; 2: adaptive ratio bit allocation
+#LCULevelRateControl                 : 1                # Rate control: 1: LCU level RC; 0: picture level RC
+#RCLCUSeparateModel                  : 1                # Rate control: use LCU level separate R-lambda model
+#InitialQP                           : 0                # Rate control: initial QP
+#RCForceIntraQP                      : 0                # Rate control: force intra QP to be equal to initial QP
+
+### DO NOT ADD ANYTHING BELOW THIS LINE ###
+### DO NOT DELETE THE EMPTY LINE BELOW ###
Index: branches/SHM-dev/cfg/encoder_lowdelay_he10.cfg
===================================================================
--- branches/SHM-dev/cfg/encoder_lowdelay_he10.cfg	(revision 991)
+++ 	(revision )
@@ -1,104 +1,0 @@
-#======== File I/O =====================
-BitstreamFile                 : str.bin
-#ReconFile                     : rec.yuv
-
-#======== Unit definition ================
-MaxCUWidth                    : 64          # Maximum coding unit width in pixel
-MaxCUHeight                   : 64          # Maximum coding unit height in pixel
-MaxPartitionDepth             : 4           # Maximum coding unit depth
-QuadtreeTULog2MaxSize         : 5           # Log2 of maximum transform size for
-                                            # quadtree-based TU coding (2...6)
-QuadtreeTULog2MinSize         : 2           # Log2 of minimum transform size for
-                                            # quadtree-based TU coding (2...6)
-QuadtreeTUMaxDepthInter       : 3
-QuadtreeTUMaxDepthIntra       : 3
-
-#======== Coding Structure =============
-#IntraPeriod                   : -1          # Period of I-Frame ( -1 = only first)
-DecodingRefreshType           : 0           # Random Accesss 0:none, 1:CDR, 2:IDR
-GOPSize                       : 4           # GOP Size (number of B slice = GOPSize-1)
-#        Type POC QPoffset QPfactor temporal_id #ref_pics_active #ref_pics reference pictures predict deltaRPS #ref_idcs reference idcs 
-Frame1:  B    1   3        0.4624   0           4                4         -1 -5 -9 -13       0
-Frame2:  B    2   2        0.4624   0           4                4         -1 -2 -6 -10       1      -1       5         1 1 1 0 1
-Frame3:  B    3   3        0.4624   0           4                4         -1 -3 -7 -11       1      -1       5         0 1 1 1 1            
-Frame4:  B    4   1        0.578    0           4                4         -1 -4 -8 -12       1      -1       5         0 1 1 1 1
-ListCombination               : 1           # Use combined list for uni-prediction in B-slices
-
-#=========== Motion Search =============
-FastSearch                    : 1           # 0:Full search  1:EPZS
-SearchRange                   : 64          # (0: Search range is a Full frame)
-BipredSearchRange             : 4           # Search range for bi-prediction refinement
-HadamardME                    : 1           # Use of hadamard measure for fractional ME
-FEN                           : 1           # Fast encoder decision
-FDM                           : 1           # Fast Decision for Merge RD cost
-
-#======== Quantization =============
-#QP                            : 32          # Quantization parameter(0-51)
-MaxDeltaQP                    : 0           # CU-based multi-QP optimization
-MaxCuDQPDepth                 : 0           # Max depth of a minimum CuDQP for sub-LCU-level delta QP
-DeltaQpRD                     : 0           # Slice-based multi-QP optimization
-RDOQ                          : 1           # RDOQ
-
-#=========== Deblock Filter ============
-DeblockingFilterControlPresent: 0           # Dbl control params present (0=not present, 1=present)
-LoopFilterOffsetInPPS         : 0           # Dbl params in PPS or SliceHeader (0=SliceHeader, 1=PPS)
-LoopFilterDisable             : 0           # Disable deblocking filter in slice header (0=Filter, 1=No Filter)
-LoopFilterBetaOffset_div2     : 0           # Range: -13 ~ 13
-LoopFilterTcOffset_div2       : 0           # Range: -13 ~ 13
-
-#=========== Misc. ============
-#InternalBitDepth             : 10          # codec operating bit-depth
-
-#=========== Coding Tools =================
-SAO                           : 1           # Sample adaptive offset  (0: OFF, 1: ON)
-AMP                           : 1           # Asymmetric motion partitions (0: OFF, 1: ON)
-TransformSkip                 : 1           # Transform skipping (0: OFF, 1: ON)
-TransformSkipFast             : 1           # Fast Transform skipping (0: OFF, 1: ON)
-SAOLcuBoundary                : 0           # SAOLcuBoundary using non-deblocked pixels (0: OFF, 1: ON)
-
-#============ Slices ================
-SliceMode                : 0                # 0: Disable all slice options.
-                                            # 1: Enforce maximum number of LCU in an slice,
-                                            # 2: Enforce maximum number of bytes in an 'slice'
-                                            # 3: Enforce maximum number of tiles in a slice
-SliceArgument            : 1500             # Argument for 'SliceMode'.
-                                            # If SliceMode==1 it represents max. SliceGranularity-sized blocks per slice.
-                                            # If SliceMode==2 it represents max. bytes per slice.
-                                            # If SliceMode==3 it represents max. tiles per slice.
-
-LFCrossSliceBoundaryFlag : 1                # In-loop filtering, including ALF and DB, is across or not across slice boundary.
-                                            # 0:not across, 1: across
-
-#============ PCM ================
-PCMEnabledFlag                      : 0                # 0: No PCM mode
-PCMLog2MaxSize                      : 5                # Log2 of maximum PCM block size.
-PCMLog2MinSize                      : 3                # Log2 of minimum PCM block size.
-PCMInputBitDepthFlag                : 1                # 0: PCM bit-depth is internal bit-depth. 1: PCM bit-depth is input bit-depth.
-PCMFilterDisableFlag                : 0                # 0: Enable loop filtering on I_PCM samples. 1: Disable loop filtering on I_PCM samples.
-
-#============ Tiles ================
-UniformSpacingIdc                   : 0                # 0: the column boundaries are indicated by ColumnWidth array, the row boundaries are indicated by RowHeight array
-                                                       # 1: the column and row boundaries are distributed uniformly
-NumTileColumnsMinus1                : 0                # Number of columns in a picture minus 1
-ColumnWidthArray                    : 2 3              # Array containing ColumnWidth values in units of LCU (from left to right in picture)   
-NumTileRowsMinus1                   : 0                # Number of rows in a picture minus 1
-RowHeightArray                      : 2                # Array containing RowHeight values in units of LCU (from top to bottom in picture)
-
-LFCrossTileBoundaryFlag           : 1                  # In-loop filtering is across or not across tile boundary.
-                                                       # 0:not across, 1: across 
-
-#============ WaveFront ================
-#WaveFrontSynchro                    : 0                # 0:  No WaveFront synchronisation (WaveFrontSubstreams must be 1 in this case).
-                                                       # >0: WaveFront synchronises with the LCU above and to the right by this many LCUs.
-
-#=========== Quantization Matrix =================
-ScalingList                   : 0                      # ScalingList 0 : off, 1 : default, 2 : file read
-ScalingListFile               : scaling_list.txt       # Scaling List file name. If file is not exist, use Default Matrix.
-
-#============ Lossless ================
-LosslessCuEnabled                   : 0                # 1: Set "qpprime_y_zero_transquant_bypass_flag=1" and enable the lossless mode as well as the RD-based mode selection process.
-TransquantBypassEnableFlag: 0  # Value of PPS flag.
-CUTransquantBypassFlagForce: 0 # Constant lossless-value signaling per CU, if TransquantBypassEnableFlag is 1.
-
-### DO NOT ADD ANYTHING BELOW THIS LINE ###
-### DO NOT DELETE THE EMPTY LINE BELOW ###
Index: branches/SHM-dev/cfg/encoder_lowdelay_scalable.cfg
===================================================================
--- branches/SHM-dev/cfg/encoder_lowdelay_scalable.cfg	(revision 1029)
+++ branches/SHM-dev/cfg/encoder_lowdelay_scalable.cfg	(revision 1029)
@@ -0,0 +1,121 @@
+#======== File I/O =====================
+BitstreamFile                 : str.bin
+#ReconFile                     : rec.yuv
+
+#======== Profile ================
+NumProfileTierLevel           : 3
+Profile0                      : main                # Profile for BL (NOTE01: this profile applies to whole layers but only BL is outputted)
+                                                    #                (NOTE02: this profile has no effect when NonHEVCBase is set to 1)
+Profile1                      : main                # Profile for BL (NOTE01: this profile applies to HEVC BL only)
+                                                    #                (NOTE02: When NonHEVCBase is set to 1, this profile & associated level should be updated appropriately)
+Profile2                      : scalable-main       # Scalable profile
+
+#======== Unit definition ================
+MaxCUWidth                    : 64          # Maximum coding unit width in pixel
+MaxCUHeight                   : 64          # Maximum coding unit height in pixel
+MaxPartitionDepth             : 4           # Maximum coding unit depth
+QuadtreeTULog2MaxSize         : 5           # Log2 of maximum transform size for
+                                            # quadtree-based TU coding (2...6)
+QuadtreeTULog2MinSize         : 2           # Log2 of minimum transform size for
+                                            # quadtree-based TU coding (2...6)
+QuadtreeTUMaxDepthInter       : 3
+QuadtreeTUMaxDepthIntra       : 3
+
+#======== Coding Structure =============
+#IntraPeriod                   : -1          # Period of I-Frame ( -1 = only first)
+DecodingRefreshType           : 0           # Random Accesss 0:none, 1:CRA, 2:IDR, 3:Recovery Point SEI
+GOPSize                       : 4           # GOP Size (number of B slice = GOPSize-1)
+#        Type POC QPoffset QPfactor tcOffsetDiv2 betaOffsetDiv2  temporal_id #ref_pics_active #ref_pics reference pictures predict deltaRPS #ref_idcs reference idcs 
+Frame1:  B    1   3        0.4624   0            0               0           4                4         -1 -5 -9 -13       0
+Frame2:  B    2   2        0.4624   0            0               0           4                4         -1 -2 -6 -10       1      -1       5         1 1 1 0 1
+Frame3:  B    3   3        0.4624   0            0               0           4                4         -1 -3 -7 -11       1      -1       5         0 1 1 1 1            
+Frame4:  B    4   1        0.578    0            0               0           4                4         -1 -4 -8 -12       1      -1       5         0 1 1 1 1
+
+#=========== Motion Search =============
+FastSearch                    : 1           # 0:Full search  1:TZ search
+SearchRange                   : 64          # (0: Search range is a Full frame)
+BipredSearchRange             : 4           # Search range for bi-prediction refinement
+HadamardME                    : 1           # Use of hadamard measure for fractional ME
+FEN                           : 1           # Fast encoder decision
+FDM                           : 1           # Fast Decision for Merge RD cost
+
+#======== Quantization =============
+#QP                            : 32          # Quantization parameter(0-51)
+MaxDeltaQP                    : 0           # CU-based multi-QP optimization
+MaxCuDQPDepth                 : 0           # Max depth of a minimum CuDQP for sub-LCU-level delta QP
+DeltaQpRD                     : 0           # Slice-based multi-QP optimization
+RDOQ                          : 1           # RDOQ
+RDOQTS                        : 1           # RDOQ for transform skip
+
+#=========== Deblock Filter ============
+DeblockingFilterControlPresent: 0           # Dbl control params present (0=not present, 1=present)
+LoopFilterOffsetInPPS         : 0           # Dbl params: 0=varying params in SliceHeader, param = base_param + GOP_offset_param; 1=constant params in PPS, param = base_param)
+LoopFilterDisable             : 0           # Disable deblocking filter (0=Filter, 1=No Filter)
+LoopFilterBetaOffset_div2     : 0           # base_param: -6 ~ 6
+LoopFilterTcOffset_div2       : 0           # base_param: -6 ~ 6
+DeblockingFilterMetric        : 0           # blockiness metric (automatically configures deblocking parameters in bitstream)
+
+#=========== Misc. ============
+#InternalBitDepth             : 8           # codec operating bit-depth
+
+#=========== Coding Tools =================
+SAO                           : 1           # Sample adaptive offset  (0: OFF, 1: ON)
+AMP                           : 1           # Asymmetric motion partitions (0: OFF, 1: ON)
+TransformSkip                 : 1           # Transform skipping (0: OFF, 1: ON)
+TransformSkipFast             : 1           # Fast Transform skipping (0: OFF, 1: ON)
+SAOLcuBoundary                : 0           # SAOLcuBoundary using non-deblocked pixels (0: OFF, 1: ON)
+
+#============ Slices ================
+SliceMode                : 0                # 0: Disable all slice options.
+                                            # 1: Enforce maximum number of LCU in an slice,
+                                            # 2: Enforce maximum number of bytes in an 'slice'
+                                            # 3: Enforce maximum number of tiles in a slice
+SliceArgument            : 1500             # Argument for 'SliceMode'.
+                                            # If SliceMode==1 it represents max. SliceGranularity-sized blocks per slice.
+                                            # If SliceMode==2 it represents max. bytes per slice.
+                                            # If SliceMode==3 it represents max. tiles per slice.
+
+LFCrossSliceBoundaryFlag : 1                # In-loop filtering, including ALF and DB, is across or not across slice boundary.
+                                            # 0:not across, 1: across
+
+#============ PCM ================
+PCMEnabledFlag                      : 0                # 0: No PCM mode
+PCMLog2MaxSize                      : 5                # Log2 of maximum PCM block size.
+PCMLog2MinSize                      : 3                # Log2 of minimum PCM block size.
+PCMInputBitDepthFlag                : 1                # 0: PCM bit-depth is internal bit-depth. 1: PCM bit-depth is input bit-depth.
+PCMFilterDisableFlag                : 0                # 0: Enable loop filtering on I_PCM samples. 1: Disable loop filtering on I_PCM samples.
+
+#============ Tiles ================
+TileUniformSpacing                  : 0                # 0: the column boundaries are indicated by TileColumnWidth array, the row boundaries are indicated by TileRowHeight array
+                                                       # 1: the column and row boundaries are distributed uniformly
+NumTileColumnsMinus1                : 0                # Number of tile columns in a picture minus 1
+TileColumnWidthArray                : 2 3              # Array containing tile column width values in units of CTU (from left to right in picture)   
+NumTileRowsMinus1                   : 0                # Number of tile rows in a picture minus 1
+TileRowHeightArray                  : 2                # Array containing tile row height values in units of CTU (from top to bottom in picture)
+
+LFCrossTileBoundaryFlag             : 1                # In-loop filtering is across or not across tile boundary.
+                                                       # 0:not across, 1: across 
+
+#============ WaveFront ================
+#WaveFrontSynchro                    : 0                # 0:  No WaveFront synchronisation (WaveFrontSubstreams must be 1 in this case).
+                                                       # >0: WaveFront synchronises with the LCU above and to the right by this many LCUs.
+
+#=========== Quantization Matrix =================
+ScalingList                   : 0                      # ScalingList 0 : off, 1 : default, 2 : file read
+ScalingListFile               : scaling_list.txt       # Scaling List file name. If file is not exist, use Default Matrix.
+
+#============ Lossless ================
+TransquantBypassEnableFlag : 0                         # Value of PPS flag.
+CUTransquantBypassFlagForce: 0                         # Force transquant bypass mode, when transquant_bypass_enable_flag is enabled
+
+#============ Rate Control ======================
+#RateControl                         : 0                # Rate control: enable rate control
+#TargetBitrate                       : 1000000          # Rate control: target bitrate, in bps
+#KeepHierarchicalBit                 : 2                # Rate control: 0: equal bit allocation; 1: fixed ratio bit allocation; 2: adaptive ratio bit allocation
+#LCULevelRateControl                 : 1                # Rate control: 1: LCU level RC; 0: picture level RC
+#RCLCUSeparateModel                  : 1                # Rate control: use LCU level separate R-lambda model
+#InitialQP                           : 0                # Rate control: initial QP
+#RCForceIntraQP                      : 0                # Rate control: force intra QP to be equal to initial QP
+
+### DO NOT ADD ANYTHING BELOW THIS LINE ###
+### DO NOT DELETE THE EMPTY LINE BELOW ###
Index: branches/SHM-dev/cfg/encoder_lowdelay_scalable10.cfg
===================================================================
--- branches/SHM-dev/cfg/encoder_lowdelay_scalable10.cfg	(revision 1029)
+++ branches/SHM-dev/cfg/encoder_lowdelay_scalable10.cfg	(revision 1029)
@@ -0,0 +1,121 @@
+#======== File I/O =====================
+BitstreamFile                 : str.bin
+#ReconFile                     : rec.yuv
+
+#======== Profile ================
+NumProfileTierLevel           : 3
+Profile0                      : main10                # Profile for BL (NOTE01: this profile applies to whole layers but only BL is outputted)
+                                                      #                (NOTE02: this profile has no effect when NonHEVCBase is set to 1)
+Profile1                      : main10                # Profile for BL (NOTE01: this profile applies to HEVC BL only)
+                                                      #                (NOTE02: When NonHEVCBase is set to 1, this profile & associated level should be updated appropriately)
+Profile2                      : scalable-main10       # Scalable profile
+
+#======== Unit definition ================
+MaxCUWidth                    : 64          # Maximum coding unit width in pixel
+MaxCUHeight                   : 64          # Maximum coding unit height in pixel
+MaxPartitionDepth             : 4           # Maximum coding unit depth
+QuadtreeTULog2MaxSize         : 5           # Log2 of maximum transform size for
+                                            # quadtree-based TU coding (2...6)
+QuadtreeTULog2MinSize         : 2           # Log2 of minimum transform size for
+                                            # quadtree-based TU coding (2...6)
+QuadtreeTUMaxDepthInter       : 3
+QuadtreeTUMaxDepthIntra       : 3
+
+#======== Coding Structure =============
+#IntraPeriod                   : -1          # Period of I-Frame ( -1 = only first)
+DecodingRefreshType           : 0           # Random Accesss 0:none, 1:CRA, 2:IDR, 3:Recovery Point SEI
+GOPSize                       : 4           # GOP Size (number of B slice = GOPSize-1)
+#        Type POC QPoffset QPfactor tcOffsetDiv2 betaOffsetDiv2  temporal_id #ref_pics_active #ref_pics reference pictures predict deltaRPS #ref_idcs reference idcs 
+Frame1:  B    1   3        0.4624   0            0               0           4                4         -1 -5 -9 -13       0
+Frame2:  B    2   2        0.4624   0            0               0           4                4         -1 -2 -6 -10       1      -1       5         1 1 1 0 1
+Frame3:  B    3   3        0.4624   0            0               0           4                4         -1 -3 -7 -11       1      -1       5         0 1 1 1 1            
+Frame4:  B    4   1        0.578    0            0               0           4                4         -1 -4 -8 -12       1      -1       5         0 1 1 1 1
+
+#=========== Motion Search =============
+FastSearch                    : 1           # 0:Full search  1:TZ search
+SearchRange                   : 64          # (0: Search range is a Full frame)
+BipredSearchRange             : 4           # Search range for bi-prediction refinement
+HadamardME                    : 1           # Use of hadamard measure for fractional ME
+FEN                           : 1           # Fast encoder decision
+FDM                           : 1           # Fast Decision for Merge RD cost
+
+#======== Quantization =============
+#QP                            : 32          # Quantization parameter(0-51)
+MaxDeltaQP                    : 0           # CU-based multi-QP optimization
+MaxCuDQPDepth                 : 0           # Max depth of a minimum CuDQP for sub-LCU-level delta QP
+DeltaQpRD                     : 0           # Slice-based multi-QP optimization
+RDOQ                          : 1           # RDOQ
+RDOQTS                        : 1           # RDOQ for transform skip
+
+#=========== Deblock Filter ============
+DeblockingFilterControlPresent: 0           # Dbl control params present (0=not present, 1=present)
+LoopFilterOffsetInPPS         : 0           # Dbl params: 0=varying params in SliceHeader, param = base_param + GOP_offset_param; 1=constant params in PPS, param = base_param)
+LoopFilterDisable             : 0           # Disable deblocking filter (0=Filter, 1=No Filter)
+LoopFilterBetaOffset_div2     : 0           # base_param: -6 ~ 6
+LoopFilterTcOffset_div2       : 0           # base_param: -6 ~ 6
+DeblockingFilterMetric        : 0           # blockiness metric (automatically configures deblocking parameters in bitstream)
+
+#=========== Misc. ============
+#InternalBitDepth             : 10          # codec operating bit-depth
+
+#=========== Coding Tools =================
+SAO                           : 1           # Sample adaptive offset  (0: OFF, 1: ON)
+AMP                           : 1           # Asymmetric motion partitions (0: OFF, 1: ON)
+TransformSkip                 : 1           # Transform skipping (0: OFF, 1: ON)
+TransformSkipFast             : 1           # Fast Transform skipping (0: OFF, 1: ON)
+SAOLcuBoundary                : 0           # SAOLcuBoundary using non-deblocked pixels (0: OFF, 1: ON)
+
+#============ Slices ================
+SliceMode                : 0                # 0: Disable all slice options.
+                                            # 1: Enforce maximum number of LCU in an slice,
+                                            # 2: Enforce maximum number of bytes in an 'slice'
+                                            # 3: Enforce maximum number of tiles in a slice
+SliceArgument            : 1500             # Argument for 'SliceMode'.
+                                            # If SliceMode==1 it represents max. SliceGranularity-sized blocks per slice.
+                                            # If SliceMode==2 it represents max. bytes per slice.
+                                            # If SliceMode==3 it represents max. tiles per slice.
+
+LFCrossSliceBoundaryFlag : 1                # In-loop filtering, including ALF and DB, is across or not across slice boundary.
+                                            # 0:not across, 1: across
+
+#============ PCM ================
+PCMEnabledFlag                      : 0                # 0: No PCM mode
+PCMLog2MaxSize                      : 5                # Log2 of maximum PCM block size.
+PCMLog2MinSize                      : 3                # Log2 of minimum PCM block size.
+PCMInputBitDepthFlag                : 1                # 0: PCM bit-depth is internal bit-depth. 1: PCM bit-depth is input bit-depth.
+PCMFilterDisableFlag                : 0                # 0: Enable loop filtering on I_PCM samples. 1: Disable loop filtering on I_PCM samples.
+
+#============ Tiles ================
+TileUniformSpacing                  : 0                # 0: the column boundaries are indicated by TileColumnWidth array, the row boundaries are indicated by TileRowHeight array
+                                                       # 1: the column and row boundaries are distributed uniformly
+NumTileColumnsMinus1                : 0                # Number of tile columns in a picture minus 1
+TileColumnWidthArray                : 2 3              # Array containing tile column width values in units of CTU (from left to right in picture)   
+NumTileRowsMinus1                   : 0                # Number of tile rows in a picture minus 1
+TileRowHeightArray                  : 2                # Array containing tile row height values in units of CTU (from top to bottom in picture)
+
+LFCrossTileBoundaryFlag             : 1                # In-loop filtering is across or not across tile boundary.
+                                                       # 0:not across, 1: across 
+
+#============ WaveFront ================
+#WaveFrontSynchro                    : 0                # 0:  No WaveFront synchronisation (WaveFrontSubstreams must be 1 in this case).
+                                                       # >0: WaveFront synchronises with the LCU above and to the right by this many LCUs.
+
+#=========== Quantization Matrix =================
+ScalingList                   : 0                      # ScalingList 0 : off, 1 : default, 2 : file read
+ScalingListFile               : scaling_list.txt       # Scaling List file name. If file is not exist, use Default Matrix.
+
+#============ Lossless ================
+TransquantBypassEnableFlag : 0                         # Value of PPS flag.
+CUTransquantBypassFlagForce: 0                         # Force transquant bypass mode, when transquant_bypass_enable_flag is enabled
+
+#============ Rate Control ======================
+#RateControl                         : 0                # Rate control: enable rate control
+#TargetBitrate                       : 1000000          # Rate control: target bitrate, in bps
+#KeepHierarchicalBit                 : 2                # Rate control: 0: equal bit allocation; 1: fixed ratio bit allocation; 2: adaptive ratio bit allocation
+#LCULevelRateControl                 : 1                # Rate control: 1: LCU level RC; 0: picture level RC
+#RCLCUSeparateModel                  : 1                # Rate control: use LCU level separate R-lambda model
+#InitialQP                           : 0                # Rate control: initial QP
+#RCForceIntraQP                      : 0                # Rate control: force intra QP to be equal to initial QP
+
+### DO NOT ADD ANYTHING BELOW THIS LINE ###
+### DO NOT DELETE THE EMPTY LINE BELOW ###
Index: branches/SHM-dev/cfg/encoder_randomaccess_he10.cfg
===================================================================
--- branches/SHM-dev/cfg/encoder_randomaccess_he10.cfg	(revision 991)
+++ 	(revision )
@@ -1,110 +1,0 @@
-#======== File I/O =====================
-BitstreamFile                 : str.bin
-#ReconFile                     : rec.yuv
-
-#======== Unit definition ================
-MaxCUWidth                    : 64          # Maximum coding unit width in pixel
-MaxCUHeight                   : 64          # Maximum coding unit height in pixel
-MaxPartitionDepth             : 4           # Maximum coding unit depth
-QuadtreeTULog2MaxSize         : 5           # Log2 of maximum transform size for
-                                            # quadtree-based TU coding (2...6)
-QuadtreeTULog2MinSize         : 2           # Log2 of minimum transform size for
-                                            # quadtree-based TU coding (2...6)
-QuadtreeTUMaxDepthInter       : 3
-QuadtreeTUMaxDepthIntra       : 3
-
-#======== Coding Structure =============
-#IntraPeriod                   : 32          # Period of I-Frame ( -1 = only first)
-DecodingRefreshType           : 1           # Random Accesss 0:none, 1:CDR, 2:IDR
-GOPSize                       : 8           # GOP Size (number of B slice = GOPSize-1)
-#        Type POC QPoffset QPfactor temporal_id #ref_pics_active #ref_pics reference pictures     predict deltaRPS #ref_idcs reference idcs 
-Frame1:  B    8   1        0.442    0           4                4         -8 -10 -12 -16         0
-Frame2:  B    4   2        0.3536   0           2                3         -4 -6  4               1       4        5         1 1 0 0 1
-Frame3:  B    2   3        0.3536   0           2                4         -2 -4  2 6             1       2        4         1 1 1 1  
-Frame4:  B    1   4        0.68     0           2                4         -1  1  3 7             1       1        5         1 0 1 1 1 
-Frame5:  B    3   4        0.68     0           2                4         -1 -3  1 5             1      -2        5         1 1 1 1 0
-Frame6:  B    6   3        0.3536   0           2                4         -2 -4 -6 2             1      -3        5         1 1 1 1 0
-Frame7:  B    5   4        0.68     0           2                4         -1 -5  1 3             1       1        5         1 0 1 1 1  
-Frame8:  B    7   4        0.68     0           2                4         -1 -3 -7 1             1      -2        5         1 1 1 1 0
-
-ListCombination               : 1           # Use combined list for uni-prediction in B-slices
-
-#=========== Motion Search =============
-FastSearch                    : 1           # 0:Full search  1:EPZS
-SearchRange                   : 64          # (0: Search range is a Full frame)
-BipredSearchRange             : 4           # Search range for bi-prediction refinement
-HadamardME                    : 1           # Use of hadamard measure for fractional ME
-FEN                           : 1           # Fast encoder decision
-FDM                           : 1           # Fast Decision for Merge RD cost
-
-#======== Quantization =============
-#QP                            : 32          # Quantization parameter(0-51)
-MaxDeltaQP                    : 0           # CU-based multi-QP optimization
-MaxCuDQPDepth                 : 0           # Max depth of a minimum CuDQP for sub-LCU-level delta QP
-DeltaQpRD                     : 0           # Slice-based multi-QP optimization
-RDOQ                          : 1           # RDOQ
-
-#=========== Deblock Filter ============
-DeblockingFilterControlPresent: 0           # Dbl control params present (0=not present, 1=present)
-LoopFilterOffsetInPPS         : 0           # Dbl params in PPS or SliceHeader (0=SliceHeader, 1=PPS)
-LoopFilterDisable             : 0           # Disable deblocking filter in slice header (0=Filter, 1=No Filter)
-LoopFilterBetaOffset_div2     : 0           # Range: -13 ~ 13
-LoopFilterTcOffset_div2       : 0           # Range: -13 ~ 13
-
-#=========== Misc. ============
-#InternalBitDepth             : 10          # codec operating bit-depth
-
-#=========== Coding Tools =================
-SAO                           : 1           # Sample adaptive offset  (0: OFF, 1: ON)
-AMP                           : 1           # Asymmetric motion partitions (0: OFF, 1: ON)
-TransformSkip                 : 1           # Transform skipping (0: OFF, 1: ON)
-TransformSkipFast             : 1           # Fast Transform skipping (0: OFF, 1: ON)
-SAOLcuBoundary                : 0           # SAOLcuBoundary using non-deblocked pixels (0: OFF, 1: ON)
-
-#============ Slices ================
-SliceMode                : 0                # 0: Disable all slice options.
-                                            # 1: Enforce maximum number of LCU in an slice,
-                                            # 2: Enforce maximum number of bytes in an 'slice'
-                                            # 3: Enforce maximum number of tiles in a slice
-SliceArgument            : 1500             # Argument for 'SliceMode'.
-                                            # If SliceMode==1 it represents max. SliceGranularity-sized blocks per slice.
-                                            # If SliceMode==2 it represents max. bytes per slice.
-                                            # If SliceMode==3 it represents max. tiles per slice.
-
-LFCrossSliceBoundaryFlag : 1                # In-loop filtering, including ALF and DB, is across or not across slice boundary.
-                                            # 0:not across, 1: across
-
-#============ PCM ================
-PCMEnabledFlag                      : 0                # 0: No PCM mode
-PCMLog2MaxSize                      : 5                # Log2 of maximum PCM block size.
-PCMLog2MinSize                      : 3                # Log2 of minimum PCM block size.
-PCMInputBitDepthFlag                : 1                # 0: PCM bit-depth is internal bit-depth. 1: PCM bit-depth is input bit-depth.
-PCMFilterDisableFlag                : 0                # 0: Enable loop filtering on I_PCM samples. 1: Disable loop filtering on I_PCM samples.
-
-#============ Tiles ================
-UniformSpacingIdc                   : 0                # 0: the column boundaries are indicated by ColumnWidth array, the row boundaries are indicated by RowHeight array
-                                                       # 1: the column and row boundaries are distributed uniformly
-NumTileColumnsMinus1                : 0                # Number of columns in a picture minus 1
-ColumnWidthArray                    : 2 3              # Array containing ColumnWidth values in units of LCU (from left to right in picture)   
-NumTileRowsMinus1                   : 0                # Number of rows in a picture minus 1
-RowHeightArray                      : 2                # Array containing RowHeight values in units of LCU (from top to bottom in picture)
-
-LFCrossTileBoundaryFlag           : 1                  # In-loop filtering is across or not across tile boundary.
-                                                       # 0:not across, 1: across                                                       
-
-#============ WaveFront ================
-#WaveFrontSynchro                    : 0                # 0:  No WaveFront synchronisation (WaveFrontSubstreams must be 1 in this case).
-                                                       # >0: WaveFront synchronises with the LCU above and to the right by this many LCUs.
-
-#=========== Quantization Matrix =================
-ScalingList                   : 0                      # ScalingList 0 : off, 1 : default, 2 : file read
-ScalingListFile               : scaling_list.txt       # Scaling List file name. If file is not exist, use Default Matrix.
-
-#============ Lossless ================
-LosslessCuEnabled                   : 0                # 1: Set "qpprime_y_zero_transquant_bypass_flag=1" and enable the lossless mode as well as the RD-based mode selection process.
-TransquantBypassEnableFlag: 0  # Value of PPS flag.
-CUTransquantBypassFlagValue: 0 # Constant lossless-value signaling per CU, if TransquantBypassEnableFlag is 1.
-
-### DO NOT ADD ANYTHING BELOW THIS LINE ###
-### DO NOT DELETE THE EMPTY LINE BELOW ###
-
Index: branches/SHM-dev/cfg/encoder_randomaccess_scalable.cfg
===================================================================
--- branches/SHM-dev/cfg/encoder_randomaccess_scalable.cfg	(revision 1029)
+++ branches/SHM-dev/cfg/encoder_randomaccess_scalable.cfg	(revision 1029)
@@ -0,0 +1,126 @@
+#======== File I/O =====================
+BitstreamFile                 : str.bin
+#ReconFile                     : rec.yuv
+
+#======== Profile ================
+NumProfileTierLevel           : 3
+Profile0                      : main                # Profile for BL (NOTE01: this profile applies to whole layers but only BL is outputted)
+                                                    #                (NOTE02: this profile has no effect when NonHEVCBase is set to 1)
+Profile1                      : main                # Profile for BL (NOTE01: this profile applies to HEVC BL only)
+                                                    #                (NOTE02: When NonHEVCBase is set to 1, this profile & associated level should be updated appropriately)
+Profile2                      : scalable-main       # Scalable profile
+
+#======== Unit definition ================
+MaxCUWidth                    : 64          # Maximum coding unit width in pixel
+MaxCUHeight                   : 64          # Maximum coding unit height in pixel
+MaxPartitionDepth             : 4           # Maximum coding unit depth
+QuadtreeTULog2MaxSize         : 5           # Log2 of maximum transform size for
+                                            # quadtree-based TU coding (2...6)
+QuadtreeTULog2MinSize         : 2           # Log2 of minimum transform size for
+                                            # quadtree-based TU coding (2...6)
+QuadtreeTUMaxDepthInter       : 3
+QuadtreeTUMaxDepthIntra       : 3
+
+#======== Coding Structure =============
+#IntraPeriod                   : 32          # Period of I-Frame ( -1 = only first)
+DecodingRefreshType           : 1           # Random Accesss 0:none, 1:CRA, 2:IDR, 3:Recovery Point SEI
+GOPSize                       : 8           # GOP Size (number of B slice = GOPSize-1)
+#        Type POC QPoffset QPfactor tcOffsetDiv2 betaOffsetDiv2 temporal_id #ref_pics_active #ref_pics reference pictures     predict deltaRPS #ref_idcs reference idcs 
+Frame1:  B    8   1        0.442    0            0              0           4                4         -8 -10 -12 -16         0
+Frame2:  B    4   2        0.3536   0            0              0           2                3         -4 -6  4               1       4        5         1 1 0 0 1
+Frame3:  B    2   3        0.3536   0            0              0           2                4         -2 -4  2 6             1       2        4         1 1 1 1  
+Frame4:  B    1   4        0.68     0            0              1           2                4         -1  1  3 7             1       1        5         1 0 1 1 1 
+Frame5:  B    3   4        0.68     0            0              1           2                4         -1 -3  1 5             1      -2        5         1 1 1 1 0
+Frame6:  B    6   3        0.3536   0            0              0           2                4         -2 -4 -6 2             1      -3        5         1 1 1 1 0
+Frame7:  B    5   4        0.68     0            0              1           2                4         -1 -5  1 3             1       1        5         1 0 1 1 1  
+Frame8:  B    7   4        0.68     0            0              1           2                4         -1 -3 -7 1             1      -2        5         1 1 1 1 0
+
+#=========== Motion Search =============
+FastSearch                    : 1           # 0:Full search  1:TZ search
+SearchRange                   : 64          # (0: Search range is a Full frame)
+BipredSearchRange             : 4           # Search range for bi-prediction refinement
+HadamardME                    : 1           # Use of hadamard measure for fractional ME
+FEN                           : 1           # Fast encoder decision
+FDM                           : 1           # Fast Decision for Merge RD cost
+
+#======== Quantization =============
+#QP                            : 32          # Quantization parameter(0-51)
+MaxDeltaQP                    : 0           # CU-based multi-QP optimization
+MaxCuDQPDepth                 : 0           # Max depth of a minimum CuDQP for sub-LCU-level delta QP
+DeltaQpRD                     : 0           # Slice-based multi-QP optimization
+RDOQ                          : 1           # RDOQ
+RDOQTS                        : 1           # RDOQ for transform skip
+
+#=========== Deblock Filter ============
+DeblockingFilterControlPresent: 0           # Dbl control params present (0=not present, 1=present)
+LoopFilterOffsetInPPS         : 0           # Dbl params: 0=varying params in SliceHeader, param = base_param + GOP_offset_param; 1=constant params in PPS, param = base_param)
+LoopFilterDisable             : 0           # Disable deblocking filter (0=Filter, 1=No Filter)
+LoopFilterBetaOffset_div2     : 0           # base_param: -6 ~ 6
+LoopFilterTcOffset_div2       : 0           # base_param: -6 ~ 6
+DeblockingFilterMetric        : 0           # blockiness metric (automatically configures deblocking parameters in bitstream)
+
+#=========== Misc. ============
+#InternalBitDepth             : 8           # codec operating bit-depth
+
+#=========== Coding Tools =================
+SAO                           : 1           # Sample adaptive offset  (0: OFF, 1: ON)
+AMP                           : 1           # Asymmetric motion partitions (0: OFF, 1: ON)
+TransformSkip                 : 1           # Transform skipping (0: OFF, 1: ON)
+TransformSkipFast             : 1           # Fast Transform skipping (0: OFF, 1: ON)
+SAOLcuBoundary                : 0           # SAOLcuBoundary using non-deblocked pixels (0: OFF, 1: ON)
+
+#============ Slices ================
+SliceMode                : 0                # 0: Disable all slice options.
+                                            # 1: Enforce maximum number of LCU in an slice,
+                                            # 2: Enforce maximum number of bytes in an 'slice'
+                                            # 3: Enforce maximum number of tiles in a slice
+SliceArgument            : 1500             # Argument for 'SliceMode'.
+                                            # If SliceMode==1 it represents max. SliceGranularity-sized blocks per slice.
+                                            # If SliceMode==2 it represents max. bytes per slice.
+                                            # If SliceMode==3 it represents max. tiles per slice.
+
+LFCrossSliceBoundaryFlag : 1                # In-loop filtering, including ALF and DB, is across or not across slice boundary.
+                                            # 0:not across, 1: across
+
+#============ PCM ================
+PCMEnabledFlag                      : 0                # 0: No PCM mode
+PCMLog2MaxSize                      : 5                # Log2 of maximum PCM block size.
+PCMLog2MinSize                      : 3                # Log2 of minimum PCM block size.
+PCMInputBitDepthFlag                : 1                # 0: PCM bit-depth is internal bit-depth. 1: PCM bit-depth is input bit-depth.
+PCMFilterDisableFlag                : 0                # 0: Enable loop filtering on I_PCM samples. 1: Disable loop filtering on I_PCM samples.
+
+#============ Tiles ================
+TileUniformSpacing                  : 0                # 0: the column boundaries are indicated by TileColumnWidth array, the row boundaries are indicated by TileRowHeight array
+                                                       # 1: the column and row boundaries are distributed uniformly
+NumTileColumnsMinus1                : 0                # Number of tile columns in a picture minus 1
+TileColumnWidthArray                : 2 3              # Array containing tile column width values in units of CTU (from left to right in picture)   
+NumTileRowsMinus1                   : 0                # Number of tile rows in a picture minus 1
+TileRowHeightArray                  : 2                # Array containing tile row height values in units of CTU (from top to bottom in picture)
+
+LFCrossTileBoundaryFlag             : 1                # In-loop filtering is across or not across tile boundary.
+                                                       # 0:not across, 1: across 
+
+#============ WaveFront ================
+#WaveFrontSynchro                    : 0                # 0:  No WaveFront synchronisation (WaveFrontSubstreams must be 1 in this case).
+                                                       # >0: WaveFront synchronises with the LCU above and to the right by this many LCUs.
+
+#=========== Quantization Matrix =================
+ScalingList                   : 0                      # ScalingList 0 : off, 1 : default, 2 : file read
+ScalingListFile               : scaling_list.txt       # Scaling List file name. If file is not exist, use Default Matrix.
+
+#============ Lossless ================
+TransquantBypassEnableFlag : 0                         # Value of PPS flag.
+CUTransquantBypassFlagForce: 0                         # Force transquant bypass mode, when transquant_bypass_enable_flag is enabled
+
+#============ Rate Control ======================
+#RateControl                         : 0                # Rate control: enable rate control
+#TargetBitrate                       : 1000000          # Rate control: target bitrate, in bps
+#KeepHierarchicalBit                 : 2                # Rate control: 0: equal bit allocation; 1: fixed ratio bit allocation; 2: adaptive ratio bit allocation
+#LCULevelRateControl                 : 1                # Rate control: 1: LCU level RC; 0: picture level RC
+#RCLCUSeparateModel                  : 1                # Rate control: use LCU level separate R-lambda model
+#InitialQP                           : 0                # Rate control: initial QP
+#RCForceIntraQP                      : 0                # Rate control: force intra QP to be equal to initial QP
+
+### DO NOT ADD ANYTHING BELOW THIS LINE ###
+### DO NOT DELETE THE EMPTY LINE BELOW ###
+
Index: branches/SHM-dev/cfg/encoder_randomaccess_scalable10.cfg
===================================================================
--- branches/SHM-dev/cfg/encoder_randomaccess_scalable10.cfg	(revision 1029)
+++ branches/SHM-dev/cfg/encoder_randomaccess_scalable10.cfg	(revision 1029)
@@ -0,0 +1,126 @@
+#======== File I/O =====================
+BitstreamFile                 : str.bin
+#ReconFile                     : rec.yuv
+
+#======== Profile ================
+NumProfileTierLevel           : 3
+Profile0                      : main10                # Profile for BL (NOTE01: this profile applies to whole layers but only BL is outputted)
+                                                      #                (NOTE02: this profile has no effect when NonHEVCBase is set to 1)
+Profile1                      : main10                # Profile for BL (NOTE01: this profile applies to HEVC BL only)
+                                                      #                (NOTE02: When NonHEVCBase is set to 1, this profile & associated level should be updated appropriately)
+Profile2                      : scalable-main10       # Scalable profile
+
+#======== Unit definition ================
+MaxCUWidth                    : 64          # Maximum coding unit width in pixel
+MaxCUHeight                   : 64          # Maximum coding unit height in pixel
+MaxPartitionDepth             : 4           # Maximum coding unit depth
+QuadtreeTULog2MaxSize         : 5           # Log2 of maximum transform size for
+                                            # quadtree-based TU coding (2...6)
+QuadtreeTULog2MinSize         : 2           # Log2 of minimum transform size for
+                                            # quadtree-based TU coding (2...6)
+QuadtreeTUMaxDepthInter       : 3
+QuadtreeTUMaxDepthIntra       : 3
+
+#======== Coding Structure =============
+#IntraPeriod                   : 32          # Period of I-Frame ( -1 = only first)
+DecodingRefreshType           : 1           # Random Accesss 0:none, 1:CRA, 2:IDR, 3:Recovery Point SEI
+GOPSize                       : 8           # GOP Size (number of B slice = GOPSize-1)
+#        Type POC QPoffset QPfactor tcOffsetDiv2 betaOffsetDiv2 temporal_id #ref_pics_active #ref_pics reference pictures     predict deltaRPS #ref_idcs reference idcs 
+Frame1:  B    8   1        0.442    0            0              0           4                4         -8 -10 -12 -16         0
+Frame2:  B    4   2        0.3536   0            0              0           2                3         -4 -6  4               1       4        5         1 1 0 0 1
+Frame3:  B    2   3        0.3536   0            0              0           2                4         -2 -4  2 6             1       2        4         1 1 1 1  
+Frame4:  B    1   4        0.68     0            0              1           2                4         -1  1  3 7             1       1        5         1 0 1 1 1 
+Frame5:  B    3   4        0.68     0            0              1           2                4         -1 -3  1 5             1      -2        5         1 1 1 1 0
+Frame6:  B    6   3        0.3536   0            0              0           2                4         -2 -4 -6 2             1      -3        5         1 1 1 1 0
+Frame7:  B    5   4        0.68     0            0              1           2                4         -1 -5  1 3             1       1        5         1 0 1 1 1  
+Frame8:  B    7   4        0.68     0            0              1           2                4         -1 -3 -7 1             1      -2        5         1 1 1 1 0
+
+#=========== Motion Search =============
+FastSearch                    : 1           # 0:Full search  1:TZ search
+SearchRange                   : 64          # (0: Search range is a Full frame)
+BipredSearchRange             : 4           # Search range for bi-prediction refinement
+HadamardME                    : 1           # Use of hadamard measure for fractional ME
+FEN                           : 1           # Fast encoder decision
+FDM                           : 1           # Fast Decision for Merge RD cost
+
+#======== Quantization =============
+#QP                            : 32          # Quantization parameter(0-51)
+MaxDeltaQP                    : 0           # CU-based multi-QP optimization
+MaxCuDQPDepth                 : 0           # Max depth of a minimum CuDQP for sub-LCU-level delta QP
+DeltaQpRD                     : 0           # Slice-based multi-QP optimization
+RDOQ                          : 1           # RDOQ
+RDOQTS                        : 1           # RDOQ for transform skip
+
+#=========== Deblock Filter ============
+DeblockingFilterControlPresent: 0           # Dbl control params present (0=not present, 1=present)
+LoopFilterOffsetInPPS         : 0           # Dbl params: 0=varying params in SliceHeader, param = base_param + GOP_offset_param; 1=constant params in PPS, param = base_param)
+LoopFilterDisable             : 0           # Disable deblocking filter (0=Filter, 1=No Filter)
+LoopFilterBetaOffset_div2     : 0           # base_param: -6 ~ 6
+LoopFilterTcOffset_div2       : 0           # base_param: -6 ~ 6
+DeblockingFilterMetric        : 0           # blockiness metric (automatically configures deblocking parameters in bitstream)
+
+#=========== Misc. ============
+#InternalBitDepth             : 10           # codec operating bit-depth
+
+#=========== Coding Tools =================
+SAO                           : 1           # Sample adaptive offset  (0: OFF, 1: ON)
+AMP                           : 1           # Asymmetric motion partitions (0: OFF, 1: ON)
+TransformSkip                 : 1           # Transform skipping (0: OFF, 1: ON)
+TransformSkipFast             : 1           # Fast Transform skipping (0: OFF, 1: ON)
+SAOLcuBoundary                : 0           # SAOLcuBoundary using non-deblocked pixels (0: OFF, 1: ON)
+
+#============ Slices ================
+SliceMode                : 0                # 0: Disable all slice options.
+                                            # 1: Enforce maximum number of LCU in an slice,
+                                            # 2: Enforce maximum number of bytes in an 'slice'
+                                            # 3: Enforce maximum number of tiles in a slice
+SliceArgument            : 1500             # Argument for 'SliceMode'.
+                                            # If SliceMode==1 it represents max. SliceGranularity-sized blocks per slice.
+                                            # If SliceMode==2 it represents max. bytes per slice.
+                                            # If SliceMode==3 it represents max. tiles per slice.
+
+LFCrossSliceBoundaryFlag : 1                # In-loop filtering, including ALF and DB, is across or not across slice boundary.
+                                            # 0:not across, 1: across
+
+#============ PCM ================
+PCMEnabledFlag                      : 0                # 0: No PCM mode
+PCMLog2MaxSize                      : 5                # Log2 of maximum PCM block size.
+PCMLog2MinSize                      : 3                # Log2 of minimum PCM block size.
+PCMInputBitDepthFlag                : 1                # 0: PCM bit-depth is internal bit-depth. 1: PCM bit-depth is input bit-depth.
+PCMFilterDisableFlag                : 0                # 0: Enable loop filtering on I_PCM samples. 1: Disable loop filtering on I_PCM samples.
+
+#============ Tiles ================
+TileUniformSpacing                  : 0                # 0: the column boundaries are indicated by TileColumnWidth array, the row boundaries are indicated by TileRowHeight array
+                                                       # 1: the column and row boundaries are distributed uniformly
+NumTileColumnsMinus1                : 0                # Number of tile columns in a picture minus 1
+TileColumnWidthArray                : 2 3              # Array containing tile column width values in units of CTU (from left to right in picture)   
+NumTileRowsMinus1                   : 0                # Number of tile rows in a picture minus 1
+TileRowHeightArray                  : 2                # Array containing tile row height values in units of CTU (from top to bottom in picture)
+
+LFCrossTileBoundaryFlag             : 1                # In-loop filtering is across or not across tile boundary.
+                                                       # 0:not across, 1: across 
+
+#============ WaveFront ================
+#WaveFrontSynchro                    : 0                # 0:  No WaveFront synchronisation (WaveFrontSubstreams must be 1 in this case).
+                                                       # >0: WaveFront synchronises with the LCU above and to the right by this many LCUs.
+
+#=========== Quantization Matrix =================
+ScalingList                   : 0                      # ScalingList 0 : off, 1 : default, 2 : file read
+ScalingListFile               : scaling_list.txt       # Scaling List file name. If file is not exist, use Default Matrix.
+
+#============ Lossless ================
+TransquantBypassEnableFlag : 0                         # Value of PPS flag.
+CUTransquantBypassFlagForce: 0                         # Force transquant bypass mode, when transquant_bypass_enable_flag is enabled
+
+#============ Rate Control ======================
+#RateControl                         : 0                # Rate control: enable rate control
+#TargetBitrate                       : 1000000          # Rate control: target bitrate, in bps
+#KeepHierarchicalBit                 : 2                # Rate control: 0: equal bit allocation; 1: fixed ratio bit allocation; 2: adaptive ratio bit allocation
+#LCULevelRateControl                 : 1                # Rate control: 1: LCU level RC; 0: picture level RC
+#RCLCUSeparateModel                  : 1                # Rate control: use LCU level separate R-lambda model
+#InitialQP                           : 0                # Rate control: initial QP
+#RCForceIntraQP                      : 0                # Rate control: force intra QP to be equal to initial QP
+
+### DO NOT ADD ANYTHING BELOW THIS LINE ###
+### DO NOT DELETE THE EMPTY LINE BELOW ###
+
Index: branches/SHM-dev/cfg/layers.cfg
===================================================================
--- branches/SHM-dev/cfg/layers.cfg	(revision 991)
+++ branches/SHM-dev/cfg/layers.cfg	(revision 1029)
@@ -13,5 +13,5 @@
 #============= LAYER 0 ==================
 QP0                           : 22
-MaxTidIlRefPicsPlus10         : 1           # max_tid_il_ref_pics_plus1 for layer0
+MaxTidIlRefPicsPlus10         : 2           # max_tid_il_ref_pics_plus1 for layer0
 #============ Rate Control ==============
 RateControl0                  : 0           # Rate control: enable rate control for layer 0
@@ -53,9 +53,9 @@
 LayerSetLayerIdList1          : 0 1
 
-NumAddLayerSets               : 0
-NumOutputLayerSets            : 2           # Include defualt OLS, value of 0 not allowed
-DefaultTargetOutputLayerIdc   : 1
-NumOutputLayersInOutputLayerSet     : 1           # The number of layers in the 0-th OLS should not be specified, 
+NumAddLayerSets                      : 0
+NumOutputLayerSets                   : 2           # Include defualt OLS, value of 0 not allowed
+DefaultTargetOutputLayerIdc          : 1
+NumOutputLayersInOutputLayerSet      : 1           # The number of layers in the 0-th OLS should not be specified, 
 # ListOfOutputLayers0 need not be specified
-ListOfOutputLayers1	          : 1
-ListOfProfileTierLevelOls1    : 1 2
+ListOfOutputLayers1	                 : 1
+ListOfProfileTierLevelOls1           : 1 2
Index: branches/SHM-dev/cfg/layers_avcbase.cfg
===================================================================
--- branches/SHM-dev/cfg/layers_avcbase.cfg	(revision 991)
+++ branches/SHM-dev/cfg/layers_avcbase.cfg	(revision 1029)
@@ -6,9 +6,10 @@
 CrossLayerPictureTypeAlignFlag: 0           # Picture type alignment across layers
 CrossLayerIrapAlignFlag       : 0           # Align IRAP across layers
+MaxTidRefPresentFlag          : 1           # max_tid_ref_present_flag (0=not present, 1=present(default))
 SEIpictureDigest              : 1
 
 #============= LAYER 0 ==================
 QP0                           : 22
-
+MaxTidIlRefPicsPlus10         : 2           # max_tid_il_ref_pics_plus1 for layer0
 #============ Rate Control ==============
 RateControl0                  : 0           # Rate control: enable rate control for layer 0
@@ -49,10 +50,9 @@
 LayerSetLayerIdList1          : 0 1
 
-NumAddLayerSets               : 0
-NumOutputLayerSets            : 2           # Include defualt OLS, value of 0 not allowed
-DefaultTargetOutputLayerIdc   : 1
-NumOutputLayersInOutputLayerSet     : 1           # The number of layers in the 0-th OLS should not be specified, 
+NumAddLayerSets                      : 0
+NumOutputLayerSets                   : 2           # Include defualt OLS, value of 0 not allowed
+DefaultTargetOutputLayerIdc          : 1
+NumOutputLayersInOutputLayerSet      : 1           # The number of layers in the 0-th OLS should not be specified,  
 # ListOfOutputLayers0 need not be specified
-ListOfOutputLayers1	      : 1
-ListOfProfileTierLevelOls1    : 1 2
-
+ListOfOutputLayers1	                 : 1
+ListOfProfileTierLevelOls1           : 1 2
