Changeset 617 in SHVCSoftware

Timestamp:

19 Feb 2014, 20:08:44 (11 years ago)

Author:

qualcomm

Message:

P0307_VPS_NON_VUI_EXT_UPDATE\

Update implementation for parsing vps_non_vui_extension_data_bit.
Decoder should allow the vps_non_vui_extension_length to be greater than 0 and read the vps_non_vui_extension_data_bit and then discard it.

Submitted by Hendry (fhendry@…)

Location:

branches/SHM-5.1-dev/source/Lib

Files:

• TLibCommon/TypeDef.h (modified) (1 diff)
• TLibDecoder/TDecCAVLC.cpp (modified) (1 diff)
• TLibEncoder/TEncCavlc.cpp (modified) (1 diff)

branches/SHM-5.1-dev/source/Lib/TLibCommon/TypeDef.h

@@ -53 +53 @@
 #define P0307_REMOVE_VPS_VUI_OFFSET      1      ///< JCTVC-P0307, remove implementation related to VPS VUI offset signalling
 #define P0307_VPS_NON_VUI_EXTENSION      1      ///< JCTVC-P0307, implementation related to NON VUI VPS Extension signalling
+#define P0307_VPS_NON_VUI_EXT_UPDATE     1      ///< JCTVC-P0307, implementation related to NON VUI VPS Extension signalling
 
 #define DISCARDABLE_PIC_RPS              1      ///< JCTVC-P0130: Inter-layer RPS and temporal RPS should not contain picture with discardable_flag equal to 1

branches/SHM-5.1-dev/source/Lib/TLibDecoder/TDecCAVLC.cpp

@@ -1546 +1546 @@
 #if P0307_VPS_NON_VUI_EXTENSION
   READ_UVLC( uiCode,           "vps_non_vui_extension_length"); vps->setVpsNonVuiExtLength((Int)uiCode);
+#if P0307_VPS_NON_VUI_EXT_UPDATE
+  if (uiCode > 0)
+  {
+    Int nonVuiExtBits = uiCode * 8;
+    for (i = 0; i < nonVuiExtBits; i++)
+    {
+      READ_FLAG(uiCode, "vps_non_vui_extension_data_bit" ); //just parse and discard for now.
+    }
+  }
+#else
   if ( vps->getVpsNonVuiExtLength() > 0 )
   {
     printf("\n\nUp to the current spec, the value of vps_non_vui_extension_length is supposed to be 0\n");
   }
+#endif
 #endif
 

branches/SHM-5.1-dev/source/Lib/TLibEncoder/TEncCavlc.cpp

@@ -1156 +1156 @@
 #if P0307_VPS_NON_VUI_EXTENSION
   WRITE_UVLC( vps->getVpsNonVuiExtLength(), "vps_non_vui_extension_length" );
+#if P0307_VPS_NON_VUI_EXT_UPDATE
+  if (vps->getVpsNonVuiExtLength() > 0)
+  {
+    Int nonVuiExtBits = vps->getVpsNonVuiExtLength() * 8;
+    for (i = 0; i < nonVuiExtBits; i++)
+    {
+      WRITE_FLAG(1, "vps_non_vui_extension_data_bit"); //just parse and discard for now.
+    }
+  }
+#else
   if ( vps->getVpsNonVuiExtLength() > 0 )
   {
     printf("\n\nUp to the current spec, the value of vps_non_vui_extension_length is supposed to be 0\n");
   }
+#endif
 #endif