[x265-commits] [x265] log: replace "Skip" with more accurate "Merge"

[Steve Borho]

details:   http://hg.videolan.org/x265/rev/eadcdeb661bc
branches:  
changeset: 5330:eadcdeb661bc
user:      Steve Borho <steve at borho.org>
date:      Wed Nov 27 00:35:05 2013 -0600
description:
log: replace "Skip" with more accurate "Merge"
Subject: [x265] encoder: do not print weightp stats if no P frames were generated

details:   http://hg.videolan.org/x265/rev/ece323e1b603
branches:  
changeset: 5331:ece323e1b603
user:      Steve Borho <steve at borho.org>
date:      Wed Nov 27 00:29:23 2013 -0600
description:
encoder: do not print weightp stats if no P frames were generated

(prevents NAN or worse errors)
Subject: [x265] Merge with default (feature freeze for 0.6)

details:   http://hg.videolan.org/x265/rev/417f794274e5
branches:  stable
changeset: 5332:417f794274e5
user:      Steve Borho <steve at borho.org>
date:      Wed Nov 27 01:49:09 2013 -0600
description:
Merge with default (feature freeze for 0.6)

Bug fixes and tunings only on the stable branch, until the
next tag is issued.

diffstat:

 source/encoder/encoder.cpp |  4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diffs (21 lines):

diff -r b09b6fa7e89a -r 417f794274e5 source/encoder/encoder.cpp
--- a/source/encoder/encoder.cpp	Tue Nov 26 12:24:24 2013 -0600
+++ b/source/encoder/encoder.cpp	Wed Nov 27 01:49:09 2013 -0600
@@ -443,7 +443,7 @@ void Encoder::printSummary()
                 int len;
 
                 int cuSize = g_maxCUWidth >> depth;
-                len = sprintf(stats, "Split "LL"%% Skip "LL"%% Inter "LL"%%",
+                len = sprintf(stats, "Split "LL"%% Merge "LL"%% Inter "LL"%%",
                               cntSplit, cntSkipCu, cntInter);
 
                 if (param.bEnableAMP)
@@ -494,7 +494,7 @@ void Encoder::printSummary()
             x265_log(&param, X265_LOG_INFO, "frame B: %s\n", statsString(m_analyzeB, buffer));
         if (m_analyzeAll.m_numPics)
             x265_log(&param, X265_LOG_INFO, "global : %s\n", statsString(m_analyzeAll, buffer));
-        if (param.bEnableWeightedPred)
+        if (param.bEnableWeightedPred && m_analyzeP.m_numPics)
         {
             x265_log(&param, X265_LOG_INFO, "%d of %d (%.2f%%) P frames weighted\n",
                      m_numWPFrames, m_analyzeP.m_numPics, (float)100.0 * m_numWPFrames / m_analyzeP.m_numPics);