Ticket #242: ListCOmbination_bugfix.patch

source/App/TAppEncoder/TAppEncCfg.cpp

@@ -196 +196 @@
   ("LowDelayCoding",         m_bUseLDC,             false, "low-delay mode")
   ("GPB", m_bUseGPB, false, "generalized B instead of P in low-delay mode")
 #endif
+#if LC_BUGFIX
+  ("ListCombination,-lc", m_bUseLComb, true, "combined reference list flag for uni-prediction in B-slices")
+#else
   ("ListCombination, -lc", m_bUseLComb, true, "combined reference list for uni-prediction in B-slices")
+#endif
   ("LCModification", m_bLCMod, false, "enables signalling of combined reference list derivation")
 #if !G1002_RPS
   ("NRF", m_bUseNRF,  true, "non-reference frame marking in last layer")
@@ -786 +790 @@
   {
     xConfirmPara(m_pcGOPList[i].m_iSliceType!='B'&&m_pcGOPList[i].m_iSliceType!='P', "Slice type must be equal to B or P");
   }
+#if LC_BUGFIX
+  xConfirmPara( m_bUseLComb==false && m_uiMaxNumberOfReorderPictures!=0, "ListCombination can only be 0 in low delay coding (more precisely when L0 and L1 are identical)" );  // Note however this is not the full necessary condition as ref_pic_list_combination_flag can only be 0 if L0 == L1.
+#endif
 #else
 #if REF_SETTING_FOR_LD
   xConfirmPara( m_bUseNewRefSetting && m_iGOPSize>1, "New reference frame setting was only designed for LD setting" );

source/App/TAppEncoder/TAppEncCfg.h

@@ -76 +76 @@
 #if G1002_RPS
   Int       m_iExtraRPSs;
   GOPEntry  m_pcGOPList[MAX_GOP];
+#if LC_BUGFIX
+  UInt      m_uiMaxNumberOfReorderPictures;                   ///< total number of reorder pictures
+  UInt      m_uiMaxNumberOfReferencePictures;                 ///< total number of reference pictures needed for decoding
+#else
   UInt      m_uiMaxNumberOfReorderPictures;                   ///< total number of reference pictures needed for decoding
   UInt      m_uiMaxNumberOfReferencePictures;                 ///< total number of reorder pictures
+#endif
 #else
   Int       m_iRateGOPSize;                                   ///< GOP size for QP variance
   Int       m_iNumOfReference;                                ///< total number of reference frames in P-slice

source/Lib/TLibCommon/TypeDef.h

@@ -38 +38 @@
 #ifndef _TYPEDEF__
 #define _TYPEDEF__
 
+#define LC_BUGFIX                 1
+
 //! \ingroup TLibCommon
 //! \{
 #define PADDING_INTRA             1 ///< G812: padding from bottom left, copy previous pixel instead of averaging