[x265] [PATCH 2 of 2] encoder: log avg Qp decided by AQ for each slice type

[aarthi at multicorewareinc.com]

# HG changeset patch
# User Aarthi Thirumalai
# Date 1393365360 -19800
#      Wed Feb 26 03:26:00 2014 +0530
# Node ID 78a032400d4ba00fed51d767c525075ab7d8f736
# Parent  378444ab3d1a23e06418ab904ac2dbcb6fad19e7
encoder: log avg Qp decided by AQ for each slice type

diff -r 378444ab3d1a -r 78a032400d4b source/encoder/encoder.cpp
--- a/source/encoder/encoder.cpp	Wed Feb 26 03:25:28 2014 +0530
+++ b/source/encoder/encoder.cpp	Wed Feb 26 03:26:00 2014 +0530
@@ -805,7 +805,7 @@
 
     //===== add bits, psnr and ssim =====
     m_analyzeAll.addBits(bits);
-    m_analyzeAll.addQP(pic->m_avgQpRc);
+    m_analyzeAll.addQP(pic->m_avgQpAq);
 
     if (param.bEnablePsnr)
     {
@@ -821,7 +821,7 @@
     if (slice->isIntra())
     {
         m_analyzeI.addBits(bits);
-        m_analyzeI.addQP(pic->m_avgQpRc);
+        m_analyzeI.addQP(pic->m_avgQpAq);
         if (param.bEnablePsnr)
             m_analyzeI.addPsnr(psnrY, psnrU, psnrV);
         if (param.bEnableSsim)
@@ -830,7 +830,7 @@
     else if (slice->isInterP())
     {
         m_analyzeP.addBits(bits);
-        m_analyzeP.addQP(pic->m_avgQpRc);
+        m_analyzeP.addQP(pic->m_avgQpAq);
         if (param.bEnablePsnr)
             m_analyzeP.addPsnr(psnrY, psnrU, psnrV);
         if (param.bEnableSsim)
@@ -839,7 +839,7 @@
     else if (slice->isInterB())
     {
         m_analyzeB.addBits(bits);
-        m_analyzeB.addQP(pic->m_avgQpRc);
+        m_analyzeB.addQP(pic->m_avgQpAq);
         if (param.bEnablePsnr)
             m_analyzeB.addPsnr(psnrY, psnrU, psnrV);
         if (param.bEnableSsim)
@@ -856,7 +856,7 @@
 
         char buf[1024];
         int p;
-        p = sprintf(buf, "POC:%d %c QP %2.2lf(%d) %10d bits", poc, c, pic->m_avgQpRc, slice->getSliceQp(), (int)bits);
+        p = sprintf(buf, "POC:%d %c QP %2.2lf(%d) %10d bits", poc, c, pic->m_avgQpAq, slice->getSliceQp(), (int)bits);
         if (param.bEnablePsnr)
             p += sprintf(buf + p, " [Y:%6.2lf U:%6.2lf V:%6.2lf]", psnrY, psnrU, psnrV);
         if (param.bEnableSsim)
@@ -881,7 +881,7 @@
         // per frame CSV logging if the file handle is valid
         if (m_csvfpt)
         {
-            fprintf(m_csvfpt, "%d, %c-SLICE, %4d, %2.2lf, %10d,", m_outputCount++, c, poc, pic->m_avgQpRc, (int)bits);
+            fprintf(m_csvfpt, "%d, %c-SLICE, %4d, %2.2lf, %10d,", m_outputCount++, c, poc, pic->m_avgQpAq, (int)bits);
             double psnr = (psnrY * 6 + psnrU + psnrV) / 8;
             if (param.bEnablePsnr)
                 fprintf(m_csvfpt, "%.3lf, %.3lf, %.3lf, %.3lf,", psnrY, psnrU, psnrV, psnr);