From e06253d437bbf3d2ff21af9d9d8e5d709e8ccfe5 Mon Sep 17 00:00:00 2001 From: Laurent Fasnacht Date: Wed, 16 Apr 2014 11:00:04 +0200 Subject: [PATCH] scalinglist changes missing in previous commit --- src/encoder.c | 4 ++-- src/encoder.h | 1 - src/transform.c | 2 +- 3 files changed, 3 insertions(+), 4 deletions(-) diff --git a/src/encoder.c b/src/encoder.c index b9bc124a..61b7ffe1 100644 --- a/src/encoder.c +++ b/src/encoder.c @@ -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"); // scaling list - WRITE_U(encoder->stream, encoder->scaling_list_enable, 1, "scaling_list_enable_flag"); - if (encoder->scaling_list_enable) { + WRITE_U(encoder->stream, encoder->scaling_list.enable, 1, "scaling_list_enable_flag"); + if (encoder->scaling_list.enable) { WRITE_U(encoder->stream, 1, 1, "sps_scaling_list_data_present_flag"); encode_scaling_list(encoder); } diff --git a/src/encoder.h b/src/encoder.h index e091210b..65ca5b29 100644 --- a/src/encoder.h +++ b/src/encoder.h @@ -101,7 +101,6 @@ typedef struct int8_t aud_enable; //scaling list - uint8_t scaling_list_enable; scaling_list scaling_list; } encoder_control; diff --git a/src/transform.c b/src/transform.c index 65d37eb8..e9df31f9 100644 --- a/src/transform.c +++ b/src/transform.c @@ -764,7 +764,7 @@ void dequant(const encoder_control * const encoder, int16_t *q_coef, int16_t *co 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; int32_t scalinglist_type = (block_type == CU_INTRA ? 0 : 3) + (int8_t)("\0\3\1\2"[type]);