Changeset 623 in SHVCSoftware

Timestamp:

7 Mar 2014, 03:23:54 (11 years ago)

Author:

qualcomm

Message:

JCTVC-P0041 (partial): Signal poc_reset_info_present_flag (Macro: POC_RESET_IDC)

Includes signalling of poc_reset_info_present_flag, and fix a bug in value of pps_extension_type_flag. Usage of this flag poc_reset_info_present_flag will be submitted in a later commit.

From: Adarsh K. Ramasubramonian <aramasub@…>

Location:

branches/SHM-5.1-dev/source/Lib

Files:

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

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

@@ -2738 +2738 @@
 , m_scalingListRefLayerId ( 0 )
 #endif
+#if POC_RESET_IDC
+, m_pocResetInfoPresentFlag   (false)
+#endif
 {
   m_scalingList = new TComScalingList;

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

@@ -1656 +1656 @@
   UInt     m_scalingListRefLayerId;
 #endif
+#if POC_RESET_IDC
+  Bool     m_pocResetInfoPresentFlag;
+#endif
 #endif
 
@@ -1793 +1796 @@
   Bool getSliceHeaderExtensionPresentFlag   ()                    { return m_sliceHeaderExtensionPresentFlag; }
   Void setSliceHeaderExtensionPresentFlag   (Bool val)            { m_sliceHeaderExtensionPresentFlag = val; }
+#if POC_RESET_IDC
+  Bool getPocResetInfoPresentFlag   ()                    { return m_pocResetInfoPresentFlag; }
+  Void setPocResetInfoPresentFlag   (const Bool val)      { m_pocResetInfoPresentFlag = val; }
+#endif
 };
 

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

@@ -87 +87 @@
 #define VPS_NUH_LAYER_ID                 1      ///< JCTVC-N0085: Assert that the nuh_layer_id of VPS NAL unit should be 0
 #define POC_RESET_FLAG                   1      ///< JCTVC-N0244: POC reset flag for  layer pictures.
+#define POC_RESET_IDC                    1      ///< JCTVC-P0041: Include poc_reset_idc and related derivation - eventually will replace POC_RESET_FLAG
 #define ALIGN_TSA_STSA_PICS              1      ///< JCTVC-N0084: Alignment of TSA and STSA pictures across AU.
 #define REPN_FORMAT_IN_VPS               1      ///< JCTVC-N0092: Signal represenation format (spatial resolution, bit depth, colour format) in the VPS

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

@@ -340 +340 @@
       READ_FLAG( ppsExtensionTypeFlag[i], "pps_extension_type_flag" );
     }
+#if !POC_RESET_IDC
     if (ppsExtensionTypeFlag[1])
     {
+#else
+    if( ppsExtensionTypeFlag[0] )
+    {
+      READ_FLAG( uiCode, "poc_reset_info_present_flag" );
+      pcPPS->setPocResetInfoPresentFlag(uiCode ? true : false);
+#endif
     }
     if (ppsExtensionTypeFlag[7])

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

@@ -255 +255 @@
   if( 1 ) //pps_extension_flag
   {
+#if !POC_RESET_IDC
     UInt ppsExtensionTypeFlag[8] = { 0, 1, 0, 0, 0, 0, 0, 0 };
+#else
+    UInt ppsExtensionTypeFlag[8] = { 1, 0, 0, 0, 0, 0, 0, 0 };
+#endif
     for (UInt i = 0; i < 8; i++)
     {
       WRITE_FLAG( ppsExtensionTypeFlag[i], "pps_extension_type_flag" );
     }
+#if !POC_RESET_IDC
+    if( ppsExtensionTypeFlag[0] )
+    {
+#else
     if( ppsExtensionTypeFlag[1] )
     {
+      WRITE_FLAG( pcPPS->getPocResetInfoPresentFlag() ? 1 : 0, "poc_reset_info_present_flag" );
+#endif
     }
   }