Changeset 464 in SHVCSoftware for branches

Timestamp:

13 Nov 2013, 03:10:08 (11 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

Files:

• cfg/per-sequence-svc/BQTerrace-1.5x.cfg (modified) (1 diff)
• cfg/per-sequence-svc/BQTerrace-2x.cfg (modified) (1 diff)
• cfg/per-sequence-svc/BQTerrace-SNR.cfg (modified) (1 diff)
• cfg/per-sequence-svc/BasketballDrive-1.5x.cfg (modified) (1 diff)
• cfg/per-sequence-svc/BasketballDrive-2x.cfg (modified) (1 diff)
• cfg/per-sequence-svc/BasketballDrive-SNR.cfg (modified) (1 diff)
• cfg/per-sequence-svc/Cactus-1.5x.cfg (modified) (1 diff)
• cfg/per-sequence-svc/Cactus-2x.cfg (modified) (1 diff)
• cfg/per-sequence-svc/Cactus-SNR.cfg (modified) (1 diff)
• cfg/per-sequence-svc/Kimono-1.5x.cfg (modified) (1 diff)
• cfg/per-sequence-svc/Kimono-2x.cfg (modified) (1 diff)
• cfg/per-sequence-svc/Kimono-SNR.cfg (modified) (1 diff)
• cfg/per-sequence-svc/ParkScene-1.5x.cfg (modified) (1 diff)
• cfg/per-sequence-svc/ParkScene-2x.cfg (modified) (1 diff)
• cfg/per-sequence-svc/ParkScene-SNR.cfg (modified) (1 diff)
• cfg/per-sequence-svc/PeopleOnStreet-2x.cfg (modified) (1 diff)
• cfg/per-sequence-svc/PeopleOnStreet-SNR.cfg (modified) (1 diff)
• cfg/per-sequence-svc/Traffic-2x.cfg (modified) (1 diff)
• cfg/per-sequence-svc/Traffic-SNR.cfg (modified) (1 diff)
• source/App/TAppEncoder/TAppEncCfg.cpp (modified) (3 diffs)
• source/App/TAppEncoder/TAppEncCfg.h (modified) (1 diff)
• source/App/TAppEncoder/TAppEncTop.cpp (modified) (1 diff)
• source/Lib/TLibCommon/TComPrediction.cpp (modified) (1 diff)
• source/Lib/TLibCommon/TComPrediction.h (modified) (1 diff)
• source/Lib/TLibCommon/TComSlice.h (modified) (2 diffs)
• source/Lib/TLibCommon/TComUpsampleFilter.cpp (modified) (4 diffs)
• source/Lib/TLibCommon/TComUpsampleFilter.h (modified) (1 diff)
• source/Lib/TLibCommon/TypeDef.h (modified) (1 diff)
• source/Lib/TLibDecoder/TDecCAVLC.cpp (modified) (1 diff)
• source/Lib/TLibDecoder/TDecTop.cpp (modified) (2 diffs)
• source/Lib/TLibEncoder/TEncCavlc.cpp (modified) (1 diff)
• source/Lib/TLibEncoder/TEncGOP.cpp (modified) (1 diff)

branches/SHM-4.0-dev/cfg/per-sequence-svc/BQTerrace-1.5x.cfg

@@ -2 +2 @@
 FrameSkip                     : 0           # Number of frames to be skipped in input
 FramesToBeEncoded             : 600         # Number of frames to be coded
+PhaseAlignment                : 0           # Sample location alignment between layers (0: zero position aligned, 1: central position aligned)
 
 #======== File I/O ===============

branches/SHM-4.0-dev/cfg/per-sequence-svc/BQTerrace-2x.cfg

@@ -2 +2 @@
 FrameSkip                     : 0           # Number of frames to be skipped in input
 FramesToBeEncoded             : 600         # Number of frames to be coded
+PhaseAlignment                : 0           # Sample location alignment between layers (0: zero position aligned, 1: central position aligned)
 
 #======== File I/O ===============

branches/SHM-4.0-dev/cfg/per-sequence-svc/BQTerrace-SNR.cfg

@@ -2 +2 @@
 FrameSkip                     : 0           # Number of frames to be skipped in input
 FramesToBeEncoded             : 600         # Number of frames to be coded
+PhaseAlignment                : 0           # Sample location alignment between layers (0: zero position aligned, 1: central position aligned)
 
 #======== File I/O ===============

branches/SHM-4.0-dev/cfg/per-sequence-svc/BasketballDrive-1.5x.cfg

@@ -2 +2 @@
 FrameSkip                     : 0           # Number of frames to be skipped in input
 FramesToBeEncoded             : 500         # Number of frames to be coded
+PhaseAlignment                : 0           # Sample location alignment between layers (0: zero position aligned, 1: central position aligned)
 
 #======== File I/O ===============

branches/SHM-4.0-dev/cfg/per-sequence-svc/BasketballDrive-2x.cfg

@@ -2 +2 @@
 FrameSkip                     : 0           # Number of frames to be skipped in input
 FramesToBeEncoded             : 500         # Number of frames to be coded
+PhaseAlignment                : 0           # Sample location alignment between layers (0: zero position aligned, 1: central position aligned)
 
 #======== File I/O ===============

branches/SHM-4.0-dev/cfg/per-sequence-svc/BasketballDrive-SNR.cfg

@@ -2 +2 @@
 FrameSkip                     : 0           # Number of frames to be skipped in input
 FramesToBeEncoded             : 500         # Number of frames to be coded
+PhaseAlignment                : 0           # Sample location alignment between layers (0: zero position aligned, 1: central position aligned)
 
 #======== File I/O ===============

branches/SHM-4.0-dev/cfg/per-sequence-svc/Cactus-1.5x.cfg

@@ -2 +2 @@
 FrameSkip                     : 0           # Number of frames to be skipped in input
 FramesToBeEncoded             : 500         # Number of frames to be coded
+PhaseAlignment                : 0           # Sample location alignment between layers (0: zero position aligned, 1: central position aligned)
 
 #======== File I/O ===============

branches/SHM-4.0-dev/cfg/per-sequence-svc/Cactus-2x.cfg

@@ -2 +2 @@
 FrameSkip                     : 0           # Number of frames to be skipped in input
 FramesToBeEncoded             : 500         # Number of frames to be coded
+PhaseAlignment                : 0           # Sample location alignment between layers (0: zero position aligned, 1: central position aligned)
 
 #======== File I/O ===============

branches/SHM-4.0-dev/cfg/per-sequence-svc/Cactus-SNR.cfg

@@ -2 +2 @@
 FrameSkip                     : 0           # Number of frames to be skipped in input
 FramesToBeEncoded             : 500         # Number of frames to be coded
+PhaseAlignment                : 0           # Sample location alignment between layers (0: zero position aligned, 1: central position aligned)
 
 #======== File I/O ===============

branches/SHM-4.0-dev/cfg/per-sequence-svc/Kimono-1.5x.cfg

@@ -2 +2 @@
 FrameSkip                     : 0           # Number of frames to be skipped in input
 FramesToBeEncoded             : 240         # Number of frames to be coded
+PhaseAlignment                : 0           # Sample location alignment between layers (0: zero position aligned, 1: central position aligned)
 
 #======== File I/O ===============

branches/SHM-4.0-dev/cfg/per-sequence-svc/Kimono-2x.cfg

@@ -2 +2 @@
 FrameSkip                     : 0           # Number of frames to be skipped in input
 FramesToBeEncoded             : 240         # Number of frames to be coded
+PhaseAlignment                : 0           # Sample location alignment between layers (0: zero position aligned, 1: central position aligned)
 
 #======== File I/O ===============

branches/SHM-4.0-dev/cfg/per-sequence-svc/Kimono-SNR.cfg

@@ -2 +2 @@
 FrameSkip                     : 0           # Number of frames to be skipped in input
 FramesToBeEncoded             : 240         # Number of frames to be coded
+PhaseAlignment                : 0           # Sample location alignment between layers (0: zero position aligned, 1: central position aligned)
 
 #======== File I/O ===============

branches/SHM-4.0-dev/cfg/per-sequence-svc/ParkScene-1.5x.cfg

@@ -2 +2 @@
 FrameSkip                     : 0           # Number of frames to be skipped in input
 FramesToBeEncoded             : 240         # Number of frames to be coded
+PhaseAlignment                : 0           # Sample location alignment between layers (0: zero position aligned, 1: central position aligned)
 
 #======== File I/O ===============

branches/SHM-4.0-dev/cfg/per-sequence-svc/ParkScene-2x.cfg

@@ -2 +2 @@
 FrameSkip                     : 0           # Number of frames to be skipped in input
 FramesToBeEncoded             : 240         # Number of frames to be coded
+PhaseAlignment                : 0           # Sample location alignment between layers (0: zero position aligned, 1: central position aligned)
 
 #======== File I/O ===============

branches/SHM-4.0-dev/cfg/per-sequence-svc/ParkScene-SNR.cfg

@@ -2 +2 @@
 FrameSkip                     : 0           # Number of frames to be skipped in input
 FramesToBeEncoded             : 240         # Number of frames to be coded
+PhaseAlignment                : 0           # Sample location alignment between layers (0: zero position aligned, 1: central position aligned)
 
 #======== File I/O ===============

branches/SHM-4.0-dev/cfg/per-sequence-svc/PeopleOnStreet-2x.cfg

@@ -2 +2 @@
 FrameSkip                     : 0           # Number of frames to be skipped in input
 FramesToBeEncoded             : 150         # Number of frames to be coded
+PhaseAlignment                : 0           # Sample location alignment between layers (0: zero position aligned, 1: central position aligned)
 
 #======== File I/O ===============

branches/SHM-4.0-dev/cfg/per-sequence-svc/PeopleOnStreet-SNR.cfg

@@ -2 +2 @@
 FrameSkip                     : 0           # Number of frames to be skipped in input
 FramesToBeEncoded             : 150         # Number of frames to be coded
+PhaseAlignment                : 0           # Sample location alignment between layers (0: zero position aligned, 1: central position aligned)
 
 #======== File I/O ===============

branches/SHM-4.0-dev/cfg/per-sequence-svc/Traffic-2x.cfg

@@ -2 +2 @@
 FrameSkip                     : 0           # Number of frames to be skipped in input
 FramesToBeEncoded             : 150         # Number of frames to be coded
+PhaseAlignment                : 0           # Sample location alignment between layers (0: zero position aligned, 1: central position aligned)
 
 #======== File I/O ===============

branches/SHM-4.0-dev/cfg/per-sequence-svc/Traffic-SNR.cfg

@@ -2 +2 @@
 FrameSkip                     : 0           # Number of frames to be skipped in input
 FramesToBeEncoded             : 150         # Number of frames to be coded
+PhaseAlignment                : 0           # Sample location alignment between layers (0: zero position aligned, 1: central position aligned)
 
 #======== File I/O ===============

branches/SHM-4.0-dev/source/App/TAppEncoder/TAppEncCfg.cpp

@@ -509 +509 @@
   ("FrameRate%d,-fr%d",       cfg_FrameRate,  0, MAX_LAYERS, "Frame rate for layer %d")
   ("LambdaModifier%d,-LM%d",  m_adLambdaModifier, ( double )1.0, MAX_TLAYER, "Lambda modifier for temporal layer %d")
+#if O0215_PHASE_ALIGNMENT
+  ("PhaseAlignment",          m_phaseAlignFlag, false, "indicate the sample location alignment between layers (0: zero position aligned, 1: central position aligned)")
+#endif
 #if REPN_FORMAT_IN_VPS
   ("RepFormatIdx%d",          cfg_repFormatIdx, -1, MAX_LAYERS, "Index to the representation format structure used from the VPS")
@@ -594 +597 @@
   ("FrameSkip,-fs",         m_FrameSkip,          0u, "Number of frames to skip at start of input YUV")
   ("FramesToBeEncoded,f",   m_framesToBeEncoded,   0, "Number of frames to be encoded (default=all)")
-  
   // Profile and level
   ("Profile", m_profile,   Profile::NONE, "Profile to be used when encoding (Incomplete)")
@@ -2399 +2401 @@
   printf("Internal bit depth           : (Y:%d, C:%d)\n", m_internalBitDepthY, m_internalBitDepthC );
   printf("PCM sample bit depth         : (Y:%d, C:%d)\n", g_uiPCMBitDepthLuma, g_uiPCMBitDepthChroma );
+#if O0215_PHASE_ALIGNMENT
+  printf("cross-layer sample alignment : %d\n", m_phaseAlignFlag);
+#endif
 #if RATE_CONTROL_LAMBDA_DOMAIN
 #if !RC_SHVC_HARMONIZATION

branches/SHM-4.0-dev/source/App/TAppEncoder/TAppEncCfg.h

@@ -381 +381 @@
   UInt      m_ilcIdc[1024];
 #endif
+#if O0215_PHASE_ALIGNMENT
+  bool m_phaseAlignFlag;
+#endif
 public:
   TAppEncCfg();

branches/SHM-4.0-dev/source/App/TAppEncoder/TAppEncTop.cpp

@@ -1139 +1139 @@
 #endif
 #endif
+
+#if O0215_PHASE_ALIGNMENT
+  vps->setPhaseAlignFlag( m_phaseAlignFlag );
+#endif
+
 #else //SVC_EXTENSION
   m_cTEncTop.init(isFieldCoding);

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

branches/SHM-4.0-dev/source/Lib/TLibDecoder/TDecCAVLC.cpp

@@ -1251 +1251 @@
   vps->setMaxOneActiveRefLayerFlag(uiCode);
 #endif
+#if O0215_PHASE_ALIGNMENT
+  READ_FLAG( uiCode, "phase_align_flag"); vps->setPhaseAlignFlag( uiCode == 1 ? true : false );
+#endif
 
 #if N0147_IRAP_ALIGN_FLAG

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

@@ -1144 +1144 @@
         if( pcPic->isSpatialEnhLayer(refLayerIdc) )
         {    
+#if O0215_PHASE_ALIGNMENT
+          m_cPrediction.upsampleBasePic( refLayerIdc, pcPic->getFullPelBaseRec(refLayerIdc), pcSlice->getBaseColPic(refLayerIdc)->getPicYuvRec(), pcPic->getPicYuvRec(), pcSlice->getSPS()->getScaledRefLayerWindow(refLayerIdc), pcSlice->getVPS()->getPhaseAlignFlag() );
+#else
           m_cPrediction.upsampleBasePic( refLayerIdc, pcPic->getFullPelBaseRec(refLayerIdc), pcSlice->getBaseColPic(refLayerIdc)->getPicYuvRec(), pcPic->getPicYuvRec(), pcSlice->getSPS()->getScaledRefLayerWindow(refLayerIdc) );
+#endif
         }
         else
@@ -1201 +1205 @@
 
       pcSlice->setILRPic( m_cIlpPic );
+
 #if REF_IDX_MFM
 #if M0457_COL_PICTURE_SIGNALING

branches/SHM-4.0-dev/source/Lib/TLibEncoder/TEncCavlc.cpp

@@ -990 +990 @@
   WRITE_FLAG(vps->getMaxOneActiveRefLayerFlag(), "max_one_active_ref_layer_flag");
 #endif 
+#if O0215_PHASE_ALIGNMENT
+  WRITE_FLAG(vps->getPhaseAlignFlag(), "phase_align_flag" );
+#endif
 #if N0147_IRAP_ALIGN_FLAG
   WRITE_FLAG(vps->getCrossLayerIrapAlignFlag(), "cross_layer_irap_aligned_flag");

branches/SHM-4.0-dev/source/Lib/TLibEncoder/TEncGOP.cpp

@@ -796 +796 @@
         if( pcPic->isSpatialEnhLayer(refLayerIdc))
         {
+#if O0215_PHASE_ALIGNMENT
+          m_pcPredSearch->upsampleBasePic( refLayerIdc, pcPic->getFullPelBaseRec(refLayerIdc), pcSlice->getBaseColPic(refLayerIdc)->getPicYuvRec(), pcPic->getPicYuvRec(), pcSlice->getSPS()->getScaledRefLayerWindow(refLayerIdc), pcSlice->getVPS()->getPhaseAlignFlag() );
+#else
           m_pcPredSearch->upsampleBasePic( refLayerIdc, pcPic->getFullPelBaseRec(refLayerIdc), pcSlice->getBaseColPic(refLayerIdc)->getPicYuvRec(), pcPic->getPicYuvRec(), pcSlice->getSPS()->getScaledRefLayerWindow(refLayerIdc) );
+#endif
         }
         else