Changeset 1124 in SHVCSoftware for branches/SHM-dev/source


Ignore:
Timestamp:
7 Jul 2015, 02:24:58 (9 years ago)
Author:
seregin
Message:

macro cleanup: P0300_ALT_OUTPUT_LAYER_FLAG, O0153_ALT_OUTPUT_LAYER_FLAG

Location:
branches/SHM-dev/source
Files:
8 edited

Legend:

Unmodified
Added
Removed

  • branches/SHM-dev/source/App/TAppEncoder/TAppEncCfg.cpp

    r1116 r1124  
    16851685  ("SEIOverlayPersistenceFlag",               m_overlayInfoPersistenceFlag,              true, "Indicates if the SEI message applies to the current picture only (0) or also to following pictures (1)")
    16861686#endif
     1687#if SVC_EXTENSION
    16871688#if Q0189_TMVP_CONSTRAINTS
    16881689  ("SEITemporalMotionVectorPredictionConstraints",             m_TMVPConstraintsSEIEnabled,              0, "Control generation of TMVP constrants SEI message")
    … …  
    17031704  ("TileSetsArray",                    cfg_tileSets,                         string(""), "Array containing tile sets params (TopLeftTileIndex, BottonRightTileIndex and ilcIdc for each set) ")
    17041705#endif
    1705 #if O0153_ALT_OUTPUT_LAYER_FLAG
    17061706  ("AltOutputLayerFlag",               m_altOutputLayerFlag,                      false, "Specifies the value of alt_output_layer_flag in VPS extension")
    1707 #endif
    17081707#if O0149_CROSS_LAYER_BLA_FLAG
    17091708  ("CrossLayerBLAFlag",                m_crossLayerBLAFlag,                       false, "Specifies the value of cross_layer_bla_flag in VPS")
    … …  
    17241723  ("InheritCodingStruct%d",m_inheritCodingStruct, 0, MAX_LAYERS, "Predicts the GOP structure of one layer for another layer")
    17251724#endif
     1725#endif //SVC_EXTENSION
    17261726  ;
    17271727

  • branches/SHM-dev/source/App/TAppEncoder/TAppEncCfg.h

    r1116 r1124  
    451451  Int       m_TMVPConstraintsSEIEnabled;
    452452#endif
    453 #if O0153_ALT_OUTPUT_LAYER_FLAG
    454453  Bool      m_altOutputLayerFlag;                             ///< Specifies the value of alt_output_laye_flag in VPS extension
    455 #endif
    456454  Int       m_elRapSliceBEnabled;
    457455#endif

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

    r1121 r1124  
    799799    m_acTEncTop[layer].setChromaFormatIDC                        ( m_acLayerCfg[layer].m_chromaFormatIDC );
    800800#endif
    801 #if O0153_ALT_OUTPUT_LAYER_FLAG
    802801    m_acTEncTop[layer].setAltOuputLayerFlag                      ( m_altOutputLayerFlag );
    803 #endif
    804802#if O0149_CROSS_LAYER_BLA_FLAG
    805803    m_acTEncTop[layer].setCrossLayerBLAFlag                      ( m_crossLayerBLAFlag );
    … …  
    17841782#endif
    17851783
    1786 #if P0300_ALT_OUTPUT_LAYER_FLAG
    17871784  for (Int k = 0; k < MAX_VPS_LAYER_SETS_PLUS1; k++)
    17881785  {
    17891786    vps->setAltOuputLayerFlag( k, m_altOutputLayerFlag );
    17901787  }
    1791 #else
    1792 #if O0153_ALT_OUTPUT_LAYER_FLAG
    1793   vps->setAltOuputLayerFlag( m_altOutputLayerFlag );
    1794 #endif
    1795 #endif
    17961788
    17971789#if VPS_VUI_BSP_HRD_PARAMS

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

    r1120 r1124  
    752752  Int        m_avgPicRate          [MAX_VPS_LAYER_SETS_PLUS1][MAX_TLAYER];
    753753
    754 #if P0300_ALT_OUTPUT_LAYER_FLAG
    755754#if Q0078_ADD_LAYER_SETS
    756755  Bool       m_altOutputLayerFlag[MAX_VPS_LAYER_SETS_PLUS1 + 2*MAX_NUM_ADD_LAYER_SETS];
    … …  
    758757  Bool       m_altOutputLayerFlag[MAX_VPS_LAYER_SETS_PLUS1];
    759758#endif
    760 #else
    761 #if O0153_ALT_OUTPUT_LAYER_FLAG
    762   Bool       m_altOutputLayerFlag;
    763 #endif
    764 #endif
     759
    765760#if REPN_FORMAT_IN_VPS
    766761  Bool       m_repFormatIdxPresentFlag;
    … …  
    12711266#endif
    12721267
    1273 #if P0300_ALT_OUTPUT_LAYER_FLAG
    12741268  Bool   getAltOuputLayerFlag(Int idx)         { return m_altOutputLayerFlag[idx]; }
    12751269  Void   setAltOuputLayerFlag(Int idx, Bool x) { m_altOutputLayerFlag[idx] = x;    }
    1276 #else
    1277 #if O0153_ALT_OUTPUT_LAYER_FLAG
    1278   Bool   getAltOuputLayerFlag()             { return m_altOutputLayerFlag; }
    1279   Void   setAltOuputLayerFlag(Bool x)       { m_altOutputLayerFlag = x;    }
    1280 #endif
    1281 #endif
     1270
    12821271#if REPN_FORMAT_IN_VPS
    12831272  Bool   getRepFormatIdxPresentFlag()       { return m_repFormatIdxPresentFlag; }

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

    r1122 r1124  
    190190#define O0098_SCALED_REF_LAYER_ID        1      ///< JCTVC-O0098: signal scaled reference id
    191191
    192 #define O0153_ALT_OUTPUT_LAYER_FLAG      1      ///< JCTVC-O0153: alt output layer flag
    193 #define P0300_ALT_OUTPUT_LAYER_FLAG      1      ///< JCTVC-P0300: alt output layer flag
    194 
    195192#define Q0165_OUTPUT_LAYER_SET           1      ///< JCTVC-Q0165: add a constraint to disallow an empty output layer set
    196193#define Q0165_NUM_ADD_OUTPUT_LAYER_SETS  1      ///< JCTVC-Q0165: signal num_add_olss and default_target_output_layer_idc when vps_num_layer_sets_minus1 is greater than 0

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

    r1121 r1124  
    26982698{
    26992699  UInt uiCode;
    2700   // ... More syntax elements to be parsed here
    2701 #if P0300_ALT_OUTPUT_LAYER_FLAG
    27022700  Int NumOutputLayersInOutputLayerSet[MAX_VPS_LAYER_SETS_PLUS1];
    27032701  Int OlsHighestOutputLayerId[MAX_VPS_LAYER_SETS_PLUS1];
    2704 #endif
    27052702#if LIST_OF_PTL
    27062703  if( vps->getMaxLayers() > 1 && vps->getBaseLayerInternalFlag() )
    … …  
    30893086    READ_CODE( numBits, uiCode, "profile_tier_level_idx[i]" );     vps->setProfileLevelTierIdx(i, uiCode);
    30903087#endif
    3091 #if P0300_ALT_OUTPUT_LAYER_FLAG
     3088
    30923089    NumOutputLayersInOutputLayerSet[i] = 0;
    30933090    for (j = 0; j < vps->getNumLayersInIdList(layerSetIdxForOutputLayerSet); j++)
    … …  
    31133110#if Q0165_OUTPUT_LAYER_SET
    31143111    assert( NumOutputLayersInOutputLayerSet[i]>0 );
    3115 #endif
    3116 
    31173112#endif
    31183113  }
    … …  
    32103205    READ_CODE( numBits, uiCode, "profile_level_tier_idx[i]" );     vps->setProfileLevelTierIdx(i, uiCode);
    32113206  }
    3212 #endif
    3213 
    3214 #if !P0300_ALT_OUTPUT_LAYER_FLAG
    3215 #if O0153_ALT_OUTPUT_LAYER_FLAG
    3216   if( vps->getMaxLayers() > 1 )
    3217   {
    3218     READ_FLAG( uiCode, "alt_output_layer_flag");
    3219     vps->setAltOuputLayerFlag( uiCode ? true : false );
    3220   }
    3221 #endif
    32223207#endif
    32233208

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

    r1121 r1124  
    19881988Void TEncCavlc::codeVPSExtension (TComVPS *vps)
    19891989{
    1990   // ... More syntax elements to be written here
    1991 #if P0300_ALT_OUTPUT_LAYER_FLAG
    19921990  Int NumOutputLayersInOutputLayerSet[MAX_VPS_LAYER_SETS_PLUS1];
    19931991  Int OlsHighestOutputLayerId[MAX_VPS_LAYER_SETS_PLUS1];
    1994 #endif
    19951992#if LIST_OF_PTL
    19961993  if( vps->getMaxLayers() > 1 && vps->getBaseLayerInternalFlag() )
    … …  
    22472244    WRITE_CODE( vps->getProfileLevelTierIdx(i), numBits, "profile_level_tier_idx[i]" );     
    22482245#endif
    2249 #if P0300_ALT_OUTPUT_LAYER_FLAG
     2246
    22502247    NumOutputLayersInOutputLayerSet[i] = 0;
    22512248    for (j = 0; j < vps->getNumLayersInIdList(layerSetIdxForOutputLayerSet); j++)
    … …  
    22652262    assert( NumOutputLayersInOutputLayerSet[i]>0 );
    22662263#endif
    2267 
    2268 #endif
    2269   }
    2270 
    2271 #if !P0300_ALT_OUTPUT_LAYER_FLAG
    2272 #if O0153_ALT_OUTPUT_LAYER_FLAG
    2273   if( vps->getMaxLayers() > 1 )
    2274   {
    2275     WRITE_FLAG( vps->getAltOuputLayerFlag(), "alt_output_layer_flag" );   
    2276   }
    2277 #endif
    2278 #endif
     2264  }
    22792265
    22802266#if REPN_FORMAT_IN_VPS

  • branches/SHM-dev/source/Lib/TLibEncoder/TEncCfg.h

    r1090 r1124  
    377377  int       m_layerSwitchOffEnd;
    378378#endif
    379 #if O0153_ALT_OUTPUT_LAYER_FLAG
    380379  Bool      m_altOutputLayerFlag;
    381 #endif
    382380#if HIGHER_LAYER_IRAP_SKIP_FLAG
    383381  Int       m_skipPictureAtArcSwitch;
    … …  
    10361034  ChromaFormat getChromaFormatIDC()               { return m_chromaFormatIDC; }
    10371035#endif
    1038 #if O0153_ALT_OUTPUT_LAYER_FLAG
    10391036  Bool      getAltOuputLayerFlag() const { return m_altOutputLayerFlag; }
    10401037  Void      setAltOuputLayerFlag(Bool b) { m_altOutputLayerFlag = b;    }
    1041 #endif
    10421038#if O0149_CROSS_LAYER_BLA_FLAG
    10431039  Bool      getCrossLayerBLAFlag() const { return m_crossLayerBLAFlag; }
    … …  
    11791175#endif
    11801176#endif
    1181 #endif
     1177#endif //SVC_EXTENSION
    11821178};
    11831179
Note: See TracChangeset for help on using the changeset viewer.