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

Timestamp:

7 Jul 2015, 01:05:51 (10 years ago)

Author:

seregin

Message:

macro cleanup: P0307_REMOVE_VPS_VUI_OFFSET

File:

• branches/SHM-dev/source/Lib/TLibEncoder/TEncCavlc.cpp (modified) (4 diffs)

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

@@ -781 +781 @@
 Void TEncCavlc::codeVPS( TComVPS* pcVPS )
 {
-#if !P0307_REMOVE_VPS_VUI_OFFSET
-#if VPS_VUI_OFFSET
-   m_vpsVuiCounter = this->m_pcBitIf->getNumberOfWrittenBits();
-#endif
-#endif
   WRITE_CODE( pcVPS->getVPSId(),                    4,        "vps_video_parameter_set_id" );
 #if VPS_RESERVED_FLAGS
@@ -2013 +2008 @@
   WRITE_FLAG( vps->getAvcBaseLayerFlag(),              "avc_base_layer_flag" );
 #endif
-#if !P0307_REMOVE_VPS_VUI_OFFSET
-#if O0109_MOVE_VPS_VUI_FLAG
-  WRITE_FLAG( 1,                     "vps_vui_present_flag" );
-  vps->setVpsVuiPresentFlag(true);
-  if ( vps->getVpsVuiPresentFlag() ) 
-  {
-#if VPS_VUI_OFFSET
-    WRITE_CODE( vps->getVpsVuiOffset(  ), 16,             "vps_vui_offset" );
-#endif
-    WRITE_FLAG( vps->getSplittingFlag(),                 "splitting_flag" );
-  }
-#else
-#if VPS_VUI_OFFSET
-  WRITE_CODE( vps->getVpsVuiOffset(  ), 16,             "vps_vui_offset" );  
-#endif
-  WRITE_FLAG( vps->getSplittingFlag(),                 "splitting_flag" );
-#endif // O0109_MOVE_VPS_VUI_FLAG
-#endif
+
   WRITE_FLAG( vps->getSplittingFlag(),                 "splitting_flag" );
 
@@ -2485 +2463 @@
   }
 #else
-#if P0307_REMOVE_VPS_VUI_OFFSET
+
   vps->setVpsVuiPresentFlag(true);
   WRITE_FLAG( vps->getVpsVuiPresentFlag() ? 1 : 0,                     "vps_vui_present_flag" );
-#endif
+
   if(vps->getVpsVuiPresentFlag())   // Should be conditioned on the value of vps_vui_present_flag
   {
@@ -2495 +2473 @@
       WRITE_FLAG(1,                  "vps_vui_alignment_bit_equal_to_one");
     }
-#if !P0307_REMOVE_VPS_VUI_OFFSET
-#if VPS_VUI_OFFSET
-    Int vpsVuiOffsetValeInBits = this->m_pcBitIf->getNumberOfWrittenBits() - m_vpsVuiCounter + 16; // 2 bytes for NUH
-    assert( vpsVuiOffsetValeInBits % 8 == 0 );
-    vps->setVpsVuiOffset( vpsVuiOffsetValeInBits >> 3 );
-#endif
-#endif
+
     codeVPSVUI(vps);  
   }