Changeset 1412 in 3DVCSoftware for branches/HTM-16.2-dev/source/App/TAppEncoder/TAppEncTop.h

Timestamp:

12 Apr 2018, 11:12:21 (7 years ago)

Author:

tech

Message:

• Update HM-16.18
• Cleanups
• Encoder Extension

-- Representation formats
-- Parameter set sharing
-- GOP configuration

File:

• branches/HTM-16.2-dev/source/App/TAppEncoder/TAppEncTop.h (modified) (4 diffs)

branches/HTM-16.2-dev/source/App/TAppEncoder/TAppEncTop.h

@@ -4 +4 @@
  * granted under this license.
  *
- * Copyright (c) 2010-2016, ITU/ISO/IEC
+ * Copyright (c) 2010-2017, ITU/ISO/IEC
  * All rights reserved.
  *
@@ -73 +73 @@
 
   std::vector<Int>           m_frameRcvd;                   ///< number of received frames 
-
   TComPicLists               m_ivPicLists;                  ///< picture buffers of encoder instances
+
+  ParameterSetMap<TComSPS>   m_spsMap;
+  ParameterSetMap<TComPPS>   m_ppsMap;
+  
+  IntAry1d                   m_parameterSetId;  
+  BoolAry1d                  m_sendParameterSets;
+
+
 #if NH_MV
   TComVPS*                   m_vps;                         ///< vps
@@ -147 +154 @@
   Void xSetCamPara                ( TComVPS& vps );
 #endif
-  GOPEntry* xGetGopEntry( Int layerIdInVps, Int poc );
+
+  Void xDeriveParameterSetIds( TComVPS& vps )
+  {
+
+    m_parameterSetId  .clear();
+    m_sendParameterSets.clear();
+
+    m_parameterSetId  .resize( m_numberOfLayers, -1 );
+    m_sendParameterSets.resize( m_numberOfLayers, false );
+    if ( !m_shareParameterSets )
+    {
+      AOT( m_numberOfLayers > 16 ); 
+      for (Int curVpsLayerId = 0; curVpsLayerId < m_numberOfLayers; curVpsLayerId++ )
+      {
+        m_parameterSetId   [curVpsLayerId] = curVpsLayerId; 
+        m_sendParameterSets[curVpsLayerId] = true         ; 
+      }
+    }
+    else
+    {
+      // The spec requires e.g.:
+      // - It is a requirement of bitstream conformance that, when present, the value of chroma_format_idc shall be less than or equal to chroma_format_vps_idc 
+      //   of the vps_rep_format_idx[ j ]-th rep_format( ) syntax structure in the active VPS, where j is equal to LayerIdxInVps[ layerIdCurr ].  
+
+      // Consequently, a depth layer with chorma format 4:0:0 cannot refer to a base layer SPS with chroma format 4:2:0
+
+      // Furthermore, it is required that
+      // - the SPS RBSP shall have nuh_layer_id equal to 0, nuhLayerId, or IdRefLayer[ nuhLayerId ][ i ] with any value of i in the range of 0 to NumRefLayers[ nuhLayerId ] - 1, inclusive.
+
+      // Because of these requirements and when parameter set sharing is enabled, HTM sends the parameter sets for a current layer in its smallest reference layer having the same representation format. 
+
+
+      Int curPsId = 0; 
+
+      // Loop all layers
+      for (Int curVpsLayerId = 0; curVpsLayerId < m_numberOfLayers; curVpsLayerId++ )
+      {
+        // Get smallest reference layer with same rep format idx
+        Int curNuhLayerId = vps.getLayerIdInNuh(curVpsLayerId);
+        Int smallestRefNuhLIdSameRepFmt   = curNuhLayerId;
+
+        Int curRepFormatIdx = m_layerIdxInVpsToRepFormatIdx[ curVpsLayerId ];
+
+        for (Int j = 0; j < vps.getNumRefLayers( curNuhLayerId ); j++ )
+        {
+          Int refNuhLayerId = vps.getIdRefLayer( curNuhLayerId, j );
+          Int refVpsLayerId = vps.getLayerIdInVps( refNuhLayerId ); 
+
+          if ( smallestRefNuhLIdSameRepFmt > refNuhLayerId &&  m_layerIdxInVpsToRepFormatIdx[refVpsLayerId] == curRepFormatIdx  )
+          {
+            smallestRefNuhLIdSameRepFmt = refNuhLayerId; 
+          }
+        }
+
+        Int smallestRefVpsLIdSameRepFmt =   vps.getLayerIdInVps(  smallestRefNuhLIdSameRepFmt ); 
+
+        if (smallestRefVpsLIdSameRepFmt == curVpsLayerId )
+        {
+          m_sendParameterSets[ curVpsLayerId ] = true;         
+          m_parameterSetId   [ curVpsLayerId ] = curPsId;
+          curPsId++;
+          AOT( curPsId > 15 ); 
+        }
+        else
+        {
+          AOT( m_parameterSetId   [ smallestRefVpsLIdSameRepFmt  ] == -1 );
+          m_parameterSetId   [ curVpsLayerId ] = m_parameterSetId   [ smallestRefVpsLIdSameRepFmt  ];
+        }
+
+        
+      }
+    }
+  }
+
   Int  xGetMax( std::vector<Int>& vec);
   Bool xLayerIdInTargetEncLayerIdList( Int nuhLayerId );
 #endif
-#if NH_3D_DLT
+#if NH_3D
   Void xDeriveDltArray( TComVPS& vps, TComDLT* dlt );
   Void xAnalyzeInputBaseDepth(UInt layer, UInt uiNumFrames, TComVPS* vps, TComDLT* dlt);
@@ -165 +245 @@
 #else
   TEncTop&    getTEncTop  ()   { return  m_cTEncTop; }      ///< return encoder class pointer reference
-#endif
+ 
+#endif
+private:
+
 };// END CLASS DEFINITION TAppEncTop