Changeset 1534 in SHVCSoftware for branches/SHM-dev/source/Lib/TLibEncoder

Timestamp:

22 Mar 2016, 19:58:32 (10 years ago)

Author:

seregin

Message:

integration of multi-view support from JCTVC-W0134

Location:

branches/SHM-dev/source/Lib/TLibEncoder

Files:

• TEncCavlc.cpp (modified) (3 diffs)
• TEncCfg.h (modified) (3 diffs)
• TEncCu.cpp (modified) (1 diff)
• TEncGOP.cpp (modified) (1 diff)
• TEncSearch.cpp (modified) (6 diffs)
• TEncSearch.h (modified) (3 diffs)
• TEncTop.cpp (modified) (1 diff)

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

@@ -1445 +1445 @@
     WRITE_CODE(0, 32,  "general_reserved_zero_34bits");  WRITE_CODE(0, 2,  "general_reserved_zero_34bits");
   }
+#if VIEW_SCALABILITY
+  else if( ptl->getProfileIdc() == Profile::MULTIVIEWMAIN )
+  {
+    WRITE_FLAG(true,   "general_max_12bit_constraint_flag");
+    WRITE_FLAG(true,   "general_max_10bit_constraint_flag");
+    WRITE_FLAG(true,   "general_max_8bit_constraint_flag");
+    WRITE_FLAG(true,   "general_max_422chroma_constraint_flag");
+    WRITE_FLAG(true,   "general_max_420chroma_constraint_flag");
+    WRITE_FLAG(false,  "general_max_monochrome_constraint_flag");
+    WRITE_FLAG(false,  "general_intra_constraint_flag");
+    WRITE_FLAG(false,  "general_one_picture_only_constraint_flag");
+    WRITE_FLAG(true,   "general_lower_bit_rate_constraint_flag");
+    WRITE_CODE(0, 32,  "general_reserved_zero_34bits");  WRITE_CODE(0, 2,  "general_reserved_zero_34bits");
+  }
+#endif
   else
   {
@@ -1994 +2009 @@
 
   WRITE_CODE( vps->getViewIdLen( ), 4, "view_id_len" );
+#if !VIEW_SCALABILITY
   assert ( vps->getNumViews() >= (1<<vps->getViewIdLen()) );
+#endif
 
   if ( vps->getViewIdLen() > 0 )
@@ -2460 +2477 @@
 
   // Vertical MV component restriction is not used in SHVC CTC
+#if VIEW_SCALABILITY 
+  WRITE_FLAG( pcSPS->getInterViewMvVertConstraintFlag() ? 1 : 0 , "inter_view_mv_vert_constraint_flag" );
+#else
   WRITE_FLAG( 0, "inter_view_mv_vert_constraint_flag" );
+#endif
 }
 

branches/SHM-dev/source/Lib/TLibEncoder/TEncCfg.h

@@ -399 +399 @@
 
 #if SVC_EXTENSION
-  UInt      m_layerId;   
+  UInt      m_layerId;
   UInt      m_numLayer;
   Bool      m_elRapSliceBEnabled;
@@ -483 +483 @@
   Int                                 m_TMVPConstraintsSEIEnabled;
 #endif
+
+#if VIEW_SCALABILITY
+  Bool                                m_bUseDisparitySearchRangeRestriction;
+#endif 
 #endif //SVC_EXTENSION
 
@@ -1253 +1257 @@
 #endif
 #endif
+#if VIEW_SCALABILITY 
+  Void      setUseDisparitySearchRangeRestriction ( Bool b ) { m_bUseDisparitySearchRangeRestriction = b; }
+  Bool      getUseDisparitySearchRangeRestriction ()         { return  m_bUseDisparitySearchRangeRestriction; }
+#endif
 #endif //SVC_EXTENSION
 };

branches/SHM-dev/source/Lib/TLibEncoder/TEncCu.cpp

