Changeset 1108 in SHVCSoftware
- Timestamp:
- 6 Jul 2015, 21:03:54 (9 years ago)
- Location:
- branches/SHM-dev/source/Lib
- Files:
-
- 3 edited
Legend:
- Unmodified
- Added
- Removed
-
branches/SHM-dev/source/Lib/TLibCommon/TypeDef.h
r1107 r1108 49 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-R1008 50 50 #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 #define CROSS_LAYER_BLA_FLAG_FIX 1 ///< Fix for earlier implementation mistake that omit the signalling of cross_layer_bla_flag52 51 #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 53 52 #define VPS_AVC_BL_FLAG_REMOVAL 1 ///< remove avc_base_layer_flag and direct the function its offer to vps_base_layer_internal_flag and vps_base_layer_available_flag -
branches/SHM-dev/source/Lib/TLibDecoder/TDecCAVLC.cpp
r1107 r1108 1232 1232 { 1233 1233 #if SVC_EXTENSION 1234 #if CROSS_LAYER_BLA_FLAG_FIX1235 1234 Int iBits = 0; 1236 1235 if(pcSlice->getPPS()->getNumExtraSliceHeaderBits() > iBits) 1237 #else1238 if(pcSlice->getPPS()->getNumExtraSliceHeaderBits()>0)1239 #endif1240 1236 { 1241 1237 READ_FLAG(uiCode, "discardable_flag"); // ignored … … 1251 1247 } 1252 1248 #endif 1253 #if CROSS_LAYER_BLA_FLAG_FIX1254 1249 iBits++; 1255 #endif 1256 } 1257 #if CROSS_LAYER_BLA_FLAG_FIX 1250 } 1251 1258 1252 if(pcSlice->getPPS()->getNumExtraSliceHeaderBits() > iBits) 1259 1253 { … … 1261 1255 iBits++; 1262 1256 } 1257 1263 1258 for ( ; iBits < pcSlice->getPPS()->getNumExtraSliceHeaderBits(); iBits++) 1264 #else1265 for (Int i = 1; i < pcSlice->getPPS()->getNumExtraSliceHeaderBits(); i++)1266 #endif1267 1259 { 1268 1260 READ_FLAG(uiCode, "slice_reserved_undetermined_flag[]"); // ignored -
branches/SHM-dev/source/Lib/TLibEncoder/TEncCavlc.cpp
r1105 r1108 955 955 { 956 956 #if SVC_EXTENSION 957 #if CROSS_LAYER_BLA_FLAG_FIX958 957 Int iBits = 0; 959 958 if(pcSlice->getPPS()->getNumExtraSliceHeaderBits() > iBits) 960 #else961 if (pcSlice->getPPS()->getNumExtraSliceHeaderBits()>0)962 #endif963 959 { 964 960 assert(!!"discardable_flag"); … … 974 970 #endif 975 971 WRITE_FLAG(pcSlice->getDiscardableFlag(), "discardable_flag"); 976 #if CROSS_LAYER_BLA_FLAG_FIX977 972 iBits++; 978 #endif 979 } 980 #if CROSS_LAYER_BLA_FLAG_FIX 973 } 974 981 975 if( pcSlice->getPPS()->getNumExtraSliceHeaderBits() > iBits ) 982 976 { … … 985 979 iBits++; 986 980 } 981 987 982 for (; iBits < pcSlice->getPPS()->getNumExtraSliceHeaderBits(); iBits++) 988 #else989 for (Int i = 1; i < pcSlice->getPPS()->getNumExtraSliceHeaderBits(); i++)990 #endif991 983 { 992 984 assert(!!"slice_reserved_undetermined_flag[]");
Note: See TracChangeset for help on using the changeset viewer.