Changeset 1107 in SHVCSoftware for branches/SHM-dev/source/App

Timestamp:

6 Jul 2015, 21:01:55 (10 years ago)

Author:

seregin

Message:

macro cleanup: R0235_SMALLEST_LAYER_ID

Location:

branches/SHM-dev/source/App

Files:

• TAppDecoder/TAppDecCfg.cpp (modified) (1 diff)
• TAppDecoder/TAppDecTop.cpp (modified) (2 diffs)
• TAppEncoder/TAppEncCfg.cpp (modified) (5 diffs)
• TAppEncoder/TAppEncCfg.h (modified) (1 diff)

branches/SHM-dev/source/App/TAppDecoder/TAppDecCfg.cpp

@@ -259 +259 @@
       }
       fclose (targetDecLayerIdSetFile);
-#if !R0235_SMALLEST_LAYER_ID  // LayerId=0 is not required anymore in some cases
-      if ( m_targetDecLayerIdSet.size() > 0 && !isLayerIdZeroIncluded )
-      {
-        fprintf(stderr, "TargetDecLayerIdSet must contain LayerId=0, aborting" );
-        return false;
-      }
-#endif
     }
     else

branches/SHM-dev/source/App/TAppDecoder/TAppDecTop.cpp

@@ -1284 +1284 @@
     return true;
   }
-#if R0235_SMALLEST_LAYER_ID
+#if SVC_EXTENSION
   if (nalu->m_layerId == 0 && (nalu->m_nalUnitType == NAL_UNIT_VPS || nalu->m_nalUnitType == NAL_UNIT_SPS || nalu->m_nalUnitType == NAL_UNIT_PPS || nalu->m_nalUnitType == NAL_UNIT_EOS))
   {
@@ -1299 +1299 @@
   return false;
 }
+
 #if ALIGNED_BUMPING
 // Function outputs a picture, and marks it as not needed for output.

branches/SHM-dev/source/App/TAppEncoder/TAppEncCfg.cpp

@@ -2611 +2611 @@
 #if MULTIPLE_PTL_SUPPORT
     Int olsToLsIndex = (olsCtr >= (m_numLayerSets + m_numAddLayerSets)) ? m_outputLayerSetIdx[olsCtr - (m_numLayerSets + m_numAddLayerSets)] : olsCtr;
-#if R0235_SMALLEST_LAYER_ID
+
     // This is a fix to allow setting of PTL for additional layer sets
     if (olsCtr >= m_numLayerSets && olsCtr < (m_numLayerSets + m_numAddLayerSets))
@@ -2621 +2621 @@
       scanStringToArray(cfg_listOfLayerPTLOfOlss[olsCtr], m_numLayerInIdList[olsToLsIndex], "List of PTL for each layers in OLS", m_listOfLayerPTLofOlss[olsCtr]);
     }
-#else
-    scanStringToArray( cfg_listOfLayerPTLOfOlss[olsCtr], m_numLayerInIdList[olsToLsIndex], "List of PTL for each layers in OLS", m_listOfLayerPTLofOlss[olsCtr] );
-#endif
+
     //For conformance checking
     //Conformance of a layer in an output operation point associated with an OLS in a bitstream to the Scalable Main profile is indicated as follows:
@@ -2630 +2628 @@
     //If OpTid of the output operation point is equal to vps_max_sub_layer_minus1, the conformance is indicated by general_profile_idc being equal to 7 or general_profile_compatibility_flag[ 7 ] being equal to 1
     //The following assert may be updated / upgraded to take care of general_profile_compatibility_flag.
-#if R0235_SMALLEST_LAYER_ID
     if (m_numAddLayerSets == 0)
     {
-#endif
-    for ( Int ii = 1; ii < m_numLayerInIdList[olsToLsIndex]; ii++)
-    {
-      if (m_layerSetLayerIdList[olsToLsIndex][ii - 1] != 0 && m_layerSetLayerIdList[olsToLsIndex][ii] != 0)  //Profile / profile compatibility of enhancement layers must indicate the same profile.
-      {
-        assert( (m_profileList[m_listOfLayerPTLofOlss[olsCtr][ii]] == m_profileList[m_listOfLayerPTLofOlss[olsCtr][ii - 1]]) ||
-                (m_profileList[m_listOfLayerPTLofOlss[olsCtr][ii]] == m_profileCompatibility[m_listOfLayerPTLofOlss[olsCtr][ii - 1]]) ||   
-                (m_profileCompatibility[m_listOfLayerPTLofOlss[olsCtr][ii]] == m_profileList[m_listOfLayerPTLofOlss[olsCtr][ii - 1]]) );
-      }
-    }
-#if R0235_SMALLEST_LAYER_ID
-    }
-#endif
+      for ( Int ii = 1; ii < m_numLayerInIdList[olsToLsIndex]; ii++)
+      {
+        if (m_layerSetLayerIdList[olsToLsIndex][ii - 1] != 0 && m_layerSetLayerIdList[olsToLsIndex][ii] != 0)  //Profile / profile compatibility of enhancement layers must indicate the same profile.
+        {
+          assert( (m_profileList[m_listOfLayerPTLofOlss[olsCtr][ii]] == m_profileList[m_listOfLayerPTLofOlss[olsCtr][ii - 1]]) ||
+            (m_profileList[m_listOfLayerPTLofOlss[olsCtr][ii]] == m_profileCompatibility[m_listOfLayerPTLofOlss[olsCtr][ii - 1]]) ||   
+            (m_profileCompatibility[m_listOfLayerPTLofOlss[olsCtr][ii]] == m_profileList[m_listOfLayerPTLofOlss[olsCtr][ii - 1]]) );
+        }
+      }
+    }
 #endif
   }
@@ -4854 +4848 @@
 #endif
 
-#if R0235_SMALLEST_LAYER_ID
 #if OUTPUT_LAYER_SETS_CONFIG
 Void TAppEncCfg::cfgStringToArrayNumEntries(Int **arr, string const cfgString, Int &numEntries, const char* logString)
@@ -4924 +4917 @@
 }
 #endif
-#endif // R0235
 #endif //SVC_EXTENSION
 //! \}

branches/SHM-dev/source/App/TAppEncoder/TAppEncCfg.h

@@ -576 +576 @@
   Bool scanStringToArray(string const cfgString, Int const numEntries, const char* logString, std::vector<Int> &  returnVector);
   Void cfgStringToArray(Int **arr, string const cfgString, Int const numEntries, const char* logString);
-#if R0235_SMALLEST_LAYER_ID
   Bool scanStringToArrayNumEntries(string const cfgString, Int &numEntries, const char* logString, Int * const returnArray);
   Bool scanStringToArrayNumEntries(string const cfgString, Int &numEntries, const char* logString, std::vector<Int> &  returnVector);
   Void cfgStringToArrayNumEntries(Int **arr, string const cfgString, Int &numEntries, const char* logString);
-#endif
 #else
   Void cfgStringToArray(Int **arr, string cfgString, Int numEntries, const char* logString);