Changeset 1114 in SHVCSoftware for branches

Timestamp:

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

Author:

seregin

Message:

macro cleanup: O0109_MOVE_VPS_VUI_FLAG

Location:

branches/SHM-dev/source/Lib

Files:

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

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

@@ -823 +823 @@
 #endif
 
-#if O0109_MOVE_VPS_VUI_FLAG
   Bool       m_vpsVuiPresentFlag;
-#endif
   Bool       m_vpsExtensionFlag;
 
@@ -1352 +1350 @@
 #endif
 
-#if O0109_MOVE_VPS_VUI_FLAG
   Bool   getVpsVuiPresentFlag()                        { return m_vpsVuiPresentFlag; }
   Void   setVpsVuiPresentFlag(Bool x)                  { m_vpsVuiPresentFlag = x;    }
-#endif
   Bool   getVpsExtensionFlag()                         { return m_vpsExtensionFlag;  }
   Void   setVpsExtensionFlag(Bool x)                   { m_vpsExtensionFlag = x;     }

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

@@ -94 +94 @@
 #define P0295_DEFAULT_OUT_LAYER_IDC      1      ///< JCTVC-P0295: modifify default_one_target_output_layer_idc to default_output_layer_idc
 #define O0109_DEFAULT_ONE_OUT_LAYER_IDC  1      ///< JCTVC-O0109: default_one_target_output_layer_flag to default_one_target_output_layer_idc
-#define O0109_MOVE_VPS_VUI_FLAG          1      ///< JCTVC-O0109: move vps_vui_present_flag before vps_vui_offset
 
 #define O0135_DEFAULT_ONE_OUT_SEMANTIC   1      ///< JCTVC-O0135: semantics change of default_one_target_output_layer_idc for auxiliary pictures

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

@@ -3458 +3458 @@
   READ_FLAG( uiCode, "vps_vui_present_flag"); vps->setVpsVuiPresentFlag(uiCode ? true : false);
 
-#if O0109_MOVE_VPS_VUI_FLAG
   if ( vps->getVpsVuiPresentFlag() )
-#else
-  READ_FLAG( uiCode,  "vps_vui_present_flag" );
-  if (uiCode)
-#endif
   {
     while ( m_pcBitstream->getNumBitsRead() % 8 != 0 )

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

@@ -2447 +2447 @@
 #endif
 
-#if !O0109_MOVE_VPS_VUI_FLAG
-  WRITE_FLAG( 1,                     "vps_vui_present_flag" );
-  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");
-    }
-#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
-    codeVPSVUI(vps);  
-  }
-#else
-
   vps->setVpsVuiPresentFlag(true);
   WRITE_FLAG( vps->getVpsVuiPresentFlag() ? 1 : 0,                     "vps_vui_present_flag" );
@@ -2476 +2459 @@
     codeVPSVUI(vps);  
   }
-#endif // 0109_MOVE_VPS_FLAG
 }