Changeset 187 in SHVCSoftware for branches/SHM-2.0-dev/source/Lib

Timestamp:

12 May 2013, 18:11:47 (12 years ago)

Author:

seregin

Message:

enable zero number of direct references, fix for AVC base YUV input

Location:

branches/SHM-2.0-dev/source/Lib

Files:

• TLibCommon/TComSlice.cpp (modified) (2 diffs)
• TLibCommon/TComUpsampleFilter.cpp (modified) (2 diffs)
• TLibCommon/TypeDef.h (modified) (1 diff)
• TLibDecoder/TDecCu.cpp (modified) (1 diff)
• TLibDecoder/TDecTop.cpp (modified) (2 diffs)
• TLibEncoder/TEncGOP.cpp (modified) (5 diffs)
• TLibEncoder/TEncTop.cpp (modified) (1 diff)

branches/SHM-2.0-dev/source/Lib/TLibCommon/TComSlice.cpp

@@ -461 +461 @@
 
 #if REF_IDX_FRAMEWORK
+#if ZERO_NUM_DIRECT_LAYERS
+  if( m_layerId == 0 || ( m_layerId > 0 && ( m_activeNumILRRefIdx == 0 || !((getNalUnitType() >= NAL_UNIT_CODED_SLICE_BLA_W_LP) && (getNalUnitType() <= NAL_UNIT_CODED_SLICE_CRA)) ) ) )
+#else
   if ((getLayerId() == 0) || 
       ((getSPS()->getLayerId()) &&  !((getNalUnitType() >= NAL_UNIT_CODED_SLICE_BLA_W_LP) &&
        (getNalUnitType() <= NAL_UNIT_CODED_SLICE_CRA)) )
      )
+#endif
   {
 #endif
@@ -516 +520 @@
   //inter-layer reference picture
 #if REF_IDX_MFM
+#if ZERO_NUM_DIRECT_LAYERS
+  if( m_layerId > 0 && m_activeNumILRRefIdx > 0 )
+#else
   if (getLayerId())
+#endif
   {
     if(!(getNalUnitType() >= NAL_UNIT_CODED_SLICE_BLA_W_LP && getNalUnitType() <= NAL_UNIT_CODED_SLICE_CRA) && getSPS()->getMFMEnabledFlag())

branches/SHM-2.0-dev/source/Lib/TLibCommon/TComUpsampleFilter.cpp

@@ -437 +437 @@
 #if SCALED_REF_LAYER_OFFSETS
       // Only increase the x position of reference upsample picture when within the window
-      // "-2" to ensure that pointer doesn't go beyond the boundeary rightEndL-1
+      // "-2" to ensure that pointer doesn't go beyond the boundary rightEndL-1
       if( (i >= leftStartL) && (i <= rightEndL-2) )
       {
@@ -605 +605 @@
 #if SCALED_REF_LAYER_OFFSETS
       // Only increase the x position of reference upsample picture when within the window
-      // "-2" to ensure that pointer doesn't go beyond the boundeary rightEndC-1
+      // "-2" to ensure that pointer doesn't go beyond the boundary rightEndC-1
       if( (i >= leftStartC) && (i <= rightEndC-2) )
       {

branches/SHM-2.0-dev/source/Lib/TLibCommon/TypeDef.h

@@ -90 +90 @@
 #define REF_IDX_MFM                      1      ///< L0336: motion vector mapping of inter-layer reference picture
 #define JCTVC_M0458_INTERLAYER_RPS_SIG   1      ///< implementation of JCTVC-L0178 (currently only one reference layer is supported )
+#if JCTVC_M0458_INTERLAYER_RPS_SIG
+#define ZERO_NUM_DIRECT_LAYERS           1      ///< support of zero direct reference layers
+#endif
 #else
 #define INTRA_BL                         1      ///< inter-layer texture prediction

branches/SHM-2.0-dev/source/Lib/TLibDecoder/TDecCu.cpp

@@ -370 +370 @@
   m_pcEntropyDecoder->decodePredInfo( pcCU, uiAbsPartIdx, uiDepth, m_ppcCU[uiDepth]);
 #endif
-  
+
   // Coefficient decoding
   Bool bCodeDQP = getdQPFlag();

branches/SHM-2.0-dev/source/Lib/TLibDecoder/TDecTop.cpp

@@ -1268 +1268 @@
   if( vps->getNumDirectRefLayers( m_layerId ) <= 0 )
   {
+#if ZERO_NUM_DIRECT_LAYERS
+    return (TDecTop *)getLayerDec( 0 );
+#else
     return NULL;
+#endif
   }
 
@@ -1276 +1280 @@
   assert( vps->getMaxOneActiveRefLayerFlag() == 1 );
 #endif 
-
-
+  
   return (TDecTop *)getLayerDec( vps->getRefLayerId( m_layerId, 0 ) );
 }

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

@@ -556 +556 @@
       pcSlice->setNalUnitType(NAL_UNIT_CODED_SLICE_CRA);
     }
+#if ZERO_NUM_DIRECT_LAYERS
+    if( m_layerId > 0 && pcSlice->getActiveNumILRRefIdx() == 0 && pcSlice->getNalUnitType() >= NAL_UNIT_CODED_SLICE_BLA_W_LP && pcSlice->getNalUnitType() <= NAL_UNIT_CODED_SLICE_CRA )
+    {
+      pcSlice->setSliceType(I_SLICE);
+    }
+    else
+#endif
     if( m_layerId > 0 && !m_pcEncTop->getElRapSliceTypeB() )
     {
@@ -657 +664 @@
 
 #if REF_IDX_FRAMEWORK
+#if ZERO_NUM_DIRECT_LAYERS
+    if( m_layerId > 0 && pcSlice->getActiveNumILRRefIdx() )
+#else
     if(m_layerId > 0)
+#endif
     {
 #if JCTVC_M0458_INTERLAYER_RPS_SIG
@@ -690 +701 @@
 
 #if SVC_EXTENSION      
+#if ZERO_NUM_DIRECT_LAYERS
+    if( m_layerId > 0 && pcSlice->getActiveNumILRRefIdx() )
+#else
     if(m_layerId > 0)
+#endif
     {
 #if !IDR_ALIGNMENT
@@ -723 +738 @@
     //  Set reference list
 #if REF_IDX_FRAMEWORK
+#if ZERO_NUM_DIRECT_LAYERS
+    if(m_layerId ==  0 || ( m_layerId > 0 && pcSlice->getActiveNumILRRefIdx() == 0 ) )
+#else
     if(m_layerId ==  0)
+#endif
     {
       pcSlice->setRefPicList( rcListPic);
@@ -731 +750 @@
 #endif
 #if REF_IDX_FRAMEWORK
+#if ZERO_NUM_DIRECT_LAYERS
+    if( m_layerId > 0 && pcSlice->getActiveNumILRRefIdx() )
+#else
     if(m_layerId > 0)
+#endif
     {
       m_pcEncTop->setILRPic(pcPic);

branches/SHM-2.0-dev/source/Lib/TLibEncoder/TEncTop.cpp

@@ -1193 +1193 @@
   if( m_ppcTEncTop[m_layerId]->getNumDirectRefLayers() <= 0 )
   {
+#if ZERO_NUM_DIRECT_LAYERS
+    return (TEncTop *)getLayerEnc( 0 );
+#else
     return NULL;
+#endif
   }