# HG changeset patch # User David T Yuen <dtyx...@gmail.com> # Date 1393990004 28800 # Node ID 91936aab5ae9fb5b8224dcb1c5661a0d2107bb68 # Parent 5cad3652bee8130e8861f5b7b2f6ff1c8695cc1a Removed Encoder::m_csp and replaced it with x265_param::internalCsp
diff -r 5cad3652bee8 -r 91936aab5ae9 source/encoder/encoder.cpp --- a/source/encoder/encoder.cpp Tue Mar 04 20:53:17 2014 -0600 +++ b/source/encoder/encoder.cpp Tue Mar 04 19:26:44 2014 -0800 @@ -1415,7 +1415,6 @@ x265_log(p, X265_LOG_WARNING, "!! This output bitstream may not be compliant with the final spec !!\n"); } - m_csp = p->internalCsp; m_bframeDelay = p->bframes ? (p->bBPyramid ? 2 : 1) : 0; //====== Coding Tools ======== diff -r 5cad3652bee8 -r 91936aab5ae9 source/encoder/encoder.h --- a/source/encoder/encoder.h Tue Mar 04 20:53:17 2014 -0600 +++ b/source/encoder/encoder.h Tue Mar 04 19:26:44 2014 -0800 @@ -162,7 +162,6 @@ int m_displayOrientationSEIAngle; int m_gradualDecodingRefreshInfoEnabled; int m_decodingUnitInfoSEIEnabled; - int m_csp; uint32_t m_log2ParallelMergeLevelMinus2; ///< Parallel merge estimation region diff -r 5cad3652bee8 -r 91936aab5ae9 source/encoder/framefilter.cpp --- a/source/encoder/framefilter.cpp Tue Mar 04 20:53:17 2014 -0600 +++ b/source/encoder/framefilter.cpp Tue Mar 04 19:26:44 2014 -0800 @@ -64,8 +64,8 @@ m_top = top; m_cfg = top; m_numRows = numRows; - m_hChromaShift = CHROMA_H_SHIFT(m_cfg->m_csp); - m_vChromaShift = CHROMA_V_SHIFT(m_cfg->m_csp); + m_hChromaShift = CHROMA_H_SHIFT(m_cfg->param->internalCsp); + m_vChromaShift = CHROMA_V_SHIFT(m_cfg->param->internalCsp); // NOTE: for sao only, I write this code because I want to exact match with HM's bug bitstream m_rdGoOnSbacCoderRow0 = rdGoOnSbacCoder; @@ -80,7 +80,7 @@ m_sao.setSaoLcuBoundary(top->param->saoLcuBoundary); m_sao.setSaoLcuBasedOptimization(top->param->saoLcuBasedOptimization); m_sao.setMaxNumOffsetsPerPic(top->m_maxNumOffsetsPerPic); - m_sao.create(top->param->sourceWidth, top->param->sourceHeight, g_maxCUWidth, g_maxCUHeight, m_cfg->m_csp); + m_sao.create(top->param->sourceWidth, top->param->sourceHeight, g_maxCUWidth, g_maxCUHeight, m_cfg->param->internalCsp); m_sao.createEncBuffer(); } _______________________________________________ x265-devel mailing list x265-devel@videolan.org https://mailman.videolan.org/listinfo/x265-devel