Changeset 837 in SHVCSoftware for branches/SHM-dev

Timestamp:

25 Jul 2014, 02:41:19 (10 years ago)

Author:

qualcomm

Message:

Signalling of bit rate and picture rate information for additional layer sets -- adoption of JCTVC-R0227. (Macro: R0227_BR_PR_ADD_LAYER_SET)

From: Hendry <fhendry@…>

Location:

branches/SHM-dev/source/Lib

Files:

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

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

@@ -47 +47 @@
 #define VPS_VUI_OFFSET                   1      ///< N0085: Signal VPS VUI offset in the VPS extension 
 #define O0137_MAX_LAYERID                1      ///< JCTVC-O0137, JCTVC-O0200, JCTVC-O0223: restrict nuh_layer_id and vps_max_layers_minus1
+
+#define R0227_BR_PR_ADD_LAYER_SET        1      ///< JCTVC-R0227, Signalling of bit-rate and picture rate for additional layer set
 
 #define Q0108_TSA_STSA                   1      ///< JCTVC-Q0108, Remove cross-layer alignment constraints of TSA and STSA pictures, enable to have different prediction structures in different layers

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

@@ -2140 +2140 @@
 
 #if Q0078_ADD_LAYER_SETS
+#if R0227_BR_PR_ADD_LAYER_SET
+  for( i = 0; i < vps->getNumLayerSets(); i++ )
+#else
   for( i = 0; i <= vps->getVpsNumLayerSetsMinus1(); i++ )
+#endif
 #else
   for( i = 0; i < vps->getNumLayerSets(); i++ )

branches/SHM-dev/source/Lib/TLibEncoder/TEncCavlc.cpp

@@ -1491 +1491 @@
   {
 #if Q0078_ADD_LAYER_SETS
+#if R0227_BR_PR_ADD_LAYER_SET
+    for( i = 0; i < vps->getNumLayerSets(); i++ )
+#else
     for( i = 0; i <= vps->getVpsNumLayerSetsMinus1(); i++ )
+#endif
 #else
     for( i = 0; i < vps->getNumLayerSets(); i++ )