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

Fixed a bug in flat scaling list and disabled scaling list by default

Browse source
This commit is contained in:
Marko Viitanen 2013-11-05 09:41:14 +02:00
parent 2f53b0aa3a
commit 93f2b75df7
2 changed files with 4 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/global.h
View file

@ -57,7 +57,7 @@ typedef int16_t coefficient;
#define ENABLE_PCM 0 /*!< Setting to 1 will enable using PCM blocks (current intra-search does not consider PCM) */
#define ENABLE_SIGN_HIDING 1
#define ENABLE_SCALING_LIST 1 /*!< Enable usage of (default) scaling list (BREAKS CHROMA WHEN 0!) */
#define ENABLE_SCALING_LIST 0 /*!< Enable usage of (default) scaling list */
#define ENABLE_TEMPORAL_MVP 0 /*!< Enable usage of temporal Motion Vector Prediction */

8
src/transform.c
View file

@ -769,7 +769,6 @@ void quant(encoder_control *encoder, int16_t *coef, int16_t *q_coef, int32_t wid
int32_t qp_scaled;
int32_t qp_offset = 0;
if(type == 0) {
qp_scaled = qp_base + qp_offset;
} else {
@ -780,7 +779,7 @@ void quant(encoder_control *encoder, int16_t *coef, int16_t *q_coef, int32_t wid
qp_scaled = g_chroma_scale[qp_scaled] + qp_offset;
}
}
//New block for variable definitions
{
int32_t n;
@ -818,7 +817,6 @@ void quant(encoder_control *encoder, int16_t *coef, int16_t *q_coef, int32_t wid
#define SCAN_SET_SIZE 16
#define LOG2_SCAN_SET_SIZE 4
int32_t n,last_cg = -1, abssum = 0, subset, subpos;
uint32_t *scan_subpos;
for(subset = (width*height - 1)>>LOG2_SCAN_SET_SIZE; subset >= 0; subset--) {
int32_t first_nz_pos_in_cg = SCAN_SET_SIZE, last_nz_pos_in_cg=-1;
subpos = subset<<LOG2_SCAN_SET_SIZE;
@ -922,7 +920,7 @@ void dequant(encoder_control *encoder, int16_t *q_coef, int16_t *coef, int32_t w
if (qp_scaled < 0) {
qp_scaled = qp_scaled;
} else {
qp_scaled = g_chroma_scale[ qp_scaled ];
qp_scaled = g_chroma_scale[qp_scaled];
}
}
@ -950,7 +948,7 @@ void dequant(encoder_control *encoder, int16_t *q_coef, int16_t *coef, int32_t w
}
#else
{
int32_t scale = g_inv_quant_scales[encoder->QP%6] << (encoder->QP/6);
int32_t scale = g_inv_quant_scales[qp_scaled%6] << (qp_scaled/6);
add = 1 << (shift-1);
for (n = 0; n < width*height; n++) {