Changeset 1029 in SHVCSoftware for branches/SHM-dev/cfg

Timestamp:

26 Feb 2015, 00:21:54 (10 years ago)

Author:

seregin

Message:

merge with SHM-upgrade branch

Location:

branches/SHM-dev

Files:

• . (modified) (1 prop)
• cfg (modified) (1 prop)
• cfg/encoder_intra_he10.cfg (deleted)
• cfg/encoder_intra_scalable.cfg (copied) (copied from branches/SHM-upgrade/cfg/encoder_intra_scalable.cfg)
• cfg/encoder_intra_scalable10.cfg (copied) (copied from branches/SHM-upgrade/cfg/encoder_intra_scalable10.cfg)
• cfg/encoder_lowdelay_P_he10.cfg (deleted)
• cfg/encoder_lowdelay_P_scalable.cfg (copied) (copied from branches/SHM-upgrade/cfg/encoder_lowdelay_P_scalable.cfg)
• cfg/encoder_lowdelay_P_scalable10.cfg (copied) (copied from branches/SHM-upgrade/cfg/encoder_lowdelay_P_scalable10.cfg)
• cfg/encoder_lowdelay_he10.cfg (deleted)
• cfg/encoder_lowdelay_scalable.cfg (copied) (copied from branches/SHM-upgrade/cfg/encoder_lowdelay_scalable.cfg)
• cfg/encoder_lowdelay_scalable10.cfg (copied) (copied from branches/SHM-upgrade/cfg/encoder_lowdelay_scalable10.cfg)
• cfg/encoder_randomaccess_he10.cfg (deleted)
• cfg/encoder_randomaccess_scalable.cfg (copied) (copied from branches/SHM-upgrade/cfg/encoder_randomaccess_scalable.cfg)
• cfg/encoder_randomaccess_scalable10.cfg (copied) (copied from branches/SHM-upgrade/cfg/encoder_randomaccess_scalable10.cfg)
• cfg/layers.cfg (modified) (2 diffs)
• cfg/layers_avcbase.cfg (modified) (2 diffs)

branches/SHM-dev/cfg/layers.cfg

@@ -13 +13 @@
 #============= 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 +53 @@
 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

branches/SHM-dev/cfg/layers_avcbase.cfg

@@ -6 +6 @@
 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 +50 @@
 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