Changeset 857 in 3DVCSoftware for branches/HTM-10.0-dev0/source/Lib/TLibDecoder/TDecCAVLC.cpp

Timestamp:

22 Feb 2014, 00:50:21 (10 years ago)

Author:

qualcomm

Message:

H_MV_HLS_7_VPS_P0307_23

Implementation for adoption of (VPS/P0307/VPS VUI extension)

• Move vps_vui_present_flag to the end of syntax table
• Remove vps_vui_offset
• Add vps_non_vui_extension_length and vps_non_vui_extension_data_byte

submitted by Hendry (fhendry@…

File:

• branches/HTM-10.0-dev0/source/Lib/TLibDecoder/TDecCAVLC.cpp (modified) (2 diffs)

branches/HTM-10.0-dev0/source/Lib/TLibDecoder/TDecCAVLC.cpp

@@ -1211 +1211 @@
   UInt uiCode; 
   READ_FLAG( uiCode, "avc_base_layer_flag" );                     pcVPS->setAvcBaseLayerFlag( uiCode == 1 ? true : false );
-#if !H_MV_HLS7_GEN
+
+#if !H_MV_HLS_7_VPS_P0307_23
   READ_FLAG( uiCode, "vps_vui_present_flag" );                    pcVPS->setVpsVuiPresentFlag( uiCode == 1 );
   if ( pcVPS->getVpsVuiPresentFlag() )
@@ -1526 +1527 @@
   }  
 
-#if H_MV_HLS7_GEN
+#if H_MV_HLS_7_VPS_P0307_23
   READ_UVLC( uiCode, "vps_non_vui_extension_length" ); pcVPS->setVpsNonVuiExtensionLength( uiCode ); 
-  for ( Int i = 1; i < pcVPS->getVpsNonVuiExtensionLength(); i++ )
+  for ( Int i = 1; i <= pcVPS->getVpsNonVuiExtensionLength(); i++ )
   {
     READ_CODE( 8, uiCode, "vps_non_vui_extension_data_byte" );
   }
-  READ_FLAG( uiCode, "vps_vui_present_flag" );                    pcVPS->setVpsVuiPresentFlag( uiCode == 1 );  if ( pcVPS->getVpsVuiPresentFlag() )
+  READ_FLAG( uiCode, "vps_vui_present_flag" );  pcVPS->setVpsVuiPresentFlag( uiCode == 1 );
 #endif
 #if !H_MV_HLS_7_RESERVED_FLAGS