Changeset 19 in SHVCSoftware for trunk/source

Timestamp:

29 Jan 2013, 19:06:14 (12 years ago)

Author:

seregin

Message:

ENCODER_BUGFIX: encoder bug fix for inter mode (L0167)

Location:

trunk/source/Lib

Files:

• TLibCommon/TypeDef.h (modified) (1 diff)
• TLibEncoder/TEncSearch.cpp (modified) (1 diff)

trunk/source/Lib/TLibCommon/TypeDef.h

@@ -48 +48 @@
 #define SET_SLICE_LAYER_ID               1      ///< set layerId to the slice
 #define BUGFIX_925                       1      ///< bug fix ticket #925
+#define ENCODER_BUGFIX                   1      ///< L0167: encoder bug fix for inter mode
 
 #define CHROMA_UPSAMPLING                1      ///< L0335: Chroma upsampling with 5 bits coefficients

trunk/source/Lib/TLibEncoder/TEncSearch.cpp

@@ -3501 +3501 @@
         }
 
+#if ENCODER_BUGFIX
+        if ( ( iRefList == 0 && uiCostTemp < uiCost[iRefList] ) ||
+            ( iRefList == 1 &&  pcCU->getSlice()->getNoBackPredFlag() && iRefIdxTemp == iRefIdx[0] ) ||
+            ( iRefList == 1 && !pcCU->getSlice()->getNoBackPredFlag() && uiCostTemp < uiCost[iRefList] ) )
+#else
         if ( ( iRefList == 0 && uiCostTemp < uiCost[iRefList] ) ||
             ( iRefList == 1 &&  pcCU->getSlice()->getNoBackPredFlag() && iRefIdxTemp == iRefIdx[0] ) ||
             ( iRefList == 1 && (pcCU->getSlice()->getNumRefIdx(REF_PIC_LIST_C) > 0) && (iRefIdxTemp==0 || iRefIdxTemp == iRefIdx[0]) && !pcCU->getSlice()->getNoBackPredFlag() && (iRefIdxTemp == pcCU->getSlice()->getRefIdxOfL0FromRefIdxOfL1(iRefIdxTemp)) ) ||
             ( iRefList == 1 && !pcCU->getSlice()->getNoBackPredFlag() && uiCostTemp < uiCost[iRefList] ) )
+#endif
           {
             uiCost[iRefList] = uiCostTemp;