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

Timestamp:

24 Jul 2015, 21:05:03 (9 years ago)

Author:

seregin

Message:

make scaling list layer-specific

Location:

branches/SHM-dev/cfg

Files:

• encoder_intra_scalable.cfg (modified) (1 diff)
• encoder_intra_scalable10.cfg (modified) (1 diff)
• encoder_lowdelay_P_scalable.cfg (modified) (1 diff)
• encoder_lowdelay_P_scalable10.cfg (modified) (1 diff)
• encoder_lowdelay_scalable.cfg (modified) (1 diff)
• encoder_lowdelay_scalable10.cfg (modified) (1 diff)
• encoder_randomaccess_scalable.cfg (modified) (1 diff)
• encoder_randomaccess_scalable10.cfg (modified) (1 diff)
• layers.cfg (modified) (2 diffs)
• layers_avcbase.cfg (modified) (1 diff)

branches/SHM-dev/cfg/encoder_intra_scalable.cfg

@@ -96 +96 @@
 
 #=========== 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.
+#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 ================

branches/SHM-dev/cfg/encoder_intra_scalable10.cfg

@@ -95 +95 @@
 
 #=========== 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.
+#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 ================

branches/SHM-dev/cfg/encoder_lowdelay_P_scalable.cfg

@@ -101 +101 @@
 
 #=========== 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.
+#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 ================

branches/SHM-dev/cfg/encoder_lowdelay_P_scalable10.cfg

@@ -101 +101 @@
 
 #=========== 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.
+#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 ================

branches/SHM-dev/cfg/encoder_lowdelay_scalable.cfg

@@ -101 +101 @@
 
 #=========== 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.
+#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 ================

branches/SHM-dev/cfg/encoder_lowdelay_scalable10.cfg

@@ -101 +101 @@
 
 #=========== 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.
+#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 ================

branches/SHM-dev/cfg/encoder_randomaccess_scalable.cfg

@@ -105 +105 @@
 
 #=========== 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.
+#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 ================

branches/SHM-dev/cfg/encoder_randomaccess_scalable10.cfg

@@ -105 +105 @@
 
 #=========== 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.
+#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 ================

branches/SHM-dev/cfg/layers.cfg

@@ -26 +26 @@
 WaveFrontSynchro0             : 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 =================
+ScalingList0                  : 0                      # ScalingList 0 : off, 1 : default, 2 : file read
+ScalingListFile0              : scaling_list0.txt      # Scaling List file name. If file is not exist, use Default Matrix.
+                                            
 #============= LAYER 1 ==================
 QP1                           : 20
@@ -48 +51 @@
 WaveFrontSynchro1             : 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 =================
+ScalingList1                  : 2                      # ScalingList 0 : off, 1 : default, 2 : file read
+ScalingListFile1              : scaling_list1.txt      # Scaling List file name. If file is not exist, use Default Matrix.
+                                            
 NumLayerSets                  : 2           # Include default layer set, value of 0 not allowed
 NumLayerInIdList1             : 2           # 0-th layer set is default, need not specify LayerSetLayerIdList0 or NumLayerInIdList0

branches/SHM-dev/cfg/layers_avcbase.cfg

@@ -45 +45 @@
 WaveFrontSynchro1             : 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 =================
+ScalingList1                  : 0                      # ScalingList 0 : off, 1 : default, 2 : file read
+ScalingListFile1              : scaling_list1.txt      # Scaling List file name. If file is not exist, use Default Matrix.                                            
 
 NumLayerSets                  : 2           # Include default layer set, value of 0 not allowed