Changeset 297 in SHVCSoftware for branches/SHM-2.1-dev/source/Lib/TLibEncoder

Timestamp:

20 Jun 2013, 22:40:50 (11 years ago)

Author:

vidyo

Message:

Implementation of inter_layer_sample_pred_only_flag part of M0457. The code is disabled by default. Enable by setting M0457_IL_SAMPLE_PRED_ONLY_FLAG to 1.

Location:

branches/SHM-2.1-dev/source/Lib/TLibEncoder

Files:

• TEncCavlc.cpp (modified) (1 diff)
• TEncCu.cpp (modified) (1 diff)
• TEncGOP.cpp (modified) (2 diffs)
• TEncTop.h (modified) (2 diffs)

branches/SHM-2.1-dev/source/Lib/TLibEncoder/TEncCavlc.cpp

@@ -1119 +1119 @@
       }
     }     
+#if M0457_IL_SAMPLE_PRED_ONLY_FLAG
+    if( pcSlice->getNumSamplePredRefLayers() > 0 && pcSlice->getActiveNumILRRefIdx() > 0 )
+    {
+      WRITE_FLAG( pcSlice->getInterLayerSamplePredOnlyFlag(), "inter_layer_sample_pred_only_flag" );
+    }
+#endif
 #endif 
 

branches/SHM-2.1-dev/source/Lib/TLibEncoder/TEncCu.cpp

@@ -463 +463 @@
         if(pcSlice->getSliceType() == B_SLICE && pcSlice->getNumRefIdx(REF_PIC_LIST_0) == pcSlice->getActiveNumILRRefIdx() && pcSlice->getNumRefIdx(REF_PIC_LIST_1) == pcSlice->getActiveNumILRRefIdx()) 
             testInter = false;
+#if M0457_IL_SAMPLE_PRED_ONLY_FLAG
+        if( pcSlice->getInterLayerSamplePredOnlyFlag() ) 
+            testInter = false; 
+#endif
     }
 #endif

branches/SHM-2.1-dev/source/Lib/TLibEncoder/TEncGOP.cpp

@@ -539 +539 @@
 #endif
 
+#if M0457_IL_SAMPLE_PRED_ONLY_FLAG
+    pcSlice->setNumSamplePredRefLayers( m_pcEncTop->getNumSamplePredRefLayers() );
+    pcSlice->setInterLayerSamplePredOnlyFlag( 0 );
+    if( pcSlice->getNumSamplePredRefLayers() > 0 && pcSlice->getActiveNumILRRefIdx() > 0 )
+    {
+      if( m_pcEncTop->getIlSampleOnlyPred() > 0 )
+      {
+        pcSlice->setInterLayerSamplePredOnlyFlag( true );
+      }
+    }
+#endif
+
     pcSlice->setLastIDR(m_iLastIDR);
     pcSlice->setSliceIdx(0);
@@ -923 +935 @@
 #endif
 
+#if M0457_IL_SAMPLE_PRED_ONLY_FLAG
+    if (pcSlice->getSliceType() == B_SLICE && m_pcEncTop->getIlSampleOnlyPred() == 0)
+#else
     if (pcSlice->getSliceType() == B_SLICE)
+#endif
     {
 #if !REF_IDX_FRAMEWORK

branches/SHM-2.1-dev/source/Lib/TLibEncoder/TEncTop.h

@@ -139 +139 @@
   Bool                    m_bMFMEnabledFlag;
 #endif
+#if M0457_IL_SAMPLE_PRED_ONLY_FLAG
+  Int                     m_ilSampleOnlyPred;
+#endif
 #if SCALED_REF_LAYER_OFFSETS
   UInt                    m_numScaledRefLayerOffsets;
@@ -227 +230 @@
   Bool      getMFMEnabledFlag()                   {return m_bMFMEnabledFlag;}    
 #endif
+#if M0457_IL_SAMPLE_PRED_ONLY_FLAG
+  Void      setIlSampleOnlyPred( Int i )          { m_ilSampleOnlyPred = i;    }
+  Int       getIlSampleOnlyPred()                 { return m_ilSampleOnlyPred; }
+#endif
 #if AVC_SYNTAX
   Void      setBLSyntaxFile( fstream* pFile ) { m_pBLSyntaxFile = pFile; }