[x265-commits] [x265] spleling

[Steve Borho]

details:   http://hg.videolan.org/x265/rev/db86567c3f5c
branches:  
changeset: 9690:db86567c3f5c
user:      Steve Borho <steve at borho.org>
date:      Wed Mar 11 21:43:29 2015 -0500
description:
spleling
Subject: [x265] encoder: fix --no-wpp with --nr and/or DETAILED_CU_STATS

details:   http://hg.videolan.org/x265/rev/b47989a0a69e
branches:  
changeset: 9691:b47989a0a69e
user:      Steve Borho <steve at borho.org>
date:      Wed Mar 11 21:57:40 2015 -0500
description:
encoder: fix --no-wpp with --nr and/or DETAILED_CU_STATS
Subject: [x265] frameencoder: initialize m_localTldIdx

details:   http://hg.videolan.org/x265/rev/b931c50d5501
branches:  
changeset: 9692:b931c50d5501
user:      Steve Borho <steve at borho.org>
date:      Wed Mar 11 21:58:02 2015 -0500
description:
frameencoder: initialize m_localTldIdx

diffstat:

 source/encoder/encoder.cpp      |  6 ++++++
 source/encoder/frameencoder.cpp |  1 +
 source/encoder/search.h         |  2 +-
 3 files changed, 8 insertions(+), 1 deletions(-)

diffs (39 lines):

diff -r b4fc1b79f618 -r b931c50d5501 source/encoder/encoder.cpp
--- a/source/encoder/encoder.cpp	Wed Mar 11 20:33:48 2015 -0500
+++ b/source/encoder/encoder.cpp	Wed Mar 11 21:58:02 2015 -0500
@@ -173,6 +173,12 @@ void Encoder::create()
         for (int i = 0; i < m_numPools; i++)
             m_threadPool[i].start();
     }
+    else
+    {
+        /* CU stats and noise-reduction buffers are indexed by jpId, so it cannot be left as -1 */
+        for (int i = 0; i < m_param->frameNumThreads; i++)
+            m_frameEncoder[i]->m_jpId = 0;
+    }
 
     if (!m_scalingList.init())
     {
diff -r b4fc1b79f618 -r b931c50d5501 source/encoder/frameencoder.cpp
--- a/source/encoder/frameencoder.cpp	Wed Mar 11 20:33:48 2015 -0500
+++ b/source/encoder/frameencoder.cpp	Wed Mar 11 21:58:02 2015 -0500
@@ -57,6 +57,7 @@ FrameEncoder::FrameEncoder()
     m_frame = NULL;
     m_cuGeoms = NULL;
     m_ctuGeomMap = NULL;
+    m_localTldIdx = 0;
     memset(&m_frameStats, 0, sizeof(m_frameStats));
     memset(&m_rce, 0, sizeof(RateControlEntry));
 }
diff -r b4fc1b79f618 -r b931c50d5501 source/encoder/search.h
--- a/source/encoder/search.h	Wed Mar 11 20:33:48 2015 -0500
+++ b/source/encoder/search.h	Wed Mar 11 21:58:02 2015 -0500
@@ -139,7 +139,7 @@ struct Mode
 /* This structure is intended for performance debugging and we make no attempt
  * to handle dynamic range overflows. Care should be taken to avoid long encodes
  * if you care about the accuracy of these elapsed times and counters. This
- * profiling is orthoganal to PPA/VTune and can be enabled indepedently from
+ * profiling is orthogonal to PPA/VTune and can be enabled independently from
  * either of them */
 struct CUStats
 {