Changeset 914 in SHVCSoftware for branches

Timestamp:

4 Nov 2014, 22:08:05 (10 years ago)

Author:

seregin

Message:

JCTVC-R0157: when pps_pic_parameter_set_id greater than or equal to 8, colour_mapping_enabled_flag shall be equal to 0, the code was provided by Jill Boyce <jill@…>

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

@@ -284 +284 @@
 #endif
 #endif
+#define R0157_RESTRICT_PPSID_FOR_CGS_LUT 1      ///< JCTVC-R0157: when pps_pic_parameter_set_id greater than or equal to 8, colour_mapping_enabled_flag shall be equal to 0
 
 /// scalability types

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

@@ -548 +548 @@
       if( pcPPS->getCGSFlag() )
       {
+#if R0157_RESTRICT_PPSID_FOR_CGS_LUT
+        // when pps_pic_parameter_set_id greater than or equal to 8, colour_mapping_enabled_flag shall be equal to 0
+        assert( pcPPS->getPPSId() < 8 );
+#endif
         xParse3DAsymLUT( pc3DAsymLUT );
         pcPPS->setCGSOutputBitDepthY( pc3DAsymLUT->getOutputBitDepthY() );