Changeset 403 in SHVCSoftware for branches/SHM-3.1-dev/source/App

Timestamp:

20 Sep 2013, 23:03:54 (11 years ago)

Author:

seregin

Message:

auto RepFormatIdx

Location:

branches/SHM-3.1-dev/source/App/TAppEncoder

Files:

• TAppEncLayerCfg.h (modified) (1 diff)
• TAppEncTop.cpp (modified) (1 diff)

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

@@ -154 +154 @@
 #endif
 #if REPN_FORMAT_IN_VPS
-  Int     getRepFormatIdx()           { return m_repFormatIdx; }
-  Void    setSourceWidth(Int x)            {m_iSourceWidth = x;     }
-  Void    setSourceHeight(Int x)           {m_iSourceHeight = x;    }
+  Int     getRepFormatIdx()           { return m_repFormatIdx;  }
+  Void    setRepFormatIdx(Int x)      { m_repFormatIdx = x;     }
+  Void    setSourceWidth(Int x)       { m_iSourceWidth = x;     }
+  Void    setSourceHeight(Int x)      { m_iSourceHeight = x;    }
 #endif
 #if N0120_MAX_TID_REF_CFG

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

@@ -93 +93 @@
   vps->setRepFormatIdxPresentFlag( true );   // Could be disabled to optimize in some cases.
   Int maxRepFormatIdx = -1;
+  Int formatIdx = -1;
   for(UInt layer=0; layer < m_numLayers; layer++)
   {
+    // Auto generation of the format index
+    if( m_acLayerCfg[layer].getRepFormatIdx() == -1 )
+    {
+      // Currently only picture width and height are considred. It has to be updated if different chroma format and bit-depth will are used.
+      Bool found = false;
+      for( UInt idx = 0; idx < layer; idx++ )
+      {
+        if( m_acLayerCfg[layer].getSourceWidth() == m_acLayerCfg[idx].getSourceWidth() && m_acLayerCfg[layer].getSourceHeight() == m_acLayerCfg[idx].getSourceHeight() )
+        {
+          found = true;
+          break;
+        }
+      }
+      if( !found )
+      {
+        formatIdx++;
+      }
+
+      m_acLayerCfg[layer].setRepFormatIdx( formatIdx );
+    }
+
     assert( m_acLayerCfg[layer].getRepFormatIdx() != -1 && "RepFormatIdx not assigned for a layer" );   
     vps->setVpsRepFormatIdx( layer, m_acLayerCfg[layer].getRepFormatIdx() );