Ticket #1282: ticket_1282.patch

Lib/TLibEncoder/TEncGOP.cpp

@@ -1753 +1753 @@
     xCalculateAddPSNR( pcPic, pcPic->getPicYuvRec(), accessUnit, dEncTime );
     
     //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 && ( (!pcPic->isTopField() && isTff) || (pcPic->isTopField() && !isTff) ) && (!IRAPtoReorder || (pcPic->getPOC() != m_associatedIRAPPOC)) )
     {
       //get complementary top field
       TComPic* pcPicTop;
@@ -1765 +1765 @@
       pcPicTop = *(iterPic);
       xCalculateInterlacedAddPSNR(pcPicTop, pcPic, pcPicTop->getPicYuvRec(), pcPic->getPicYuvRec(), accessUnit, dEncTime );
     }
-    else if (isField && pcPic->getPOC()!= 0 && (pcPic->getPOC()%m_iGopSize == 0))
+    else if (isField && (IRAPtoReorder && (pcPic->getPOC() == m_associatedIRAPPOC-1) ))
     {
       //get complementary bottom field
       TComPic* pcPicBottom;