Changeset 942 in SHVCSoftware for branches/SHM-dev/source/App/TAppEncoder

Timestamp:

30 Dec 2014, 20:36:14 (10 years ago)

Author:

seregin

Message:

code clean up

Location:

branches/SHM-dev/source/App/TAppEncoder

Files:

• TAppEncCfg.cpp (modified) (4 diffs)
• TAppEncCfg.h (modified) (2 diffs)
• TAppEncTop.cpp (modified) (2 diffs)

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

@@ -840 +840 @@
   
   // Profile and level
-#if !MULTIPLE_PTL_SUPPORT
-  ("Profile", m_profile,   Profile::NONE, "Profile to be used when encoding (Incomplete)")
-  ("Level",   m_level,     Level::NONE,   "Level limit to be used, eg 5.1 (Incomplete)")
-  ("Tier",    m_levelTier, Level::MAIN,   "Tier to use for interpretation of --Level")
-
-  ("ProgressiveSource", m_progressiveSourceFlag, false, "Indicate that source is progressive")
-  ("InterlacedSource",  m_interlacedSourceFlag,  false, "Indicate that source is interlaced")
-  ("NonPackedSource",   m_nonPackedConstraintFlag, false, "Indicate that source does not contain frame packing")
-  ("FrameOnly",         m_frameOnlyConstraintFlag, false, "Indicate that the bitstream contains only frames")
-#else
+#if SVC_EXTENSION && MULTIPLE_PTL_SUPPORT
   ("NumProfileTierLevel", m_numPTLInfo, 2, "Number of Profile, Tier and Level information")
   ("Profile%d", m_profileList,   Profile::NONE, NUM_POSSIBLE_LEVEL, "Profile to be used when encoding (Incomplete)")
@@ -862 +853 @@
   ("LayerPTLIndex%d", m_layerPTLIdx, 0, MAX_VPS_LAYER_ID_PLUS1, "Index of PTL for each layer")
   ("ListOfProfileTierLevelOls%d", cfg_listOfLayerPTLOfOlss, string(""), MAX_VPS_LAYER_ID_PLUS1, "PTL Index for each layer in each OLS except the first OLS. The PTL index for layer in the first OLS is set to 1")
+#else
+  ("Profile", m_profile,   Profile::NONE, "Profile to be used when encoding (Incomplete)")
+  ("Level",   m_level,     Level::NONE,   "Level limit to be used, eg 5.1 (Incomplete)")
+  ("Tier",    m_levelTier, Level::MAIN,   "Tier to use for interpretation of --Level")
+
+  ("ProgressiveSource", m_progressiveSourceFlag, false, "Indicate that source is progressive")
+  ("InterlacedSource",  m_interlacedSourceFlag,  false, "Indicate that source is interlaced")
+  ("NonPackedSource",   m_nonPackedConstraintFlag, false, "Indicate that source does not contain frame packing")
+  ("FrameOnly",         m_frameOnlyConstraintFlag, false, "Indicate that the bitstream contains only frames")
 #endif
 
@@ -2541 +2541 @@
   }
   
-#if !MULTIPLE_PTL_SUPPORT
+#if SVC_EXTENSION && MULTIPLE_PTL_SUPPORT
+  Int ii = 0;
+  while ( ii < m_numPTLInfo )
+  {
+    if( m_profileList[ii] == Profile::NONE )
+    {
+      fprintf(stderr, "***************************************************************************\n");
+      fprintf(stderr, "** WARNING: For conforming bitstreams a valid Profile value must be set! **\n");
+      fprintf(stderr, "***************************************************************************\n");
+    }
+    if( m_levelList[ii] == Level::NONE )
+    {
+      fprintf(stderr, "***************************************************************************\n");
+      fprintf(stderr, "** WARNING: For conforming bitstreams a valid Level value must be set!   **\n");
+      fprintf(stderr, "***************************************************************************\n");
+    }
+    ii++;
+  }
+#else
   if( m_profile==Profile::NONE )
   {
@@ -2553 +2571 @@
     fprintf(stderr, "** WARNING: For conforming bitstreams a valid Level value must be set!   **\n");
     fprintf(stderr, "***************************************************************************\n");
-  }
-#else
-  int ii = 0;
-  while ( ii < m_numPTLInfo )
-  {
-    if( m_profileList[ii] == Profile::NONE )
-    {
-      fprintf(stderr, "***************************************************************************\n");
-      fprintf(stderr, "** WARNING: For conforming bitstreams a valid Profile value must be set! **\n");
-      fprintf(stderr, "***************************************************************************\n");
-    }
-    if( m_levelList[ii] == Level::NONE )
-    {
-      fprintf(stderr, "***************************************************************************\n");
-      fprintf(stderr, "** WARNING: For conforming bitstreams a valid Level value must be set!   **\n");
-      fprintf(stderr, "***************************************************************************\n");
-    }
-    ii++;
   }
 #endif

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

