Changeset 1075 in 3DVCSoftware


Ignore:
Timestamp:
21 Oct 2014, 21:09:26 (9 years ago)
Author:
tech
Message:

Removed MV-HEVC related macros part 1.

Location:
branches/HTM-12.1-dev0/source/Lib
Files:
6 edited

Legend:

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

    r1074 r1075  
    103103, m_temporalLayerNonReferenceFlag ( false )
    104104, m_enableTMVPFlag                ( true )
    105 #if I0044_SLICE_TMVP
     105#if H_MV
    106106, m_availableForTMVPRefFlag       ( true )
    107 #endif
    108 #if H_MV
    109107, m_refPicSetInterLayer0           ( NULL )
    110108, m_refPicSetInterLayer1           ( NULL )
     
    724722
    725723        assert( rpsCurrList[li][ orgIdx ] != NULL );
    726 #if DISCARDABLE_PIC_RPS
    727724        assert( rpsCurrList[li][ orgIdx ]->getSlice(0)->getDiscardableFlag() == 0 );    // Inter-layer RPS shall not contain picture with discardable_flag = 1.
    728 #endif
    729725        m_apcRefPicList    [li][rIdx] = rpsCurrList    [li][ orgIdx ];
    730726        m_bIsUsedAsLongTerm[li][rIdx] = usedAsLongTerm [li][ orgIdx ] ;
  • branches/HTM-12.1-dev0/source/Lib/TLibCommon/TComSlice.h

    r1074 r1075  
    12061206  Void    setLayerSetIdxForOlsMinus1( Int outLayerSetIdx, Int val )        { m_layerSetIdxForOlsMinus1[ outLayerSetIdx ]  = val; }
    12071207  Int     getLayerSetIdxForOlsMinus1( Int outLayerSetIdx )                 { return m_layerSetIdxForOlsMinus1[ outLayerSetIdx ]; }
    1208 #if VPS_MISC_UPDATES
    12091208  Int     getLayerSetIdxForOlsMinus1Len( Int outLayerSetIdx )              { return gCeilLog2( getNumLayerSets() ); }
    1210 #endif
    12111209
    12121210  Void    setOutputLayerFlag( Int outLayerSetIdx, Int i, Bool flag )       { m_outputLayerFlag[ outLayerSetIdx ][ i ] = flag; }
     
    24882486
    24892487  Bool       m_enableTMVPFlag;
    2490 #if I0044_SLICE_TMVP
     2488#if H_MV
    24912489  Bool       m_availableForTMVPRefFlag;
    24922490#endif
     
    28282826  Void      setEnableTMVPFlag     ( Bool   b )    { m_enableTMVPFlag = b; }
    28292827  Bool      getEnableTMVPFlag     ()              { return m_enableTMVPFlag;}
    2830 #if I0044_SLICE_TMVP
     2828#if H_MV
    28312829  Void      setAvailableForTMVPRefFlag     ( Bool   b )    { m_availableForTMVPRefFlag = b; }
    28322830  Bool      getAvailableForTMVPRefFlag     ()              { return m_availableForTMVPRefFlag;}
  • branches/HTM-12.1-dev0/source/Lib/TLibCommon/TypeDef.h

    r1074 r1075  
    368368// TBD: Check if integration is necessary.
    369369
    370 
    371 
    372 //Added by Qualcomm for HLS
    373 #define DISCARDABLE_PIC_RPS              1      ///< JCT3V-G0131: Inter-layer RPS and temporal RPS should not contain picture with discardable_flag equal to 1
    374 #define VPS_MISC_UPDATES                 1      ///< Misc updates:JCT3V-0240,
    375 #define NON_REF_NAL_TYPE_DISCARDABLE     1      ///< JCT3V-G0031: If discardable picture is a non-IRAP, it must be a non-referenced sub-layer picture
    376 #define INFERENCE_POC_MSB_VAL_PRESENT    1      ///< JCT3V-H0042: poc_msb_val_present_flag shall be equal to 0 when slice_header_extension_length is (inferred to be ) equal to 0
    377 #define INFERENCE_POC_RESET_INFO_PRESENT 1      ///< JCT3V-H0042: Infer the value of poc_reset_info_present_flag to be equal to 0 when no pps extension / pps extension for multilayer.
    378 #define I0044_SLICE_TMVP                 1      ///< JCT3V-I0044: Regarding slice_temporal_mvp_enabled_flag
    379 #define I0045_BR_PR_ADD_LAYER_SET        1      ///< JCT3V-I0045: Signalling of bit-rate and picture rate for additional layer set
    380 #define I0045_VPS_VUI_VST_PARAMS         1      ///< JCT3V-I0045: Related to signalling of VST parameters of the base layer.
    381 
    382 
    383370#define H_MV_HLS10_GEN                       0  // General changes (not tested)
    384371
     
    429416//#define H_MV_HLS_7_SEI_P0133_28  0 // (SEI/P0133/Recovery point SEI) #28 Decision: Adopt change to recover point semantics only (-v3)
    430417//#define H_MV_HLS_7_SEI_P0123_25  0 // (SEI/P0123/Alpha channel info) #25 Add alpha channel information SEI message Decision: Adopt. Constrain the bit depth indicated to be equal to the coded bit depth of the aux picture.
    431 
    432 // Auxiliary picture related
    433 //#define H_MV_HLS_8_AUX_NODOC_40  0 // #40 (AUX    /NODOC/primary pic) Clarify that an auxiliary picture can be associated with more than one primary picture. Consider if the language associating an alpha auxiliary picture with a primary picture in the semantics of dimension_id[ ][ ] near the AuxId derivation could be moved to the alpha SEI message.
    434 //#define H_MV_HLS_8_AUX_Q0081_2   0 // #2  (AUX    /Q0081/primary) Decision: Remove the constraint that an alpha picture must be accompanied by a primary picture.
    435 //#define H_MV_HLS_8_AUX_Q0078_44  0 // #44 (AUX    /Q0078/concepts Auxiliary picture concepts:
    436 //#define H_MV_HLS_8_AUX_Q0078_39  0 // #39 (AUX    /Q0078/conformance): mechanism for signaling a profile/tier/level conformance point for auxiliary pictures
    437 
    438 // Profiles
    439 //#define H_MV_HLS_8_PRO_NODOC_50  0 // #50 (PROF   /NODOC/Monochrome) Add Monochrome 8-bit profile
    440 //#define H_MV_HLS_8_PRO_NODOC_31  0 // #31 (PROF   /NODOC/Profile constraint) Add a profile constraint to the Scalable Main, Scalable Main 10, and Stereo Main profiles against allowing layers with duplicate values of DependencyId (or ViewOrderIdx) when AuxId equal to 0.
    441 //#define H_MV_HLS_8_PRO_H0126_45  0 // #45 (PROF   /H0126/Stereo main) Phrasing used in specifying the Stereo Main profile.
    442 //#define H_MV_HLS_8_PRO_Q0160_33  0 // #33 (PROF   /Q0160/alt_output_flag) v2: Add constraint to stereo main profile that it must contain exactly two texture views, and add a note to state that the constraint implies a restriction that alt_output_flag equal to 0.
    443418
    444419// DPB
  • branches/HTM-12.1-dev0/source/Lib/TLibDecoder/TDecCAVLC.cpp

    r1074 r1075  
    14801480    if( i >= pcVPS->getNumLayerSets( ) )   
    14811481    {       
    1482 #if !VPS_MISC_UPDATES
    1483       READ_UVLC( uiCode,      "layer_set_idx_for_ols_minus1[i]" ); pcVPS->setLayerSetIdxForOlsMinus1( i, uiCode );
    1484 #else
    14851482      READ_CODE( pcVPS->getLayerSetIdxForOlsMinus1Len( i ), uiCode, "layer_set_idx_for_ols_minus1[i]" ); pcVPS->setLayerSetIdxForOlsMinus1( i, uiCode );
    1486 #endif
    14871483    }
    14881484
     
    17381734  }
    17391735
    1740 #if I0045_VPS_VUI_VST_PARAMS
    17411736  if( pcVPSVUI->getVideoSignalInfoIdxPresentFlag() && pcVPSVUI->getVpsNumVideoSignalInfoMinus1() > 0 )
    17421737  {
     
    17601755    }
    17611756  }
    1762 #else
    1763   if( pcVPSVUI->getVideoSignalInfoIdxPresentFlag() && pcVPSVUI->getVpsNumVideoSignalInfoMinus1() > 0 )
    1764   {
    1765     for( Int i = 1; i <=  pcVPS->getMaxLayersMinus1(); i++ )
    1766     {
    1767       READ_CODE( 4, uiCode, "vps_video_signal_info_idx" ); pcVPSVUI->setVpsVideoSignalInfoIdx( i, uiCode );
    1768       assert( pcVPSVUI->getVpsVideoSignalInfoIdx( i ) >= 0 && pcVPSVUI->getVpsVideoSignalInfoIdx( i ) <= pcVPSVUI->getVpsNumVideoSignalInfoMinus1() );
    1769     }
    1770   }
    1771   else
    1772   {
    1773     for( Int i = 1; i <=  pcVPS->getMaxLayersMinus1(); i++ )
    1774     {
    1775       pcVPSVUI->setVpsVideoSignalInfoIdx( i, pcVPSVUI->getVideoSignalInfoIdxPresentFlag() ? 0 : i );
    1776     }
    1777   }
    1778 #endif
     1757
    17791758  READ_FLAG( uiCode, "tiles_not_in_use_flag" ); pcVPSVUI->setTilesNotInUseFlag( uiCode == 1 );
    17801759  if( !pcVPSVUI->getTilesNotInUseFlag() )
     
    18511830  if ( pcVPSVUI->getVpsVuiBspHrdPresentFlag( ) )
    18521831  {
    1853 #if VPS_MISC_UPDATES
    18541832    assert(pcVPS->getTimingInfo()->getTimingInfoPresentFlag() == 1);
    1855 #endif
    18561833    parseVpsVuiBspHrdParameters( pcVPS );
    18571834  }
     
    22972274      esb++;
    22982275      READ_FLAG( uiCode, "discardable_flag" ); rpcSlice->setDiscardableFlag( uiCode == 1 );
    2299 #if NON_REF_NAL_TYPE_DISCARDABLE
    23002276      if ( uiCode == 1 )
    23012277      {
     
    23062282          rpcSlice->getNalUnitType() != NAL_UNIT_CODED_SLICE_RASL_R);
    23072283      }
    2308 #endif
    23092284    }
    23102285
     
    25942569      if (rpcSlice->getSPS()->getTMVPFlagsPresent())
    25952570      {
    2596 #if I0044_SLICE_TMVP
     2571#if H_MV
    25972572        READ_FLAG( uiCode, "slice_temporal_mvp_enabled_flag" );
    25982573#else
     
    30343009#endif
    30353010  }
    3036 #if INFERENCE_POC_MSB_VAL_PRESENT
    30373011  else
    30383012  {
     
    30403014    rpcSlice->setPocMsbValPresentFlag( false );
    30413015  }
    3042 #endif
    3043 
    3044 
    30453016  m_pcBitstream->readByteAlignment();
    30463017
  • branches/HTM-12.1-dev0/source/Lib/TLibDecoder/TDecTop.cpp

    r1074 r1075  
    944944     xResetPocInPicBuffer();
    945945   }
    946 #endif
    947    
    948 #if I0044_SLICE_TMVP
    949   if ( m_apcSlicePilot->getTLayer() == 0 && m_apcSlicePilot->getEnableTMVPFlag() == 0 )
     946
     947   if ( m_apcSlicePilot->getTLayer() == 0 && m_apcSlicePilot->getEnableTMVPFlag() == 0 )
    950948  {
    951949    //update all pics in the DPB such that they cannot be used for TMPV ref
     
    11931191#endif
    11941192    // For generalized B
    1195 #if I0044_SLICE_TMVP
     1193#if H_MV
    11961194    if( m_layerId > 0 && !pcSlice->isIntra() && pcSlice->getEnableTMVPFlag() )
    11971195    {
  • branches/HTM-12.1-dev0/source/Lib/TLibEncoder/TEncCavlc.cpp

    r1074 r1075  
    12541254    if( i >= pcVPS->getNumLayerSets( ) )   
    12551255    {     
    1256 #if !VPS_MISC_UPDATES
    1257       WRITE_UVLC( pcVPS->getLayerSetIdxForOlsMinus1( i ),      "layer_set_idx_for_ols_minus1[i]" );
    1258 #else
    12591256      WRITE_CODE( pcVPS->getLayerSetIdxForOlsMinus1( i ), pcVPS->getLayerSetIdxForOlsMinus1Len( i ) ,      "layer_set_idx_for_ols_minus1[i]" );
    1260 #endif
    12611257    }
    12621258
     
    15801576  if( pcVPSVUI->getVideoSignalInfoIdxPresentFlag() && pcVPSVUI->getVpsNumVideoSignalInfoMinus1() > 0 )
    15811577  {
    1582 #if I0045_VPS_VUI_VST_PARAMS
    15831578    for( Int i = pcVPS->getVpsBaseLayerInternalFlag() ? 0 : 1; i <=  pcVPS->getMaxLayersMinus1(); i++ )
    15841579    {
    15851580      WRITE_CODE( pcVPSVUI->getVpsVideoSignalInfoIdx( i ), 4, "vps_video_signal_info_idx" );
    15861581    }
    1587 #else
    1588     for( Int i = 1; i <=  pcVPS->getMaxLayersMinus1(); i++ )
    1589     {
    1590       WRITE_CODE( pcVPSVUI->getVpsVideoSignalInfoIdx( i ), 4, "vps_video_signal_info_idx" );
    1591       assert( pcVPSVUI->getVpsVideoSignalInfoIdx( i ) >= 0 && pcVPSVUI->getVpsVideoSignalInfoIdx( i ) <= pcVPSVUI->getVpsNumVideoSignalInfoMinus1() );
    1592     }
    1593   }
    1594   else
    1595   {
    1596     for( Int i = 1; i <=  pcVPS->getMaxLayersMinus1(); i++ )
    1597     {
    1598       assert( pcVPSVUI->getVpsVideoSignalInfoIdx( i  ) == ( pcVPSVUI->getVideoSignalInfoIdxPresentFlag() ? 0 : i ) );
    1599     }
    1600 #endif
    16011582  }
    16021583  WRITE_FLAG( pcVPSVUI->getTilesNotInUseFlag( ) ? 1 : 0 , "tiles_not_in_use_flag" );
     
    19211902      esb++;
    19221903      WRITE_FLAG( pcSlice->getDiscardableFlag( ) ? 1 : 0 , "discardable_flag" );
    1923 #if NON_REF_NAL_TYPE_DISCARDABLE
    19241904      if (pcSlice->getDiscardableFlag( ))
    19251905      {
     
    19301910          pcSlice->getNalUnitType() != NAL_UNIT_CODED_SLICE_RASL_R);
    19311911      }
    1932 #endif
    19331912    }
    19341913
     
    20912070      if (pcSlice->getSPS()->getTMVPFlagsPresent())
    20922071      {
    2093 #if I0044_SLICE_TMVP
     2072#if H_MV
    20942073        WRITE_FLAG( pcSlice->getEnableTMVPFlag() ? 1 : 0, "slice_temporal_mvp_enabled_flag" );
    20952074#else
Note: See TracChangeset for help on using the changeset viewer.