Ticket #1358: pps(sps)_extension_flag.patch

source/Lib/TLibDecoder/TDecCAVLC.cpp

@@ -322 +322 @@
   READ_FLAG( uiCode, "pps_extension_present_flag");
   if (uiCode)
   {
-    Bool pps_extension_flags[NUM_PPS_EXTENSION_FLAGS];
-    for(Int i=0; i<NUM_PPS_EXTENSION_FLAGS; i++)
+    Bool pps_extension_Xbits[NUM_PPS_EXTENSION_FLAGS];
+
+    READ_FLAG( uiCode, "pps_range_extensions_flag" );
+    pps_extension_Xbits[0] = uiCode!=0;
+
+    for(Int i = 1; i < NUM_PPS_EXTENSION_FLAGS; i++)
     {
-      READ_FLAG( uiCode, "pps_extension_flag[]" );
-      pps_extension_flags[i] = uiCode!=0;
+      READ_FLAG( uiCode, "pps_extension_7bits" );
+      pps_extension_Xbits[i] = uiCode!=0;
     }
 
     Bool bSkipTrailingExtensionBits=false;
     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))
         {
@@ -754 +758 @@
   READ_FLAG( uiCode, "sps_extension_present_flag");
   if (uiCode)
   {
-    Bool sps_extension_flags[NUM_SPS_EXTENSION_FLAGS];
-    for(Int i=0; i<NUM_SPS_EXTENSION_FLAGS; i++)
+    Bool sps_extension_Xbits[NUM_SPS_EXTENSION_FLAGS];
+
+    READ_FLAG( uiCode, "sps_range_extensions_flag" );
+    sps_extension_Xbits[0] = uiCode!=0;
+
+    for(Int i=1; i<NUM_SPS_EXTENSION_FLAGS; i++)
     {
-      READ_FLAG( uiCode, "sps_extension_flag[]" );
-      sps_extension_flags[i] = uiCode!=0;
+      READ_FLAG( uiCode, "sps_extension_7bits" );
+      sps_extension_Xbits[i] = uiCode!=0;
     }
 
     Bool bSkipTrailingExtensionBits=false;
     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))
         {