From 48e56d57cc82849a8ded720fa35e0bbadd4f9bed Mon Sep 17 00:00:00 2001 From: Markus Multrus Date: Wed, 2 Aug 2023 18:18:48 +0200 Subject: [PATCH 1/3] compiler warning --- Makefile | 2 +- lib_enc/ivas_masa_enc.c | 7 ++++++- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/Makefile b/Makefile index 138a4cdaed..2ce7cf7a52 100644 --- a/Makefile +++ b/Makefile @@ -87,7 +87,7 @@ endif ifeq "$(RELEASE)" "1" CFLAGS += -DRELEASE -OPTIM ?= 2 +#OPTIM ?= 2 endif ifneq "$(DEBUG)" "0" diff --git a/lib_enc/ivas_masa_enc.c b/lib_enc/ivas_masa_enc.c index 18590f5cc0..461a43f80e 100644 --- a/lib_enc/ivas_masa_enc.c +++ b/lib_enc/ivas_masa_enc.c @@ -3255,12 +3255,15 @@ static int16_t encode_ratio_ism_subframe( { int16_t b, b_signif; int16_t diff_idx[MAX_NUM_OBJECTS]; - int16_t nbits, nbits0, nbits1, GR_order, GR_order_sb, bits_pos0; + int16_t nbits, nbits0, nbits1, GR_order, GR_order_sb; int16_t differential_subframe; int16_t ratio_ism_idx_ref[MAX_NUM_OBJECTS]; int16_t bits_index; int16_t nbits00, nbits11; int16_t idx_sep_obj_local; +#ifdef DEBUGGING + int16_t bits_pos0; +#endif idx_sep_obj_local = idx_separated_obj; if ( idx_separated_obj > -1 ) @@ -3274,7 +3277,9 @@ static int16_t encode_ratio_ism_subframe( nbits0 = 0; nbits1 = 0; +#ifdef DEBUGGING bits_pos0 = hMetaData->nb_bits_tot; +#endif differential_subframe = 1; /* the differences are taken with respect to previous subframe */ /* first subframe */ -- GitLab From 7bccff500c5e5c7e46a3e66dace965227590ccbf Mon Sep 17 00:00:00 2001 From: Markus Multrus Date: Wed, 2 Aug 2023 18:20:12 +0200 Subject: [PATCH 2/3] Revert "compiler warning" This reverts commit 48e56d57cc82849a8ded720fa35e0bbadd4f9bed. --- Makefile | 2 +- lib_enc/ivas_masa_enc.c | 7 +------ 2 files changed, 2 insertions(+), 7 deletions(-) diff --git a/Makefile b/Makefile index 2ce7cf7a52..138a4cdaed 100644 --- a/Makefile +++ b/Makefile @@ -87,7 +87,7 @@ endif ifeq "$(RELEASE)" "1" CFLAGS += -DRELEASE -#OPTIM ?= 2 +OPTIM ?= 2 endif ifneq "$(DEBUG)" "0" diff --git a/lib_enc/ivas_masa_enc.c b/lib_enc/ivas_masa_enc.c index 461a43f80e..18590f5cc0 100644 --- a/lib_enc/ivas_masa_enc.c +++ b/lib_enc/ivas_masa_enc.c @@ -3255,15 +3255,12 @@ static int16_t encode_ratio_ism_subframe( { int16_t b, b_signif; int16_t diff_idx[MAX_NUM_OBJECTS]; - int16_t nbits, nbits0, nbits1, GR_order, GR_order_sb; + int16_t nbits, nbits0, nbits1, GR_order, GR_order_sb, bits_pos0; int16_t differential_subframe; int16_t ratio_ism_idx_ref[MAX_NUM_OBJECTS]; int16_t bits_index; int16_t nbits00, nbits11; int16_t idx_sep_obj_local; -#ifdef DEBUGGING - int16_t bits_pos0; -#endif idx_sep_obj_local = idx_separated_obj; if ( idx_separated_obj > -1 ) @@ -3277,9 +3274,7 @@ static int16_t encode_ratio_ism_subframe( nbits0 = 0; nbits1 = 0; -#ifdef DEBUGGING bits_pos0 = hMetaData->nb_bits_tot; -#endif differential_subframe = 1; /* the differences are taken with respect to previous subframe */ /* first subframe */ -- GitLab From 40a18f249230af442033eed4c85265f0f204d508 Mon Sep 17 00:00:00 2001 From: Markus Multrus Date: Wed, 2 Aug 2023 18:21:42 +0200 Subject: [PATCH 3/3] compiler warning --- lib_enc/ivas_masa_enc.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/lib_enc/ivas_masa_enc.c b/lib_enc/ivas_masa_enc.c index 18590f5cc0..461a43f80e 100644 --- a/lib_enc/ivas_masa_enc.c +++ b/lib_enc/ivas_masa_enc.c @@ -3255,12 +3255,15 @@ static int16_t encode_ratio_ism_subframe( { int16_t b, b_signif; int16_t diff_idx[MAX_NUM_OBJECTS]; - int16_t nbits, nbits0, nbits1, GR_order, GR_order_sb, bits_pos0; + int16_t nbits, nbits0, nbits1, GR_order, GR_order_sb; int16_t differential_subframe; int16_t ratio_ism_idx_ref[MAX_NUM_OBJECTS]; int16_t bits_index; int16_t nbits00, nbits11; int16_t idx_sep_obj_local; +#ifdef DEBUGGING + int16_t bits_pos0; +#endif idx_sep_obj_local = idx_separated_obj; if ( idx_separated_obj > -1 ) @@ -3274,7 +3277,9 @@ static int16_t encode_ratio_ism_subframe( nbits0 = 0; nbits1 = 0; +#ifdef DEBUGGING bits_pos0 = hMetaData->nb_bits_tot; +#endif differential_subframe = 1; /* the differences are taken with respect to previous subframe */ /* first subframe */ -- GitLab