Changeset 383 in SHVCSoftware for branches/SHM-3.1-dev/source/Lib

Timestamp:

6 Sep 2013, 01:09:22 (11 years ago)

Author:

qualcomm

Message:

Added byte alignment before parsing VPS VUI

From: Adarsh K. Ramasubramonian <aramasub@…>

Location:

branches/SHM-3.1-dev/source/Lib

Files:

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

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

@@ -1150 +1150 @@
   {
 #if VPS_VUI
+    while ( m_pcBitstream->getNumBitsRead() % 8 != 0 )
+    {
+      READ_FLAG( uiCode, "vps_vui_alignment_bit_equal_to_one"); assert(uiCode == 1);
+    }
     parseVPSVUI(vps);
 #endif 

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

@@ -891 +891 @@
 #else
   WRITE_FLAG( 1,                     "vps_vui_present_flag" );
-  codeVPSVUI(vps);  
+  if(1)   // Should be conditioned on the value of vps_vui_present_flag
+  {
+    while ( m_pcBitIf->getNumberOfWrittenBits() % 8 != 0 )
+    {
+      WRITE_FLAG(1,                  "vps_vui_alignment_bit_equal_to_one");
+    }
+    codeVPSVUI(vps);  
+  }
 #endif 
 }