@@ -120 +120 @@
 
   // profile/level
-#if !MULTIPLE_PTL_SUPPORT
-  Profile::Name m_profile;
-  Level::Tier   m_levelTier;
-  Level::Name   m_level;
-  Bool m_progressiveSourceFlag;
-  Bool m_interlacedSourceFlag;
-  Bool m_nonPackedConstraintFlag;
-  Bool m_frameOnlyConstraintFlag;
-#else
+#if SVC_EXTENSION && MULTIPLE_PTL_SUPPORT
   Int           m_numPTLInfo;
   Int           m_layerPTLIdx[MAX_VPS_LAYER_ID_PLUS1]; ///< scalability_mask
@@ -140 +132 @@
 
   std::vector< std::vector<Int> > m_listOfLayerPTLofOlss;
-#endif
+#else
+  Profile::Name m_profile;
+  Level::Tier   m_levelTier;
+  Level::Name   m_level;
+  Bool m_progressiveSourceFlag;
+  Bool m_interlacedSourceFlag;
+  Bool m_nonPackedConstraintFlag;
+  Bool m_frameOnlyConstraintFlag;
+#endif
+
   // coding structure
 #if !SVC_EXTENSION

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

@@ -262 +262 @@
     m_acTEncTop[layer].setFramesToBeEncoded            ( m_framesToBeEncoded );
 
-#if !MULTIPLE_PTL_SUPPORT
+#if SVC_EXTENSION && MULTIPLE_PTL_SUPPORT
+    m_acTEncTop[layer].setProfile(m_profileList[m_layerPTLIdx[layer]]);
+    m_acTEncTop[layer].setLevel(m_levelTierList[m_layerPTLIdx[layer]], m_levelList[m_layerPTLIdx[layer]]);
+    m_acTEncTop[layer].setProgressiveSourceFlag(m_progressiveSourceFlagList[m_layerPTLIdx[layer]]);
+    m_acTEncTop[layer].setInterlacedSourceFlag(m_interlacedSourceFlagList[m_layerPTLIdx[layer]]);
+    m_acTEncTop[layer].setNonPackedConstraintFlag(m_nonPackedConstraintFlagList[m_layerPTLIdx[layer]]);
+    m_acTEncTop[layer].setFrameOnlyConstraintFlag(m_frameOnlyConstraintFlagList[m_layerPTLIdx[layer]]);
+#else
     m_acTEncTop[layer].setProfile(m_profile);
     m_acTEncTop[layer].setLevel(m_levelTier, m_level);
@@ -269 +276 @@
     m_acTEncTop[layer].setNonPackedConstraintFlag(m_nonPackedConstraintFlag);
     m_acTEncTop[layer].setFrameOnlyConstraintFlag(m_frameOnlyConstraintFlag);
-#else
-    m_acTEncTop[layer].setProfile(m_profileList[m_layerPTLIdx[layer]]);
-    m_acTEncTop[layer].setLevel(m_levelTierList[m_layerPTLIdx[layer]], m_levelList[m_layerPTLIdx[layer]]);
-    m_acTEncTop[layer].setProgressiveSourceFlag(m_progressiveSourceFlagList[m_layerPTLIdx[layer]]);
-    m_acTEncTop[layer].setInterlacedSourceFlag(m_interlacedSourceFlagList[m_layerPTLIdx[layer]]);
-    m_acTEncTop[layer].setNonPackedConstraintFlag(m_nonPackedConstraintFlagList[m_layerPTLIdx[layer]]);
-    m_acTEncTop[layer].setFrameOnlyConstraintFlag(m_frameOnlyConstraintFlagList[m_layerPTLIdx[layer]]);
 #endif