Changeset 730 in 3DVCSoftware for branches/HTM-9.0-dev0/source/Lib/TLibEncoder/TEncGOP.cpp

Timestamp:

9 Dec 2013, 17:16:03 (10 years ago)

Author:

tech

Message:

MV HEVC 6 HLS changes.

File:

• branches/HTM-9.0-dev0/source/Lib/TLibEncoder/TEncGOP.cpp (modified) (4 diffs)

branches/HTM-9.0-dev0/source/Lib/TLibEncoder/TEncGOP.cpp

@@ -664 +664 @@
     refPicListModification->setRefPicListModificationFlagL1(0);
 #if H_MV
+#if H_MV_6_RALS_O0149_11
+    if ( pcSlice->getPPS()->getNumExtraSliceHeaderBits() > 0 )
+#else
     if ( pcSlice->getPPS()->getNumExtraSliceHeaderBits() > 1 )
+#endif
     {
       // Some more sophisticated algorithm to determine discardable_flag might be added here. 
@@ -673 +677 @@
     Int numDirectRefLayers = vps    ->getNumDirectRefLayers( getLayerId() ); 
     GOPEntry gopEntry      = m_pcCfg->getGOPEntry( (pcSlice->getRapPicFlag() && getLayerId() > 0) ? MAX_GOP : iGOPid );     
-    
+
+#if H_MV_6_ILDDS_ILREFPICS_27_34
+    Bool interLayerPredLayerIdcPresentFlag = false; 
+#endif
     if ( getLayerId() > 0 && !vps->getAllRefLayersActiveFlag() && numDirectRefLayers > 0 )
     {         
@@ -685 +692 @@
         if ( gopEntry.m_numActiveRefLayerPics != vps->getNumDirectRefLayers( getLayerId() ) )
         {        
+#if H_MV_6_ILDDS_ILREFPICS_27_34
+          interLayerPredLayerIdcPresentFlag = true; 
+#endif
           for (Int i = 0; i < gopEntry.m_numActiveRefLayerPics; i++ )
           {
@@ -692 +702 @@
       }
     }
+#if H_MV_6_ILDDS_ILREFPICS_27_34
+    if ( !interLayerPredLayerIdcPresentFlag )
+    {
+      for( Int i = 0; i < pcSlice->getNumActiveRefLayerPics(); i++ )   
+      {
+        pcSlice->setInterLayerPredLayerIdc(i, pcSlice->getRefLayerPicIdc( i ) );
+      }
+    }
+#endif
+
+
     assert( pcSlice->getNumActiveRefLayerPics() == gopEntry.m_numActiveRefLayerPics );