Changeset 758 in SHVCSoftware
- Timestamp:
- 30 Apr 2014, 00:04:11 (11 years ago)
- Location:
- branches/SHM-6-dev/source
- Files:
-
- 10 edited
Legend:
- Unmodified
- Added
- Removed
-
branches/SHM-6-dev/source/App/TAppEncoder/TAppEncCfg.cpp
r756 r758 597 597 ("CrossLayerPictureTypeAlignFlag", m_crossLayerPictureTypeAlignFlag, true, "align picture type across layers" ) 598 598 #endif 599 #if N0147_IRAP_ALIGN_FLAG600 599 ("CrossLayerIrapAlignFlag", m_crossLayerIrapAlignFlag, true, "align IRAP across layers" ) 601 #endif602 600 #if P0068_CROSS_LAYER_ALIGNED_IDR_ONLY_FOR_IRAP_FLAG 603 601 ("CrossLayerAlignedIdrOnlyFlag", m_crossLayerAlignedIdrOnlyFlag, true, "only idr for IRAP across layers" ) … … 2412 2410 printf("Align picture type : %d\n", m_crossLayerPictureTypeAlignFlag ); 2413 2411 #endif 2414 #if N0147_IRAP_ALIGN_FLAG2415 2412 printf("Cross layer IRAP alignment : %d\n", m_crossLayerIrapAlignFlag ); 2416 #endif2417 2413 #if P0068_CROSS_LAYER_ALIGNED_IDR_ONLY_FOR_IRAP_FLAG 2418 2414 printf("IDR only for IRAP : %d\n", m_crossLayerAlignedIdrOnlyFlag ); -
branches/SHM-6-dev/source/App/TAppEncoder/TAppEncCfg.h
r756 r758 361 361 Void xPrintParameter (); ///< print configuration values 362 362 Void xPrintUsage (); ///< print usage 363 #if SVC_EXTENSION 363 364 #if M0040_ADAPTIVE_RESOLUTION_CHANGE 364 365 Int m_adaptiveResolutionChange; ///< Indicate adaptive resolution change frame … … 384 385 Bool m_crossLayerPictureTypeAlignFlag; 385 386 #endif 386 #if N0147_IRAP_ALIGN_FLAG387 387 Bool m_crossLayerIrapAlignFlag; 388 #endif389 388 #if P0068_CROSS_LAYER_ALIGNED_IDR_ONLY_FOR_IRAP_FLAG 390 389 Bool m_crossLayerAlignedIdrOnlyFlag; … … 402 401 Int m_nCGSLUTBit; 403 402 #endif 403 #endif //SVC_EXTENSION 404 404 public: 405 405 TAppEncCfg(); -
branches/SHM-6-dev/source/App/TAppEncoder/TAppEncTop.cpp
r756 r758 1336 1336 vps->setCrossLayerAlignedIdrOnlyFlag( m_crossLayerAlignedIdrOnlyFlag ); 1337 1337 #endif 1338 #if N0147_IRAP_ALIGN_FLAG1339 1338 vps->setCrossLayerIrapAlignFlag( m_crossLayerIrapAlignFlag ); 1340 1339 for(UInt layerCtr = 1;layerCtr <= vps->getMaxLayers() - 1; layerCtr++) … … 1352 1351 } 1353 1352 } 1354 #endif1355 1353 #if M0040_ADAPTIVE_RESOLUTION_CHANGE 1356 1354 vps->setSingleLayerForNonIrapFlag(m_adaptiveResolutionChange > 0 ? true : false); -
branches/SHM-6-dev/source/Lib/TLibCommon/TComSlice.cpp
r755 r758 775 775 #endif 776 776 777 #if N0147_IRAP_ALIGN_FLAG778 777 assert(m_aiNumRefIdx[REF_PIC_LIST_0] > 0); 779 778 assert(m_aiNumRefIdx[REF_PIC_LIST_1] > 0); 780 #else781 assert(m_aiNumRefIdx[REF_PIC_LIST_0] > 1);782 assert(m_aiNumRefIdx[REF_PIC_LIST_1] > 1);783 #endif784 779 785 780 //set L0 inter-layer reference picture modification … … 789 784 Bool hasModification = (m_aiNumRefIdx[REF_PIC_LIST_0] == numberOfRpsCurrTempList) ? false : true; 790 785 #endif 791 #if N0147_IRAP_ALIGN_FLAG792 786 hasModification = hasModification && ( m_aiNumRefIdx[REF_PIC_LIST_0] > 1 ); 793 #endif794 787 refPicListModification->setRefPicListModificationFlagL0(hasModification); 795 788 if(hasModification) … … 838 831 //set L1 inter-layer reference picture modification 839 832 hasModification = (m_aiNumRefIdx[REF_PIC_LIST_1] >= numberOfRpsCurrTempList) ? false : true; 840 #if N0147_IRAP_ALIGN_FLAG841 833 hasModification = hasModification && ( m_aiNumRefIdx[REF_PIC_LIST_1] > 1 ); 842 #endif843 834 844 835 refPicListModification->setRefPicListModificationFlagL1(hasModification); … … 2332 2323 m_crossLayerPictureTypeAlignFlag = true; 2333 2324 #endif 2334 #if N0147_IRAP_ALIGN_FLAG2335 2325 m_crossLayerIrapAlignFlag = true; 2336 #endif2337 2326 #if P0068_CROSS_LAYER_ALIGNED_IDR_ONLY_FOR_IRAP_FLAG 2338 2327 m_crossLayerAlignedIdrOnlyFlag = false; -
branches/SHM-6-dev/source/Lib/TLibCommon/TComSlice.h
r755 r758 569 569 Bool m_crossLayerPictureTypeAlignFlag; 570 570 #endif 571 #if N0147_IRAP_ALIGN_FLAG572 571 Bool m_crossLayerIrapAlignFlag; 573 #endif574 572 #if P0068_CROSS_LAYER_ALIGNED_IDR_ONLY_FOR_IRAP_FLAG 575 573 Bool m_crossLayerAlignedIdrOnlyFlag; … … 931 929 Void setCrossLayerAlignedIdrOnlyFlag(Bool x) { m_crossLayerAlignedIdrOnlyFlag = x; } 932 930 #endif 933 #if N0147_IRAP_ALIGN_FLAG934 931 Bool getCrossLayerIrapAlignFlag() { return m_crossLayerIrapAlignFlag; } 935 932 Void setCrossLayerIrapAlignFlag(Bool x) { m_crossLayerIrapAlignFlag = x; } 936 #endif937 933 #if O0225_MAX_TID_FOR_REF_LAYERS 938 934 UInt getMaxTidIlRefPicsPlus1(Int layerId, Int refLayerId) { return m_maxTidIlRefPicsPlus1[layerId][refLayerId]; } -
branches/SHM-6-dev/source/Lib/TLibCommon/TypeDef.h
r757 r758 211 211 #define P0068_CROSS_LAYER_ALIGNED_IDR_ONLY_FOR_IRAP_FLAG 1 ///< a flag to indicatate whether picture types for IRAP are IDR across layers. 212 212 213 #define N0147_IRAP_ALIGN_FLAG 1 ///< a flag to indicatate whether IRAPs are aligned across layers214 #if N0147_IRAP_ALIGN_FLAG215 213 #define O0223_O0139_IRAP_ALIGN_NO_CONTRAINTS 1 ///< Remove IRAP align depedency constraints on poc_Reset_flag. 216 214 #define IRAP_ALIGN_FLAG_IN_VPS_VUI 1 ///< Move IRAP align flag to VPS VUI 217 #endif218 215 #define FAST_INTRA_SHVC 1 ///< JCTVC-M0115: reduction number of intra modes in the EL (encoder only) 219 216 #if FAST_INTRA_SHVC -
branches/SHM-6-dev/source/Lib/TLibDecoder/TDecCAVLC.cpp
r756 r758 1631 1631 #endif 1632 1632 1633 #if N0147_IRAP_ALIGN_FLAG && !IRAP_ALIGN_FLAG_IN_VPS_VUI1634 1633 READ_FLAG(uiCode, "cross_layer_irap_aligned_flag" ); 1635 1634 vps->setCrossLayerIrapAlignFlag(uiCode); 1636 #endif1637 1635 1638 1636 #if VPS_DPB_SIZE_TABLE … … 1829 1827 Void TDecCavlc::defaultVPSVUI( TComVPS* vps ) 1830 1828 { 1831 #if N0147_IRAP_ALIGN_FLAG1832 1829 // When not present, the value of all_layers_idr_aligned_flag is inferred to be equal to 0. 1833 1830 vps->setCrossLayerIrapAlignFlag( false ); 1834 #endif1835 1831 1836 1832 #if M0040_ADAPTIVE_RESOLUTION_CHANGE -
branches/SHM-6-dev/source/Lib/TLibDecoder/TDecTop.cpp
r754 r758 1109 1109 // actual decoding starts here 1110 1110 xActivateParameterSets(); 1111 #if !O0223_O0139_IRAP_ALIGN_NO_CONTRAINTS && N0147_IRAP_ALIGN_FLAG1111 #if !O0223_O0139_IRAP_ALIGN_NO_CONTRAINTS 1112 1112 //Note setting O0223_O0139_IRAP_ALIGN_NO_CONTRAINTS to 0 may cause decoder to crash. 1113 1113 //When cross_layer_irap_aligned_flag is equal to 0, num_extra_slice_header_bits >=1 … … 1763 1763 #endif 1764 1764 1765 #if N0147_IRAP_ALIGN_FLAG1766 1765 if( m_layerId > 0 && pcSlice->getVPS()->getCrossLayerIrapAlignFlag() ) 1767 1766 { … … 1779 1778 } 1780 1779 } 1781 #endif1782 1780 1783 1781 if( m_layerId > 0 && !pcSlice->isIntra() && pcSlice->getEnableTMVPFlag() ) -
branches/SHM-6-dev/source/Lib/TLibEncoder/TEncCavlc.cpp
r755 r758 1200 1200 WRITE_FLAG(vps->getPhaseAlignFlag(), "cross_layer_phase_alignment_flag" ); 1201 1201 #endif 1202 #if N0147_IRAP_ALIGN_FLAG &&!IRAP_ALIGN_FLAG_IN_VPS_VUI1202 #if !IRAP_ALIGN_FLAG_IN_VPS_VUI 1203 1203 WRITE_FLAG(vps->getCrossLayerIrapAlignFlag(), "cross_layer_irap_aligned_flag"); 1204 1204 #endif -
branches/SHM-6-dev/source/Lib/TLibEncoder/TEncGOP.cpp
r757 r758 1160 1160 if( pocCurr % m_pcCfg->getIntraPeriod() == 0 ) 1161 1161 { 1162 #if N0147_IRAP_ALIGN_FLAG1163 1162 if(pcSlice->getVPS()->getCrossLayerIrapAlignFlag()) 1164 1163 { … … 1175 1174 } 1176 1175 else 1177 #endif 1176 { 1178 1177 pcSlice->setNalUnitType(NAL_UNIT_CODED_SLICE_CRA); 1178 } 1179 1179 } 1180 1180
Note: See TracChangeset for help on using the changeset viewer.