Changeset 568 in SHVCSoftware for branches/SHM-5.0-dev/source


Ignore:
Timestamp:
27 Jan 2014, 20:37:31 (11 years ago)
Author:
qualcomm
Message:

JCTVC-P0125 -- Revert vps_extension_offset back to vps_reserved_0xffff_16bits

One macro (P0125_REVERT_VPS_EXTN_OFFSET_TO_RESERVED) is defined and it negate the following two macros (VPS_EXTN_OFFSET & VPS_EXTN_OFFSET_CALC).

Contact fhendry@…

Location:
branches/SHM-5.0-dev/source
Files:
6 edited

Legend:

Unmodified
Added
Removed

  • branches/SHM-5.0-dev/source/App/TAppEncoder/TAppEncTop.cpp

    r567 r568  
    13271327  vps->setHigherLayerIrapSkipFlag(m_skipPictureAtArcSwitch);
    13281328#endif
     1329#if !P0125_REVERT_VPS_EXTN_OFFSET_TO_RESERVED
    13291330#if !VPS_EXTN_OFFSET_CALC
    13301331#if VPS_EXTN_OFFSET
    13311332  // to be updated according to the current semantics
    13321333  vps->setExtensionOffset( 0xffff );
     1334#endif
    13331335#endif
    13341336#endif

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

    r565 r568  
    483483  Int         m_numLayerInIdList[MAX_VPS_LAYER_SETS_PLUS1];
    484484#endif
     485#if !P0125_REVERT_VPS_EXTN_OFFSET_TO_RESERVED
    485486#if VPS_EXTN_OFFSET
    486487  UInt        m_extensionOffset;
     488#endif
    487489#endif
    488490#if VPS_RENAME
    … …  
    980982  Int     scalTypeToScalIdx( ScalabilityType scalType );
    981983#endif
     984#if !P0125_REVERT_VPS_EXTN_OFFSET_TO_RESERVED
    982985#if VPS_EXTN_OFFSET
    983986  Int     getExtensionOffset()                 { return m_extensionOffset;   }
    984987  Void    setExtensionOffset( UInt offset )    { m_extensionOffset = offset; }
     988#endif
    985989#endif
    986990#if O0215_PHASE_ALIGNMENT

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

    r567 r568  
    126126#endif
    127127
     128#define P0125_REVERT_VPS_EXTN_OFFSET_TO_RESERVED        1   ///< JCTVC-P0125 -- Keep it as a reserved FFFF value --- The following two macros (VPS_EXTN_OFFSET & VPS_EXTN_OFFSET_CALC) will have no effect when this macro is set to 1.
    128129#define VPS_EXTN_OFFSET                  1      ///< implementation of vps_extension_offset syntax element
    129130#define VPS_EXTN_OFFSET_CALC             1      ///< Calculation of VPS extension offset

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

    r566 r568  
    847847  READ_FLAG(     uiCode,  "vps_temporal_id_nesting_flag" );       pcVPS->setTemporalNestingFlag( uiCode ? true:false );
    848848  assert (pcVPS->getMaxTLayers()>1||pcVPS->getTemporalNestingFlag());
     849#if !P0125_REVERT_VPS_EXTN_OFFSET_TO_RESERVED
    849850#if VPS_EXTN_OFFSET
    850851  READ_CODE( 16, uiCode,  "vps_extension_offset" );               pcVPS->setExtensionOffset( uiCode );
     852#else
     853  READ_CODE( 16, uiCode,  "vps_reserved_ffff_16bits" );           assert(uiCode == 0xffff);
     854#endif
    851855#else
    852856  READ_CODE( 16, uiCode,  "vps_reserved_ffff_16bits" );           assert(uiCode == 0xffff);

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

    r566 r568  
    637637Void TEncCavlc::codeVPS( TComVPS* pcVPS )
    638638{
     639#if !P0125_REVERT_VPS_EXTN_OFFSET_TO_RESERVED
    639640#if VPS_EXTN_OFFSET_CALC
    640641  UInt numBytesInVps = this->m_pcBitIf->getNumberOfWrittenBits();
     642#endif
    641643#endif
    642644#if !P0307_REMOVE_VPS_VUI_OFFSET
    … …  
    655657  WRITE_FLAG( pcVPS->getTemporalNestingFlag(),                "vps_temporal_id_nesting_flag" );
    656658  assert (pcVPS->getMaxTLayers()>1||pcVPS->getTemporalNestingFlag());
     659#if !P0125_REVERT_VPS_EXTN_OFFSET_TO_RESERVED
    657660#if VPS_EXTN_OFFSET
    658661  WRITE_CODE( pcVPS->getExtensionOffset(),         16,        "vps_extension_offset" );
     662#else
     663  WRITE_CODE( 0xffff,                              16,        "vps_reserved_ffff_16bits" );
     664#endif
    659665#else
    660666  WRITE_CODE( 0xffff,                              16,        "vps_reserved_ffff_16bits" );
    … …  
    748754      WRITE_FLAG(1,                  "vps_extension_alignment_bit_equal_to_one");
    749755    }
     756#if !P0125_REVERT_VPS_EXTN_OFFSET_TO_RESERVED
    750757#if VPS_EXTN_OFFSET_CALC
    751758    Int vpsExntOffsetValueInBits = this->m_pcBitIf->getNumberOfWrittenBits() - numBytesInVps + 16; // 2 bytes for NUH
    752759    assert( vpsExntOffsetValueInBits % 8 == 0 );
    753760    pcVPS->setExtensionOffset( vpsExntOffsetValueInBits >> 3 );
     761#endif
    754762#endif
    755763    codeVPSExtension(pcVPS);

  • branches/SHM-5.0-dev/source/Lib/TLibEncoder/TEncGOP.cpp

    r567 r568  
    16971697      // The following code also calculates the VPS VUI offset
    16981698#endif
     1699#if !P0125_REVERT_VPS_EXTN_OFFSET_TO_RESERVED
    16991700#if VPS_EXTN_OFFSET_CALC
    17001701      OutputNALUnit tempNalu(NAL_UNIT_VPS, 0, 0        ); // The value of nuh_layer_id of VPS NAL unit shall be equal to 0.
    17011702      m_pcEntropyCoder->setBitstream(&tempNalu.m_Bitstream);
    17021703      m_pcEntropyCoder->encodeVPS(m_pcEncTop->getVPS());  // Use to calculate the VPS extension offset
     1704#endif
    17031705#endif
    17041706      m_pcEntropyCoder->setBitstream(&nalu.m_Bitstream);
Note: See TracChangeset for help on using the changeset viewer.