Changeset 760 in SHVCSoftware for branches

Timestamp:

30 Apr 2014, 00:44:54 (11 years ago)

Author:

seregin

Message:

add pps extension flag

Location:

branches/SHM-6-dev/source/Lib

Files:

• TLibCommon/TComSlice.cpp (modified) (2 diffs)
• TLibCommon/TComSlice.h (modified) (4 diffs)
• TLibDecoder/TDecCAVLC.cpp (modified) (2 diffs)
• TLibEncoder/TEncCavlc.cpp (modified) (1 diff)
• TLibEncoder/TEncTop.cpp (modified) (2 diffs)

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

@@ -3073 +3073 @@
 , m_listsModificationPresentFlag(  0)
 , m_numExtraSliceHeaderBits(0)
+#if SVC_EXTENSION
+, m_extensionFlag(false)
 #if SCALINGLIST_INFERRING
+, m_layerId(0)
 , m_inferScalingListFlag ( false )
 , m_scalingListRefLayerId ( 0 )
@@ -3085 +3088 @@
 , m_nCGSOutputBitDepthC(0)
 #endif
+#endif //SVC_EXTENSION
 {
   m_scalingList = new TComScalingList;

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

@@ -1738 +1738 @@
 
 #if SVC_EXTENSION
+  Bool     m_extensionFlag;
 #if SCALINGLIST_INFERRING
   UInt     m_layerId;
@@ -1864 +1865 @@
 
 #if SCALINGLIST_INFERRING
-  UInt     getLayerId() { return m_layerId; }
-  Void     setLayerId( UInt layerId ) { m_layerId = layerId;            }
-  Bool     getInferScalingListFlag()  { return m_inferScalingListFlag;  }
-  UInt     getScalingListRefLayerId() { return m_scalingListRefLayerId; }
-  Void     setInferScalingListFlag( Bool flag )     { m_inferScalingListFlag = flag;     }
-  Void     setScalingListRefLayerId( UInt layerId ) { m_scalingListRefLayerId = layerId; }
-#endif
-
-#if SCALINGLIST_INFERRING
   Void     setScalingList( TComScalingList *scalingList ) { m_scalingList = scalingList; }
 #else
@@ -1888 +1880 @@
   Bool getSliceHeaderExtensionPresentFlag   ()                    { return m_sliceHeaderExtensionPresentFlag; }
   Void setSliceHeaderExtensionPresentFlag   (Bool val)            { m_sliceHeaderExtensionPresentFlag = val; }
+#if SVC_EXTENSION
+  Int     getExtensionFlag()                { return m_extensionFlag;  }
+  Void    setExtensionFlag(Int n)           { m_extensionFlag = n;     }
+#if SCALINGLIST_INFERRING
+  UInt     getLayerId() { return m_layerId; }
+  Void     setLayerId( UInt layerId ) { m_layerId = layerId;            }
+  Bool     getInferScalingListFlag()  { return m_inferScalingListFlag;  }
+  UInt     getScalingListRefLayerId() { return m_scalingListRefLayerId; }
+  Void     setInferScalingListFlag( Bool flag )     { m_inferScalingListFlag = flag;     }
+  Void     setScalingListRefLayerId( UInt layerId ) { m_scalingListRefLayerId = layerId; }
+#endif
 #if POC_RESET_IDC
   Bool getPocResetInfoPresentFlag   ()                    { return m_pocResetInfoPresentFlag; }
@@ -1900 +1903 @@
   Void    setCGSOutputBitDepthC(Int n){ m_nCGSOutputBitDepthC = n;     }
 #endif
+#endif //SVC_EXTENSION
 };
 

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

@@ -340 +340 @@
   READ_FLAG( uiCode, "pps_extension_flag");
 #if POC_RESET_INFO_INFERENCE
-  Bool ppsExtensionFlag = uiCode ? true : false;
-  if( ppsExtensionFlag )
+  pcPPS->setExtensionFlag( uiCode ? true : false );
+
+  if( pcPPS->getExtensionFlag() )
 #else
   if (uiCode)
@@ -391 +392 @@
   }
 #if POC_RESET_INFO_INFERENCE
-  if( !ppsExtensionFlag )
+  if( !pcPPS->getExtensionFlag() )
   {
     pcPPS->setPocResetInfoPresentFlag( false );

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

@@ -256 +256 @@
   WRITE_FLAG( pcPPS->getSliceHeaderExtensionPresentFlag() ? 1 : 0, "slice_segment_header_extension_present_flag");
 #if P0166_MODIFIED_PPS_EXTENSION
-  WRITE_FLAG( 1, "pps_extension_flag" );
-  if( 1 ) //pps_extension_flag
+  WRITE_FLAG( pcPPS->getExtensionFlag() ? 1 : 0, "pps_extension_flag" );
+
+  if( pcPPS->getExtensionFlag() )
   {
 #if !POC_RESET_IDC

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

@@ -1171 +1171 @@
   }
 #if SVC_EXTENSION
-  if (!m_layerId)
+  if( m_layerId > 0 )
+  {
+    m_cPPS.setListsModificationPresentFlag(true);
+    m_cPPS.setExtensionFlag(true);
+  }
+  else
   {
     m_cPPS.setListsModificationPresentFlag(false);
-  }
-  else
-  {
-    m_cPPS.setListsModificationPresentFlag(true);
-  }
-
-  m_cPPS.setPPSId         ( m_iPPSIdCnt         );
-  m_cPPS.setSPSId         ( m_iSPSIdCnt         );
-#endif
+    m_cPPS.setExtensionFlag(false);
+  }
+
+  m_cPPS.setPPSId( m_iPPSIdCnt );
+  m_cPPS.setSPSId( m_iSPSIdCnt );
 #if POC_RESET_FLAG
   m_cPPS.setNumExtraSliceHeaderBits( 2 );
@@ -1195 +1196 @@
   m_cPPS.setCGSFlag( m_nCGSFlag );
 #endif
+#endif //SVC_EXTENSION
 }