[x265-commits] [x265] TComPrediction: remove unused alloc and stride
Steve Borho
steve at borho.org
Thu Feb 20 00:20:02 CET 2014
details: http://hg.videolan.org/x265/rev/8571d160aedb
branches:
changeset: 6182:8571d160aedb
user: Steve Borho <steve at borho.org>
date: Tue Feb 18 01:43:42 2014 -0600
description:
TComPrediction: remove unused alloc and stride
Subject: [x265] nextState table
details: http://hg.videolan.org/x265/rev/f1951bb4c2ae
branches:
changeset: 6183:f1951bb4c2ae
user: Satoshi Nakagawa <nakagawa424 at oki.com>
date: Tue Feb 18 17:07:25 2014 +0900
description:
nextState table
Subject: [x265] ratecontrol: change RateControl::lastSatd to currentSatd, add comments
details: http://hg.videolan.org/x265/rev/757d3e3db046
branches:
changeset: 6184:757d3e3db046
user: Deepthi Nandakumar <deepthi at multicorewareinc.com>
date: Tue Feb 18 16:08:30 2014 +0530
description:
ratecontrol: change RateControl::lastSatd to currentSatd, add comments
Subject: [x265] compress: improve rd 1 performance
details: http://hg.videolan.org/x265/rev/9f4d3ef34e5a
branches:
changeset: 6185:9f4d3ef34e5a
user: Sumalatha Polureddy
date: Mon Feb 17 12:12:40 2014 +0530
description:
compress: improve rd 1 performance
a. Always allow intra mode for mode decision
b. increase more skips at each depth(do encode of best merge candidates initially and
if the merge is skipped, dont do inter modes)
Subject: [x265] cli: add x264's 'seek', leave HM's 'frame-skip' as undocumented alias
details: http://hg.videolan.org/x265/rev/1a0d5b456b19
branches:
changeset: 6186:1a0d5b456b19
user: Steve Borho <steve at borho.org>
date: Tue Feb 18 14:46:51 2014 -0600
description:
cli: add x264's 'seek', leave HM's 'frame-skip' as undocumented alias
We want to support x264's CLI options as much as possible, but don't want to
break any existing scripts
Subject: [x265] api: add support for float or rational FPS [API CHANGE]
details: http://hg.videolan.org/x265/rev/a6c9a476b205
branches:
changeset: 6187:a6c9a476b205
user: Steve Borho <steve at borho.org>
date: Tue Feb 18 00:21:58 2014 -0600
description:
api: add support for float or rational FPS [API CHANGE]
Since x265_param was changing anyway, I went ahead and changed inputBitDepth
to internalBitDepth, which has always been its real function.
X265_BUILD is bumped to 6
Subject: [x265] prevent implicit type conversion warnings from MSVC
details: http://hg.videolan.org/x265/rev/9ddc919f678a
branches:
changeset: 6188:9ddc919f678a
user: Steve Borho <steve at borho.org>
date: Wed Feb 19 01:29:49 2014 -0600
description:
prevent implicit type conversion warnings from MSVC
Subject: [x265] asm: added 16bpp support for dct[4x4, 8x8], idct4x4, dst4x4 and idst4x4 primitives
details: http://hg.videolan.org/x265/rev/96e94ea91f58
branches:
changeset: 6189:96e94ea91f58
user: Dnyaneshwar G <dnyaneshwar at multicorewareinc.com>
date: Wed Feb 19 12:21:13 2014 +0530
description:
asm: added 16bpp support for dct[4x4, 8x8], idct4x4, dst4x4 and idst4x4 primitives
Subject: [x265] fix for 420 binary mismatch for --preset=slower option
details: http://hg.videolan.org/x265/rev/591ca91f0501
branches:
changeset: 6190:591ca91f0501
user: ashok at multicorewareinc.com
date: Wed Feb 19 16:34:20 2014 +0530
description:
fix for 420 binary mismatch for --preset=slower option
Subject: [x265] Fixed ENC_DEC_TRACE warnings and errors
details: http://hg.videolan.org/x265/rev/1c78bd13a14f
branches:
changeset: 6191:1c78bd13a14f
user: David T Yuen <dtyx265 at gmail.com>
date: Wed Feb 19 09:46:46 2014 -0800
description:
Fixed ENC_DEC_TRACE warnings and errors
Subject: [x265] TEncSbac: white-space nits
details: http://hg.videolan.org/x265/rev/f60c76257811
branches:
changeset: 6192:f60c76257811
user: Steve Borho <steve at borho.org>
date: Wed Feb 19 13:14:10 2014 -0600
description:
TEncSbac: white-space nits
Subject: [x265] TEncSearch: white-space nits
details: http://hg.videolan.org/x265/rev/e465b8c259f7
branches:
changeset: 6193:e465b8c259f7
user: Steve Borho <steve at borho.org>
date: Wed Feb 19 15:52:25 2014 -0600
description:
TEncSearch: white-space nits
Subject: [x265] weightp: don't allow the PPS weightp flag to be changed by weight analysis
details: http://hg.videolan.org/x265/rev/16602968225f
branches:
changeset: 6194:16602968225f
user: Steve Borho <steve at borho.org>
date: Wed Feb 19 16:18:08 2014 -0600
description:
weightp: don't allow the PPS weightp flag to be changed by weight analysis
Subject: [x265] weightp: do not log weights if none are enabled
details: http://hg.videolan.org/x265/rev/d2ebbbbdbe75
branches:
changeset: 6195:d2ebbbbdbe75
user: Steve Borho <steve at borho.org>
date: Wed Feb 19 16:18:43 2014 -0600
description:
weightp: do not log weights if none are enabled
Subject: [x265] ratecontrol: recover CRF behavior following fps changeset a6c9a476b205
details: http://hg.videolan.org/x265/rev/3389061b75a4
branches:
changeset: 6196:3389061b75a4
user: Steve Borho <steve at borho.org>
date: Wed Feb 19 17:03:21 2014 -0600
description:
ratecontrol: recover CRF behavior following fps changeset a6c9a476b205
diffstat:
source/CMakeLists.txt | 2 +-
source/Lib/TLibCommon/ContextTables.h | 7 +-
source/Lib/TLibCommon/TComDataCU.cpp | 3 +-
source/Lib/TLibCommon/TComDataCU.h | 2 +-
source/Lib/TLibCommon/TComPrediction.cpp | 18 +--
source/Lib/TLibCommon/TComPrediction.h | 8 +-
source/Lib/TLibCommon/TComRom.h | 2 +-
source/Lib/TLibCommon/TComSlice.cpp | 31 +----
source/Lib/TLibCommon/TComSlice.h | 2 +-
source/Lib/TLibCommon/TComTrQuant.cpp | 15 +-
source/Lib/TLibEncoder/SyntaxElementWriter.cpp | 8 +-
source/Lib/TLibEncoder/TEncBinCoderCABAC.cpp | 2 +-
source/Lib/TLibEncoder/TEncSbac.cpp | 53 +++------
source/Lib/TLibEncoder/TEncSearch.cpp | 6 +-
source/common/common.cpp | 48 +++++--
source/common/primitives.cpp | 1 -
source/common/x86/asm-primitives.cpp | 8 +-
source/common/x86/const-a.asm | 3 +-
source/common/x86/dct8.asm | 145 ++++++++++++------------
source/encoder/compress.cpp | 72 +++++-------
source/encoder/encoder.cpp | 11 +-
source/encoder/frameencoder.cpp | 3 +-
source/encoder/ratecontrol.cpp | 36 +++---
source/encoder/ratecontrol.h | 7 +-
source/encoder/slicetype.cpp | 6 +-
source/encoder/weightPrediction.cpp | 39 +++---
source/input/input.h | 2 +-
source/input/y4m.h | 2 +-
source/input/yuv.h | 2 +-
source/output/output.cpp | 4 +-
source/output/output.h | 3 +-
source/output/y4m.cpp | 28 ++--
source/output/y4m.h | 2 +-
source/test/mbdstharness.cpp | 32 ++++-
source/x265.cpp | 71 ++++++------
source/x265.h | 7 +-
36 files changed, 331 insertions(+), 360 deletions(-)
diffs (truncated from 1804 to 300 lines):
diff -r 1be6b8c8b9ed -r 3389061b75a4 source/CMakeLists.txt
--- a/source/CMakeLists.txt Tue Feb 18 00:32:57 2014 -0600
+++ b/source/CMakeLists.txt Wed Feb 19 17:03:21 2014 -0600
@@ -17,7 +17,7 @@ include(CheckFunctionExists)
include(CheckCXXCompilerFlag)
# X265_BUILD must be incremented each time the public API is changed
-set(X265_BUILD 5)
+set(X265_BUILD 6)
configure_file("${PROJECT_SOURCE_DIR}/x265.def.in"
"${PROJECT_BINARY_DIR}/x265.def")
configure_file("${PROJECT_SOURCE_DIR}/x265_config.h.in"
diff -r 1be6b8c8b9ed -r 3389061b75a4 source/Lib/TLibCommon/ContextTables.h
--- a/source/Lib/TLibCommon/ContextTables.h Tue Feb 18 00:32:57 2014 -0600
+++ b/source/Lib/TLibCommon/ContextTables.h Wed Feb 19 17:03:21 2014 -0600
@@ -136,17 +136,12 @@ typedef struct ContextModel
uint8_t bBinsCoded;
} ContextModel;
-extern const uint8_t g_nextStateMPS[128];
-extern const uint8_t g_nextStateLPS[128];
extern const int g_entropyBits[128];
-extern uint8_t g_nextState[128][2];
-void buildNextStateTable();
+extern const uint8_t g_nextState[128][2];
uint8_t sbacInit(int qp, int initValue); ///< initialize state with initial probability
#define sbacGetMps(S) ((S) & 1)
#define sbacGetState(S) ((S) >> 1)
-#define sbacNextLPS(S) (g_nextStateLPS[(S)])
-#define sbacNextMPS(S) (g_nextStateMPS[(S)])
#define sbacNext(S, V) (g_nextState[(S)][(V)])
#define sbacGetEntropyBits(S, V) (g_entropyBits[(S) ^ (V)])
#define sbacGetEntropyBitsTrm(V) (g_entropyBits[126 ^ (V)])
diff -r 1be6b8c8b9ed -r 3389061b75a4 source/Lib/TLibCommon/TComDataCU.cpp
--- a/source/Lib/TLibCommon/TComDataCU.cpp Tue Feb 18 00:32:57 2014 -0600
+++ b/source/Lib/TLibCommon/TComDataCU.cpp Wed Feb 19 17:03:21 2014 -0600
@@ -2852,7 +2852,7 @@ void TComDataCU::xDeriveCenterIdx(uint32
+ (partWidth / m_pic->getMinCUWidth()) / 2];
}
-uint32_t TComDataCU::getCoefScanIdx(uint32_t absPartIdx, uint32_t width, bool bIsLuma, bool bIsIntra)
+uint32_t TComDataCU::getCoefScanIdx(uint32_t absPartIdx, uint32_t width, uint32_t height, bool bIsLuma, bool bIsIntra)
{
uint32_t scanIdx;
uint32_t dirMode;
@@ -2863,7 +2863,6 @@ uint32_t TComDataCU::getCoefScanIdx(uint
}
//check that MDCS can be used for this TU
- uint32_t height = width;
if (bIsLuma)
{
const uint32_t maximumWidth = MDCS_MAXIMUM_WIDTH;
diff -r 1be6b8c8b9ed -r 3389061b75a4 source/Lib/TLibCommon/TComDataCU.h
--- a/source/Lib/TLibCommon/TComDataCU.h Tue Feb 18 00:32:57 2014 -0600
+++ b/source/Lib/TLibCommon/TComDataCU.h Wed Feb 19 17:03:21 2014 -0600
@@ -473,7 +473,7 @@ public:
uint32_t& getTotalNumPart() { return m_numPartitions; }
- uint32_t getCoefScanIdx(uint32_t absPartIdx, uint32_t width, bool bIsLuma, bool bIsIntra);
+ uint32_t getCoefScanIdx(uint32_t absPartIdx, uint32_t width, uint32_t height, bool bIsLuma, bool bIsIntra);
// -------------------------------------------------------------------------------------------------------------------
// member functions to support multiple color space formats
diff -r 1be6b8c8b9ed -r 3389061b75a4 source/Lib/TLibCommon/TComPrediction.cpp
--- a/source/Lib/TLibCommon/TComPrediction.cpp Tue Feb 18 00:32:57 2014 -0600
+++ b/source/Lib/TLibCommon/TComPrediction.cpp Wed Feb 19 17:03:21 2014 -0600
@@ -60,8 +60,6 @@ static const UChar intraFilterThreshold[
TComPrediction::TComPrediction()
: m_predBuf(NULL)
, m_predAllAngsBuf(NULL)
- , m_lumaRecBuffer(0)
- , m_lumaRecStride(0)
{}
TComPrediction::~TComPrediction()
@@ -81,10 +79,7 @@ TComPrediction::~TComPrediction()
m_predTempYuv.destroy();
- delete [] m_lumaRecBuffer;
-
- if (m_immedVals)
- X265_FREE(m_immedVals);
+ X265_FREE(m_immedVals);
}
void TComPrediction::initTempBuff(int csp)
@@ -112,15 +107,6 @@ void TComPrediction::initTempBuff(int cs
m_immedVals = X265_MALLOC(int16_t, 64 * (64 + NTAPS_LUMA - 1));
}
-
- if (m_lumaRecStride != (MAX_CU_SIZE >> 1) + 1)
- {
- m_lumaRecStride = (MAX_CU_SIZE >> 1) + 1;
- if (!m_lumaRecBuffer)
- {
- m_lumaRecBuffer = new Pel[m_lumaRecStride * m_lumaRecStride];
- }
- }
}
// ====================================================================================================================
@@ -524,7 +510,7 @@ void TComPrediction::xPredInterLumaBlk(T
pixel *ref = refPic->getLumaAddr(cu->getAddr(), cu->getZorderIdxInCU() + partAddr) + refOffset;
int dstStride = dstPic->m_width;
- int16_t *dst = dstPic->getLumaAddr(partAddr);
+ int16_t *dst = dstPic->getLumaAddr(partAddr);
int xFrac = mv->x & 0x3;
int yFrac = mv->y & 0x3;
diff -r 1be6b8c8b9ed -r 3389061b75a4 source/Lib/TLibCommon/TComPrediction.h
--- a/source/Lib/TLibCommon/TComPrediction.h Tue Feb 18 00:32:57 2014 -0600
+++ b/source/Lib/TLibCommon/TComPrediction.h Wed Feb 19 17:03:21 2014 -0600
@@ -73,11 +73,9 @@ protected:
TShortYUV m_predShortYuv[2];
TComYuv m_predTempYuv;
- int16_t* m_immedVals;
- Pel* m_lumaRecBuffer; ///< array for down-sampled reconstructed luma sample
- int m_lumaRecStride; ///< stride of m_lumaRecBuffer
- int m_hChromaShift;
- int m_vChromaShift;
+ int16_t* m_immedVals;
+ int m_hChromaShift;
+ int m_vChromaShift;
// motion compensation functions
void xPredInterUni(TComDataCU* cu, uint32_t partAddr, int width, int height, int picList, TComYuv* outPredYuv, bool bLuma = true, bool bChroma = true);
diff -r 1be6b8c8b9ed -r 3389061b75a4 source/Lib/TLibCommon/TComRom.h
--- a/source/Lib/TLibCommon/TComRom.h Tue Feb 18 00:32:57 2014 -0600
+++ b/source/Lib/TLibCommon/TComRom.h Wed Feb 19 17:03:21 2014 -0600
@@ -189,7 +189,7 @@ extern uint64_t g_nSymbolCounter;
#define DTRACE_CABAC_F(x) if ((g_nSymbolCounter >= COUNTER_START && g_nSymbolCounter <= COUNTER_END) || g_bJustDoIt) fprintf(g_hTrace, "%f", x);
#define DTRACE_CABAC_V(x) if ((g_nSymbolCounter >= COUNTER_START && g_nSymbolCounter <= COUNTER_END) || g_bJustDoIt) fprintf(g_hTrace, "%d", x);
-#define DTRACE_CABAC_VL(x) if ((g_nSymbolCounter >= COUNTER_START && g_nSymbolCounter <= COUNTER_END) || g_bJustDoIt) fprintf(g_hTrace, "%lld", x);
+#define DTRACE_CABAC_VL(x) if ((g_nSymbolCounter >= COUNTER_START && g_nSymbolCounter <= COUNTER_END) || g_bJustDoIt) fprintf(g_hTrace, "%ld", x);
#define DTRACE_CABAC_T(x) if ((g_nSymbolCounter >= COUNTER_START && g_nSymbolCounter <= COUNTER_END) || g_bJustDoIt) fprintf(g_hTrace, "%s", x);
#define DTRACE_CABAC_X(x) if ((g_nSymbolCounter >= COUNTER_START && g_nSymbolCounter <= COUNTER_END) || g_bJustDoIt) fprintf(g_hTrace, "%x", x);
#define DTRACE_CABAC_R(x, y) if ((g_nSymbolCounter >= COUNTER_START && g_nSymbolCounter <= COUNTER_END) || g_bJustDoIt) fprintf(g_hTrace, x, y);
diff -r 1be6b8c8b9ed -r 3389061b75a4 source/Lib/TLibCommon/TComSlice.cpp
--- a/source/Lib/TLibCommon/TComSlice.cpp Tue Feb 18 00:32:57 2014 -0600
+++ b/source/Lib/TLibCommon/TComSlice.cpp Wed Feb 19 17:03:21 2014 -0600
@@ -598,7 +598,7 @@ void TComSPS::createRPSList(int numRPS)
m_RPSList.create(numRPS);
}
-void TComSPS::setHrdParameters(uint32_t frameRate, uint32_t numDU, uint32_t bitRate, bool randomAccess)
+void TComSPS::setHrdParameters(uint32_t fpsNum, uint32_t fpsDenom, uint32_t numDU, uint32_t bitRate, bool randomAccess)
{
if (!getVuiParametersPresentFlag())
{
@@ -610,33 +610,8 @@ void TComSPS::setHrdParameters(uint32_t
TimingInfo *timingInfo = vui->getTimingInfo();
timingInfo->setTimingInfoPresentFlag(true);
- switch (frameRate)
- {
- case 24:
- timingInfo->setNumUnitsInTick(1125000);
- timingInfo->setTimeScale(27000000);
- break;
- case 25:
- timingInfo->setNumUnitsInTick(1080000);
- timingInfo->setTimeScale(27000000);
- break;
- case 30:
- timingInfo->setNumUnitsInTick(900900);
- timingInfo->setTimeScale(27000000);
- break;
- case 50:
- timingInfo->setNumUnitsInTick(540000);
- timingInfo->setTimeScale(27000000);
- break;
- case 60:
- timingInfo->setNumUnitsInTick(450450);
- timingInfo->setTimeScale(27000000);
- break;
- default:
- timingInfo->setNumUnitsInTick(1001);
- timingInfo->setTimeScale(60000);
- break;
- }
+ timingInfo->setNumUnitsInTick(fpsDenom);
+ timingInfo->setTimeScale(fpsNum);
bool rateCnt = (bitRate > 0);
hrd->setNalHrdParametersPresentFlag(rateCnt);
diff -r 1be6b8c8b9ed -r 3389061b75a4 source/Lib/TLibCommon/TComSlice.h
--- a/source/Lib/TLibCommon/TComSlice.h Tue Feb 18 00:32:57 2014 -0600
+++ b/source/Lib/TLibCommon/TComSlice.h Wed Feb 19 17:03:21 2014 -0600
@@ -1053,7 +1053,7 @@ public:
TComVUI* getVuiParameters() { return &m_vuiParameters; }
- void setHrdParameters(uint32_t frameRate, uint32_t numDU, uint32_t bitRate, bool randomAccess);
+ void setHrdParameters(uint32_t fpsNum, uint32_t fpsDenom, uint32_t numDU, uint32_t bitRate, bool randomAccess);
TComPTL* getPTL() { return &m_ptl; }
};
diff -r 1be6b8c8b9ed -r 3389061b75a4 source/Lib/TLibCommon/TComTrQuant.cpp
--- a/source/Lib/TLibCommon/TComTrQuant.cpp Tue Feb 18 00:32:57 2014 -0600
+++ b/source/Lib/TLibCommon/TComTrQuant.cpp Wed Feb 19 17:03:21 2014 -0600
@@ -502,7 +502,7 @@ void TComTrQuant::getTUEntropyCodingPara
const uint32_t log2BlockWidth = g_convertToBit[width] + 2;
const uint32_t log2BlockHeight = g_convertToBit[height] + 2;
- result.scanType = COEFF_SCAN_TYPE(cu->getCoefScanIdx(absPartIdx, width, ttype == TEXT_LUMA, cu->isIntra(absPartIdx)));
+ result.scanType = COEFF_SCAN_TYPE(cu->getCoefScanIdx(absPartIdx, width, height, ttype == TEXT_LUMA, cu->isIntra(absPartIdx)));
//set the group layout
result.widthInGroups = width >> MLS_CG_LOG2_WIDTH;
@@ -516,19 +516,20 @@ void TComTrQuant::getTUEntropyCodingPara
result.scanCG = g_scanOrder[SCAN_UNGROUPED][result.scanType][log2WidthInGroups][log2HeightInGroups];
//set the significance map context selection parameters
+ TextType ctype = ttype == TEXT_LUMA ? TEXT_LUMA : TEXT_CHROMA;
if ((width == 4) && (height == 4))
{
- result.firstSignificanceMapContext = significanceMapContextSetStart[ttype][CONTEXT_TYPE_4x4];
+ result.firstSignificanceMapContext = significanceMapContextSetStart[ctype][CONTEXT_TYPE_4x4];
}
else if ((width == 8) && (height == 8))
{
- result.firstSignificanceMapContext = significanceMapContextSetStart[ttype][CONTEXT_TYPE_8x8];
+ result.firstSignificanceMapContext = significanceMapContextSetStart[ctype][CONTEXT_TYPE_8x8];
if (result.scanType != SCAN_DIAG)
- result.firstSignificanceMapContext += nonDiagonalScan8x8ContextOffset[ttype];
+ result.firstSignificanceMapContext += nonDiagonalScan8x8ContextOffset[ctype];
}
else
{
- result.firstSignificanceMapContext = significanceMapContextSetStart[ttype][CONTEXT_TYPE_NxN];
+ result.firstSignificanceMapContext = significanceMapContextSetStart[ctype][CONTEXT_TYPE_NxN];
}
}
@@ -1124,8 +1125,8 @@ int TComTrQuant::getSigCtxInc(int
}
const bool notFirstGroup = ((posX >> MLS_CG_LOG2_WIDTH) + (posY >> MLS_CG_LOG2_HEIGHT)) > 0;
-
- offset = (notFirstGroup ? notFirstGroupNeighbourhoodContextOffset[ttype] : 0) + cnt;
+ TextType ctype = ttype == TEXT_LUMA ? TEXT_LUMA : TEXT_CHROMA;
+ offset = (notFirstGroup ? notFirstGroupNeighbourhoodContextOffset[ctype] : 0) + cnt;
}
return codingParameters.firstSignificanceMapContext + offset;
}
diff -r 1be6b8c8b9ed -r 3389061b75a4 source/Lib/TLibEncoder/SyntaxElementWriter.cpp
--- a/source/Lib/TLibEncoder/SyntaxElementWriter.cpp Tue Feb 18 00:32:57 2014 -0600
+++ b/source/Lib/TLibEncoder/SyntaxElementWriter.cpp Wed Feb 19 17:03:21 2014 -0600
@@ -50,7 +50,7 @@ void SyntaxElementWriter::xWriteCodeTr(
xWriteCode(value, length);
if (g_HLSTraceEnable)
{
- fprintf(g_hTrace, "%8lld ", g_nSymbolCounter++);
+ fprintf(g_hTrace, "%8ld ", g_nSymbolCounter++);
if (length < 10)
{
fprintf(g_hTrace, "%-50s u(%d) : %d\n", symbolName, length, value);
@@ -67,7 +67,7 @@ void SyntaxElementWriter::xWriteUvlcTr(
xWriteUvlc(value);
if (g_HLSTraceEnable)
{
- fprintf(g_hTrace, "%8lld ", g_nSymbolCounter++);
+ fprintf(g_hTrace, "%8ld ", g_nSymbolCounter++);
fprintf(g_hTrace, "%-50s ue(v) : %d\n", symbolName, value);
}
}
@@ -77,7 +77,7 @@ void SyntaxElementWriter::xWriteSvlcTr(
xWriteSvlc(value);
if (g_HLSTraceEnable)
{
- fprintf(g_hTrace, "%8lld ", g_nSymbolCounter++);
+ fprintf(g_hTrace, "%8ld ", g_nSymbolCounter++);
fprintf(g_hTrace, "%-50s se(v) : %d\n", symbolName, value);
}
}
@@ -87,7 +87,7 @@ void SyntaxElementWriter::xWriteFlagTr(
xWriteFlag(value);
if (g_HLSTraceEnable)
{
- fprintf(g_hTrace, "%8lld ", g_nSymbolCounter++);
+ fprintf(g_hTrace, "%8ld ", g_nSymbolCounter++);
fprintf(g_hTrace, "%-50s u(1) : %d\n", symbolName, value);
}
}
diff -r 1be6b8c8b9ed -r 3389061b75a4 source/Lib/TLibEncoder/TEncBinCoderCABAC.cpp
--- a/source/Lib/TLibEncoder/TEncBinCoderCABAC.cpp Tue Feb 18 00:32:57 2014 -0600
+++ b/source/Lib/TLibEncoder/TEncBinCoderCABAC.cpp Wed Feb 19 17:03:21 2014 -0600
@@ -172,7 +172,7 @@ void TEncBinCABAC::encodeBin(uint32_t bi
{
DTRACE_CABAC_VL(g_nSymbolCounter++)
DTRACE_CABAC_T("\tstate=")
- DTRACE_CABAC_V((ctxModel.getState() << 1) + ctxModel.getMps())
More information about the x265-commits
mailing list