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


Ignore:
Timestamp:
2 Jul 2015, 21:13:04 (9 years ago)
Author:
seregin
Message:

cleanup macros: VPS_EXTN_OFFSET_CALC, VPS_EXTN_OFFSET, P0125_REVERT_VPS_EXTN_OFFSET_TO_RESERVED

Location:
branches/SHM-dev/source/Lib/TLibEncoder
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • TabularUnified branches/SHM-dev/source/Lib/TLibEncoder/TEncCavlc.cpp

    r1093 r1094  
    781781Void TEncCavlc::codeVPS( TComVPS* pcVPS )
    782782{
    783 #if !P0125_REVERT_VPS_EXTN_OFFSET_TO_RESERVED
    784 #if VPS_EXTN_OFFSET_CALC
    785   UInt numBytesInVps = this->m_pcBitIf->getNumberOfWrittenBits();
    786 #endif
    787 #endif
    788783#if !P0307_REMOVE_VPS_VUI_OFFSET
    789784#if VPS_VUI_OFFSET
     
    807802  WRITE_FLAG( pcVPS->getTemporalNestingFlag(),                "vps_temporal_id_nesting_flag" );
    808803  assert (pcVPS->getMaxTLayers()>1||pcVPS->getTemporalNestingFlag());
    809 #if !P0125_REVERT_VPS_EXTN_OFFSET_TO_RESERVED
    810 #if VPS_EXTN_OFFSET
    811   WRITE_CODE( pcVPS->getExtensionOffset(),         16,        "vps_extension_offset" );
    812 #else
    813804  WRITE_CODE( 0xffff,                              16,        "vps_reserved_ffff_16bits" );
    814 #endif
    815 #else
    816   WRITE_CODE( 0xffff,                              16,        "vps_reserved_ffff_16bits" );
    817 #endif
    818805  codePTL( pcVPS->getPTL(), true, pcVPS->getMaxTLayers() - 1 );
    819806  const Bool subLayerOrderingInfoPresentFlag = 1;
     
    918905      WRITE_FLAG(1,                  "vps_extension_alignment_bit_equal_to_one");
    919906    }
    920 #if !P0125_REVERT_VPS_EXTN_OFFSET_TO_RESERVED
    921 #if VPS_EXTN_OFFSET_CALC
    922     Int vpsExntOffsetValueInBits = this->m_pcBitIf->getNumberOfWrittenBits() - numBytesInVps + 16; // 2 bytes for NUH
    923     assert( vpsExntOffsetValueInBits % 8 == 0 );
    924     pcVPS->setExtensionOffset( vpsExntOffsetValueInBits >> 3 );
    925 #endif
    926 #endif
    927907    codeVPSExtension(pcVPS);
    928908    WRITE_FLAG( 0,                     "vps_extension2_flag" );   // Flag value of 1 reserved
  • TabularUnified branches/SHM-dev/source/Lib/TLibEncoder/TEncGOP.cpp

    r1093 r1094  
    24032403      // The following code also calculates the VPS VUI offset
    24042404#endif
    2405 #if !P0125_REVERT_VPS_EXTN_OFFSET_TO_RESERVED
    2406 #if VPS_EXTN_OFFSET_CALC
    2407       OutputNALUnit tempNalu(NAL_UNIT_VPS, 0, 0        ); // The value of nuh_layer_id of VPS NAL unit shall be equal to 0.
    2408       m_pcEntropyCoder->setBitstream(&tempNalu.m_Bitstream);
    2409       m_pcEntropyCoder->encodeVPS(m_pcEncTop->getVPS());  // Use to calculate the VPS extension offset
    2410 #endif
    2411 #endif
    24122405      m_pcEntropyCoder->setBitstream(&nalu.m_Bitstream);
    24132406      m_pcEntropyCoder->encodeVPS(m_pcEncTop->getVPS());
Note: See TracChangeset for help on using the changeset viewer.