[x265] [PATCH] vbv: bug fixes in --no-cutree flow. Ignore intracosts in calculating satdcost per cu

[aarthi at multicorewareinc.com]

# HG changeset patch
# User Aarthi Thirumalai
# Date 1393882980 -19800
#      Tue Mar 04 03:13:00 2014 +0530
# Node ID 477ccd4a9fa78d852a999291e1a6de4b1d55bb3f
# Parent  6662df480e39c83ab138d831f883d11fc5b052c5
vbv: bug fixes in --no-cutree flow. Ignore intracosts in calculating satdcost per cu.

diff -r 6662df480e39 -r 477ccd4a9fa7 source/encoder/frameencoder.cpp
--- a/source/encoder/frameencoder.cpp	Mon Mar 03 11:28:22 2014 +0530
+++ b/source/encoder/frameencoder.cpp	Tue Mar 04 03:13:00 2014 +0530
@@ -1172,8 +1172,6 @@
             if (m_cfg->param.rc.vbvBufferSize > 0 && m_cfg->param.rc.vbvMaxBitrate > 0)
             {
                 m_pic->m_cuCostsForVbv[cuAddr] += m_pic->m_lowres.lowresCostForRc[idx];
-                if (!m_cfg->param.rc.cuTree)
-                    m_pic->m_cuCostsForVbv[cuAddr] += m_pic->m_lowres.intraCost[idx];
             }
             cnt++;
         }
diff -r 6662df480e39 -r 477ccd4a9fa7 source/encoder/slicetype.cpp
--- a/source/encoder/slicetype.cpp	Mon Mar 03 11:28:22 2014 +0530
+++ b/source/encoder/slicetype.cpp	Tue Mar 04 03:13:00 2014 +0530
@@ -421,7 +421,7 @@
 
     int nextNonB = keyframe ? prevNonB : curNonB;
 
-    while (curNonB < numFrames)
+    while (curNonB < numFrames + !keyframe)
     {
         /* P/I cost: This shouldn't include the cost of nextNonB */
         if (nextNonB != curNonB)