From ea406966e04b41cde0ba1160cea408bd7b558d5c Mon Sep 17 00:00:00 2001
From: Haiwei Sun <haiwei.sun@sg.panasonic.com>
Date: Fri, 12 Jun 2020 06:16:22 +0200
Subject: [PATCH] remove macro FIELD_CODING_FIX
---
source/Lib/EncoderLib/EncLib.cpp | 7 -------
1 file changed, 7 deletions(-)
diff --git a/source/Lib/EncoderLib/EncLib.cpp b/source/Lib/EncoderLib/EncLib.cpp
index 4710030a77..943bc9b8bd 100644
--- a/source/Lib/EncoderLib/EncLib.cpp
+++ b/source/Lib/EncoderLib/EncLib.cpp
@@ -876,9 +876,6 @@ bool EncLib::encodePrep( bool flush, PelStorage* pcPicYuvOrg, PelStorage* pcPicY
if( m_iNumPicRcvd && ( flush || m_iPOCLast == 1 || m_iNumPicRcvd == m_iGOPSize ) )
{
m_picIdInGOP = 0;
-#if !FIELD_CODING_FIX
- m_iPOCLast -= 2;
-#endif
keepDoing = false;
}
@@ -891,11 +888,7 @@ bool EncLib::encode( const InputColourSpaceConversion snrCSC, std::list<PelUnitB
for( int fieldNum = 0; fieldNum < 2; fieldNum++ )
{
-#if FIELD_CODING_FIX
m_iPOCLast = m_iPOCLast < 2 ? fieldNum : m_iPOCLast;
-#else
- m_iPOCLast = ( m_iNumPicRcvd == m_iGOPSize ) ? m_uiNumAllPicCoded + m_iNumPicRcvd - 1 : m_iPOCLast + 1;
-#endif
// compress GOP
m_cGOPEncoder.compressGOP( m_iPOCLast, m_iPOCLast < 2 ? m_iPOCLast + 1 : m_iNumPicRcvd, m_cListPic, rcListPicYuvRecOut, true, isTff, snrCSC, m_printFrameMSE, false, m_picIdInGOP );
--
GitLab