[x265] fix m_initSliceContext (uninitialised m_sliceQp)

Satoshi Nakagawa nakagawa424 at oki.com
Tue Aug 26 10:25:41 CEST 2014


# HG changeset patch
# User Satoshi Nakagawa <nakagawa424 at oki.com>
# Date 1409041357 -32400
#      Tue Aug 26 17:22:37 2014 +0900
# Node ID c18255467f12da1a780340ade55292c32d95bfdd
# Parent  5acfb12ec5d17cc700e313fc99248e2408e5967b
fix m_initSliceContext (uninitialised m_sliceQp)

diff -r 5acfb12ec5d1 -r c18255467f12 source/encoder/frameencoder.cpp
--- a/source/encoder/frameencoder.cpp	Mon Aug 25 17:53:12 2014 +0900
+++ b/source/encoder/frameencoder.cpp	Tue Aug 26 17:22:37 2014 +0900
@@ -158,8 +158,6 @@
     int64_t startCompressTime = x265_mdate();
     Slice* slice = m_frame->m_picSym->m_slice;
 
-    m_initSliceContext.resetEntropy(slice);
-
     /* Emit access unit delimiter unless this is the first frame and the user is
      * not repeating headers (since AUD is supposed to be the first NAL in the access
      * unit) */
@@ -225,12 +223,15 @@
         m_frameFilter.m_sao.m_refDepth = 2 + !IS_REFERENCED(slice);
         break;
     }
-    m_frameFilter.start(m_frame);
 
     // Clip slice QP to 0-51 spec range before encoding
     qp = Clip3(-QP_BD_OFFSET, MAX_QP, qp);
     slice->m_sliceQp = qp;
 
+    m_initSliceContext.resetEntropy(slice);
+
+    m_frameFilter.start(m_frame);
+
     if (m_frame->m_lowres.bKeyframe)
     {
         if (m_param->bEmitHRDSEI)


More information about the x265-devel mailing list