Changeset 769 in 3DVCSoftware for branches/HTM-9.2-dev0/source/Lib/TLibDecoder/TDecTop.cpp

Timestamp:

13 Jan 2014, 08:05:57 (10 years ago)

Author:

tech

Message:

Further fixes.

File:

• branches/HTM-9.2-dev0/source/Lib/TLibDecoder/TDecTop.cpp (modified) (10 diffs)

branches/HTM-9.2-dev0/source/Lib/TLibDecoder/TDecTop.cpp

@@ -725 +725 @@
 #endif
 
+#if H_MV
     xCeckNoClrasOutput();
+#endif
     // Skip pictures due to random access
     if (isRandomAccessSkipPicture(iSkipFrame, iPOCLastDisplay))
@@ -731 +733 @@
     m_prevSliceSkipped = true;
     m_skippedPOC = m_apcSlicePilot->getPOC();
-      sliceSkippedFlag = true; 
+#if H_MV
+    sliceSkippedFlag = true; 
+#endif
       return false;
     }
@@ -739 +743 @@
     m_prevSliceSkipped = true;
     m_skippedPOC = m_apcSlicePilot->getPOC();
-      sliceSkippedFlag = true; 
+#if H_MV
+    sliceSkippedFlag = true; 
+#endif
       return false;
     }
@@ -1273 +1279 @@
     return true;
   }
+#if H_MV
   else if ( !m_layerInitilizedFlag[ m_layerId ] ) // start of random access point, m_pocRandomAccess has not been set yet.
+#else
+  else if (m_pocRandomAccess == MAX_INT) // start of random access point, m_pocRandomAccess has not been set yet.
+#endif
   {
     if (   m_apcSlicePilot->getNalUnitType() == NAL_UNIT_CODED_SLICE_CRA
@@ -1281 +1291 @@
     {
 
+#if H_MV
       if ( xAllRefLayersInitilized() )
       {
@@ -1290 +1301 @@
         return true; 
       }
+#else
+      // set the POC random access since we need to skip the reordered pictures in the case of CRA/CRANT/BLA/BLANT.
+      m_pocRandomAccess = m_apcSlicePilot->getPOC();
+#endif
     }
     else if ( m_apcSlicePilot->getNalUnitType() == NAL_UNIT_CODED_SLICE_IDR_W_RADL || m_apcSlicePilot->getNalUnitType() == NAL_UNIT_CODED_SLICE_IDR_N_LP )
     {
+#if H_MV
       if ( xAllRefLayersInitilized() )
       {
         m_layerInitilizedFlag[ m_layerId ] = true; 
+        m_pocRandomAccess = -MAX_INT; // no need to skip the reordered pictures in IDR, they are decodable.
+      }
+      else 
+      {
+        return true; 
+      }
+#else
       m_pocRandomAccess = -MAX_INT; // no need to skip the reordered pictures in IDR, they are decodable.
+#endif
     }
     else 
     {
-        return true; 
-      }
-    }
-    else 
-    {
+#if H_MV_FIX_SKIP_PICTURES
       static Bool warningMessage[MAX_NUM_LAYERS];
       static Bool warningInitFlag = false;
@@ -1322 +1342 @@
         warningMessage[m_layerId] = false; 
       }
+#else
+      static Bool warningMessage = false;
+      if(!warningMessage)
+      {
+        printf("\nWarning: this is not a valid random access point and the data is discarded until the first CRA picture");
+        warningMessage = true;
+      }
+#endif
       return true;
     }
@@ -1331 +1359 @@
     return true;
   }
+#if H_MV
   return !m_layerInitilizedFlag[ getLayerId() ]; 
+#else
+  // if we reach here, then the picture is not skipped.
+  return false; 
+#endif
 }
 
@@ -1373 +1406 @@
 }
 
+#if H_MV
 Void TDecTop::xCeckNoClrasOutput()
 {
@@ -1407 +1441 @@
 }
 #endif
+#endif
 //! \}