Changeset 888 in SHVCSoftware

Timestamp:

17 Sep 2014, 02:45:59 (10 years ago)

Author:

qualcomm

Message:

Correcting implementation related to the following adoption:
JCTVC-Q0146 -- poc_msb_val_present_flag shall be equal to 0 when slice_header_extension_length is (inferred to be ) equal to 0

MACRO: INFERENCE_POC_MSB_VAL_PRESENT

submitted by Hendry (fhendry@…)

Location:

branches/SHM-dev/source/Lib

Files:

• TLibCommon/TypeDef.h (modified) (2 diffs)
• TLibDecoder/TDecCAVLC.cpp (modified) (1 diff)

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

@@ -44 +44 @@
 #define MAX_LAYERS                       8      ///< max number of layers the codec is supposed to handle
 
+#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
 #define CROSS_LAYER_BLA_FLAG_FIX         1      ///< Fix for earlier implementation mistake that omit the signalling of cross_layer_bla_flag
 #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
@@ -133 +134 @@
 #define UNAVAILABLE_PIC_BUGFIX           1
 #endif
+#if INFERENCE_POC_MSB_VAL_PRESENT
+#define POC_MSB_VAL_PRESENT_FLAG_SEM     0      ///< JCTVC-Q0146: Inference of poc_msb_val_present_flag
+#else
 #define POC_MSB_VAL_PRESENT_FLAG_SEM     1      ///< JCTVC-Q0146: Inference of poc_msb_val_present_flag
+#endif
 #define POC_RESET_INFO_INFERENCE         1      ///< JCTVC-Q0146: Infer the value of poc_reset_info_present_flag when not present
 #define NO_OUTPUT_OF_PRIOR_PICS          1      ///< Use no_output_of_prior_pics_flag

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

@@ -3570 +3570 @@
 {
   sliceHeaderExtensionLength = 0;
+#if INFERENCE_POC_MSB_VAL_PRESENT
+  rpcSlice->setPocMsbValPresentFlag( false );
+#endif
 }
 UInt startBits = m_pcBitstream->getNumBitsRead();     // Start counter of # SH Extn bits