@@ -1299 +1299 @@
     {
 #if REF_IDX_ME_ZEROMV
-      Bool bZeroMVILR = rpcTempCU->xCheckZeroMVILRMerge(uhInterDirNeighbours[uiMergeCand], cMvFieldNeighbours[0 + 2*uiMergeCand], cMvFieldNeighbours[1 + 2*uiMergeCand]);
-      if(bZeroMVILR)
+      Bool bZeroMVILR = rpcTempCU->checkZeroMVILRMerge(uhInterDirNeighbours[uiMergeCand], cMvFieldNeighbours[0 + 2*uiMergeCand], cMvFieldNeighbours[1 + 2*uiMergeCand]);
+
+      if( bZeroMVILR )
       {
 #endif

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

@@ -2029 +2029 @@
     {
       pcSlice->setILRPic( m_pcEncTop->getIlpList() );
+#if VIEW_SCALABILITY 
+      pcSlice->setRefPicListModificationSvc(m_pcEncTop->getIlpList());
+#else
       pcSlice->setRefPicListModificationSvc();
+#endif
       pcSlice->setRefPicList( rcListPic, false, m_pcEncTop->getIlpList());
 

branches/SHM-dev/source/Lib/TLibEncoder/TEncSearch.cpp

@@ -2888 +2888 @@
   {
 #if REF_IDX_ME_ZEROMV
-    Bool bZeroMVILR = pcCU->xCheckZeroMVILRMerge(uhInterDirNeighbours[uiMergeCand], cMvFieldNeighbours[0 + 2*uiMergeCand], cMvFieldNeighbours[1 + 2*uiMergeCand]);
-    if(bZeroMVILR)
+    Bool bZeroMVILR = pcCU->checkZeroMVILRMerge(uhInterDirNeighbours[uiMergeCand], cMvFieldNeighbours[0 + 2*uiMergeCand], cMvFieldNeighbours[1 + 2*uiMergeCand]);
+
+    if( bZeroMVILR )
     {
 #endif
@@ -3113 +3114 @@
         {
 #if REF_IDX_ME_ZEROMV 
-          Bool bZeroMVILR = pcCU->xCheckZeroMVILRMvdL1Zero(iRefList, iRefIdxTemp, aaiMvpIdx[iRefList][iRefIdxTemp]);
-          if(bZeroMVILR)
+          Bool bZeroMVILR = pcCU->checkZeroMVILRMvdL1Zero(iRefList, iRefIdxTemp, aaiMvpIdx[iRefList][iRefIdxTemp]);
+
+          if( bZeroMVILR )
           {
 #endif
@@ -3864 +3866 @@
 
   TComMv      cMvPred = *pcMvPred;
-
+#if VIEW_SCALABILITY 
+  m_vertRestriction = m_pcEncCfg->getUseDisparitySearchRangeRestriction() && pcCU->getSlice()->getRefPic( eRefPicList, iRefIdxPred )->getPOC() == pcCU->getSlice()->getPOC();
+#endif
   if ( bBi )
   {
@@ -3882 +3886 @@
   //  Do integer search
 #if REF_IDX_ME_ZEROMV
-  if( pcCU->getSlice()->getRefPic( eRefPicList, iRefIdxPred )->isILR(pcCU->getPic()->getLayerId()))  //ILR reference pic 
+  //scalable layer
+  if( pcCU->getSlice()->getVPS()->getScalabilityMask( SCALABILITY_ID ) && pcCU->getSlice()->getRefPic( eRefPicList, iRefIdxPred )->isILR(pcCU->getPic()->getLayerId()) )  //ILR reference pic 
   {
     rcMv.setZero();  //use Mv(0, 0) for integer ME 
@@ -3918 +3923 @@
 
 #if REF_IDX_ME_ZEROMV
-  if( pcCU->getSlice()->getRefPic( eRefPicList, iRefIdxPred )->isILR(pcCU->getPic()->getLayerId()))  //ILR reference pic
+  //scalable layer
+  if( pcCU->getSlice()->getVPS()->getScalabilityMask( SCALABILITY_ID ) && pcCU->getSlice()->getRefPic( eRefPicList, iRefIdxPred )->isILR(pcCU->getPic()->getLayerId()))  //ILR reference pic
   {
     xPatternSearchFracDIFMv0( pcPatternKey, piRefY, iRefStride, &rcMv, cMvHalf, cMvQter, ruiCost );
@@ -3950 +3956 @@
   rcMvSrchRngRB.setHor( cTmpMvPred.getHor() + (iSrchRng << iMvShift) );
   rcMvSrchRngRB.setVer( cTmpMvPred.getVer() + (iSrchRng << iMvShift) );
+#if VIEW_SCALABILITY
+  if( m_vertRestriction )
+  {
+    Int mvRestricted = ( 56 - 1 ) << iMvShift ; // -1 to consider subpel search
+    if( rcMvSrchRngRB.getVer() > mvRestricted )
+    {
+      rcMvSrchRngRB.setVer( mvRestricted );
+    }
+  }
+#endif
   pcCU->clipMv        ( rcMvSrchRngLT );
   pcCU->clipMv        ( rcMvSrchRngRB );

branches/SHM-dev/source/Lib/TLibEncoder/TEncSearch.h

@@ -120 +120 @@
   Bool            m_isInitialized;
 
-#if SVC_EXTENSION && N0383_IL_CONSTRAINED_TILE_SETS_SEI
+#if SVC_EXTENSION 
+#if N0383_IL_CONSTRAINED_TILE_SETS_SEI
   Bool            m_disableILP;
+#endif
+#if VIEW_SCALABILITY 
+  Bool            m_vertRestriction;
+#endif 
 #endif
 
@@ -473 +478 @@
   inline  Void  setDistParamComp( ComponentID compIdx )  { m_cDistParam.compIdx = compIdx; }
 
-#if SVC_EXTENSION && REF_IDX_ME_ZEROMV
+#if SVC_EXTENSION 
+#if REF_IDX_ME_ZEROMV
   Void xPatternSearchFracDIFMv0  ( TComPattern*  pcPatternKey,
                                    Pel*          piRefY,
@@ -485 +491 @@
                                    UInt&         ruiCost     );
 #endif
-#endif //SVC_EXTENSION  
+#endif
+
+#if VIEW_SCALABILITY 
+  TComMv xCheckMVVertRestriction( TComMv mv );
+#endif
+#endif //SVC_EXTENSION
 
 };// END CLASS DEFINITION TEncSearch

branches/SHM-dev/source/Lib/TLibEncoder/TEncTop.cpp

@@ -848 +848 @@
     m_cSPS.setLayerId(m_layerId);
   }
+#if VIEW_SCALABILITY 
+  if( m_bUseDisparitySearchRangeRestriction )
+  {
+    m_cSPS.setInterViewMvVertConstraintFlag( true );
+  }
+  else
+  {
+    m_cSPS.setInterViewMvVertConstraintFlag( false );
+  }
+#endif
 #endif //SVC_EXTENSION