Changeset 461 in SHVCSoftware for branches

Timestamp:

12 Nov 2013, 16:01:31 (11 years ago)

Author:

qualcomm

Message:

Calculation of VPS extension offset (MACRO: VPS_EXTN_OFFSET_CALC)

From: Adarsh K. Ramasubramonian <aramasub@…>

Location:

branches/SHM-4.0-dev/source

Files:

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

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

@@ -1133 +1133 @@
   vps->setSingleLayerForNonIrapFlag(m_adaptiveResolutionChange > 0 ? true : false);
 #endif
+#if !VPS_EXTN_OFFSET_CALC
 #if VPS_EXTN_OFFSET
   // to be updated according to the current semantics
   vps->setExtensionOffset( 0xffff );
+#endif
 #endif
 #else //SVC_EXTENSION

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

@@ -92 +92 @@
 
 #define VPS_EXTN_OFFSET                  1      ///< implementation of vps_extension_offset syntax element
+#define VPS_EXTN_OFFSET_CALC             1      ///< Calculation of VPS extension offset
 #define SPS_PTL_FIX                      1      ///< remove profile_tier_level from enhancement layer SPS
 

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

@@ -700 +700 @@
 Void TEncCavlc::codeVPS( TComVPS* pcVPS )
 {
+#if VPS_EXTN_OFFSET_CALC
+  UInt numBytesInVps = this->m_pcBitIf->getNumberOfWrittenBits();
+#endif
   WRITE_CODE( pcVPS->getVPSId(),                    4,        "vps_video_parameter_set_id" );
   WRITE_CODE( 3,                                    2,        "vps_reserved_three_2bits" );
@@ -803 +806 @@
       WRITE_FLAG(1,                  "vps_extension_alignment_bit_equal_to_one");
     }
+#if VPS_EXTN_OFFSET_CALC
+    Int vpsExntOffsetValueInBits = this->m_pcBitIf->getNumberOfWrittenBits() - numBytesInVps + 16; // 2 bytes for NUH
+    assert( vpsExntOffsetValueInBits % 8 == 0 );
+    pcVPS->setExtensionOffset( vpsExntOffsetValueInBits >> 3 );
+#endif
     codeVPSExtension(pcVPS);
     WRITE_FLAG( 0,                     "vps_extension2_flag" );   // Flag value of 1 reserved

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

@@ -1683 +1683 @@
       OutputNALUnit nalu(NAL_UNIT_VPS);
 #endif
+#if VPS_EXTN_OFFSET_CALC
+      OutputNALUnit tempNalu(NAL_UNIT_VPS, 0, 0        ); // The value of nuh_layer_id of VPS NAL unit shall be equal to 0.
+      m_pcEntropyCoder->setBitstream(&tempNalu.m_Bitstream);
+      m_pcEntropyCoder->encodeVPS(m_pcEncTop->getVPS());  // Use to calculate the VPS extension offset
+#endif
       m_pcEntropyCoder->setBitstream(&nalu.m_Bitstream);
       m_pcEntropyCoder->encodeVPS(m_pcEncTop->getVPS());