Changeset 1487 in SHVCSoftware for branches/SHM-dev/source/Lib/TLibCommon

Timestamp:

24 Nov 2015, 03:13:36 (9 years ago)

Author:

fujitsu

Message:

Added support of scalable range extension profiles. Also corrected few issues such as the confWindow wrong initialization. Code is controlled by the macro SCALABLE_REXT.

Location:

branches/SHM-dev/source/Lib/TLibCommon

Files:

• TComPic.cpp (modified) (2 diffs)
• TComUpsampleFilter.cpp (modified) (5 diffs)
• TypeDef.h (modified) (3 diffs)

branches/SHM-dev/source/Lib/TLibCommon/TComPic.cpp ¶

@@ -292 +292 @@
 Void TComPic::copyUpsampledPictureYuv(TComPicYuv*   pcPicYuvIn, TComPicYuv*   pcPicYuvOut)
 {
+#if SCALABLE_REXT
+  Int upsampledRowWidthLuma = pcPicYuvOut->getStride(COMPONENT_Y); // 2 * pcPicYuvOut->getLumaMargin() + pcPicYuvOut->getWidth(); 
+  copyOnetoOnePicture(
+    pcPicYuvIn->getAddr(COMPONENT_Y),        
+    pcPicYuvOut->getAddr(COMPONENT_Y),      
+    pcPicYuvOut->getWidth(COMPONENT_Y), 
+    pcPicYuvOut->getHeight(COMPONENT_Y),
+    upsampledRowWidthLuma);
+
+  if(pcPicYuvOut->getChromaFormat() != CHROMA_400)
+  {
+    Int upsampledRowWidthChroma = pcPicYuvOut->getStride(COMPONENT_Cb); //2 * pcPicYuvOut->getChromaMargin() + (pcPicYuvOut->getWidth()>>1);
+
+    copyOnetoOnePicture(
+      pcPicYuvIn->getAddr(COMPONENT_Cr),        
+      pcPicYuvOut->getAddr(COMPONENT_Cr),      
+      pcPicYuvOut->getWidth(COMPONENT_Cr), 
+      pcPicYuvOut->getHeight(COMPONENT_Cr),
+      upsampledRowWidthChroma);
+    copyOnetoOnePicture(
+      pcPicYuvIn->getAddr(COMPONENT_Cb),        
+      pcPicYuvOut->getAddr(COMPONENT_Cb),      
+      pcPicYuvOut->getWidth(COMPONENT_Cb), 
+      pcPicYuvOut->getHeight(COMPONENT_Cb),
+      upsampledRowWidthChroma);
+  }
+#else
   Int upsampledRowWidthLuma = pcPicYuvOut->getStride(COMPONENT_Y); // 2 * pcPicYuvOut->getLumaMargin() + pcPicYuvOut->getWidth(); 
   Int upsampledRowWidthCroma = pcPicYuvOut->getStride(COMPONENT_Cb); //2 * pcPicYuvOut->getChromaMargin() + (pcPicYuvOut->getWidth()>>1);
@@ -313 +340 @@
     pcPicYuvOut->getHeight(COMPONENT_Y)>>1,
     upsampledRowWidthCroma);
+#endif
 }
 

branches/SHM-dev/source/Lib/TLibCommon/TComUpsampleFilter.cpp ¶

@@ -85 +85 @@
   if( !resamplingPhase.phasePresentFlag )
   {
+#if SCALABLE_REXT
+    if(chromaFormatIdc == 3)
+    {
+      phaseVerChroma = 0;
+    }
+    else
+    {
+#endif
     Int refRegionHeight = heightBL - windowRL.getWindowTopOffset() - windowRL.getWindowBottomOffset();
     phaseVerChroma = (4 * heightEL + (refRegionHeight >> 1)) / refRegionHeight - 4;
+#if SCALABLE_REXT
+    }
+#endif
   }
 
@@ -139 +150 @@
     }
 
+#if SCALABLE_REXT
+  if(chromaFormatIdc != 0)
+  {
+#endif
     widthEL  >>= 1;
     heightEL >>= 1;
@@ -177 +192 @@
       piDstV += strideEL;
     }
+#if SCALABLE_REXT
+  }
+#endif
   }
   else // general resampling process
@@ -290 +308 @@
     //========== UV component upsampling ===========
 
+#if SCALABLE_REXT
+  if(chromaFormatIdc != 0)
+  {
+#endif
     widthEL  >>= 1;
     heightEL >>= 1;
@@ -396 +418 @@
       }
     }
+#if SCALABLE_REXT
+    }
+#endif
   }
     pcUsPic->setBorderExtension(false);

branches/SHM-dev/source/Lib/TLibCommon/TypeDef.h ¶

@@ -48 +48 @@
 
 #if SVC_EXTENSION
+#define SCALABLE_REXT                    1
+#define FORMATIDX_CHECK                  1
+
 #define MAX_LAYERS                       8      ///< max number of layers the codec is supposed to handle
 
@@ -197 +200 @@
 // This can be enabled by the makefile
 #ifndef RExt__HIGH_BIT_DEPTH_SUPPORT
-#define RExt__HIGH_BIT_DEPTH_SUPPORT                      0 ///< 0 (default) use data type definitions for 8-10 bit video, 1 = use larger data types to allow for up to 16-bit video (originally developed as part of N0188)
+#define RExt__HIGH_BIT_DEPTH_SUPPORT                      1 ///< 0 (default) use data type definitions for 8-10 bit video, 1 = use larger data types to allow for up to 16-bit video (originally developed as part of N0188)
 #endif
 
@@ -644 +647 @@
     SCALABLEMAIN = 7,
     SCALABLEMAIN10 = 8,
+#if SCALABLE_REXT
+    SCALABLEREXT = 10
+#endif
 #endif
   };