Changeset 1109 in SHVCSoftware for branches/SHM-dev/source
- Timestamp:
- 6 Jul 2015, 21:09:31 (9 years ago)
- Location:
- branches/SHM-dev/source/Lib
- Files:
-
- 3 edited
Legend:
- Unmodified
- Added
- Removed
-
TabularUnified branches/SHM-dev/source/Lib/TLibCommon/TypeDef.h ¶
r1108 r1109 47 47 #define CONFORMANCE_BITSTREAM_MODE 1 ///< In order to generate the metadata related to conformance bitstreams 48 48 #define FIX_NON_OUTPUT_LAYER 1 49 #define SIGNALLING_BITRATE_PICRATE_FIX 1 ///< Fix for signalling of bitrate and picture rate info in VPS VUI to be more aligned to JCTVC-R100850 49 #define INFERENCE_POC_MSB_VAL_PRESENT 1 ///< JCTVC-Q0146 -- poc_msb_val_present_flag shall be equal to 0 when slice_header_extension_length is (inferred to be ) equal to 0 51 50 #define NON_REF_NAL_TYPE_DISCARDABLE 1 ///< JCTVC-P0041 -- If discardable picture is a non-IRAP, it must be a non-referenced sub-layer picture -
TabularUnified branches/SHM-dev/source/Lib/TLibDecoder/TDecCAVLC.cpp ¶
r1108 r1109 3842 3842 READ_FLAG( uiCode, "pic_rate_present_vps_flag" ); vps->setPicRatePresentVpsFlag( uiCode ? true : false ); 3843 3843 3844 #if SIGNALLING_BITRATE_PICRATE_FIX3845 3844 if ( vps->getBitRatePresentVpsFlag() || vps->getPicRatePresentVpsFlag() ) 3846 3845 { … … 3880 3879 } 3881 3880 } 3882 #else 3883 Bool parseFlag = vps->getBitRatePresentVpsFlag() || vps->getPicRatePresentVpsFlag(); 3884 3885 #if Q0078_ADD_LAYER_SETS 3886 #if R0227_BR_PR_ADD_LAYER_SET 3887 for( i = 0; i < vps->getNumLayerSets(); i++ ) 3888 #else 3889 for( i = 0; i <= vps->getVpsNumLayerSetsMinus1(); i++ ) 3890 #endif 3891 #else 3892 for( i = 0; i < vps->getNumLayerSets(); i++ ) 3893 #endif 3894 { 3895 #if BITRATE_PICRATE_SIGNALLING 3896 for( j = 0; j <= vps->getMaxSLayersInLayerSetMinus1(i); j++ ) 3897 #else 3898 for( j = 0; j < vps->getMaxTLayers(); j++ ) 3899 #endif 3900 { 3901 if( parseFlag && vps->getBitRatePresentVpsFlag() ) 3902 { 3903 READ_FLAG( uiCode, "bit_rate_present_flag[i][j]" ); vps->setBitRatePresentFlag( i, j, uiCode ? true : false ); 3904 } 3905 else 3906 { 3907 vps->setBitRatePresentFlag( i, j, false ); 3908 } 3909 if( parseFlag && vps->getPicRatePresentVpsFlag() ) 3910 { 3911 READ_FLAG( uiCode, "pic_rate_present_flag[i][j]" ); vps->setPicRatePresentFlag( i, j, uiCode ? true : false ); 3912 } 3913 else 3914 { 3915 vps->setPicRatePresentFlag( i, j, false ); 3916 } 3917 if( parseFlag && vps->getBitRatePresentFlag(i, j) ) 3918 { 3919 READ_CODE( 16, uiCode, "avg_bit_rate[i][j]" ); vps->setAvgBitRate( i, j, uiCode ); 3920 READ_CODE( 16, uiCode, "max_bit_rate[i][j]" ); vps->setMaxBitRate( i, j, uiCode ); 3921 } 3922 else 3923 { 3924 vps->setAvgBitRate( i, j, 0 ); 3925 vps->setMaxBitRate( i, j, 0 ); 3926 } 3927 if( parseFlag && vps->getPicRatePresentFlag(i, j) ) 3928 { 3929 READ_CODE( 2 , uiCode, "constant_pic_rate_idc[i][j]" ); vps->setConstPicRateIdc( i, j, uiCode ); 3930 READ_CODE( 16, uiCode, "avg_pic_rate[i][j]" ); vps->setAvgPicRate( i, j, uiCode ); 3931 } 3932 else 3933 { 3934 vps->setConstPicRateIdc( i, j, 0 ); 3935 vps->setAvgPicRate ( i, j, 0 ); 3936 } 3937 } 3938 } 3939 #endif 3881 3940 3882 #if VPS_VUI_VIDEO_SIGNAL_MOVE 3941 3883 READ_FLAG( uiCode, "video_signal_info_idx_present_flag" ); vps->setVideoSigPresentVpsFlag( uiCode == 1 ); -
TabularUnified branches/SHM-dev/source/Lib/TLibEncoder/TEncCavlc.cpp ¶
r1108 r1109 2686 2686 #if Q0078_ADD_LAYER_SETS 2687 2687 #if R0227_BR_PR_ADD_LAYER_SET 2688 #if SIGNALLING_BITRATE_PICRATE_FIX2689 2688 for( i = vps->getBaseLayerInternalFlag() ? 0 : 1; i < vps->getNumLayerSets(); i++ ) 2690 #else2691 for( i = 0; i < vps->getNumLayerSets(); i++ )2692 #endif2693 2689 #else 2694 2690 for( i = 0; i <= vps->getVpsNumLayerSetsMinus1(); i++ )
Note: See TracChangeset for help on using the changeset viewer.