Changeset 852 in 3DVCSoftware for branches/HTM-10.0-dev0/source/App/TAppDecoder

Timestamp:

13 Feb 2014, 22:34:17 (11 years ago)

Author:

tech

Message:

Update HM-12.0 -> HM-13.0.

Location:

branches/HTM-10.0-dev0/source/App/TAppDecoder

Files:

• TAppDecCfg.cpp (modified) (1 diff)
• TAppDecCfg.h (modified) (1 diff)
• TAppDecTop.cpp (modified) (7 diffs)
• TAppDecTop.h (modified) (1 diff)
• decmain.cpp (modified) (1 diff)

branches/HTM-10.0-dev0/source/App/TAppDecoder/TAppDecCfg.cpp

@@ -4 +4 @@
  * granted under this license.  
  *
- * Copyright (c) 2010-2013, ITU/ISO/IEC
+* Copyright (c) 2010-2014, ITU/ISO/IEC
  * All rights reserved.
  *

branches/HTM-10.0-dev0/source/App/TAppDecoder/TAppDecCfg.h

@@ -4 +4 @@
  * granted under this license.  
  *
- * Copyright (c) 2010-2013, ITU/ISO/IEC
+* Copyright (c) 2010-2014, ITU/ISO/IEC
  * All rights reserved.
  *

branches/HTM-10.0-dev0/source/App/TAppDecoder/TAppDecTop.cpp

@@ -4 +4 @@
  * granted under this license.  
  *
- * Copyright (c) 2010-2013, ITU/ISO/IEC
+* Copyright (c) 2010-2014, ITU/ISO/IEC
  * All rights reserved.
  *
@@ -165 +165 @@
   Bool firstSlice        = true; 
 #endif
- 
+  Bool loopFiltered      = false;
+
   while (!!bitstreamFile)
   {
@@ -278 +279 @@
           bitstreamFile.seekg(location-streamoff(3));
           bytestream.reset();
+#if H_MV_ENC_DEC_TRAC
 #if ENC_DEC_TRACE
-#if H_MV_ENC_DEC_TRAC
           const Bool resetCounter = false; 
           if ( resetCounter )
@@ -287 +288 @@
           else
           {
-            g_disableHLSTrace = true;     // Trancing of second parsing of SH is not carried out
-          }          
-#else
-          g_nSymbolCounter = symCount;
-#endif
-#endif
-        }
-      }
-    }
-    if (bNewPicture || !bitstreamFile)
-    {
-#if H_MV
-      assert( decIdxLastPic != -1 ); 
-      m_tDecTop[decIdxLastPic]->endPicDecoding(poc, pcListPic, m_targetDecLayerIdSet );
-#else
-      m_cTDecTop.executeLoopFilters(poc, pcListPic);
-#endif
+            g_disableHLSTrace = true;     // Tracing of second parsing of SH is not carried out
+          }      
+#endif
+#endif
+        }
+      }
+    }
+    if (bNewPicture || !bitstreamFile || nalu.m_nalUnitType == NAL_UNIT_EOS )
+    {
+      if (!loopFiltered || bitstreamFile)
+      {
+#if H_MV
+        assert( decIdxLastPic != -1 ); 
+        m_tDecTop[decIdxLastPic]->endPicDecoding(poc, pcListPic, m_targetDecLayerIdSet );
+#else
+        m_cTDecTop.executeLoopFilters(poc, pcListPic);
+#endif
+      }
+      loopFiltered = (nalu.m_nalUnitType == NAL_UNIT_EOS);
     }
 #if H_3D
@@ -351 +354 @@
 #endif
       }
+      if (nalu.m_nalUnitType == NAL_UNIT_EOS)
+      {
+#if H_MV
+        xFlushOutput( pcListPic, decIdxLastPic );
+#else
+        xFlushOutput( pcListPic );
+#endif
+      }
       // write reconstruction to file
       if(bNewPicture)
@@ -462 +473 @@
 #endif
 {
+
+  if (pcListPic->empty())
+  {
+    return;
+  }
+
   TComList<TComPic*>::iterator iterPic   = pcListPic->begin();
   Int numPicsNotYetDisplayed = 0;
@@ -647 +664 @@
 #endif
 {
-  if(!pcListPic)
+  if(!pcListPic || pcListPic->empty())
   {
     return;

branches/HTM-10.0-dev0/source/App/TAppDecoder/TAppDecTop.h

@@ -4 +4 @@
  * granted under this license.  
  *
- * Copyright (c) 2010-2013, ITU/ISO/IEC
+* Copyright (c) 2010-2014, ITU/ISO/IEC
  * All rights reserved.
  *

branches/HTM-10.0-dev0/source/App/TAppDecoder/decmain.cpp

@@ -4 +4 @@
  * granted under this license.  
  *
- * Copyright (c) 2010-2013, ITU/ISO/IEC
+* Copyright (c) 2010-2014, ITU/ISO/IEC
  * All rights reserved.
  *