[x265] [PATCH 3 of 4] cturow: rename m_rdGoOnSbacCoder to m_sbacCoder; there is only one

[Steve Borho]

# HG changeset patch
# User Steve Borho <steve at borho.org>
# Date 1405032492 18000
#      Thu Jul 10 17:48:12 2014 -0500
# Node ID 9e50b8b7503b3ae656926ec038427fb7ec59bed0
# Parent  7649ffe940e1500ff168e5a46622c1447202cdeb
cturow: rename m_rdGoOnSbacCoder to m_sbacCoder; there is only one

diff -r 7649ffe940e1 -r 9e50b8b7503b source/encoder/cturow.cpp
--- a/source/encoder/cturow.cpp	Thu Jul 10 17:44:04 2014 -0500
+++ b/source/encoder/cturow.cpp	Thu Jul 10 17:48:12 2014 -0500
@@ -67,13 +67,13 @@
         m_rdSbacCoders[0][CI_CURR_BEST].loadContexts(*bufferSbac);
 
     // setup thread local data structures to use this row's CABAC state
-    tld.m_search.m_sbacCoder = &m_rdGoOnSbacCoder;
+    tld.m_search.m_sbacCoder = &m_sbacCoder;
     tld.m_search.m_rdSbacCoders = m_rdSbacCoders;
-    tld.m_cuCoder.m_sbacCoder = &m_rdGoOnSbacCoder;
+    tld.m_cuCoder.m_sbacCoder = &m_sbacCoder;
     tld.m_cuCoder.m_rdSbacCoders = m_rdSbacCoders;
 
     BitCounter bc;
-    m_rdGoOnSbacCoder.setBitstream(&bc);
+    m_sbacCoder.setBitstream(&bc);
 
     tld.m_cuCoder.compressCU(cu); // Does all the CU analysis
 
diff -r 7649ffe940e1 -r 9e50b8b7503b source/encoder/cturow.h
--- a/source/encoder/cturow.h	Thu Jul 10 17:44:04 2014 -0500
+++ b/source/encoder/cturow.h	Thu Jul 10 17:48:12 2014 -0500
@@ -63,7 +63,7 @@
 
     SBac            m_rowEntropyCoder; /* only used by frameEncoder::encodeSlice() */
 
-    SBac            m_rdGoOnSbacCoder;
+    SBac            m_sbacCoder;
     SBac            m_bufferSbacCoder;
     SBac            m_rdSbacCoders[MAX_CU_DEPTH + 1][CI_NUM];
 
@@ -74,7 +74,7 @@
 
     CTURow()
     {
-        m_rdGoOnSbacCoder.m_bIsCounter = true;
+        m_sbacCoder.m_bIsCounter = true;
         for (uint32_t depth = 0; depth < g_maxCUDepth + 1; depth++)
             for (int ciIdx = 0; ciIdx < CI_NUM; ciIdx++)
                 m_rdSbacCoders[depth][ciIdx].m_bIsCounter = true;
@@ -83,7 +83,7 @@
     void init(TComSlice *slice)
     {
         m_active = 0;
-        m_rdGoOnSbacCoder.resetEntropy(slice);
+        m_sbacCoder.resetEntropy(slice);
 
         // Note: Reset status to avoid frame parallelism output mistake on different thread number
         for (uint32_t depth = 0; depth < g_maxCUDepth + 1; depth++)
diff -r 7649ffe940e1 -r 9e50b8b7503b source/encoder/frameencoder.cpp
--- a/source/encoder/frameencoder.cpp	Thu Jul 10 17:44:04 2014 -0500
+++ b/source/encoder/frameencoder.cpp	Thu Jul 10 17:48:12 2014 -0500
@@ -100,7 +100,7 @@
     }
 
     m_tld.init(*top);
-    m_frameFilter.init(top, this, numRows, &m_rows[0].m_rdGoOnSbacCoder);
+    m_frameFilter.init(top, this, numRows, &m_rows[0].m_sbacCoder);
 
     // initialize SPS
     top->initSPS(&m_sps);