Changeset 793 in SHVCSoftware for branches/SHM-6-dev/source/Lib/TLibEncoder

Timestamp:

6 Jun 2014, 19:58:45 (11 years ago)

Author:

seregin

Message:

remove VPS_VUI

Location:

branches/SHM-6-dev/source/Lib/TLibEncoder

Files:

• TEncCavlc.cpp (modified) (5 diffs)
• TEncCavlc.h (modified) (1 diff)

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

@@ -846 +846 @@
 #if !P0307_REMOVE_VPS_VUI_OFFSET
 #if O0109_MOVE_VPS_VUI_FLAG
-#if !VPS_VUI
-  WRITE_FLAG( 0,                     "vps_vui_present_flag" );
-  vps->setVpsVuiPresentFlag(false);
-#else
   WRITE_FLAG( 1,                     "vps_vui_present_flag" );
   vps->setVpsVuiPresentFlag(true);
-#endif
   if ( vps->getVpsVuiPresentFlag() ) 
   {
@@ -1285 +1280 @@
 
 #if !O0109_MOVE_VPS_VUI_FLAG
-#if !VPS_VUI
-  WRITE_FLAG( 0,                     "vps_vui_present_flag" );
-#else
   WRITE_FLAG( 1,                     "vps_vui_present_flag" );
   if(1)   // Should be conditioned on the value of vps_vui_present_flag
@@ -1302 +1294 @@
     codeVPSVUI(vps);  
   }
-#endif 
 #else
 #if P0307_REMOVE_VPS_VUI_OFFSET
@@ -1449 +1440 @@
 }
 #endif
-#if VPS_VUI
+
 Void TEncCavlc::codeVPSVUI (TComVPS *vps)
 {
@@ -1698 +1689 @@
 #endif
 }
-#endif
 #endif //SVC_EXTENSION
 

branches/SHM-6-dev/source/Lib/TLibEncoder/TEncCavlc.h

@@ -162 +162 @@
   Void codeSPSExtension        ( TComSPS* pcSPS );
   Void codeVPSExtension        ( TComVPS* pcVPS );
-#if VPS_VUI
-  Void codeVPSVUI              (TComVPS *vps);
-#endif
+  Void codeVPSVUI              ( TComVPS *vps   );
 #if REPN_FORMAT_IN_VPS
   Void  codeRepFormat          ( RepFormat *repFormat );