Changeset 1094 in SHVCSoftware for branches/SHM-dev/source/Lib/TLibEncoder
- Timestamp:
- 2 Jul 2015, 21:13:04 (9 years ago)
- 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 781 781 Void TEncCavlc::codeVPS( TComVPS* pcVPS ) 782 782 { 783 #if !P0125_REVERT_VPS_EXTN_OFFSET_TO_RESERVED784 #if VPS_EXTN_OFFSET_CALC785 UInt numBytesInVps = this->m_pcBitIf->getNumberOfWrittenBits();786 #endif787 #endif788 783 #if !P0307_REMOVE_VPS_VUI_OFFSET 789 784 #if VPS_VUI_OFFSET … … 807 802 WRITE_FLAG( pcVPS->getTemporalNestingFlag(), "vps_temporal_id_nesting_flag" ); 808 803 assert (pcVPS->getMaxTLayers()>1||pcVPS->getTemporalNestingFlag()); 809 #if !P0125_REVERT_VPS_EXTN_OFFSET_TO_RESERVED810 #if VPS_EXTN_OFFSET811 WRITE_CODE( pcVPS->getExtensionOffset(), 16, "vps_extension_offset" );812 #else813 804 WRITE_CODE( 0xffff, 16, "vps_reserved_ffff_16bits" ); 814 #endif815 #else816 WRITE_CODE( 0xffff, 16, "vps_reserved_ffff_16bits" );817 #endif818 805 codePTL( pcVPS->getPTL(), true, pcVPS->getMaxTLayers() - 1 ); 819 806 const Bool subLayerOrderingInfoPresentFlag = 1; … … 918 905 WRITE_FLAG(1, "vps_extension_alignment_bit_equal_to_one"); 919 906 } 920 #if !P0125_REVERT_VPS_EXTN_OFFSET_TO_RESERVED921 #if VPS_EXTN_OFFSET_CALC922 Int vpsExntOffsetValueInBits = this->m_pcBitIf->getNumberOfWrittenBits() - numBytesInVps + 16; // 2 bytes for NUH923 assert( vpsExntOffsetValueInBits % 8 == 0 );924 pcVPS->setExtensionOffset( vpsExntOffsetValueInBits >> 3 );925 #endif926 #endif927 907 codeVPSExtension(pcVPS); 928 908 WRITE_FLAG( 0, "vps_extension2_flag" ); // Flag value of 1 reserved -
TabularUnified branches/SHM-dev/source/Lib/TLibEncoder/TEncGOP.cpp ¶
r1093 r1094 2403 2403 // The following code also calculates the VPS VUI offset 2404 2404 #endif 2405 #if !P0125_REVERT_VPS_EXTN_OFFSET_TO_RESERVED2406 #if VPS_EXTN_OFFSET_CALC2407 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 offset2410 #endif2411 #endif2412 2405 m_pcEntropyCoder->setBitstream(&nalu.m_Bitstream); 2413 2406 m_pcEntropyCoder->encodeVPS(m_pcEncTop->getVPS());
Note: See TracChangeset for help on using the changeset viewer.