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

Timestamp:

13 Nov 2013, 03:10:08 (12 years ago)

Author:

qualcomm

Message:

JCTVC-O0215: a VPS flag to specify the phase alignment between layers (zero or center phase shift) for up-sampling process, from cjianle@…

Location:

branches/SHM-4.0-dev/source/Lib/TLibCommon

Files:

• TComPrediction.cpp (modified) (1 diff)
• TComPrediction.h (modified) (1 diff)
• TComSlice.h (modified) (2 diffs)
• TComUpsampleFilter.cpp (modified) (4 diffs)
• TComUpsampleFilter.h (modified) (1 diff)
• TypeDef.h (modified) (1 diff)

branches/SHM-4.0-dev/source/Lib/TLibCommon/TComPrediction.cpp

@@ -765 +765 @@
 
 #if SVC_UPSAMPLING
+#if O0215_PHASE_ALIGNMENT
+Void TComPrediction::upsampleBasePic( UInt refLayerIdc, TComPicYuv* pcUsPic, TComPicYuv* pcBasePic, TComPicYuv* pcTempPic, const Window window, bool phaseAlignFlag )
+{
+  m_cUsf.upsampleBasePic( refLayerIdc, pcUsPic, pcBasePic, pcTempPic, window, phaseAlignFlag );
+}
+#else
 Void TComPrediction::upsampleBasePic( UInt refLayerIdc, TComPicYuv* pcUsPic, TComPicYuv* pcBasePic, TComPicYuv* pcTempPic, const Window window)
 {
   m_cUsf.upsampleBasePic( refLayerIdc, pcUsPic, pcBasePic, pcTempPic, window);
 }
+#endif
 #endif
 //! \}

branches/SHM-4.0-dev/source/Lib/TLibCommon/TComPrediction.h

@@ -120 +120 @@
 #if SVC_EXTENSION
 #if SVC_UPSAMPLING
+#if O0215_PHASE_ALIGNMENT
+  Void upsampleBasePic( UInt refLayerIdc, TComPicYuv* pcUsPic, TComPicYuv* pcBasePic, TComPicYuv* pcTempPic, const Window window, bool phaseAlignFlag );
+#else
   Void upsampleBasePic( UInt refLayerIdc, TComPicYuv* pcUsPic, TComPicYuv* pcBasePic, TComPicYuv* pcTempPic, const Window window );
+#endif
 #endif
 #endif //SVC_EXTENSION

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

@@ -598 +598 @@
   Int         m_viewIdVal                [MAX_LAYERS];
 #endif
+
+#if O0215_PHASE_ALIGNMENT
+  Bool       m_phaseAlignFlag;
+#endif
 #endif //SVC_EXTENSION
 public:
@@ -850 +854 @@
   Int     getExtensionOffset()                 { return m_extensionOffset;   }
   Void    setExtensionOffset( UInt offset )    { m_extensionOffset = offset; }
+#endif
+#if O0215_PHASE_ALIGNMENT
+  Bool   getPhaseAlignFlag()                             { return m_phaseAlignFlag; }
+  Void   setPhaseAlignFlag(Bool x)                       { m_phaseAlignFlag = x;    }
 #endif
 #endif //SVC_EXTENSION

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

@@ -97 +97 @@
 }
 
+#if O0215_PHASE_ALIGNMENT
+Void TComUpsampleFilter::upsampleBasePic( UInt refLayerIdc, TComPicYuv* pcUsPic, TComPicYuv* pcBasePic, TComPicYuv* pcTempPic, const Window window, bool phaseAlignFlag )
+#else
 Void TComUpsampleFilter::upsampleBasePic( UInt refLayerIdc, TComPicYuv* pcUsPic, TComPicYuv* pcBasePic, TComPicYuv* pcTempPic, const Window window )
+#endif
 {
   assert ( NTAPS_US_LUMA == 8 );
@@ -200 +204 @@
     Int   shiftY = 16;
 
+#if O0215_PHASE_ALIGNMENT //for Luma, if Phase 0, then both PhaseX  and PhaseY should be 0. If symmetric: both PhaseX and PhaseY should be 2
+    Int   phaseX = 2*phaseAlignFlag; 
+    Int   phaseY = 2*phaseAlignFlag;  
+#else
     Int   phaseX = 0;
     Int   phaseY = 0;
+#endif
 
 #if ROUNDING_OFFSET
@@ -331 +340 @@
     shiftY = 16;
 
+#if O0215_PHASE_ALIGNMENT  
+    Int phaseXC = 0; 
+    Int phaseYC = 1; 
+
+#if ROUNDING_OFFSET
+    addX       = ( ( (phaseXC+phaseAlignFlag) * scaleX + 2 ) >> 2 ) + ( 1 << ( shiftX - 5 ) );
+    addY       = ( ( (phaseYC+phaseAlignFlag) * scaleY + 2 ) >> 2 ) + ( 1 << ( shiftY - 5 ) );
+#else
+    addX       = ( ( ( widthBL * (phaseXC+phaseAlignFlag) ) << ( shiftX - 2 ) ) + ( widthEL >> 1 ) ) / widthEL + ( 1 << ( shiftX - 5 ) );
+    addY       = ( ( ( heightBL * (phaseYC+phaseAlignFlag) ) << ( shiftY - 2 ) ) + ( heightEL >> 1 ) ) / heightEL+ ( 1 << ( shiftY - 5 ) );
+#endif
+
+    deltaX     = 4 * (phaseXC+phaseAlignFlag);
+    deltaY     = 4 * (phaseYC+phaseAlignFlag);
+#else
     phaseX = 0;
     phaseY = 1;
@@ -344 +368 @@
     deltaX     = 4 * phaseX;
     deltaY     = 4 * phaseY;
+#endif
 
     shiftXM4 = shiftX - 4;

branches/SHM-4.0-dev/source/Lib/TLibCommon/TComUpsampleFilter.h

@@ -43 +43 @@
   ~TComUpsampleFilter(void);
 
+#if O0215_PHASE_ALIGNMENT
+  Void upsampleBasePic( UInt refLayerIdc, TComPicYuv* pcUsPic, TComPicYuv* pcBasePic, TComPicYuv* pcTempPic, const Window window, bool phaseAlignFlag );
+#else
   Void upsampleBasePic( UInt refLayerIdc, TComPicYuv* pcUsPic, TComPicYuv* pcBasePic, TComPicYuv* pcTempPic, const Window window );
+#endif
+
 };
 

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

@@ -152 +152 @@
 #define N0383_IL_CONSTRAINED_TILE_SETS_SEI  1
 #define N0065_LAYER_POC_ALIGNMENT        1
+
+#define O0215_PHASE_ALIGNMENT            1     // JCTVC_O0215: signal a flag to specify phase alignment case, 0: zero-position-aligned, 1: central-position-aligned,
+
 #else
 #define SYNTAX_OUTPUT                    0