Ticket #237: patch0.patch

source/App/TAppDecoder/TAppDecTop.cpp

@@ -149 +149 @@
         m_cTVideoIOYuvReconFile.open( m_pchReconFile, true ); // write mode
         recon_opened = true;
       }
+      TComList<TComPic*>::iterator iterPic   = pcListPic->begin();
+      TComPic* pcPic = *(iterPic);
+      if (pcPic->getSlice(0)->getNalUnitType() == NAL_UNIT_CODED_SLICE_IDR) {
+          m_iPOCLastDisplay = 0;
+          xFlushOutput( pcListPic );
+          m_iPOCLastDisplay = -1;
+      }
       // write reconstuction to file
       xWriteOutput( pcListPic );
     }
@@ -204 +211 @@
   while (iterPic != pcListPic->end())
   {
     TComPic* pcPic = *(iterPic);
-    if(pcPic->getReconMark() && pcPic->getPOC() > m_iPOCLastDisplay)
+    if(pcPic->getReconMark() && pcPic->getPOC() > m_iPOCLastDisplay && pcPic->getDisplayMark())
        not_displayed++;
     iterPic++;
   }
@@ -216 +223 @@
     TComPic* pcPic = *(iterPic);
     
 #if G1002_RPS
-    if ( pcPic->getReconMark() && not_displayed >  m_cTDecTop.getSPS()->getMaxNumberOfReorderPictures() && pcPic->getPOC() > m_iPOCLastDisplay)
+    if ( pcPic->getReconMark() && not_displayed >  m_cTDecTop.getSPS()->getMaxNumberOfReorderPictures() && pcPic->getPOC() > m_iPOCLastDisplay && pcPic->getDisplayMark())
     {
       // write to file
        not_displayed--;
@@ -232 +239 @@
       
       // update POC of display order
       m_iPOCLastDisplay = pcPic->getPOC();
+      pcPic->setDisplayMark(false);
       
       // erase non-referenced picture in the reference picture list after display
       if ( !pcPic->getSlice(0)->isReferenced() && pcPic->getReconMark() == true )
@@ -269 +277 @@
   {
     TComPic* pcPic = *(iterPic);
 
-    if ( pcPic->getReconMark() && pcPic->getPOC() > m_iPOCLastDisplay)
+    if ( pcPic->getReconMark() && pcPic->getPOC() > m_iPOCLastDisplay && pcPic->getDisplayMark())
     {
       // write to file
       if ( m_pchReconFile )
@@ -279 +287 @@
       
       // update POC of display order
       m_iPOCLastDisplay = pcPic->getPOC();
+      pcPic->setDisplayMark(false);
       
       // erase non-referenced picture in the reference picture list after display
       if ( !pcPic->getSlice(0)->isReferenced() && pcPic->getReconMark() == true )

source/App/TAppEncoder/TAppEncCfg.cpp

@@ -94 +94 @@
 #if G1002_RPS
 std::istringstream &operator>>(std::istringstream &in, GOPEntry &entry)     //input
 {
+  memset(&entry, 0, sizeof(entry));
   in>>entry.m_iSliceType;
   in>>entry.m_iPOC;
   in>>entry.m_iQPOffset;

source/Lib/TLibCommon/TComPic.h

@@ -69 +69 @@
   TComPicYuv*           m_pcPicYuvResi;           //  Residual
   Bool                  m_bReconstructed;
   UInt                  m_uiCurrSliceIdx;         // Index of current slice
+  Bool                  m_bDisplayed;
   
   SEImessages* m_SEIs; ///< Any SEI messages that have been received.  If !NULL we own the object.
 
@@ -123 +124 @@
   Void          setReconMark (Bool b) { m_bReconstructed = b;     }
   Bool          getReconMark ()       { return m_bReconstructed;  }
   
+  Void          setDisplayMark (Bool b) { m_bDisplayed = b;     }
+  Bool          getDisplayMark ()       { return m_bDisplayed;  }
+
 #if AMVP_BUFFERCOMPRESS
   Void          compressMotion(); 
 #endif 

source/Lib/TLibDecoder/TDecTop.cpp

@@ -201 +201 @@
     // mark it should be extended
     rpcPic->getPicYuvRec()->setBorderExtension(false);
   }
+  rpcPic->setDisplayMark(true);
 }
 
 Void TDecTop::executeDeblockAndAlf(UInt& ruiPOC, TComList<TComPic*>*& rpcListPic, Int& iSkipFrame, Int& iPOCLastDisplay)

source/Lib/TLibEncoder/TEncCavlc.cpp

@@ -491 +491 @@
     {
       WRITE_UVLC( 0, "idr_pic_id" );
       WRITE_FLAG( 0, "no_output_of_prior_pics_flag" );
+      pcSlice->setPOC(0);
     }
     else
     {

source/Lib/TLibEncoder/TEncGOP.cpp

@@ -110 +110 @@
 // ====================================================================================================================
 // Public member functions
 // ====================================================================================================================
-Void TEncGOP::compressGOP( Int iPOCLast, Int iNumPicRcvd, TComList<TComPic*>& rcListPic, TComList<TComPicYuv*>& rcListPicYuvRecOut, std::list<AccessUnit>& accessUnitsInGOP)
+Void TEncGOP::compressGOP( Int& iPOCLast, Int iNumPicRcvd, TComList<TComPic*>& rcListPic, TComList<TComPicYuv*>& rcListPicYuvRecOut, std::list<AccessUnit>& accessUnitsInGOP)
 {
   TComPic*        pcPic;
   TComPicYuv*     pcPicYuvRecOut;
@@ -243 +243 @@
         pcSlice->setSliceType(P_SLICE);
       }
 #endif
+    if (getNalUnitType(uiPOCCurr) == NAL_UNIT_CODED_SLICE_IDR)
+        iPOCLast = 0;
+
       // Set the nal unit type
       pcSlice->setNalUnitType(getNalUnitType(uiPOCCurr));
       // Do decoding refresh marking if any 

source/Lib/TLibEncoder/TEncGOP.h

@@ -116 +116 @@
   virtual ~TEncGOP();
   
   Void  init        ( TEncTop* pcTEncTop );
-  Void  compressGOP ( Int iPOCLast, Int iNumPicRcvd, TComList<TComPic*>& rcListPic, TComList<TComPicYuv*>& rcListPicYuvRec, std::list<AccessUnit>& accessUnitsInGOP );
+  Void  compressGOP ( Int& iPOCLast, Int iNumPicRcvd, TComList<TComPic*>& rcListPic, TComList<TComPicYuv*>& rcListPicYuvRec, std::list<AccessUnit>& accessUnitsInGOP );
   
 #if !G1002_RPS
   Int   getHrchDepth()        { return  m_iHrchDepth; }