Changeset 857 in 3DVCSoftware


Ignore:
Timestamp:
22 Feb 2014, 00:50:21 (10 years ago)
Author:
qualcomm
Message:

H_MV_HLS_7_VPS_P0307_23

Implementation for adoption of (VPS/P0307/VPS VUI extension)

  • Move vps_vui_present_flag to the end of syntax table
  • Remove vps_vui_offset
  • Add vps_non_vui_extension_length and vps_non_vui_extension_data_byte

submitted by Hendry (fhendry@…

Location:
branches/HTM-10.0-dev0/source/Lib
Files:
5 edited

Legend:

Unmodified
Added
Removed
  • branches/HTM-10.0-dev0/source/Lib/TLibCommon/TComSlice.cpp

    r854 r857  
    17521752
    17531753  m_avcBaseLayerFlag = false;
    1754 #if !H_MV_HLS7_GEN
     1754#if H_MV_HLS_7_VPS_P0307_23
     1755  m_vpsNonVuiExtensionLength = 0;
     1756#else
    17551757  m_vpsVuiOffset     = 0;
    17561758#endif
  • branches/HTM-10.0-dev0/source/Lib/TLibCommon/TComSlice.h

    r854 r857  
    768768  /// VPS EXTENSION SYNTAX ELEMENTS
    769769  Bool        m_avcBaseLayerFlag;
    770 #if !H_MV_HLS7_GEN
     770#if H_MV_HLS_7_VPS_P0307_23
     771  Int         m_vpsNonVuiExtensionLength;
     772#else
    771773  Int         m_vpsVuiOffset;
    772774#endif
     
    829831#if H_MV_HLS7_GEN
    830832  Int         m_directDependencyType     [MAX_NUM_LAYERS] [MAX_NUM_LAYERS];
    831   Int         m_vpsNonVuiExtensionLength;
    832833#endif
    833834  Bool        m_vpsVuiPresentFlag;
     
    973974  Bool    getAvcBaseLayerFlag()                                            { return m_avcBaseLayerFlag; }
    974975
    975 #if !H_MV_HLS7_GEN
     976#if H_MV_HLS_7_VPS_P0307_23
     977  Void    setVpsNonVuiExtensionLength( Int  val )                          { m_vpsNonVuiExtensionLength = val; }
     978  Int     getVpsNonVuiExtensionLength(  )                                  { return m_vpsNonVuiExtensionLength; }
     979#else
    976980  Void    setVpsVuiOffset( Int  val )                                      { m_vpsVuiOffset = val; }
    977981  Int     getVpsVuiOffset(  )                                              { return m_vpsVuiOffset; }
     
    11401144  Void    setDirectDependencyType( Int depLayeridInVps, Int refLayeridInVps, Int val) { m_directDependencyType[ depLayeridInVps ][ refLayeridInVps ] = val; }
    11411145  Int     getDirectDependencyType( Int depLayeridInVps, Int refLayeridInVps)   { return m_directDependencyType[ depLayeridInVps ][ refLayeridInVps ]; }
    1142 
    1143 #if H_MV_HLS7_GEN
    1144   Void    setVpsNonVuiExtensionLength( Int  val )                          { m_vpsNonVuiExtensionLength = val; }
    1145   Int     getVpsNonVuiExtensionLength(  )                                  { return m_vpsNonVuiExtensionLength; }
    1146 #endif
    11471146
    11481147  Void    setVpsVuiPresentFlag( Bool flag )                                { m_vpsVuiPresentFlag = flag; }
  • branches/HTM-10.0-dev0/source/Lib/TLibCommon/TypeDef.h

    r856 r857  
    336336// #define H_MV_HLS_7_SEI_P0133_28           0 // (SEI/P0133/Recovery point SEI) #28 Decision: Adopt change to recover point semantics only (-v3)
    337337#define H_MV_HLS_7_VPS_P0125_24           1 // (VPS/P0125/VPS extension offset ) #24 Decision: Keep it as a reserved FFFF value.
    338 // #define H_MV_HLS_7_VPS_P0307_23           0 // (VPS/P0307/VPS VUI extension)  #23 Decision: Adopt modification in P0307.
     338#define H_MV_HLS_7_VPS_P0307_23           1 // (VPS/P0307/VPS VUI extension)  #23 Decision: Adopt modification in P0307.
    339339// #define H_MV_HLS_7_POC_P0041_3            0 // (POC/P0041/POC reset) #3 It was remarked that we should require each non-IRAP picture that has discardable_flag equal to 1 to have NUT value indicating that it is a sub-layer non-reference picture. This was agreed. Decision: Adopt (with constraint for discardable_flag as described above)
    340340// #define H_MV_HLS_7_POC_P0041_FIXES        0 // (POC/P0041/Fixes) For each non-IRAP picture that has discardable_flag equal to 1 to have NUT value indicating that it is a sub-layer non-reference picture.
  • branches/HTM-10.0-dev0/source/Lib/TLibDecoder/TDecCAVLC.cpp

    r856 r857  
    12111211  UInt uiCode;
    12121212  READ_FLAG( uiCode, "avc_base_layer_flag" );                     pcVPS->setAvcBaseLayerFlag( uiCode == 1 ? true : false );
    1213 #if !H_MV_HLS7_GEN
     1213
     1214#if !H_MV_HLS_7_VPS_P0307_23
    12141215  READ_FLAG( uiCode, "vps_vui_present_flag" );                    pcVPS->setVpsVuiPresentFlag( uiCode == 1 );
    12151216  if ( pcVPS->getVpsVuiPresentFlag() )
     
    15261527  } 
    15271528
    1528 #if H_MV_HLS7_GEN
     1529#if H_MV_HLS_7_VPS_P0307_23
    15291530  READ_UVLC( uiCode, "vps_non_vui_extension_length" ); pcVPS->setVpsNonVuiExtensionLength( uiCode );
    1530   for ( Int i = 1; i < pcVPS->getVpsNonVuiExtensionLength(); i++ )
     1531  for ( Int i = 1; i <= pcVPS->getVpsNonVuiExtensionLength(); i++ )
    15311532  {
    15321533    READ_CODE( 8, uiCode, "vps_non_vui_extension_data_byte" );
    15331534  }
    1534   READ_FLAG( uiCode, "vps_vui_present_flag" );                    pcVPS->setVpsVuiPresentFlag( uiCode == 1 );  if ( pcVPS->getVpsVuiPresentFlag() )
     1535  READ_FLAG( uiCode, "vps_vui_present_flag" );  pcVPS->setVpsVuiPresentFlag( uiCode == 1 );
    15351536#endif
    15361537#if !H_MV_HLS_7_RESERVED_FLAGS
  • branches/HTM-10.0-dev0/source/Lib/TLibEncoder/TEncCavlc.cpp

    r856 r857  
    10171017{
    10181018  WRITE_FLAG( pcVPS->getAvcBaseLayerFlag() ? 1 : 0,          "avc_base_layer_flag" );
    1019 #if !H_MV_HLS7_GEN
     1019#if !H_MV_HLS_7_VPS_P0307_23
    10201020  WRITE_FLAG( pcVPS->getVpsVuiPresentFlag() ? 1 : 0 , "vps_vui_present_flag" );
    10211021  if ( pcVPS->getVpsVuiPresentFlag() )
     
    13241324    }
    13251325  } 
    1326 #if H_MV_HLS7_GEN
     1326#if H_MV_HLS_7_VPS_P0307_23
    13271327  WRITE_UVLC( 0, "vps_non_vui_extension_length" );
    13281328  WRITE_FLAG( pcVPS->getVpsVuiPresentFlag() ? 1 : 0 , "vps_vui_present_flag" );
Note: See TracChangeset for help on using the changeset viewer.