Changeset 938 in SHVCSoftware

Timestamp:

26 Dec 2014, 20:41:37 (10 years ago)

Author:

seregin

Message:

fix for the ticket #42

Location:

branches/SHM-upgrade/source/Lib

Files:

• TLibDecoder/TDecCAVLC.cpp (modified) (2 diffs)
• TLibEncoder/TEncCavlc.cpp (modified) (2 diffs)

branches/SHM-upgrade/source/Lib/TLibDecoder/TDecCAVLC.cpp

@@ -403 +403 @@
             if( pcPPS->getInferScalingListFlag() )
             {
-              READ_UVLC( uiCode, "pps_scaling_list_ref_layer_id" ); 
+              READ_CODE( 6, uiCode, "pps_scaling_list_ref_layer_id" ); 
               pcPPS->setScalingListRefLayerId( uiCode );
               // The value of pps_scaling_list_ref_layer_id shall be in the range of 0 to 62, inclusive
@@ -885 +885 @@
     if( pcSPS->getInferScalingListFlag() )
     {
-      READ_UVLC( uiCode, "sps_scaling_list_ref_layer_id" ); pcSPS->setScalingListRefLayerId( uiCode );
-
-      // The value of pps_scaling_list_ref_layer_id shall be in the range of 0 to 62, inclusive
+      READ_CODE( 6, uiCode, "sps_scaling_list_ref_layer_id" ); pcSPS->setScalingListRefLayerId( uiCode );
+
+      // The value of sps_scaling_list_ref_layer_id shall be in the range of 0 to 62, inclusive
       assert( pcSPS->getScalingListRefLayerId() <= 62 );
 

branches/SHM-upgrade/source/Lib/TLibEncoder/TEncCavlc.cpp

@@ -312 +312 @@
               // The value of pps_scaling_list_ref_layer_id shall be in the range of 0 to 62, inclusive
               assert( pcPPS->getScalingListRefLayerId() <= 62 );
-              WRITE_UVLC( pcPPS->getScalingListRefLayerId(), "pps_scaling_list_ref_layer_id" );
+              WRITE_CODE( pcPPS->getScalingListRefLayerId(), 6, "pps_scaling_list_ref_layer_id" );
             }
 #endif
@@ -674 +674 @@
       assert( pcSPS->getScalingListRefLayerId() <= 62 );
 
-      WRITE_UVLC( pcSPS->getScalingListRefLayerId(), "sps_scaling_list_ref_layer_id" );
+      WRITE_CODE( pcSPS->getScalingListRefLayerId(), 6, "sps_scaling_list_ref_layer_id" );
     }
     else