Changeset 942 in SHVCSoftware for branches/SHM-dev/source/Lib

Timestamp:

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

Author:

seregin

Message:

code clean up

Location:

branches/SHM-dev/source/Lib

Files:

• TLibCommon/TComSlice.h (modified) (3 diffs)
• TLibDecoder/TDecCAVLC.cpp (modified) (5 diffs)
• TLibEncoder/TEncCavlc.cpp (modified) (3 diffs)

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

@@ -584 +584 @@
 #if !MULTIPLE_PTL_SUPPORT
   TComPTL     m_pcPTL;
-#else
+#endif
+  TimingInfo  m_timingInfo;
+
+#if SVC_EXTENSION
+#if MULTIPLE_PTL_SUPPORT
   TComPTL     m_pcPTLList[NUM_POSSIBLE_LEVEL];
 #endif
-  TimingInfo  m_timingInfo;
-
-#if SVC_EXTENSION
 #if DERIVE_LAYER_ID_LIST_VARIABLES
 #if Q0078_ADD_LAYER_SETS
@@ -972 +973 @@
 #if !MULTIPLE_PTL_SUPPORT
   TComPTL* getPTL() { return &m_pcPTL; }
-#else
+#endif
+
+  TimingInfo* getTimingInfo() { return &m_timingInfo; }
+
+#if SVC_EXTENSION
+#if MULTIPLE_PTL_SUPPORT
   TComPTL* getPTL() { return &m_pcPTLList[0]; }
   TComPTL* getPTL(UInt idx) { return &m_pcPTLList[idx]; }
 #endif
-  TimingInfo* getTimingInfo() { return &m_timingInfo; }
-
-#if SVC_EXTENSION
 #if DERIVE_LAYER_ID_LIST_VARIABLES
   Int     getLayerSetLayerIdList(Int set, Int layerId)          { return m_layerSetLayerIdList[set][layerId]; }
@@ -1148 +1151 @@
   Void   addProfileLevelTierIdx(Int const olsIdx, Int const ptlIdx)     { m_profileLevelTierIdx[olsIdx].push_back(ptlIdx); }
 #endif
-  Int calculateLenOfSyntaxElement( Int const numVal );
+  Int    calculateLenOfSyntaxElement( Int const numVal );
 #else
   Int    getProfileLevelTierIdx(Int i)                        { return m_profileLevelTierIdx[i]; }

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

@@ -1375 +1375 @@
   {
     vps->setProfilePresentFlag(1, false);
-#if !MULTIPLE_PTL_SUPPORT
+#if MULTIPLE_PTL_SUPPORT
+    parsePTL( vps->getPTL(1), vps->getProfilePresentFlag(1), vps->getMaxTLayers() - 1 );
+#else
     vps->getPTLForExtnPtr()->empty();
     vps->getPTLForExtnPtr()->resize(2);
     vps->getPTLForExtn(1)->copyProfileInfo( vps->getPTL() );
     parsePTL( vps->getPTLForExtn(1), vps->getProfilePresentFlag(1), vps->getMaxTLayers() - 1 );
-#else
-    parsePTL( vps->getPTL(1), vps->getProfilePresentFlag(1), vps->getMaxTLayers() - 1 );
 #endif
   }
@@ -1604 +1604 @@
   READ_CODE(  6, uiCode, "vps_num_profile_tier_level_minus1"); vps->setNumProfileTierLevel( uiCode + 1 );
 #else
-  READ_UVLC(  uiCode, "vps_num_profile_tier_level_minus1"); 
-  vps->setNumProfileTierLevel( uiCode + 1 );
-  //vps->setNumProfileTierLevel( 3 );
-  int aa = vps->getNumProfileTierLevel();
+  READ_UVLC(  uiCode, "vps_num_profile_tier_level_minus1"); vps->setNumProfileTierLevel( uiCode + 1 );
 #endif
 #if PER_LAYER_PTL
@@ -1627 +1624 @@
 #if P0048_REMOVE_PROFILE_REF
       // Copy profile information from previous one
-#if !MULTIPLE_PTL_SUPPORT
+#if MULTIPLE_PTL_SUPPORT
+      vps->getPTL(idx)->copyProfileInfo( vps->getPTL( idx - 1 ) );
+#else
       vps->getPTLForExtn(idx)->copyProfileInfo( (idx==1) ? vps->getPTL() : vps->getPTLForExtn( idx - 1 ) );
-#else
-      vps->getPTL(idx)->copyProfileInfo( vps->getPTL( idx - 1 ) );
 #endif
 #else
@@ -1643 +1640 @@
 #endif
     }
-#if !MULTIPLE_PTL_SUPPORT
+#if MULTIPLE_PTL_SUPPORT
+    parsePTL( vps->getPTL(idx), vps->getProfilePresentFlag(idx), vps->getMaxTLayers() - 1 );
+#else
     parsePTL( vps->getPTLForExtn(idx), vps->getProfilePresentFlag(idx), vps->getMaxTLayers() - 1 );
-#else
-    parsePTL( vps->getPTL(idx), vps->getProfilePresentFlag(idx), vps->getMaxTLayers() - 1 );
 #endif
   }
@@ -1691 +1688 @@
   if( vps->getNumLayerSets() > 1 )
   {
-    READ_UVLC( uiCode, "num_add_olss" );            
-    vps->setNumAddOutputLayerSets( uiCode );
+    READ_UVLC( uiCode, "num_add_olss" );                  vps->setNumAddOutputLayerSets( uiCode );
     READ_CODE( 2, uiCode, "default_output_layer_idc" );   vps->setDefaultTargetOutputLayerIdc( uiCode );
   }

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

@@ -1088 +1088 @@
   if( vps->getMaxLayers() > 1 && vps->getBaseLayerInternalFlag() )
   {
-#if !MULTIPLE_PTL_SUPPORT
+#if MULTIPLE_PTL_SUPPORT
+    codePTL( vps->getPTL(1), false, vps->getMaxTLayers() - 1 );
+#else
     codePTL( vps->getPTLForExtn(1), false, vps->getMaxTLayers() - 1 );
-#else
-    codePTL( vps->getPTL(1), false, vps->getMaxTLayers() - 1 );
 #endif
   }
@@ -1258 +1258 @@
 #endif
 #if LIST_OF_PTL
-#if !MULTIPLE_PTL_SUPPORT
+#if MULTIPLE_PTL_SUPPORT
+  //Do something here to make sure the loop is correct to consider base layer internal stuff
+#else
   assert( vps->getNumProfileTierLevel() == vps->getPTLForExtnPtr()->size());
-#else
-  //Do something here to make sure the loop is correct to consider base layer internal stuff
 #endif
   for(Int idx = vps->getBaseLayerInternalFlag() ? 2 : 1; idx <= vps->getNumProfileTierLevel() - 1; idx++)
@@ -1278 +1278 @@
     }
 #endif
-#if !MULTIPLE_PTL_SUPPORT
+#if MULTIPLE_PTL_SUPPORT
+    codePTL( vps->getPTL(idx), vps->getProfilePresentFlag(idx), vps->getMaxTLayers() - 1 );
+#else
     codePTL( vps->getPTLForExtn(idx), vps->getProfilePresentFlag(idx), vps->getMaxTLayers() - 1 );
-#else
-    codePTL( vps->getPTL(idx), vps->getProfilePresentFlag(idx), vps->getMaxTLayers() - 1 );
 #endif
   }