Changeset 229 in SHVCSoftware for trunk

Timestamp:

23 May 2013, 20:46:20 (11 years ago)

Author:

seregin

Message:

merge with SHM-2.0avc-dev branch

Location:

trunk/source

Files:

• . (modified) (1 prop)
• Lib/TLibCommon/CommonDef.h (modified) (1 diff)
• Lib/TLibCommon/TComUpsampleFilter.cpp (modified) (5 diffs)
• Lib/TLibDecoder/TDecTop.cpp (modified) (1 diff)

trunk/source/Lib/TLibCommon/CommonDef.h

@@ -56 +56 @@
 // ====================================================================================================================
 
-#define NV_VERSION        "2.0"                 ///< Current software version
+#define NV_VERSION        "trunk"                 ///< Current software version
 
 // ====================================================================================================================

trunk/source/Lib/TLibCommon/TComUpsampleFilter.cpp

@@ -209 +209 @@
  
 #endif
-  
+
+  if( widthEL == widthBL && heightEL == heightBL )
+  {
+    piSrcY = piSrcBufY - scalEL.getWindowLeftOffset() - scalEL.getWindowTopOffset() * strideEL;
+    piDstY = piDstBufY;
+    for( i = 0; i < heightEL; i++ )
+    {
+      memcpy( piDstY, piSrcY, sizeof(Pel) * widthBL );
+      piSrcY += strideBL;
+      piDstY += strideEL;
+    }
+
+    widthEL  >>= 1;
+    heightEL >>= 1;
+
+    widthBL  >>= 1;
+    heightBL >>= 1;
+
+    strideBL  = pcBasePic->getCStride();
+    strideEL  = pcUsPic->getCStride();
+
+    piSrcU = piSrcBufU - ( scalEL.getWindowLeftOffset() >> 1 ) - ( scalEL.getWindowTopOffset() >> 1 ) * strideEL;
+    piSrcV = piSrcBufV - ( scalEL.getWindowLeftOffset() >> 1 ) - ( scalEL.getWindowTopOffset() >> 1 ) * strideEL;
+
+    piDstU = piDstBufU;
+    piDstV = piDstBufV;
+
+    for( i = 0; i < heightEL; i++ )
+    {
+      memcpy( piDstU, piSrcU, sizeof(Pel) * widthBL );
+      memcpy( piDstV, piSrcV, sizeof(Pel) * widthBL );
+      piSrcU += strideBL;
+      piSrcV += strideBL;
+      piDstU += strideEL;
+      piDstV += strideEL;
+    }
+  }
+  else
+  {
 #if PHASE_DERIVATION_IN_INTEGER
   Int refPos16 = 0;
@@ -245 +283 @@
 #endif
 
-  assert ( widthEL == 2*widthBL || 2*widthEL == 3*widthBL );
-  assert ( heightEL == 2*heightBL || 2*heightEL == 3*heightBL );
+  assert ( widthEL == widthBL || widthEL == 2*widthBL || 2*widthEL == 3*widthBL );
+  assert ( heightEL == heightBL || heightEL == 2*heightBL || 2*heightEL == 3*heightBL );
 
 #if JCTVC_L0178
@@ -345 +383 @@
 #endif
 #if ILP_DECODED_PICTURE
-  widthBL   = pcBasePic->getWidth ();
-  heightBL  = pcBasePic->getHeight();
-
   widthEL   = pcUsPic->getWidth ();
   heightEL  = pcUsPic->getHeight();
+
+  widthBL   = pcBasePic->getWidth ();
+  heightBL  = min<Int>( pcBasePic->getHeight(), heightEL );
 #endif
 #if SCALED_REF_LAYER_OFFSETS
@@ -503 +541 @@
 
 #if ILP_DECODED_PICTURE
-  widthBL   = pcBasePic->getWidth () >> 1;
-  heightBL  = pcBasePic->getHeight() >> 1;
-
   widthEL   = pcUsPic->getWidth () >> 1;
   heightEL  = pcUsPic->getHeight() >> 1;
+
+  widthBL   = pcBasePic->getWidth () >> 1;
+  heightBL  = min<Int>( pcBasePic->getHeight(), heightEL );
 #endif
 
@@ -720 +758 @@
   }
 #endif
+  }
 }
 #endif //SVC_EXTENSION

trunk/source/Lib/TLibDecoder/TDecTop.cpp

@@ -787 +787 @@
 #if REF_IDX_FRAMEWORK
     if (m_layerId == 0)
+#elif INTRA_BL
+    if( m_layerId > 0 )
+    {
+      pcSlice->setRefPicList( m_cListPic );
+    }
+    else
 #endif
 #if FIX1071