Changeset 512 in SHVCSoftware for branches/SHM-4.1-dev/source/Lib
- Timestamp:
- 5 Dec 2013, 15:23:55 (11 years ago)
- Location:
- branches/SHM-4.1-dev/source/Lib
- Files:
-
- 5 edited
Legend:
- Unmodified
- Added
- Removed
-
branches/SHM-4.1-dev/source/Lib/TLibCommon/TComSlice.h
r507 r512 616 616 Int m_avgPicRate [MAX_VPS_LAYER_SETS_PLUS1][MAX_TLAYER]; 617 617 #endif 618 #if O0153_ALT_OUTPUT_LAYER_FLAG 619 Bool m_altOutputLayerFlag; 620 #endif 618 621 #if REPN_FORMAT_IN_VPS 619 622 Bool m_repFormatIdxPresentFlag; … … 879 882 Void setAvgPicRate(Int i, Int j, Int x) { m_avgPicRate[i][j] = x; } 880 883 #endif 881 884 #if O0153_ALT_OUTPUT_LAYER_FLAG 885 Bool getAltOuputLayerFlag() { return m_altOutputLayerFlag; } 886 Void setAltOuputLayerFlag(Bool x) { m_altOutputLayerFlag = x; } 887 #endif 882 888 #if REPN_FORMAT_IN_VPS 883 889 Bool getRepFormatIdxPresentFlag() { return m_repFormatIdxPresentFlag; } -
branches/SHM-4.1-dev/source/Lib/TLibCommon/TypeDef.h
r509 r512 179 179 #define RESAMPLING_CONSTRAINT_BUG_FIX 1 180 180 #define O0098_SCALED_REF_LAYER_ID 1 ///< JCTVC-O0098: signal scaled reference id 181 182 #define O0153_ALT_OUTPUT_LAYER_FLAG 1 ///< JCTVC-O0153: alt output layer flag 181 183 182 184 #else -
branches/SHM-4.1-dev/source/Lib/TLibDecoder/TDecCAVLC.cpp
r511 r512 1252 1252 } 1253 1253 1254 #if O0153_ALT_OUTPUT_LAYER_FLAG 1255 if( vps->getMaxLayers() > 1 ) 1256 { 1257 READ_FLAG( uiCode, "alt_output_layer_flag"); 1258 vps->setAltOuputLayerFlag( uiCode ? true : false ); 1259 } 1260 #endif 1261 1254 1262 #if REPN_FORMAT_IN_VPS 1255 1263 READ_FLAG( uiCode, "rep_format_idx_present_flag"); -
branches/SHM-4.1-dev/source/Lib/TLibEncoder/TEncCavlc.cpp
r507 r512 999 999 } 1000 1000 1001 #if O0153_ALT_OUTPUT_LAYER_FLAG 1002 if( vps->getMaxLayers() > 1 ) 1003 { 1004 WRITE_FLAG( vps->getAltOuputLayerFlag(), "alt_output_layer_flag" ); 1005 } 1006 #endif 1007 1001 1008 #if REPN_FORMAT_IN_VPS 1002 1009 WRITE_FLAG( vps->getRepFormatIdxPresentFlag(), "rep_format_idx_present_flag"); -
branches/SHM-4.1-dev/source/Lib/TLibEncoder/TEncCfg.h
r494 r512 392 392 #if M0040_ADAPTIVE_RESOLUTION_CHANGE 393 393 Int m_adaptiveResolutionChange; 394 #endif 395 #if O0153_ALT_OUTPUT_LAYER_FLAG 396 Bool m_altOutputLayerFlag; 394 397 #endif 395 398 #endif … … 938 941 ChromaFormat getChromaFormatIDC() { return m_chromaFormatIDC; } 939 942 #endif 943 #if O0153_ALT_OUTPUT_LAYER_FLAG 944 Bool getAltOuputLayerFlag() const { return m_altOutputLayerFlag; } 945 Void setAltOuputLayerFlag(Bool b) { m_altOutputLayerFlag = b; } 946 #endif 940 947 #endif 941 948 };
Note: See TracChangeset for help on using the changeset viewer.