Changeset 890 in SHVCSoftware

Timestamp:

23 Sep 2014, 04:41:19 (10 years ago)

Author:

seregin

Message:

fix scaling ratio output

Location:

branches/SHM-dev/source/Lib

Files:

• TLibCommon/TComSlice.cpp (modified) (2 diffs)
• TLibCommon/TComSlice.h (modified) (1 diff)
• TLibDecoder/TDecGop.cpp (modified) (1 diff)
• TLibEncoder/TEncGOP.cpp (modified) (1 diff)

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

@@ -271 +271 @@
   }
 }
+
 Int TComSlice::getCurrMsb( Int currLsb, Int prevLsb, Int prevMsb, Int maxLsbVal )
 {
@@ -4261 +4262 @@
   }
 }
+
+Int TComSlice::getReferenceLayerIdc( UInt refLayerId )
+{ 
+  for( Int i = 0; i < m_activeNumILRRefIdx; i++ )
+  {
+    if( m_pcVPS->getRefLayerId(m_layerId, m_interLayerPredLayerIdc[i]) == refLayerId )
+    {
+      return m_interLayerPredLayerIdc[i];
+    }
+  }
+
+  return -1;
+}
 #endif //SVC_EXTENSION
 

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

@@ -2649 +2649 @@
   Int       getCurrMsb( Int currLsb, Int prevLsb, Int prevMsb, Int maxLsbVal );
 #endif
+  Int       getReferenceLayerIdc( UInt refLayerId );
 
 #endif //SVC_EXTENSION

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

@@ -223 +223 @@
       {
         UInt refLayerId = pcSlice->getRefPic(RefPicList(iRefList), iRefIndex)->getLayerId();
-        UInt refLayerIdc = pcSlice->getInterLayerPredLayerIdc(refLayerId);
+        UInt refLayerIdc = pcSlice->getReferenceLayerIdc(refLayerId);
         assert( g_posScalingFactor[refLayerIdc][0] );
         assert( g_posScalingFactor[refLayerIdc][1] );

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

@@ -4055 +4055 @@
 #if POC_RESET_IDC_ENCODER
         UInt refLayerId = pcSlice->getRefPic(RefPicList(iRefList), iRefIndex)->getLayerId();
-        UInt refLayerIdc = pcSlice->getInterLayerPredLayerIdc(refLayerId);
+        UInt refLayerIdc = pcSlice->getReferenceLayerIdc(refLayerId);
         assert( g_posScalingFactor[refLayerIdc][0] );
         assert( g_posScalingFactor[refLayerIdc][1] );