Changeset 632 in SHVCSoftware

Timestamp:

15 Mar 2014, 08:51:12 (11 years ago)

Author:

qualcomm

Message:

Bugfix to r630 - corrected calculation of SH extension length

From: Adarsh K. Ramasubramonian <aramasub@…>

Location:

branches/SHM-5.1-dev/source/Lib

Files:

• TLibDecoder/TDecCAVLC.cpp (modified) (1 diff)
• TLibEncoder/TEncCavlc.cpp (modified) (3 diffs)

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

@@ -2904 +2904 @@
                                           );
 
-    if( rpcSlice->getPocMsbValRequiredFlag() /* vps_poc_lsb_aligned_flag */ )
+    if( !rpcSlice->getPocMsbValRequiredFlag() /* vps_poc_lsb_aligned_flag */ )
     {
       READ_FLAG( uiCode,    "poc_msb_val_present_flag"); rpcSlice->setPocMsbValPresentFlag( uiCode ? true : false );

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

@@ -264 +264 @@
       WRITE_FLAG( ppsExtensionTypeFlag[i], "pps_extension_type_flag" );
     }
-#if !POC_RESET_IDC
+#if POC_RESET_IDC
     if( ppsExtensionTypeFlag[0] )
-    {
-#else
-    if( ppsExtensionTypeFlag[1] )
     {
       WRITE_FLAG( pcPPS->getPocResetInfoPresentFlag() ? 1 : 0, "poc_reset_info_present_flag" );
@@ -2214 +2211 @@
     {
       shExtnLengthInBit += 2;
-      if (slice->getPocResetIdc() > 0)
-      {
-        shExtnLengthInBit += 6;
-        if (slice->getPocResetIdc() == 3)
-        {
-          shExtnLengthInBit += (slice->getSPS()->getBitsForPOC() + 1);
-        }
-      }
-    }
-
-
-    if ( slice->getPocMsbValRequiredFlag() )
+    }
+    if (slice->getPocResetIdc() > 0)
+    {
+      shExtnLengthInBit += 6;
+    }
+    if (slice->getPocResetIdc() == 3)
+    {
+      shExtnLengthInBit += (slice->getSPS()->getBitsForPOC() + 1);
+    }
+
+
+    if( !slice->getPocMsbValRequiredFlag() /* &&  vps_poc_lsb_aligned_flag */ )
+    {
+      shExtnLengthInBit++;
+    }
+    else
+    {
+      if( slice->getPocMsbValRequiredFlag() )
+      {
+        slice->setPocMsbValPresentFlag( true );
+      }
+      else
+      {
+        slice->setPocMsbValPresentFlag( false );
+      }
+    }
+
+    if( slice->getPocMsbValPresentFlag() )
     {
       Int iMaxPOClsb = 1<< slice->getSPS()->getBitsForPOC();
@@ -2261 +2274 @@
     }
 
-    if( slice->getPocMsbValRequiredFlag() /* vps_poc_lsb_aligned_flag */ )
+    if( !slice->getPocMsbValRequiredFlag() /* &&  vps_poc_lsb_aligned_flag */ )
     {
       WRITE_FLAG( slice->getPocMsbValPresentFlag(),                           "poc_msb_val_present_flag" );