Changeset 507 in SHVCSoftware for branches/SHM-4.1-dev/source/App

Timestamp:

25 Nov 2013, 17:32:16 (11 years ago)

Author:

nokia

Message:

Add scaled reference layer ID (JCTVC-O0098)

Location:

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

Files:

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

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

@@ -399 +399 @@
   string* cfg_predLayerIdsPtr    [MAX_LAYERS];
 #endif
+#if O0098_SCALED_REF_LAYER_ID
+  string    cfg_scaledRefLayerId [MAX_LAYERS];
+#endif
   string    cfg_scaledRefLayerLeftOffset [MAX_LAYERS];
   string    cfg_scaledRefLayerTopOffset [MAX_LAYERS];
@@ -405 +408 @@
   Int*      cfg_numScaledRefLayerOffsets[MAX_LAYERS];
 
+#if O0098_SCALED_REF_LAYER_ID
+  string*    cfg_scaledRefLayerIdPtr           [MAX_LAYERS];
+#endif
   string*    cfg_scaledRefLayerLeftOffsetPtr   [MAX_LAYERS];
   string*    cfg_scaledRefLayerTopOffsetPtr    [MAX_LAYERS];
@@ -471 +477 @@
     for(Int i = 0; i < MAX_LAYERS; i++)
     {
+#if O0098_SCALED_REF_LAYER_ID
+      cfg_scaledRefLayerIdPtr          [layer] = &cfg_scaledRefLayerId[layer]          ;
+#endif
       cfg_scaledRefLayerLeftOffsetPtr  [layer] = &cfg_scaledRefLayerLeftOffset[layer]  ;
       cfg_scaledRefLayerTopOffsetPtr   [layer] = &cfg_scaledRefLayerTopOffset[layer]   ;
@@ -582 +591 @@
 #endif
   ("NumScaledRefLayerOffsets%d",    cfg_numScaledRefLayerOffsets,     0, MAX_LAYERS,  "Number of scaled offset layer sets ")
+#if O0098_SCALED_REF_LAYER_ID
+  ("ScaledRefLayerId%d",           cfg_scaledRefLayerIdPtr,          string(""), MAX_LAYERS, "Layer ID of scaled base layer picture")
+#endif
   ("ScaledRefLayerLeftOffset%d",   cfg_scaledRefLayerLeftOffsetPtr,  string(""), MAX_LAYERS, "Horizontal offset of top-left luma sample of scaled base layer picture with respect to"
                                                                  " top-left luma sample of the EL picture, in units of two luma samples")
@@ -1086 +1098 @@
     if(m_acLayerCfg[layer].m_numScaledRefLayerOffsets)
     {
+#if O0098_SCALED_REF_LAYER_ID
+      assert( strcmp(cfg_scaledRefLayerId[layer].c_str(),  ""));
+#endif
       assert( strcmp(cfg_scaledRefLayerLeftOffset[layer].c_str(),  "") ||
               strcmp(cfg_scaledRefLayerRightOffset[layer].c_str(), "") ||
@@ -1094 +1109 @@
 
     Int *tempArray = NULL;   // Contain the value 
+
+#if O0098_SCALED_REF_LAYER_ID
+    // ID //
+    if(strcmp(cfg_scaledRefLayerId[layer].c_str(),  ""))
+    {
+      cfgStringToArray( &tempArray, cfg_scaledRefLayerId[layer], m_acLayerCfg[layer].m_numScaledRefLayerOffsets, "ScaledRefLayerId");
+      if(tempArray)
+      {
+        for(Int i = 0; i < m_acLayerCfg[layer].m_numScaledRefLayerOffsets; i++)
+        {
+          m_acLayerCfg[layer].m_scaledRefLayerId[i] = tempArray[i];
+        }
+        delete [] tempArray; tempArray = NULL;
+      }
+    }
+#endif
+
     // Left offset //
     if(strcmp(cfg_scaledRefLayerLeftOffset[layer].c_str(),  ""))

branches/SHM-4.1-dev/source/App/TAppEncoder/TAppEncLayerCfg.cpp

@@ -53 +53 @@
   m_aiPad[1] = m_aiPad[0] = 0;
   m_numScaledRefLayerOffsets = 0;
+#if O0098_SCALED_REF_LAYER_ID
+  ::memset(m_scaledRefLayerId,           0, sizeof(m_scaledRefLayerId));
+#endif
   ::memset(m_scaledRefLayerLeftOffset,   0, sizeof(m_scaledRefLayerLeftOffset));
   ::memset(m_scaledRefLayerTopOffset,    0, sizeof(m_scaledRefLayerTopOffset));

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

@@ -95 +95 @@
   TAppEncCfg* m_cAppEncCfg;                                   ///< pointer to app encoder config
   Int       m_numScaledRefLayerOffsets  ;
+#if O0098_SCALED_REF_LAYER_ID
+  Int       m_scaledRefLayerId          [MAX_LAYERS];
+#endif
   Int       m_scaledRefLayerLeftOffset  [MAX_LAYERS];
   Int       m_scaledRefLayerTopOffset   [MAX_LAYERS];

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

@@ -605 +605 @@
       for(Int i = 0; i < m_acLayerCfg[layer].m_numScaledRefLayerOffsets; i++)
       {
+#if O0098_SCALED_REF_LAYER_ID
+        m_acTEncTop[layer].setScaledRefLayerId(i, m_acLayerCfg[layer].m_scaledRefLayerId[i]);
+#endif
         m_acTEncTop[layer].getScaledRefLayerWindow(i).setWindow( 2*m_acLayerCfg[layer].m_scaledRefLayerLeftOffset[i], 2*m_acLayerCfg[layer].m_scaledRefLayerRightOffset[i],
                                                   2*m_acLayerCfg[layer].m_scaledRefLayerTopOffset[i], 2*m_acLayerCfg[layer].m_scaledRefLayerBottomOffset[i]);