Changeset 843 in SHVCSoftware for branches/SHM-dev

Timestamp:

26 Jul 2014, 01:30:47 (10 years ago)

Author:

qualcomm

Message:

Conformance checking such that VPS VUI HRD only present if VPS timing info is signalled

Adoption of JCTVC-R0227. (Macro: R0227_VUI_BSP_HRD_FLAG)

From: Hendry <fhendry@…>

Location:

branches/SHM-dev/source/Lib

Files:

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

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

@@ -49 +49 @@
 #define O0137_MAX_LAYERID                1      ///< JCTVC-O0137, JCTVC-O0200, JCTVC-O0223: restrict nuh_layer_id and vps_max_layers_minus1
 
+#define R0227_VUI_BSP_HRD_FLAG           1      ///< JCTVC-R0227, Conformance checking such that VPS VUI HRD only present if VPS timing info is signalled
 #define R0227_REP_FORMAT_CONSTRAINT      1      ///< JCTVC-R0227, Conformance checking such that representation format of a particular layer shall not be greater than the one defined in VPS for that layer
 #define R0227_BR_PR_ADD_LAYER_SET        1      ///< JCTVC-R0227, Signalling of bit-rate and picture rate for additional layer set

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

@@ -2397 +2397 @@
   if (vps->getVpsVuiBspHrdPresentFlag())
   {
+#if R0227_VUI_BSP_HRD_FLAG
+    assert (vps->getTimingInfo()->getTimingInfoPresentFlag() == 1);
+#endif
     READ_UVLC( uiCode, "vps_num_bsp_hrd_parameters_minus1" ); vps->setVpsNumBspHrdParametersMinus1(uiCode);
     vps->createBspHrdParamBuffer(vps->getVpsNumBspHrdParametersMinus1() + 1);