Ticket #1358: pps(sps)_extension_flag_encoder.patch

source/Lib/TLibEncoder/TEncCavlc.cpp

@@ -230 +230 @@
   WRITE_FLAG( pcPPS->getSliceHeaderExtensionPresentFlag() ? 1 : 0, "slice_segment_header_extension_present_flag");
 
   Bool pps_extension_present_flag=false;
-  Bool pps_extension_flags[NUM_PPS_EXTENSION_FLAGS]={false};
+  Bool pps_extension_Xbits[NUM_PPS_EXTENSION_FLAGS]={false};
 
-  pps_extension_flags[PPS_EXT__REXT] = (
+  pps_extension_Xbits[PPS_EXT__REXT] = (
              ( pcPPS->getUseTransformSkip() && (pcPPS->getTransformSkipLog2MaxSize() != 2))
           || pcPPS->getUseCrossComponentPrediction()
           || ( pcPPS->getChromaQpAdjTableSize() > 0 )
@@ -244 +244 @@
 
   for(Int i=0; i<NUM_PPS_EXTENSION_FLAGS; i++)
   {
-    pps_extension_present_flag|=pps_extension_flags[i];
+    pps_extension_present_flag|=pps_extension_Xbits[i];
   }
 
   WRITE_FLAG( (pps_extension_present_flag?1:0), "pps_extension_present_flag" );
 
   if (pps_extension_present_flag)
   {
-    for(Int i=0; i<NUM_PPS_EXTENSION_FLAGS; i++)
+
+    WRITE_FLAG( pps_extension_Xbits[0] ? 1:0, "pps_range_extensions_flag" );
+
+    for(Int i=1; i<NUM_PPS_EXTENSION_FLAGS; i++)
     {
-      WRITE_FLAG( pps_extension_flags[i]?1:0, "pps_extension_flag[]" );
+      WRITE_FLAG( pps_extension_Xbits[i] ? 1:0, "pps_extension_7bits" );
     }
 
     for(Int i=0; i<NUM_PPS_EXTENSION_FLAGS; i++) // loop used so that the order is determined by the enum.
     {
-      if (pps_extension_flags[i])
+      if (pps_extension_Xbits[i])
       {
         switch (PPSExtensionFlagIndex(i))
         {
@@ -565 +568 @@
   }
 
   Bool sps_extension_present_flag=false;
-  Bool sps_extension_flags[NUM_SPS_EXTENSION_FLAGS]={false};
+  Bool sps_extension_Xbits[NUM_SPS_EXTENSION_FLAGS]={false};
 
-  sps_extension_flags[SPS_EXT__REXT] = (
+  sps_extension_Xbits[SPS_EXT__REXT] = (
           pcSPS->getUseResidualRotation()
        || pcSPS->getUseSingleSignificanceMapContext()
        || pcSPS->getUseResidualDPCM(RDPCM_SIGNAL_IMPLICIT)
@@ -583 +586 @@
 
   for(Int i=0; i<NUM_SPS_EXTENSION_FLAGS; i++)
   {
-    sps_extension_present_flag|=sps_extension_flags[i];
+    sps_extension_present_flag|=sps_extension_Xbits[i];
   }
 
   WRITE_FLAG( (sps_extension_present_flag?1:0), "sps_extension_present_flag" );
 
   if (sps_extension_present_flag)
   {
-    for(Int i=0; i<NUM_SPS_EXTENSION_FLAGS; i++)
+    WRITE_FLAG( sps_extension_Xbits[0]?1:0, "sps_range_extensions_flag" );
+
+    for(Int i=1; i<NUM_SPS_EXTENSION_FLAGS; i++)
     {
-      WRITE_FLAG( sps_extension_flags[i]?1:0, "sps_extension_flag[]" );
+      WRITE_FLAG( sps_extension_Xbits[i]?1:0, "sps_extension_flag[]" );
     }
 
     for(Int i=0; i<NUM_SPS_EXTENSION_FLAGS; i++) // loop used so that the order is determined by the enum.
     {
-      if (sps_extension_flags[i])
+      if (sps_extension_Xbits[i])
       {
         switch (SPSExtensionFlagIndex(i))
         {