Changeset 1156 in SHVCSoftware

Timestamp:

8 Jul 2015, 00:36:28 (9 years ago)

Author:

seregin

Message:

macro cleanup: Q0165_OUTPUT_LAYER_SET

Location:

branches/SHM-dev/source/Lib

Files:

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

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

@@ -157 +157 @@
 #define MAX_REF_LAYERS                   7
 #endif
-#define Q0165_OUTPUT_LAYER_SET           1      ///< JCTVC-Q0165: add a constraint to disallow an empty output layer set
 
 #define Q0078_ADD_LAYER_SETS             1      ///< JCTVC-Q0078: additional layer sets and layer set config

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

@@ -3012 +3012 @@
 
     NumOutputLayersInOutputLayerSet[i] = 0;
-    for (j = 0; j < vps->getNumLayersInIdList(layerSetIdxForOutputLayerSet); j++)
+
+    for( j = 0; j < vps->getNumLayersInIdList(layerSetIdxForOutputLayerSet); j++ )
     {
       NumOutputLayersInOutputLayerSet[i] += vps->getOutputLayerFlag(i, j);
-      if (vps->getOutputLayerFlag(i, j))
+      if( vps->getOutputLayerFlag(i, j) )
       {
         OlsHighestOutputLayerId[i] = vps->getLayerSetLayerIdList(layerSetIdxForOutputLayerSet, j);
       }
     }
-    if (NumOutputLayersInOutputLayerSet[i] == 1 && vps->getNumDirectRefLayers(OlsHighestOutputLayerId[i]) > 0)
+    if( NumOutputLayersInOutputLayerSet[i] == 1 && vps->getNumDirectRefLayers(OlsHighestOutputLayerId[i]) > 0 )
     {
       READ_FLAG(uiCode, "alt_output_layer_flag[i]");
@@ -3032 +3033 @@
     }
 #endif
-#if Q0165_OUTPUT_LAYER_SET
-    assert( NumOutputLayersInOutputLayerSet[i]>0 );
-#endif
+
+    assert( NumOutputLayersInOutputLayerSet[i] > 0 );
   }
 

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

@@ -2198 +2198 @@
 
     NumOutputLayersInOutputLayerSet[i] = 0;
-    for (j = 0; j < vps->getNumLayersInIdList(layerSetIdxForOutputLayerSet); j++)
+
+    for( j = 0; j < vps->getNumLayersInIdList(layerSetIdxForOutputLayerSet); j++ )
     {
       NumOutputLayersInOutputLayerSet[i] += vps->getOutputLayerFlag(i, j);
-      if (vps->getOutputLayerFlag(i, j))
+      if( vps->getOutputLayerFlag(i, j) )
       {
         OlsHighestOutputLayerId[i] = vps->getLayerSetLayerIdList(layerSetIdxForOutputLayerSet, j);
       }
     }
-    if (NumOutputLayersInOutputLayerSet[i] == 1 && vps->getNumDirectRefLayers(OlsHighestOutputLayerId[i]) > 0)
+    if( NumOutputLayersInOutputLayerSet[i] == 1 && vps->getNumDirectRefLayers(OlsHighestOutputLayerId[i]) > 0 )
     {
       WRITE_FLAG(vps->getAltOuputLayerFlag(i), "alt_output_layer_flag[i]");
     }
 
-#if Q0165_OUTPUT_LAYER_SET
-    assert( NumOutputLayersInOutputLayerSet[i]>0 );
-#endif
+    assert( NumOutputLayersInOutputLayerSet[i] > 0 );
   }