Changeset 246 in SHVCSoftware for branches/SHM-2.1-dev/source/Lib/TLibCommon/TComSlice.cpp

Timestamp:

30 May 2013, 02:26:45 (11 years ago)

Author:

qualcomm

Message:

M0269 : Assert when more than one resampling for reference layers is used - Clean up.

File:

• branches/SHM-2.1-dev/source/Lib/TLibCommon/TComSlice.cpp (modified) (1 diff)

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

@@ -571 +571 @@
     }
 #if MAX_ONE_RESAMPLING_DIRECT_LAYERS
-    if(getPic()->isSpatialEnhLayer())
-    {
-      assert(m_activeNumILRRefIdx == 1);
+    if(getVPS()->getScalabilityMask(1))
+    {
+      Int numResampler = 0;  
+      const Window &scalEL = getSPS()->getScaledRefLayerWindow();
+      Int widthEL   = getPic()->getPicYuvRec()->getWidth() - scalEL.getWindowLeftOffset() - scalEL.getWindowRightOffset();
+      Int heightEL  = getPic()->getPicYuvRec()->getHeight() - scalEL.getWindowTopOffset()  - scalEL.getWindowBottomOffset();
+      for (i=0; i < m_activeNumILRRefIdx; i++)
+      {        
+        Int widthBL   =  ilpPic[getInterLayerPredLayerIdc(i)]->getSlice(0)->getBaseColPic()->getPicYuvRec()->getWidth();
+        Int heightBL  =  ilpPic[getInterLayerPredLayerIdc(i)]->getSlice(0)->getBaseColPic()->getPicYuvRec()->getHeight();
+
+        if(widthEL != widthBL || heightEL != heightBL )
+        {
+          numResampler++;
+        }
+      }  
+      assert(numResampler <= 1);
     }
 #endif