hashirama/uvg266
1
0
Fork 0
mirror of https://github.com/ultravideo/uvg266.git synced 2024-11-27 19:24:06 +00:00
Code Issues Actions Projects Releases Wiki Activity

Move fast coeff table to transform.h

Browse source 
Guess this is a more logical place for it
This commit is contained in:
Pauli Oikkonen 2020-09-23 17:07:02 +03:00
parent 4712ce5f59
commit 6799019db0
2 changed files with 53 additions and 54 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

53
src/strategies/strategies-quant.h
View file

@ -32,59 +32,6 @@
#include "kvazaar.h" #include "kvazaar.h"
#include "tables.h" #include "tables.h"
#define MIN_FAST_COEFF_COST_QP 12
#define MAX_FAST_COEFF_COST_QP 42
#define FAST_COEFF_QP_COUNT ((MAX_FAST_COEFF_COST_QP) - (MIN_FAST_COEFF_COST_QP) + (1))
// Note: Assumes that costs are non-negative, for pretty obvious reasons
#define TO_Q88(f) ((uint16_t)((f) * (256.0f) + (0.5f)))
#define TO_4XQ88(f0,f1,f2,f3) ( \
((uint64_t)TO_Q88((f0)) << 0) | \
((uint64_t)TO_Q88((f1)) << 16) | \
((uint64_t)TO_Q88((f2)) << 32) | \
((uint64_t)TO_Q88((f3)) << 48) \
)
// Weights for 4 buckets (coeff 0, coeff 1, coeff 2, coeff >= 3), for QPs from
// MIN_FAST_COEFF_COST_QP to MAX_FAST_COEFF_COST_QP with ultrafast encoding
static const uint64_t fast_coeff_cost_wts[FAST_COEFF_QP_COUNT] = {
TO_4XQ88(0.134012, 4.207784, 3.431633, 6.556149),
TO_4XQ88(0.122972, 4.278606, 3.398710, 6.527168),
TO_4XQ88(0.109453, 4.373356, 3.335091, 6.499565),
TO_4XQ88(0.095884, 4.485212, 3.217406, 6.488617),
TO_4XQ88(0.083252, 4.591962, 3.088931, 6.481644),
TO_4XQ88(0.071878, 4.674704, 2.989839, 6.464058),
TO_4XQ88(0.060957, 4.743912, 2.922084, 6.438406),
TO_4XQ88(0.050599, 4.799877, 2.901414, 6.405108),
TO_4XQ88(0.040942, 4.848476, 2.899774, 6.368717),
TO_4XQ88(0.033205, 4.882974, 2.908347, 6.329815),
TO_4XQ88(0.026834, 4.909299, 2.913517, 6.292657),
TO_4XQ88(0.022367, 4.924819, 2.919600, 6.257252),
TO_4XQ88(0.018591, 4.935092, 2.946776, 6.214822),
TO_4XQ88(0.015312, 4.939410, 3.028364, 6.154816),
TO_4XQ88(0.012358, 4.942173, 3.127025, 6.094022),
TO_4XQ88(0.010188, 4.945157, 3.215646, 6.051293),
TO_4XQ88(0.008442, 4.948889, 3.293383, 6.020484),
TO_4XQ88(0.007136, 4.954426, 3.360035, 6.000430),
TO_4XQ88(0.006015, 4.962144, 3.418237, 5.983726),
TO_4XQ88(0.005135, 4.974654, 3.461126, 5.970288),
TO_4XQ88(0.004360, 4.989681, 3.500489, 5.958140),
TO_4XQ88(0.003711, 5.006930, 3.545568, 5.948645),
TO_4XQ88(0.003128, 5.024501, 3.596080, 5.941973),
TO_4XQ88(0.002656, 5.043468, 3.649575, 5.940536),
TO_4XQ88(0.002246, 5.065988, 3.698400, 5.940656),
TO_4XQ88(0.001924, 5.097480, 3.733661, 5.941015),
TO_4XQ88(0.001638, 5.133176, 3.763985, 5.942503),
TO_4XQ88(0.001392, 5.170478, 3.796842, 5.954164),
TO_4XQ88(0.001166, 5.206007, 3.835210, 5.980734),
TO_4XQ88(0.000987, 5.234321, 3.878463, 6.031444),
TO_4XQ88(0.000853, 5.255265, 3.915359, 6.080584),
};
#undef TO_4XQ88
#undef TO_Q88
// Declare function pointers. // Declare function pointers.
typedef unsigned (quant_func)(const encoder_state_t * const state, coeff_t *coef, coeff_t *q_coef, int32_t width, typedef unsigned (quant_func)(const encoder_state_t * const state, coeff_t *coef, coeff_t *q_coef, int32_t width,
int32_t height, int8_t type, int8_t scan_idx, int8_t block_type); int32_t height, int8_t type, int8_t scan_idx, int8_t block_type);

