Ticket #61: SPSPPSExtn6bits_jpadia_vidyo_150205.patch

source/Lib/TLibCommon/TComSlice.cpp

@@ -3364 +3364 @@
 , m_inferScalingListFlag ( false )
 , m_scalingListRefLayerId ( 0 )
 #endif
+#if SPS_PPS_6BIT_EXTENSION
+, m_sps6bitExtension      ( 0 )
+#endif
 #endif //SVC_EXTENSION
 {
   for ( Int i = 0; i < MAX_TLAYER; i++ )
@@ -3597 +3600 @@
 , m_nCGSOutputBitDepthY(0)
 , m_nCGSOutputBitDepthC(0)
 #endif
+#if SPS_PPS_6BIT_EXTENSION
+, m_pps6bitExtension(0)
+#endif
 #endif //SVC_EXTENSION
 {
   m_scalingList = new TComScalingList;

source/Lib/TLibCommon/TComSlice.h

@@ -1708 +1708 @@
   Bool        m_inferScalingListFlag;
   UInt        m_scalingListRefLayerId;
 #endif
+#if SPS_PPS_6BIT_EXTENSION
+  UInt        m_sps6bitExtension;
+#endif
 #endif //SVC_EXTENSION
 
 public:
@@ -1888 +1891 @@
   Void     setInferScalingListFlag( Bool flag )     { m_inferScalingListFlag = flag;     }
   Void     setScalingListRefLayerId( UInt layerId ) { m_scalingListRefLayerId = layerId; }
 #endif
+#if SPS_PPS_6BIT_EXTENSION
+  void     setSps6bitExtension(UInt val)  { m_sps6bitExtension = val; }
+  UInt     getSps6bitExtension()  { return m_sps6bitExtension; }
+#endif
 #endif //SVC_EXTENSION
 };
 
@@ -2010 +2017 @@
   Int      m_nCGSOutputBitDepthY; // not for syntax
   Int      m_nCGSOutputBitDepthC; // not for syntax
 #endif
+#if SPS_PPS_6BIT_EXTENSION
+  UInt    m_pps6bitExtension;
 #endif
+#endif
 
 public:
   TComPPS();
@@ -2174 +2184 @@
   Int     getCGSOutputBitDepthC()     { return m_nCGSOutputBitDepthC;  }
   Void    setCGSOutputBitDepthC(Int n){ m_nCGSOutputBitDepthC = n;     }
 #endif
+#if SPS_PPS_6BIT_EXTENSION
+  void     setPps6bitExtension(UInt val)  { m_pps6bitExtension = val; }
+  UInt     getPps6bitExtension()  { return m_pps6bitExtension; }
+#endif
 #endif //SVC_EXTENSION
 };
 

source/Lib/TLibCommon/TypeDef.h

@@ -293 +293 @@
 #endif
 #endif
 #define R0157_RESTRICT_PPSID_FOR_CGS_LUT 1      ///< JCTVC-R0157: when pps_pic_parameter_set_id greater than or equal to 8, colour_mapping_enabled_flag shall be equal to 0
+#define SPS_RESCHANGE_UPDATE                     1
+#define SPS_PPS_6BIT_EXTENSION           1
 
 #define VPS_FIX_TO_MATCH_SPEC            1
 

source/Lib/TLibDecoder/TDecCAVLC.cpp

@@ -467 +467 @@
     READ_FLAG( uiCode, "pps_multilayer_extension_flag" );
     assert(uiCode == 1);
     READ_CODE(6, uiCode, "pps_extension_6bits");
-    assert(uiCode == 0);
+        pcPPS->setPps6bitExtension(uiCode);
+    //assert(uiCode == 0);
 
     READ_FLAG( uiCode, "poc_reset_info_present_flag" );
     pcPPS->setPocResetInfoPresentFlag(uiCode ? true : false);
@@ -556 +557 @@
         pcPPS->setCGSOutputBitDepthC( pc3DAsymLUT->getOutputBitDepthC() );
       }
 #endif
+#if SPS_PPS_6BIT_EXTENSION
+        if (pcPPS->getPps6bitExtension())
+        {
+          while (xMoreRbspData())
+          {
+                READ_FLAG(uiCode, "pps_extension_data_flag");
+          }
+        }
+#endif
   }
 #endif
 
@@ -1146 +1156 @@
     assert(uiCode == 0);
     READ_FLAG( uiCode, "sps_multilayer_extension_flag" );
     assert(uiCode == 1);
-    READ_CODE(6, uiCode, "sps_extension_6bits");
-    assert(uiCode == 0);
+        READ_CODE(6, uiCode, "sps_extension_6bits");          pcSPS->setSps6bitExtension(uiCode);
+    //assert(uiCode == 0);
     parseSPSExtension( pcSPS );
+#if SPS_PPS_6BIT_EXTENSION
+        if (pcSPS->getSps6bitExtension())
+        {
+      while (xMoreRbspData())
+      {
+        READ_FLAG(uiCode, "sps_extension_data_flag");
+      }
+        }
+#endif
   }
 #endif
 #else