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

scalinglist changes missing in previous commit

Browse source
This commit is contained in:
Laurent Fasnacht 2014-04-16 11:00:04 +02:00
parent 9901c38dd5
commit e06253d437
3 changed files with 3 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/encoder.c
View file

@ -805,8 +805,8 @@ void encode_seq_parameter_set(const encoder_control * const encoder)
WRITE_UE(encoder->stream, TR_DEPTH_INTRA, "max_transform_hierarchy_depth_intra"); WRITE_UE(encoder->stream, TR_DEPTH_INTRA, "max_transform_hierarchy_depth_intra");
// scaling list // scaling list
WRITE_U(encoder->stream, encoder->scaling_list_enable, 1, "scaling_list_enable_flag"); WRITE_U(encoder->stream, encoder->scaling_list.enable, 1, "scaling_list_enable_flag");
if (encoder->scaling_list_enable) { if (encoder->scaling_list.enable) {
WRITE_U(encoder->stream, 1, 1, "sps_scaling_list_data_present_flag"); WRITE_U(encoder->stream, 1, 1, "sps_scaling_list_data_present_flag");
encode_scaling_list(encoder); encode_scaling_list(encoder);
} }

1
src/encoder.h
View file

@ -101,7 +101,6 @@ typedef struct
int8_t aud_enable; int8_t aud_enable;
//scaling list //scaling list
uint8_t scaling_list_enable;
scaling_list scaling_list; scaling_list scaling_list;
} encoder_control; } encoder_control;

2
src/transform.c
View file

@ -764,7 +764,7 @@ void dequant(const encoder_control * const encoder, int16_t *q_coef, int16_t *co
shift = 20 - QUANT_SHIFT - transform_shift; shift = 20 - QUANT_SHIFT - transform_shift;
if (encoder->scaling_list_enable) if (encoder->scaling_list.enable)
{ {
uint32_t log2_tr_size = g_convert_to_bit[ width ] + 2; uint32_t log2_tr_size = g_convert_to_bit[ width ] + 2;
int32_t scalinglist_type = (block_type == CU_INTRA ? 0 : 3) + (int8_t)("\0\3\1\2"[type]); int32_t scalinglist_type = (block_type == CU_INTRA ? 0 : 3) + (int8_t)("\0\3\1\2"[type]);