Ticket #1282: fix_1282.patch

source/Lib/TLibEncoder/TEncCfg.h

@@ -66 +66 @@
   Bool m_interRPSPrediction;
 #endif
   Int m_deltaRPS;
   Int m_numRefIdc;
   Int m_refIdc[MAX_NUM_REF_PICS+1];
+  Bool m_isEncoded;
   GOPEntry()
   : m_POC(-1)
   , m_QPOffset(0)
   , m_QPFactor(0)
   , m_tcOffsetDiv2(0)
@@ -80 +81 @@
   , m_sliceType('P')
   , m_numRefPics(0)
   , m_interRPSPrediction(false)
   , m_deltaRPS(0)
   , m_numRefIdc(0)
+  , m_isEncoded(false)
   {
     ::memset( m_referencePics, 0, sizeof(m_referencePics) );
     ::memset( m_usedByCurrPic, 0, sizeof(m_usedByCurrPic) );
     ::memset( m_refIdc,        0, sizeof(m_refIdc) );
   }
@@ -396 +398 @@
   Void      setDecodingRefreshType          ( Int   i )      { m_uiDecodingRefreshType = (UInt)i; }
   Void      setGOPSize                      ( Int   i )      { m_iGOPSize = i; }
   Void      setGopList                      ( GOPEntry*  GOPList ) {  for ( Int i = 0; i < MAX_GOP; i++ ) m_GOPList[i] = GOPList[i]; }
   Void      setExtraRPSs                    ( Int   i )      { m_extraRPSs = i; }
   GOPEntry  getGOPEntry                     ( Int   i )      { return m_GOPList[i]; }
+  Void      setEncodedFlag                  ( Int  i, Bool value )  { m_GOPList[i].m_isEncoded = value; }
   Void      setMaxDecPicBuffering           ( UInt u, UInt tlayer ) { m_maxDecPicBuffering[tlayer] = u;    }
   Void      setNumReorderPics               ( Int  i, UInt tlayer ) { m_numReorderPics[tlayer] = i;    }
 
   Void      setQP                           ( Int   i )      { m_iQP = i; }
 

source/Lib/TLibEncoder/TEncGOP.cpp

@@ -609 +609 @@
         }
       }
     }
   }
 #endif
+  // reset flag indicating whether pictures have been encoded
+  for ( Int iGOPid=0; iGOPid < m_iGopSize; iGOPid++ )
+  {
+    m_pcCfg->setEncodedFlag(iGOPid, false);
+  }
 
   for ( Int iGOPid=0; iGOPid < m_iGopSize; iGOPid++ )
   {
 #if EFFICIENT_FIELD_IRAP
     if(IRAPtoReorder)
@@ -1876 +1881 @@
       /* insert the SEI message NALUnit before any Slice NALUnits */
       AccessUnit::iterator it = find_if(accessUnit.begin(), accessUnit.end(), mem_fun(&NALUnit::isSlice));
       accessUnit.insert(it, new NALUnitEBSP(nalu));
     }
 
+    m_pcCfg->setEncodedFlag(iGOPid, true);
     xCalculateAddPSNR( pcPic, pcPic->getPicYuvRec(), accessUnit, dEncTime, snr_conversion, printFrameMSE );
 
     //In case of field coding, compute the interlaced PSNR for both fields
-    if (isField && ((!pcPic->isTopField() && isTff) || (pcPic->isTopField() && !isTff)) && (pcPic->getPOC()%m_iGopSize != 1))
+    if(isField)
     {
-      //get complementary top field
-
-      TComList<TComPic*>::iterator   iterPic = rcListPic.begin();
-      while ((*iterPic)->getPOC() != pcPic->getPOC()-1)
+      Bool bothFieldsAreEncoded = false;
+      Int correspondingFieldPOC = pcPic->getPOC();
+      Int currentPicGOPPoc = m_pcCfg->getGOPEntry(iGOPid).m_POC;
+      if(pcPic->getPOC() == 0)
+      {
+        // particular case for POC 0 and 1. 
+        // If they are not encoded first and separaltely from other pictures, we need to change this 
+        // POC 0 is always encoded first then POC 1 is encoded
+        bothFieldsAreEncoded = false;
+      }
+      else if(pcPic->getPOC() == 1)
+      {
+        // if we are at POC 1, POC 0 has been encoded for sure
+        correspondingFieldPOC = 0;
+        bothFieldsAreEncoded = true;
+      }
+      else 
       {
-        iterPic ++;
+        if(pcPic->getPOC()%2 == 1)
+        {
+            correspondingFieldPOC -= 1; // all odd POC are associated with the preceding even POC (e.g poc 1 is associated to poc 0)
+            currentPicGOPPoc      -= 1;
       }
-      TComPic* pcPicFirstField = *(iterPic);
-      xCalculateInterlacedAddPSNR(pcPicFirstField, pcPic, pcPicFirstField->getPicYuvRec(), pcPic->getPicYuvRec(), accessUnit, dEncTime, snr_conversion, printFrameMSE );
+        else
+        {
+            correspondingFieldPOC += 1; // all even POC are associated with the following odd POC (e.g poc 0 is associated to poc 1)
+            currentPicGOPPoc      += 1;
     }
-    else if (isField && pcPic->getPOC()!= 0 && (pcPic->getPOC()%m_iGopSize == 0))
+        for(Int i = 0; i < m_iGopSize; i ++)
     {
-      //get complementary bottom field
+          if(m_pcCfg->getGOPEntry(i).m_POC == currentPicGOPPoc)
+          {
+            bothFieldsAreEncoded = m_pcCfg->getGOPEntry(i).m_isEncoded;
+            break;
+          }
+        }
+      }
 
+      if(bothFieldsAreEncoded)
+      {        
+        //get complementary top field
       TComList<TComPic*>::iterator   iterPic = rcListPic.begin();
-      while ((*iterPic)->getPOC() != pcPic->getPOC()+1)
+        while ((*iterPic)->getPOC() != correspondingFieldPOC)
       {
         iterPic ++;
       }
-      TComPic* pcPicFirstField = *(iterPic);
-      xCalculateInterlacedAddPSNR(pcPic, pcPicFirstField, pcPic->getPicYuvRec(), pcPicFirstField->getPicYuvRec(), accessUnit, dEncTime, snr_conversion, printFrameMSE );
+        TComPic* correspondingFieldPic = *(iterPic);
+
+        if(pcPic->isTopField() && isTff || !pcPic->isTopField() && !isTff)
+        {
+          xCalculateInterlacedAddPSNR(pcPic, correspondingFieldPic, pcPic->getPicYuvRec(), correspondingFieldPic->getPicYuvRec(), accessUnit, dEncTime, snr_conversion, printFrameMSE );
+        }
+        else
+        {
+          xCalculateInterlacedAddPSNR(correspondingFieldPic, pcPic, correspondingFieldPic->getPicYuvRec(), pcPic->getPicYuvRec(), accessUnit, dEncTime, snr_conversion, printFrameMSE );
+        }
+      }
     }
 
     if (!digestStr.empty())
     {
       if(m_pcCfg->getDecodedPictureHashSEIEnabled() == 1)