From 6d25ec01a30e22cb89c8500982cf2a9f31315feb Mon Sep 17 00:00:00 2001
From: Karl Sharman <karl.sharman@sony.com>
Date: Tue, 24 Sep 2019 14:59:28 +0100
Subject: [PATCH] Fix calculation for CABAC zero words.
Will slightly impact CTCs, especially at low QPs.
---
source/Lib/EncoderLib/EncGOP.cpp | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/source/Lib/EncoderLib/EncGOP.cpp b/source/Lib/EncoderLib/EncGOP.cpp
index c3c1348c6..e2e6545bb 100644
--- a/source/Lib/EncoderLib/EncGOP.cpp
+++ b/source/Lib/EncoderLib/EncGOP.cpp
@@ -1090,7 +1090,7 @@ cabac_zero_word_padding(Slice *const pcSlice, Picture *const pcPic, const std::s
const int paddedHeight= ((sps.getPicHeightInLumaSamples() + minCuHeight - 1) / minCuHeight) * minCuHeight;
#endif
const int rawBits = paddedWidth * paddedHeight *
- (sps.getBitDepth(CHANNEL_TYPE_LUMA) + 2*(sps.getBitDepth(CHANNEL_TYPE_CHROMA)>>log2subWidthCxsubHeightC));
+ (sps.getBitDepth(CHANNEL_TYPE_LUMA) + ((2*sps.getBitDepth(CHANNEL_TYPE_CHROMA))>>log2subWidthCxsubHeightC));
const std::size_t threshold = (32/3)*numBytesInVclNalUnits + (rawBits/32);
if (binCountsInNalUnits >= threshold)
{
--
GitLab