# HG changeset patch # User David T Yuen <dtyx...@gmail.com> # Date 1392832006 28800 # Node ID 1c78bd13a14f3d5227c4b961664af97f86a8810d # Parent 591ca91f0501b167627adc1c9542aebc60dc320a Fixed ENC_DEC_TRACE warnings and errors
diff -r 591ca91f0501 -r 1c78bd13a14f source/Lib/TLibCommon/TComRom.h --- a/source/Lib/TLibCommon/TComRom.h Wed Feb 19 16:34:20 2014 +0530 +++ b/source/Lib/TLibCommon/TComRom.h Wed Feb 19 09:46:46 2014 -0800 @@ -189,7 +189,7 @@ #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 591ca91f0501 -r 1c78bd13a14f source/Lib/TLibEncoder/SyntaxElementWriter.cpp --- a/source/Lib/TLibEncoder/SyntaxElementWriter.cpp Wed Feb 19 16:34:20 2014 +0530 +++ b/source/Lib/TLibEncoder/SyntaxElementWriter.cpp Wed Feb 19 09:46:46 2014 -0800 @@ -50,7 +50,7 @@ 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 @@ 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 @@ 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 @@ 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 591ca91f0501 -r 1c78bd13a14f source/Lib/TLibEncoder/TEncBinCoderCABAC.cpp --- a/source/Lib/TLibEncoder/TEncBinCoderCABAC.cpp Wed Feb 19 16:34:20 2014 +0530 +++ b/source/Lib/TLibEncoder/TEncBinCoderCABAC.cpp Wed Feb 19 09:46:46 2014 -0800 @@ -172,7 +172,7 @@ { DTRACE_CABAC_VL(g_nSymbolCounter++) DTRACE_CABAC_T("\tstate=") - DTRACE_CABAC_V((ctxModel.getState() << 1) + ctxModel.getMps()) + DTRACE_CABAC_V((ctxModel.m_state << 1) + sbacGetMps(ctxModel.m_state)) DTRACE_CABAC_T("\tsymbol=") DTRACE_CABAC_V(binValue) DTRACE_CABAC_T("\n") _______________________________________________ x265-devel mailing list x265-devel@videolan.org https://mailman.videolan.org/listinfo/x265-devel