mirror of
https://github.com/ultravideo/uvg266.git
synced 2024-11-24 10:34:05 +00:00
Re-enable LUMA_MULT and CHROMA_MULT
This commit is contained in:
parent
132a8b3d96
commit
34fddeb85d
|
@ -49,11 +49,11 @@ static const int INTRA_THRESHOLD = 8;
|
||||||
|
|
||||||
// Modify weight of luma SSD.
|
// Modify weight of luma SSD.
|
||||||
#ifndef LUMA_MULT
|
#ifndef LUMA_MULT
|
||||||
# define LUMA_MULT 1
|
# define LUMA_MULT 0.8
|
||||||
#endif
|
#endif
|
||||||
// Modify weight of chroma SSD.
|
// Modify weight of chroma SSD.
|
||||||
#ifndef CHROMA_MULT
|
#ifndef CHROMA_MULT
|
||||||
# define CHROMA_MULT 1
|
# define CHROMA_MULT 1.5
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
static INLINE void copy_cu_info(int x_local, int y_local, int width, lcu_t *from, lcu_t *to)
|
static INLINE void copy_cu_info(int x_local, int y_local, int width, lcu_t *from, lcu_t *to)
|
||||||
|
@ -209,11 +209,11 @@ static double cu_zero_coeff_cost(const encoder_state_t *state, lcu_t *work_tree,
|
||||||
LCU_WIDTH, LCU_WIDTH, cu_width
|
LCU_WIDTH, LCU_WIDTH, cu_width
|
||||||
);
|
);
|
||||||
if (x % 8 == 0 && y % 8 == 0 && state->encoder_control->chroma_format != KVZ_CSP_400) {
|
if (x % 8 == 0 && y % 8 == 0 && state->encoder_control->chroma_format != KVZ_CSP_400) {
|
||||||
ssd += state->c_lambda / state->lambda * kvz_pixels_calc_ssd(
|
ssd += CHROMA_MULT * kvz_pixels_calc_ssd(
|
||||||
&lcu->ref.u[chroma_index], &lcu->rec.u[chroma_index],
|
&lcu->ref.u[chroma_index], &lcu->rec.u[chroma_index],
|
||||||
LCU_WIDTH_C, LCU_WIDTH_C, cu_width / 2
|
LCU_WIDTH_C, LCU_WIDTH_C, cu_width / 2
|
||||||
);
|
);
|
||||||
ssd += state->c_lambda / state->lambda * kvz_pixels_calc_ssd(
|
ssd += CHROMA_MULT * kvz_pixels_calc_ssd(
|
||||||
&lcu->ref.v[chroma_index], &lcu->rec.v[chroma_index],
|
&lcu->ref.v[chroma_index], &lcu->rec.v[chroma_index],
|
||||||
LCU_WIDTH_C, LCU_WIDTH_C, cu_width / 2
|
LCU_WIDTH_C, LCU_WIDTH_C, cu_width / 2
|
||||||
);
|
);
|
||||||
|
|
Loading…
Reference in a new issue