# HG changeset patch
# User Satoshi Nakagawa <[email protected]>
# Date 1390736055 -32400
# Sun Jan 26 20:34:15 2014 +0900
# Node ID ff110dd850e7931455a41f409cf621b3aaf670cf
# Parent c59cbc166bede46c227ca47a9d7207d84d117544
reduce unused context models
diff -r c59cbc166bed -r ff110dd850e7 source/Lib/TLibCommon/ContextTables.h
--- a/source/Lib/TLibCommon/ContextTables.h Sat Jan 25 13:26:43 2014 +0900
+++ b/source/Lib/TLibCommon/ContextTables.h Sun Jan 26 20:34:15 2014 +0900
@@ -77,7 +77,9 @@
#define NUM_SIG_FLAG_CTX_LUMA 27 ///< number of context models
for luma sig flag
#define NUM_SIG_FLAG_CTX_CHROMA 15 ///< number of context models
for chroma sig flag
-#define NUM_CTX_LAST_FLAG_XY 15 ///< number of context models
for last coefficient position
+#define NUM_CTX_LAST_FLAG_XY 18 ///< number of context models
for last coefficient position
+#define NUM_CTX_LAST_FLAG_XY_LUMA 15 ///< number of context models
for last coefficient position of luma
+#define NUM_CTX_LAST_FLAG_XY_CHROMA 3 ///< number of context models
for last coefficient position of chroma
#define NUM_ONE_FLAG_CTX 24 ///< number of context models
for greater than 1 flag
#define NUM_ONE_FLAG_CTX_LUMA 16 ///< number of context models
for greater than 1 flag of luma
@@ -114,8 +116,8 @@
#define OFF_SIG_CG_FLAG_CTX (OFF_QT_ROOT_CBF_CTX +
NUM_QT_ROOT_CBF_CTX)
#define OFF_SIG_FLAG_CTX (OFF_SIG_CG_FLAG_CTX + 2 *
NUM_SIG_CG_FLAG_CTX)
#define OFF_CTX_LAST_FLAG_X (OFF_SIG_FLAG_CTX +
NUM_SIG_FLAG_CTX)
-#define OFF_CTX_LAST_FLAG_Y (OFF_CTX_LAST_FLAG_X + 2 *
NUM_CTX_LAST_FLAG_XY)
-#define OFF_ONE_FLAG_CTX (OFF_CTX_LAST_FLAG_Y + 2 *
NUM_CTX_LAST_FLAG_XY)
+#define OFF_CTX_LAST_FLAG_Y (OFF_CTX_LAST_FLAG_X +
NUM_CTX_LAST_FLAG_XY)
+#define OFF_ONE_FLAG_CTX (OFF_CTX_LAST_FLAG_Y +
NUM_CTX_LAST_FLAG_XY)
#define OFF_ABS_FLAG_CTX (OFF_ONE_FLAG_CTX +
NUM_ONE_FLAG_CTX)
#define OFF_MVP_IDX_CTX (OFF_ABS_FLAG_CTX +
NUM_ABS_FLAG_CTX)
#define OFF_SAO_MERGE_FLAG_CTX (OFF_MVP_IDX_CTX +
NUM_MVP_IDX_CTX)
@@ -282,11 +284,11 @@
INIT_LAST[3][2 * NUM_CTX_LAST_FLAG_XY] =
{
{ 125, 110, 124, 110, 95, 94, 125, 111, 111, 79, 125, 126,
111, 111, 79,
- 108, 123, 93, CNU, CNU, CNU, CNU, CNU, CNU, CNU, CNU, CNU,
CNU, CNU, CNU, },
+ 108, 123, 93 },
{ 125, 110, 94, 110, 95, 79, 125, 111, 110, 78, 110, 111,
111, 95, 94,
- 108, 123, 108, CNU, CNU, CNU, CNU, CNU, CNU, CNU, CNU, CNU,
CNU, CNU, CNU, },
+ 108, 123, 108 },
{ 110, 110, 124, 125, 140, 153, 125, 127, 140, 109, 111, 143,
127, 111, 79,
- 108, 123, 63, CNU, CNU, CNU, CNU, CNU, CNU, CNU, CNU, CNU,
CNU, CNU, CNU, },
+ 108, 123, 63 },
};
static const uint8_t
diff -r c59cbc166bed -r ff110dd850e7 source/Lib/TLibEncoder/TEncSbac.cpp
--- a/source/Lib/TLibEncoder/TEncSbac.cpp Sat Jan 25 13:26:43 2014 +0900
+++ b/source/Lib/TLibEncoder/TEncSbac.cpp Sun Jan 26 20:34:15 2014 +0900
@@ -229,8 +229,8 @@
initBuffer(&m_contextModels[OFF_QT_ROOT_CBF_CTX], sliceType, qp,
(UChar*)INIT_QT_ROOT_CBF, NUM_QT_ROOT_CBF_CTX);
initBuffer(&m_contextModels[OFF_SIG_CG_FLAG_CTX], sliceType, qp,
(UChar*)INIT_SIG_CG_FLAG, 2 * NUM_SIG_CG_FLAG_CTX);
initBuffer(&m_contextModels[OFF_SIG_FLAG_CTX], sliceType, qp,
(UChar*)INIT_SIG_FLAG, NUM_SIG_FLAG_CTX);
- initBuffer(&m_contextModels[OFF_CTX_LAST_FLAG_X], sliceType, qp,
(UChar*)INIT_LAST, 2 * NUM_CTX_LAST_FLAG_XY);
- initBuffer(&m_contextModels[OFF_CTX_LAST_FLAG_Y], sliceType, qp,
(UChar*)INIT_LAST, 2 * NUM_CTX_LAST_FLAG_XY);
+ initBuffer(&m_contextModels[OFF_CTX_LAST_FLAG_X], sliceType, qp,
(UChar*)INIT_LAST, NUM_CTX_LAST_FLAG_XY);
+ initBuffer(&m_contextModels[OFF_CTX_LAST_FLAG_Y], sliceType, qp,
(UChar*)INIT_LAST, NUM_CTX_LAST_FLAG_XY);
initBuffer(&m_contextModels[OFF_ONE_FLAG_CTX], sliceType, qp,
(UChar*)INIT_ONE_FLAG, NUM_ONE_FLAG_CTX);
initBuffer(&m_contextModels[OFF_ABS_FLAG_CTX], sliceType, qp,
(UChar*)INIT_ABS_FLAG, NUM_ABS_FLAG_CTX);
initBuffer(&m_contextModels[OFF_MVP_IDX_CTX], sliceType, qp,
(UChar*)INIT_MVP_IDX, NUM_MVP_IDX_CTX);
@@ -280,8 +280,8 @@
curCost += calcCost(&m_contextModels[OFF_QT_ROOT_CBF_CTX],
curSliceType, qp, (UChar*)INIT_QT_ROOT_CBF, NUM_QT_ROOT_CBF_CTX);
curCost += calcCost(&m_contextModels[OFF_SIG_CG_FLAG_CTX],
curSliceType, qp, (UChar*)INIT_SIG_CG_FLAG, 2 * NUM_SIG_CG_FLAG_CTX);
curCost += calcCost(&m_contextModels[OFF_SIG_FLAG_CTX],
curSliceType, qp, (UChar*)INIT_SIG_FLAG, NUM_SIG_FLAG_CTX);
- curCost += calcCost(&m_contextModels[OFF_CTX_LAST_FLAG_X],
curSliceType, qp, (UChar*)INIT_LAST, 2 * NUM_CTX_LAST_FLAG_XY);
- curCost += calcCost(&m_contextModels[OFF_CTX_LAST_FLAG_Y],
curSliceType, qp, (UChar*)INIT_LAST, 2 * NUM_CTX_LAST_FLAG_XY);
+ curCost += calcCost(&m_contextModels[OFF_CTX_LAST_FLAG_X],
curSliceType, qp, (UChar*)INIT_LAST, NUM_CTX_LAST_FLAG_XY);
+ curCost += calcCost(&m_contextModels[OFF_CTX_LAST_FLAG_Y],
curSliceType, qp, (UChar*)INIT_LAST, NUM_CTX_LAST_FLAG_XY);
curCost += calcCost(&m_contextModels[OFF_ONE_FLAG_CTX],
curSliceType, qp, (UChar*)INIT_ONE_FLAG, NUM_ONE_FLAG_CTX);
curCost += calcCost(&m_contextModels[OFF_ABS_FLAG_CTX],
curSliceType, qp, (UChar*)INIT_ABS_FLAG, NUM_ABS_FLAG_CTX);
curCost += calcCost(&m_contextModels[OFF_MVP_IDX_CTX],
curSliceType, qp, (UChar*)INIT_MVP_IDX, NUM_MVP_IDX_CTX);
@@ -2074,8 +2074,8 @@
}
uint32_t ctxLast;
- ContextModel *ctxX = &m_contextModels[OFF_CTX_LAST_FLAG_X + (ttype ?
NUM_CTX_LAST_FLAG_XY : 0)];
- ContextModel *ctxY = &m_contextModels[OFF_CTX_LAST_FLAG_Y + (ttype ?
NUM_CTX_LAST_FLAG_XY : 0)];
+ ContextModel *ctxX = &m_contextModels[OFF_CTX_LAST_FLAG_X + (ttype ?
NUM_CTX_LAST_FLAG_XY_LUMA : 0)];
+ ContextModel *ctxY = &m_contextModels[OFF_CTX_LAST_FLAG_Y + (ttype ?
NUM_CTX_LAST_FLAG_XY_LUMA : 0)];
uint32_t groupIdxX = g_groupIdx[posx];
uint32_t groupIdxY = g_groupIdx[posy];
@@ -2558,16 +2558,16 @@
for (ctx = 0; ctx < g_groupIdx[width - 1]; ctx++)
{
int ctxOffset = blkSizeOffsetX + (ctx >> shiftX);
- estBitsSbac->lastXBits[ctx] = bitsX +
sbacGetEntropyBits(m_contextModels[OFF_CTX_LAST_FLAG_X + ((ttype ?
NUM_CTX_LAST_FLAG_XY : 0) + ctxOffset)].m_state, 0);
- bitsX += sbacGetEntropyBits(m_contextModels[OFF_CTX_LAST_FLAG_X +
((ttype ? NUM_CTX_LAST_FLAG_XY : 0) + ctxOffset)].m_state, 1);
+ estBitsSbac->lastXBits[ctx] = bitsX +
sbacGetEntropyBits(m_contextModels[OFF_CTX_LAST_FLAG_X + ((ttype ?
NUM_CTX_LAST_FLAG_XY_LUMA : 0) + ctxOffset)].m_state, 0);
+ bitsX += sbacGetEntropyBits(m_contextModels[OFF_CTX_LAST_FLAG_X +
((ttype ? NUM_CTX_LAST_FLAG_XY_LUMA : 0) + ctxOffset)].m_state, 1);
}
estBitsSbac->lastXBits[ctx] = bitsX;
for (ctx = 0; ctx < g_groupIdx[height - 1]; ctx++)
{
int ctxOffset = blkSizeOffsetY + (ctx >> shiftY);
- estBitsSbac->lastYBits[ctx] = bitsY +
sbacGetEntropyBits(m_contextModels[OFF_CTX_LAST_FLAG_Y + ((ttype ?
NUM_CTX_LAST_FLAG_XY : 0) + ctxOffset)].m_state, 0);
- bitsY += sbacGetEntropyBits(m_contextModels[OFF_CTX_LAST_FLAG_Y +
((ttype ? NUM_CTX_LAST_FLAG_XY : 0) + ctxOffset)].m_state, 1);
+ estBitsSbac->lastYBits[ctx] = bitsY +
sbacGetEntropyBits(m_contextModels[OFF_CTX_LAST_FLAG_Y + ((ttype ?
NUM_CTX_LAST_FLAG_XY_LUMA : 0) + ctxOffset)].m_state, 0);
+ bitsY += sbacGetEntropyBits(m_contextModels[OFF_CTX_LAST_FLAG_Y +
((ttype ? NUM_CTX_LAST_FLAG_XY_LUMA : 0) + ctxOffset)].m_state, 1);
}
estBitsSbac->lastYBits[ctx] = bitsY;
_______________________________________________
x265-devel mailing list
[email protected]
https://mailman.videolan.org/listinfo/x265-devel
