dany/libwebp
1
0
Fork 0
mirror of https://github.com/webmproject/libwebp.git synced 2025-07-14 21:09:55 +02:00
Code Issues Actions Packages Projects Releases Wiki Activity

add the missing cost for I4/I16 mode selection

Browse Source 
was missing from the RD-computation of intra-4x4 score.
Doesn't change anything significantly, it's just More Correct.

Change-Id: I25c5b53a810d97e6fb7f98c549fd23bbe55e1bf4
This commit is contained in:
Pascal Massimino
2011-08-18 20:48:06 -07:00
parent 3cf2030653
commit cd12b4b0ac
2 changed files with 21 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/enc/cost.c
View File

@ -17,7 +17,7 @@
extern "C" {
#endif
//-----------------------------------------------------------------------------
//------------------------------------------------------------------------------
// Boolean-cost cost table
const uint16_t VP8EntropyCost[256] = {
@ -49,7 +49,7 @@ const uint16_t VP8EntropyCost[256] = {
10, 9, 7, 6, 4, 3
};
//-----------------------------------------------------------------------------
//------------------------------------------------------------------------------
// Level cost tables
// For each given level, the following table given the pattern of contexts
@ -351,7 +351,7 @@ static int VariableLevelCost(int level, const uint8_t probas[NUM_PROBAS]) {
return cost;
}
//-----------------------------------------------------------------------------
//------------------------------------------------------------------------------
// Pre-calc level costs once for all
void VP8CalculateLevelCosts(VP8Proba* const proba) {
@ -374,12 +374,13 @@ void VP8CalculateLevelCosts(VP8Proba* const proba) {
}
}
//-----------------------------------------------------------------------------
//------------------------------------------------------------------------------
// Mode cost tables.
// These are the fixed probabilities (in the coding trees) turned into bit-cost
// by calling VP8BitCost().
const uint16_t VP8FixedCostsUV[4] = { 302, 984, 439, 642 };
// note: these values include the fixed VP8BitCost(1, 145) mode selection cost.
const uint16_t VP8FixedCostsI16[4] = { 663, 919, 872, 919 };
const uint16_t VP8FixedCostsI4[NUM_BMODES][NUM_BMODES][NUM_BMODES] = {
{ { 251, 1362, 1934, 2085, 2314, 2230, 1839, 1988, 2437, 2348 },
@ -484,7 +485,7 @@ const uint16_t VP8FixedCostsI4[NUM_BMODES][NUM_BMODES][NUM_BMODES] = {
{ 516, 1378, 1569, 1110, 1798, 1798, 1198, 2199, 1543, 712 } },
};
//-----------------------------------------------------------------------------
//------------------------------------------------------------------------------
#if defined(__cplusplus) || defined(c_plusplus)
} // extern "C"