When GBP = 0 in the encoder config file, some of the sequences are giving encoder decoder mismatch (e.g. BQSquare all the QP's).

SliceMode=2 is the slice mode that uses a byte threshold for breaking slices, it can for instance be used for creating 1500 byte slices. This mode does not work in HM-4.1 since the bitcounter is not set correctly when OL_USE_WPP=1. The attached patch fixes the problem by adding 3 lines of code.

In TComRom.h, there MAX_CU_DEPTH is 7, but I guess MAX_CU_DEPTH is 6 in the draft. Here is my patch based branch HM-4.1-dev.

diff --git a/source/Lib/TLibCommon/TComDataCU.cpp b/source/Lib/TLibCommon/TComDataCU.cpp index 3a89a29..db3a03d 100644 --- a/source/Lib/TLibCommon/TComDataCU.cpp +++ b/source/Lib/TLibCommon/TComDataCU.cpp @@ -4338,8 +4338,6 @@ UInt TComDataCU::getCoefScanIdx(UInt uiAbsPartIdx, UInt uiWidth, Bool bIsLuma, B

}, {0, 1, 2, 0, 0, 1, 1, 0, 2, 2, 0, 0, 1, 1, 0, 0, 2, 2, 0, 0, 0, 1, 1, 1, 1, 0, 0, 0, 0, 2, 2, 2, 2, 0, 0, 0 },

• {0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0
• },

};

UInt uiCTXIdx;

diff --git a/source/Lib/TLibCommon/TComPrediction.cpp b/source/Lib/TLibCommon/TComPrediction.cpp index dde10ca..c4f1f7b 100644 --- a/source/Lib/TLibCommon/TComPrediction.cpp +++ b/source/Lib/TLibCommon/TComPrediction.cpp @@ -637,7 +637,11 @@ Void TComPrediction::xPredIntraPlanar( Int* pSrc, Int srcStride, Pel* rpDst, Int

Int k, l, bottomLeft, topRight; Int horPred;

+#if PLANAR_F483 + Int leftColumn[MAX_CU_SIZE+1], topRow[MAX_CU_SIZE+1], bottomRow[MAX_CU_SIZE+1], rightColumn[MAX_CU_SIZE+1]; +#else

Int leftColumn[MAX_CU_SIZE], topRow[MAX_CU_SIZE], bottomRow[MAX_CU_SIZE], rightColumn[MAX_CU_SIZE];

+#endif

UInt blkSize = width; UInt offset2D = width; UInt shift1D = g_aucConvertToBit[ width ] + 2;

diff --git a/source/Lib/TLibCommon/TComRom.h b/source/Lib/TLibCommon/TComRom.h index cecb457..8912380 100644 --- a/source/Lib/TLibCommon/TComRom.h +++ b/source/Lib/TLibCommon/TComRom.h @@ -50,7 +50,7 @@

Macros ====================================================================================================================

-#define MAX_CU_DEPTH 7 log2(LCUSize) +#define MAX_CU_DEPTH 6 log2(LCUSize)

#define MAX_CU_SIZE (1<<(MAX_CU_DEPTH)) maximum allowable size of CU #define MIN_PU_SIZE 4 #define MAX_NUM_SPU_W (MAX_CU_SIZE/MIN_PU_SIZE) maximum number of SPU in horizontal line