Changeset 409 in SHVCSoftware

Timestamp:

4 Oct 2013, 09:33:05 (11 years ago)

Author:

qualcomm

Message:

software integration of N0147 changes

Location:

branches/SHM-3.1-dev/source

Files:

• App/TAppEncoder/TAppEncTop.cpp (modified) (1 diff)
• Lib/TLibCommon/TComSlice.cpp (modified) (1 diff)
• Lib/TLibCommon/TComSlice.h (modified) (2 diffs)
• Lib/TLibCommon/TypeDef.h (modified) (1 diff)
• Lib/TLibDecoder/TDecCAVLC.cpp (modified) (1 diff)
• Lib/TLibDecoder/TDecTop.cpp (modified) (2 diffs)
• Lib/TLibEncoder/TEncCavlc.cpp (modified) (1 diff)

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

@@ -1059 +1059 @@
     vps->setMaxOneActiveRefLayerFlag(maxDirectRefLayers > 1 ? false : true); 
 #endif 
+#if N0147_IRAP_ALIGN_FLAG    
+    vps->setCrossLayerIrapAlignFlag(maxDirectRefLayers == 0 ? false : true); 
+#endif 
 #if M0040_ADAPTIVE_RESOLUTION_CHANGE
   vps->setSingleLayerForNonIrapFlag(m_adaptiveResolutionChange > 0 ? true : false);

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

@@ -1806 +1806 @@
   m_maxOneActiveRefLayerFlag = true;
 #endif
+#if N0147_IRAP_ALIGN_FLAG
+  m_crossLayerIrapAlignFlag = true;
+#endif 
 #if JCTVC_M0203_INTERLAYER_PRED_IDC
 #if N0120_MAX_TID_REF_PRESENT_FLAG

branches/SHM-3.1-dev/source/Lib/TLibCommon/TComSlice.h

@@ -523 +523 @@
   Bool       m_maxOneActiveRefLayerFlag;
 #endif
+#if N0147_IRAP_ALIGN_FLAG
+  Bool       m_crossLayerIrapAlignFlag;
+#endif
 #if JCTVC_M0203_INTERLAYER_PRED_IDC
   UInt       m_maxTidIlRefPicsPlus1[MAX_VPS_LAYER_ID_PLUS1 - 1];
@@ -719 +722 @@
   Bool   getMaxOneActiveRefLayerFlag()                                          { return m_maxOneActiveRefLayerFlag;                      }
   Void   setMaxOneActiveRefLayerFlag(Bool x)                                    { m_maxOneActiveRefLayerFlag = x;                         }
+#endif 
+#if N0147_IRAP_ALIGN_FLAG
+  Bool   getCrossLayerIrapAlignFlag()                                           { return m_crossLayerIrapAlignFlag;                      }
+  Void   setCrossLayerIrapAlignFlag(Bool x)                                     { m_crossLayerIrapAlignFlag = x;                         }
 #endif 
 #if JCTVC_M0203_INTERLAYER_PRED_IDC

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

@@ -143 +143 @@
 #endif
 
+#define N0147_IRAP_ALIGN_FLAG            1
 #define FAST_INTRA_SHVC                  1      ///< M0115: reduction number of intra modes in the EL (encoder only)
 #if FAST_INTRA_SHVC

branches/SHM-3.1-dev/source/Lib/TLibDecoder/TDecCAVLC.cpp

@@ -1205 +1205 @@
 #endif
 
+#if N0147_IRAP_ALIGN_FLAG
+  READ_FLAG(uiCode, "cross_layer_irap_aligned_flag" );
+  vps->setCrossLayerIrapAlignFlag(uiCode);
+#endif 
+
 #if !VPS_MOVE_DIR_DEPENDENCY_FLAG
 #if VPS_EXTN_DIRECT_REF_LAYERS

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

@@ -757 +757 @@
   // actual decoding starts here
   xActivateParameterSets();
+#if 0 // N0147_IRAP_ALIGN_FLAG Disabled for now!
+  //When cross_layer_irap_aligned_flag is equal to 0, num_extra_slice_header_bits >=1 
+  if( m_layerId > 0 && m_apcSlicePilot->getVPS()->getCrossLayerIrapAlignFlag())
+    assert( m_apcSlicePilot->getPPS()->getNumExtraSliceHeaderBits() > 0);
+  //When cross_layer_irap_aligned_flag is equal to 1, the value of poc_reset_flag shall be equal to 0  
+  // to be added after poc_reset_flag is integrated.
+#endif 
+
 #if REPN_FORMAT_IN_VPS
   // Initialize ILRP if needed, only for the current layer  
@@ -1099 +1107 @@
 #endif //SVC_EXTENSION
 
+#if N0147_IRAP_ALIGN_FLAG
+    if(  m_layerId > 0 && pcSlice->getVPS()->getCrossLayerIrapAlignFlag())
+    {
+      if(pcSlice->isIRAP())
+      {
+        for(Int depedentLayerId = 0; depedentLayerId < pcSlice->getVPS()->getNumDirectRefLayers(m_layerId); depedentLayerId++)
+          assert(pcSlice->getNalUnitType() == pcSlice->getBaseColPic(depedentLayerId)->getSlice(0)->getNalUnitType());
+      }
+    }
+#endif 
     // For generalized B
     // note: maybe not existed case (always L0 is copied to L1 if L1 is empty)

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

@@ -923 +923 @@
       WRITE_FLAG(vps->getMaxOneActiveRefLayerFlag(), "max_one_active_ref_layer_flag");
 #endif 
+#if N0147_IRAP_ALIGN_FLAG
+      WRITE_FLAG(vps->getCrossLayerIrapAlignFlag(), "cross_layer_irap_aligned_flag");
+#endif 
 #if !VPS_MOVE_DIR_DEPENDENCY_FLAG
 #if VPS_EXTN_DIRECT_REF_LAYERS