Ticket #749: VPS_BUGFIX_749.patch

TLibCommon/TypeDef.h

@@ -42 +42 @@
 
 //! \ingroup TLibCommon
 //! \{
+
+#define VPS_BUGFIX                       1  ///< Fix VPS-related bugs reported in Ticket #749
 #define SPS_AMVP_CLEANUP                 1  ///< remove old AMVP related code for alignment with draft text
 #define SUPPORT_FOR_VUI                  1  ///< new: add support for VUI and hrd_parameters
 #define TARGET_DECLAYERID_SET            1  ///< J0074:  targetDecLayerIdSet for sub-bitstream extraction process

TLibEncoder/TEncCavlc.cpp

@@ -569 +569 @@
 {
 #if VPS_SYNTAX_CHANGES
   WRITE_CODE( pcVPS->getVPSId(),                    4,        "video_parameter_set_id" );
+#if VPS_BUGFIX
+  WRITE_FLAG( pcVPS->getTemporalNestingFlag(),            "vps_temporal_id_nesting_flag" );
+#else
   WRITE_FLAG( pcVPS->getTemporalNestingFlag() - 1,            "vps_temporal_id_nesting_flag" );
+#endif
   WRITE_CODE( 0,                                    2,        "vps_reserved_zero_2bits" );
   WRITE_CODE( 0,                                    6,        "vps_reserved_zero_6bits" );
   WRITE_CODE( pcVPS->getMaxTLayers() - 1,           3,        "vps_max_sub_layers_minus1" );