Changeset 867 in 3DVCSoftware for branches/HTM-10.0-dev0/source/Lib/TLibDecoder/TDecCAVLC.cpp

Timestamp:

15 Mar 2014, 08:37:13 (10 years ago)

Author:

qualcomm

Message:

POC-related in slice header (Macro: H_MV_HLS_7_POC_P0041)

POC-related signaling in slice header tested and included. Decoding process and encoder assignment in a later patch.

From: Adarsh K. Ramasubramonian <aramasub@…>

File:

• branches/HTM-10.0-dev0/source/Lib/TLibDecoder/TDecCAVLC.cpp (modified) (5 diffs)

branches/HTM-10.0-dev0/source/Lib/TLibDecoder/TDecCAVLC.cpp

@@ -2733 +2733 @@
   if(pps->getSliceHeaderExtensionPresentFlag())
   {
-#if !H_MV_HLS7_GEN    
+#if !H_MV_HLS_7_POC_P0041    
     READ_UVLC(uiCode,"slice_header_extension_length");
     for(Int i=0; i<uiCode; i++)
@@ -2750 +2750 @@
       READ_CODE( 2, uiCode, "poc_reset_idc" ); rpcSlice->setPocResetIdc( uiCode );
     }
+    else
+    {
+      rpcSlice->setPocResetIdc( 0 );
+    }
 
     if( rpcSlice->getPocResetIdc() !=  0 )
     {
       READ_CODE( 6, uiCode, "poc_reset_period_id" ); rpcSlice->setPocResetPeriodId( uiCode );
+    }
+    else
+    {
+      // TODO Copy poc_reset_period from earlier picture
+      rpcSlice->setPocResetPeriodId( 0 );
     }
     
@@ -2762 +2771 @@
     }          
 
-    if( !rpcSlice->getPocMsbValRequiredFlag() &&  rpcSlice->getVPS()->getVpsPocLsbAlignedFlag() )
+    // Derive the value of PocMsbValRequiredFlag
+    rpcSlice->setPocMsbValRequiredFlag( rpcSlice->getCraPicFlag() || rpcSlice->getBlaPicFlag()
+                                          /* || TODO related to vps_poc_lsb_aligned_flag */
+                                          );
+
+    if( !rpcSlice->getPocMsbValRequiredFlag() /* TODO &&  rpcSlice->getVPS()->getVpsPocLsbAlignedFlag() */ )
     {
       READ_FLAG( uiCode, "poc_msb_val_present_flag" ); rpcSlice->setPocMsbValPresentFlag( uiCode == 1 );
     }
+    else
+    {
+      if( rpcSlice->getPocMsbValRequiredFlag() )
+      {
+        rpcSlice->setPocMsbValPresentFlag( true );
+      }
+      else
+      {
+        rpcSlice->setPocMsbValPresentFlag( false );
+      }
+    }
+
     
     if( rpcSlice->getPocMsbValPresentFlag() )
@@ -2772 +2798 @@
     }
 
-    while( ( m_pcBitstream->getNumBitsRead() - posFollSliceSegHeaderExtLen ) < rpcSlice->getSliceSegmentHeaderExtensionLength() * 8 );
+    while( ( m_pcBitstream->getNumBitsRead() - posFollSliceSegHeaderExtLen ) < rpcSlice->getSliceSegmentHeaderExtensionLength() * 8 )
     {
      READ_FLAG( uiCode, "slice_segment_header_extension_data_bit" );
     }
-    assert( m_pcBitstream->getNumBitsRead() - posFollSliceSegHeaderExtLen ) == rpcSlice->getSliceSegmentHeaderExtensionLength() * 8  ); 
+    assert( ( m_pcBitstream->getNumBitsRead() - posFollSliceSegHeaderExtLen ) == rpcSlice->getSliceSegmentHeaderExtensionLength() * 8  ); 
 #else
     READ_UVLC( uiCode, "slice_header_extension_length" );
@@ -2787 +2813 @@
 #endif
 #endif
+  }