Changeset 248 in SHVCSoftware

Timestamp:

31 May 2013, 01:39:45 (12 years ago)

Author:

qualcomm

Message:

M0269 : Max one resampling process for inter-layer reference - Bug fix

Location:

branches/SHM-2.1-dev/source/Lib

Files:

• TLibCommon/TComSlice.cpp (modified) (2 diffs)
• TLibDecoder/TDecTop.cpp (modified) (1 diff)

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

@@ -575 +575 @@
       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();
+      Int scalingOffset = ((scalEL.getWindowLeftOffset()   == 0 ) && 
+                           (scalEL.getWindowRightOffset()  == 0 ) && 
+                           (scalEL.getWindowTopOffset()    == 0 ) && 
+                           (scalEL.getWindowBottomOffset() == 0 ) 
+                          );
+
+      Int widthEL   = getPic()->getPicYuvRec()->getWidth();
+      Int heightEL  = getPic()->getPicYuvRec()->getHeight();      
       for (i=0; i < m_activeNumILRRefIdx; i++)
       {
@@ -582 +588 @@
         Int heightBL  =  ilpPic[getInterLayerPredLayerIdc(i)]->getSlice(0)->getBaseColPic()->getPicYuvRec()->getHeight();
 
-        if(widthEL != widthBL || heightEL != heightBL )
+        if(!(widthEL == widthBL && heightEL == heightBL && (scalingOffset)))
         {
           numResampler++;

branches/SHM-2.1-dev/source/Lib/TLibDecoder/TDecTop.cpp

@@ -262 +262 @@
         assert( pcSlice->getVPS()->getScalabilityMask(1) == true );
       }
+#if MAX_ONE_RESAMPLING_DIRECT_LAYERS
+      if(pcSlice->getVPS()->getScalabilityMask(1))
+      {
+         pcSlice->setPic(rpcPic);
+      }
+#endif
     }
 #endif