Changeset 1534 in SHVCSoftware for branches/SHM-dev/source/App

Timestamp:

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

Author:

seregin

Message:

integration of multi-view support from JCTVC-W0134

Location:

branches/SHM-dev/source/App/TAppEncoder

Files:

• TAppEncCfg.cpp (modified) (6 diffs)
• TAppEncCfg.h (modified) (1 diff)
• TAppEncLayerCfg.h (modified) (2 diffs)
• TAppEncTop.cpp (modified) (5 diffs)

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

@@ -713 +713 @@
   Int*    cfg_auxId[MAX_LAYERS];
 #endif
+#if VIEW_SCALABILITY
+  Int*     cfg_viewOrderIndex         [MAX_LAYERS];
+  Int*     cfg_viewId                 [MAX_LAYERS]; 
+#endif
 
   Int*    cfg_numSamplePredRefLayers  [MAX_LAYERS];
@@ -889 +893 @@
     cfg_auxId[layer]                = &m_apcLayerCfg[layer]->m_auxId; 
 #endif
+#if VIEW_SCALABILITY
+    cfg_viewOrderIndex[layer]       = &m_apcLayerCfg[layer]->m_viewOrderIndex;
+    cfg_viewId[layer]               = &m_apcLayerCfg[layer]->m_viewId;
+#endif
     cfg_layerSwitchOffBegin[layer]  = &m_apcLayerCfg[layer]->m_layerSwitchOffBegin;
     cfg_layerSwitchOffEnd[layer]    = &m_apcLayerCfg[layer]->m_layerSwitchOffEnd;
@@ -1043 +1051 @@
 #if AUXILIARY_PICTURES
   ("AuxId%d",                                       cfg_auxId,                                 0, m_numLayers, "Auxilary picture ID for layer %d (0: Not aux pic, 1: Alpha plane, 2: Depth picture, 3: Cb enh, 4: Cr enh")
+#endif
+#if VIEW_SCALABILITY
+  ("ViewOrderIndex%d",                              cfg_viewOrderIndex,                       -1, m_numLayers, "View Order Index per layer")
+  ("ViewId%d",                                      cfg_viewId,                               -1, m_numLayers, "View Id per View Order Index")
 #endif
   ("ConformanceMode%d",                             cfg_conformanceMode,                       0, m_numLayers, "Window conformance mode (0: no cropping, 1:automatic padding, 2: padding, 3:cropping")
@@ -3021 +3033 @@
   // check validity of input parameters
 #if SVC_EXTENSION
+#if VIEW_SCALABILITY
+  if( m_scalabilityMask[VIEW_ORDER_INDEX] )
+  {
+
+    std::vector<Int> uniqueViewOrderIndices;
+    std::vector<Int> uniqueViewIds;
+    for( Int layer_idx = 0; layer_idx < m_numLayers; layer_idx++ )
+    {
+      Bool isIn = false;
+      for( Int uni = 0; uni < uniqueViewOrderIndices.size(); uni++ )
+      {
+        isIn = isIn || ( *(cfg_viewOrderIndex[ layer_idx ]) == uniqueViewOrderIndices[ uni ] ); 
+      }
+      if ( !isIn ) 
+      {
+        uniqueViewOrderIndices.push_back( *(cfg_viewOrderIndex[ layer_idx ]) ); 
+      } 
+
+      isIn = false;
+      for( Int uni = 0; uni < uniqueViewIds.size(); uni++ )
+      {
+        isIn = isIn || ( *(cfg_viewId[ layer_idx ]) == uniqueViewIds[ uni ] ); 
+      }
+      if( !isIn ) 
+      {
+        uniqueViewIds.push_back( *(cfg_viewId[ layer_idx ]) ); 
+      } 
+
+      assert(uniqueViewIds.size()==uniqueViewOrderIndices.size());
+
+      m_iNumberOfViews=uniqueViewIds.size();
+
+    }
+
+    m_ViewIdVal = uniqueViewIds;
+    m_iNumberOfViews = (Int)uniqueViewOrderIndices.size();
+  }
+#endif
+
   for( UInt layerIdx = 0; layerIdx < m_numLayers; layerIdx++ )
   {
@@ -4078 +4129 @@
   }
 #endif 
+#if VIEW_SCALABILITY
+  if (m_scalabilityMask[VIEW_ORDER_INDEX])
+  {   
+    xConfirmPara(m_apcLayerCfg[layerIdx]->m_viewId < 0 , "ViewId must be greater than or equal to 0");
+    xConfirmPara(m_apcLayerCfg[layerIdx]->m_viewOrderIndex < 0 , "ViewOrderIndex must be greater than or equal to 0");
+
+    if( layerIdx > 0 )
+    {
+      xConfirmPara(m_apcLayerCfg[layerIdx]->m_viewOrderIndex < m_apcLayerCfg[layerIdx-1]->m_viewOrderIndex, "ViewOrderIndex shall be increasing");
+    }
+
+  }
+#endif
 #if CGS_3D_ASYMLUT
   xConfirmPara( m_nCGSFlag < 0 || m_nCGSFlag > 1 , "0<=CGS<=1" );
@@ -4226 +4290 @@
 
 #if SVC_EXTENSION
