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

Timestamp:

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

Author:

seregin

Message:

macro cleanup: O0109_MOVE_VPS_VUI_FLAG

File:

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

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
 }