54
src/transform.h
View file

@ -31,10 +31,62 @@
#include "encoderstate.h" #include "encoderstate.h"
#include "global.h" // IWYU pragma: keep #include "global.h" // IWYU pragma: keep
extern const uint8_t kvz_g_chroma_scale[58]; extern const uint8_t kvz_g_chroma_scale[58];
extern const int16_t kvz_g_inv_quant_scales[6]; extern const int16_t kvz_g_inv_quant_scales[6];
#define MIN_FAST_COEFF_COST_QP 12
#define MAX_FAST_COEFF_COST_QP 42
#define FAST_COEFF_QP_COUNT ((MAX_FAST_COEFF_COST_QP) - (MIN_FAST_COEFF_COST_QP) + (1))
// Note: Assumes that costs are non-negative, for pretty obvious reasons
#define TO_Q88(f) ((uint16_t)((f) * (256.0f) + (0.5f)))
#define TO_4XQ88(f0,f1,f2,f3) ( \
((uint64_t)TO_Q88((f0)) << 0) | \
((uint64_t)TO_Q88((f1)) << 16) | \
((uint64_t)TO_Q88((f2)) << 32) | \
((uint64_t)TO_Q88((f3)) << 48) \
)
// Weights for 4 buckets (coeff 0, coeff 1, coeff 2, coeff >= 3), for QPs from
// MIN_FAST_COEFF_COST_QP to MAX_FAST_COEFF_COST_QP with ultrafast encoding
static const uint64_t fast_coeff_cost_wts[FAST_COEFF_QP_COUNT] = {
TO_4XQ88(0.134012, 4.207784, 3.431633, 6.556149),
TO_4XQ88(0.122972, 4.278606, 3.398710, 6.527168),
TO_4XQ88(0.109453, 4.373356, 3.335091, 6.499565),
TO_4XQ88(0.095884, 4.485212, 3.217406, 6.488617),
TO_4XQ88(0.083252, 4.591962, 3.088931, 6.481644),
TO_4XQ88(0.071878, 4.674704, 2.989839, 6.464058),
TO_4XQ88(0.060957, 4.743912, 2.922084, 6.438406),
TO_4XQ88(0.050599, 4.799877, 2.901414, 6.405108),
TO_4XQ88(0.040942, 4.848476, 2.899774, 6.368717),
TO_4XQ88(0.033205, 4.882974, 2.908347, 6.329815),
TO_4XQ88(0.026834, 4.909299, 2.913517, 6.292657),
TO_4XQ88(0.022367, 4.924819, 2.919600, 6.257252),
TO_4XQ88(0.018591, 4.935092, 2.946776, 6.214822),
TO_4XQ88(0.015312, 4.939410, 3.028364, 6.154816),
TO_4XQ88(0.012358, 4.942173, 3.127025, 6.094022),
TO_4XQ88(0.010188, 4.945157, 3.215646, 6.051293),
TO_4XQ88(0.008442, 4.948889, 3.293383, 6.020484),
TO_4XQ88(0.007136, 4.954426, 3.360035, 6.000430),
TO_4XQ88(0.006015, 4.962144, 3.418237, 5.983726),
TO_4XQ88(0.005135, 4.974654, 3.461126, 5.970288),
TO_4XQ88(0.004360, 4.989681, 3.500489, 5.958140),
TO_4XQ88(0.003711, 5.006930, 3.545568, 5.948645),
TO_4XQ88(0.003128, 5.024501, 3.596080, 5.941973),
TO_4XQ88(0.002656, 5.043468, 3.649575, 5.940536),
TO_4XQ88(0.002246, 5.065988, 3.698400, 5.940656),
TO_4XQ88(0.001924, 5.097480, 3.733661, 5.941015),
TO_4XQ88(0.001638, 5.133176, 3.763985, 5.942503),
TO_4XQ88(0.001392, 5.170478, 3.796842, 5.954164),
TO_4XQ88(0.001166, 5.206007, 3.835210, 5.980734),
TO_4XQ88(0.000987, 5.234321, 3.878463, 6.031444),
TO_4XQ88(0.000853, 5.255265, 3.915359, 6.080584),
};
#undef TO_4XQ88
#undef TO_Q88
void kvz_transformskip(const encoder_control_t *encoder, int16_t *block,int16_t *coeff, int8_t block_size); void kvz_transformskip(const encoder_control_t *encoder, int16_t *block,int16_t *coeff, int8_t block_size);
void kvz_itransformskip(const encoder_control_t *encoder, int16_t *block,int16_t *coeff, int8_t block_size); void kvz_itransformskip(const encoder_control_t *encoder, int16_t *block,int16_t *coeff, int8_t block_size);