+#if VIEW_SCALABILITY
+  if( m_scalabilityMask[VIEW_ORDER_INDEX] )
+  {
+    printf("ViewOrderIndex                         : %d\n", m_apcLayerCfg[layer]->m_viewOrderIndex );
+    printf("ViewId                                 : %d\n", m_apcLayerCfg[layer]->m_viewId );
+  }
+#endif
       printf("PTL index                              : %d\n", m_apcLayerCfg[layerIdx]->m_layerPTLIdx );
     }

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

@@ -118 +118 @@
   Int       m_numLayers;                                      ///< number of layers
   Int       m_scalabilityMask[MAX_VPS_NUM_SCALABILITY_TYPES]; ///< scalability_mask
+#if VIEW_SCALABILITY
+  Int       m_iNumberOfViews;                                 ///< number of views
+  std::vector<Int> m_ViewIdVal;
+#endif  
   Bool      m_maxTidRefPresentFlag; 
 

branches/SHM-dev/source/App/TAppEncoder/TAppEncLayerCfg.h

@@ -54 +54 @@
   Int       m_auxId;
 #endif
+#if VIEW_SCALABILITY
+  Int       m_viewOrderIndex;
+  Int       m_viewId;
+#endif
 
   Int       m_extraRPSs;                                     ///< extra RPSs added to handle CRA
@@ -173 +177 @@
   Int*    getPredLayerIds() const              { return m_predLayerIds;             }
   Int     getPredLayerIdx(Int i) const         { return m_predLayerIds[i];          }
+#if VIEW_SCALABILITY
+  Int     getViewOrderIndex()                  { return m_viewOrderIndex;       }
+  Int     getViewId()                          { return m_viewId;               }
+#endif
 
   Int     getRepFormatIdx() const              { return m_repFormatIdx;         }

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

@@ -468 +468 @@
     m_cTEncTop.setBottomRightTileIndex                              ( m_bottomRightTileIndex );
     m_cTEncTop.setIlcIdc                                            ( m_ilcIdc );
+#endif
+#if VIEW_SCALABILITY 
+    m_cTEncTop.setUseDisparitySearchRangeRestriction                ( m_scalabilityMask[VIEW_ORDER_INDEX] );
 #endif
 
@@ -971 +974 @@
 
   UInt i = 0, dimIdLen = 0;
+#if VIEW_SCALABILITY
+  Int curDimId=0;
+
+  if( m_scalabilityMask[VIEW_ORDER_INDEX] )
+  {
+    UInt maxViewOrderIndex = 0,maxViewId=0;
+    UInt voiLen = 1,vidLen=1;
+
+    for( i = 0; i < vps->getMaxLayers(); i++ )
+    {
+      if( m_apcLayerCfg[i]->getViewOrderIndex() > maxViewOrderIndex )
+      {
+        maxViewOrderIndex = m_apcLayerCfg[i]->getViewOrderIndex();
+      }
+
+      if( m_apcLayerCfg[i]->getViewId() > maxViewId )
+      {
+        maxViewId = m_apcLayerCfg[i]->getViewId();
+      }
+
+    }
+    while((1 << voiLen) < (maxViewOrderIndex + 1))
+    {
+      voiLen++;
+    }
+
+    while((1 << vidLen) < (maxViewId + 1))
+    {
+      vidLen++;
+    }
+
+    vps->setDimensionIdLen(0, voiLen);
+    vps->setViewIdLen(vidLen);
+
+    for( i = 0; i < vps->getMaxLayers(); i++ )
+    {
+      vps->setDimensionId(i, 0, m_apcLayerCfg[i]->getViewOrderIndex());          
+    }
+
+    for( i = 0; i < m_iNumberOfViews; i++ )
+    {
+      vps->setViewIdVal(i, m_ViewIdVal[i]); 
+    }
+
+    curDimId++;
+  }
+#endif
 
   while((1 << dimIdLen) < m_numLayers)
@@ -976 +1026 @@
     dimIdLen++;
   }
+#if VIEW_SCALABILITY
+  vps->setDimensionIdLen(curDimId, dimIdLen); 
+#else
   vps->setDimensionIdLen(0, dimIdLen);
+#endif
   vps->setNuhLayerIdPresentFlag(false);
   vps->setLayerIdInNuh(0, 0);
@@ -984 +1038 @@
     vps->setLayerIdInNuh(i, m_apcLayerCfg[i]->m_layerId);    
     vps->setLayerIdxInVps(vps->getLayerIdInNuh(i), i);
+#if VIEW_SCALABILITY
+    vps->setDimensionId(i, curDimId, i);
+#else
     vps->setDimensionId(i, 0, i);
-
+#endif
     if( m_apcLayerCfg[i]->m_layerId != i )
     {
@@ -1093 +1150 @@
       scalabilityTypes += m_scalabilityMask[i];
     }
+#if VIEW_SCALABILITY
+    assert( scalabilityTypes <= 3 );
+#else
 #if AUXILIARY_PICTURES
     assert( scalabilityTypes <= 2 );
 #else
     assert( scalabilityTypes == 1 );
+#endif
 #endif
     vps->setNumScalabilityTypes(scalabilityTypes);