Changeset 1113 in SHVCSoftware

Timestamp:

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

Author:

seregin

Message:

macro cleanup: P0307_REMOVE_VPS_VUI_OFFSET

Location:

branches/SHM-dev/source/Lib

Files:

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

branches/SHM-dev/source/Lib/TLibCommon/TComSlice.cpp

@@ -2005 +2005 @@
 #else
 , m_viewIdLenMinus1           (0)
-#endif
-#endif
-#if !P0307_REMOVE_VPS_VUI_OFFSET
-#if VPS_VUI_OFFSET
-, m_vpsVuiOffset (0)
 #endif
 #endif

branches/SHM-dev/source/Lib/TLibCommon/TComSlice.h

@@ -857 +857 @@
 #endif
 
-#if !P0307_REMOVE_VPS_VUI_OFFSET
-#if VPS_VUI_OFFSET
-  Int        m_vpsVuiOffset;
-#endif
-#endif
 #if P0307_VPS_NON_VUI_EXTENSION
   Int        m_vpsNonVuiExtLength;
@@ -1364 +1359 @@
   Void   setVpsExtensionFlag(Bool x)                   { m_vpsExtensionFlag = x;     }
 
-#if !P0307_REMOVE_VPS_VUI_OFFSET
-#if VPS_VUI_OFFSET
-  Int    getVpsVuiOffset()         { return m_vpsVuiOffset; }
-  Void   setVpsVuiOffset(Int x)    { m_vpsVuiOffset = x; }
-#endif
-#endif
 #if P0307_VPS_NON_VUI_EXTENSION
   Int    getVpsNonVuiExtLength()         { return m_vpsNonVuiExtLength; }

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

@@ -81 +81 @@
 
 #define P0130_EOB                        1      ///< JCTVC-P0130, set layer Id of EOB NALU to be fixed to 0
-#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

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

@@ -2726 +2726 @@
 #endif
 
-#if !P0307_REMOVE_VPS_VUI_OFFSET
-#if O0109_MOVE_VPS_VUI_FLAG
-  READ_FLAG( uiCode, "vps_vui_present_flag"); vps->setVpsVuiPresentFlag(uiCode ? true : false);
-  if ( uiCode )
-  {
-#endif
-#if VPS_VUI_OFFSET
-    READ_CODE( 16, uiCode, "vps_vui_offset" );  vps->setVpsVuiOffset( uiCode );
-#endif
-#if O0109_MOVE_VPS_VUI_FLAG
-  }
-#endif
-#endif
   READ_FLAG( uiCode, "splitting_flag" ); vps->setSplittingFlag(uiCode ? true : false);
 
@@ -3469 +3456 @@
 #endif
 
-#if P0307_REMOVE_VPS_VUI_OFFSET
   READ_FLAG( uiCode, "vps_vui_present_flag"); vps->setVpsVuiPresentFlag(uiCode ? true : false);
-#endif
 
 #if O0109_MOVE_VPS_VUI_FLAG

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);  
   }