Changeset 649 in SHVCSoftware for trunk/source/App

Timestamp:

26 Mar 2014, 02:07:30 (11 years ago)

Author:

seregin

Message:

merge with SHM-5.1-dev branch

Location:

trunk

Files:

• . (modified) (1 prop)
• source (modified) (1 prop)
• source/App/TAppEncoder/TAppEncCfg.cpp (modified) (1 diff)
• source/App/TAppEncoder/TAppEncTop.cpp (modified) (3 diffs)

trunk/source/App/TAppEncoder/TAppEncCfg.cpp

@@ -1761 +1761 @@
   m_numLayers = m_numLayers > MAX_LAYERS ? MAX_LAYERS : m_numLayers;
 
+  
+  // it can be updated after AVC BL support will be added to the WD
+  if( m_avcBaseLayerFlag )
+  {
+    m_crossLayerIrapAlignFlag = false;
+    m_crossLayerPictureTypeAlignFlag = false;
+    m_crossLayerAlignedIdrOnlyFlag = false;
+  }
+
   // verify layer configuration parameters
   for(UInt layer=0; layer<m_numLayers; layer++)

trunk/source/App/TAppEncoder/TAppEncTop.cpp

@@ -1151 +1151 @@
     vps->setProfileLevelTierIdx(i, i);
     vps->setOutputLayerSetIdx(i, i);
-  }
-
-  for(Int lsIdx = 1; lsIdx < vps->getNumLayerSets(); lsIdx++)
-  {
-    // Include the highest layer as output layer
-    for(UInt layer=0; layer <= vps->getMaxLayerId() ; layer++)
-    {
-      if(vps->getLayerIdIncludedFlag(lsIdx, layer))
-      {
-        vps->setOutputLayerFlag(lsIdx, layer, layer == (vps->getMaxLayerId()));
-      }
-    }
-  }
+  }  
 #endif
  #if VPS_DPB_SIZE_TABLE
@@ -1175 +1163 @@
   vps->deriveNumberOfSubDpbs();
 #endif
+
+  // derive OutputLayerFlag[i][j] 
+  if( vps->getDefaultTargetOutputLayerIdc() == 1 )
+  {
+    // default_target_output_layer_idc equal to 1 specifies that only the layer with the highest value of nuh_layer_id such that nuh_layer_id equal to nuhLayerIdA and 
+    // AuxId[ nuhLayerIdA ] equal to 0 in each of the output layer sets with index in the range of 1 to vps_num_layer_sets_minus1, inclusive, is an output layer of its output layer set.
+
+    // Include the highest layer as output layer for each layer set
+    for(Int lsIdx = 1; lsIdx < vps->getNumLayerSets(); lsIdx++)
+    {
+      for( UInt layer = 0; layer < vps->getNumLayersInIdList(lsIdx); layer++ )
+      {
+        if( vps->getLayerIdIncludedFlag(lsIdx, layer) )      
+        {        
+          vps->setOutputLayerFlag( lsIdx, layer, layer == vps->getNumLayersInIdList(lsIdx) - 1 );
+        }
+      }
+    }
+  }
+  else
+  {
+    // cases when default_target_output_layer_idc is not equal to 1
+    assert(!"default_target_output_layer_idc not equal to 1 is not yet supported");
+  }
+
   // Initialize dpb_size_table() for all ouput layer sets in the VPS extension
   for(i = 1; i < vps->getNumOutputLayerSets(); i++)
@@ -1322 +1335 @@
         }
       }
-    }
-
-    if( vps->getAvcBaseLayerFlag() )
-    {
-      vps->setCrossLayerIrapAlignFlag(false);
     }
 #endif