[x265] [PATCH 4 of 4 x265] Fix qp spikes in the row-level VBV rate-control when WPP enabled

[kirithika at multicorewareinc.com]

# HG changeset patch
# User Kirithika <kirithika at multicorewareinc.com>
# Date 1576128629 -19800
#      Thu Dec 12 11:00:29 2019 +0530
# Node ID d13ea83f3697e6fd95b5935895beb501eb457f31
# Parent  94b6aa5db332550f7222bbc753b7c7ffdf78c67f
Fix qp spikes in the row-level VBV rate-control when WPP enabled

This commit fixes the unwanted QP hikes that comes due to irrelevant
entropy information

diff -r 94b6aa5db332 -r d13ea83f3697 source/encoder/ratecontrol.cpp
--- a/source/encoder/ratecontrol.cpp	Wed Apr 22 10:47:12 2020 +0530
+++ b/source/encoder/ratecontrol.cpp	Thu Dec 12 11:00:29 2019 +0530
@@ -2526,12 +2526,6 @@
     uint64_t rowSatdCost = curEncData.m_rowStat[row].rowSatd;
     double encodedBits = curEncData.m_rowStat[row].encodedBits;
     uint32_t rowInSlice = row - m_sliceBaseRow[sliceId];
-
-    if (m_param->bEnableWavefront && rowInSlice == 1)
-    {
-        rowSatdCost += curEncData.m_rowStat[row - 1].rowSatd;
-        encodedBits += curEncData.m_rowStat[row - 1].encodedBits;
-    }
     rowSatdCost >>= X265_DEPTH - 8;
     updatePredictor(rce->rowPred[0], qScaleVbv, (double)rowSatdCost, encodedBits);
     if (curEncData.m_slice->m_sliceType != I_SLICE && !m_param->rc.bEnableConstVbv)
-------------- next part --------------
A non-text attachment was scrubbed...
Name: x265-4.patch
Type: text/x-patch
Size: 1212 bytes
Desc: not available
URL: <http://mailman.videolan.org/pipermail/x265-devel/attachments/20200422/4541d2ed/attachment.bin>