From b397e9106a1a3ce028cd5265fa03521f7ccdff02 Mon Sep 17 00:00:00 2001 From: vaclav Date: Wed, 30 Nov 2022 14:58:35 +0000 Subject: [PATCH 1/2] Update bitstream.c under FIX_ISM_DECODER_PRINTOUT --- lib_com/bitstream.c | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/lib_com/bitstream.c b/lib_com/bitstream.c index 12f172f2a3..a542a4f230 100644 --- a/lib_com/bitstream.c +++ b/lib_com/bitstream.c @@ -1950,6 +1950,14 @@ ivas_error preview_indices( /* read number of objects from the bitstream */ st_ivas->nchan_transport = 1; +#ifdef FIX_ISM_DECODER_PRINTOUT + k = (int16_t) ( ( total_brate / FRAMES_PER_SEC ) - 1 ); + while ( bit_stream[k] == 1 && st_ivas->nchan_transport < MAX_NUM_OBJECTS ) + { + st_ivas->nchan_transport++; + k--; + } +#else if ( total_brate != SID_2k40 && total_brate != FRAME_NO_DATA ) { k = (int16_t) ( ( total_brate / FRAMES_PER_SEC ) - 1 ); @@ -1959,7 +1967,7 @@ ivas_error preview_indices( k--; } } - +#endif st_ivas->transport_config = AUDIO_CONFIG_EXTERNAL + st_ivas->nchan_transport; st_ivas->ism_mode = ivas_ism_mode_select( st_ivas->nchan_transport, total_brate ); -- GitLab From cf04451bf5d1c603d6c2deb626e7518e15c5fae4 Mon Sep 17 00:00:00 2001 From: vaclav Date: Wed, 30 Nov 2022 15:00:28 +0000 Subject: [PATCH 2/2] Update options.h wrt. FIX_ISM_DECODER_PRINTOUT --- lib_com/options.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/lib_com/options.h b/lib_com/options.h index a4c706f0ee..388f61bd95 100644 --- a/lib_com/options.h +++ b/lib_com/options.h @@ -173,9 +173,9 @@ #define FIX_DTX_RANGE /* Issue 118: fix the DTX usage: default DTX up to 64 kbps, otherwise only in silence */ #define FIX_ISM_METADATA_READER /* Issue 211: make ISM metadata file reader robust against invalid files */ #define FIX_GET_DELAY_RETURN /* Issue 223: change return data type in function get_delay() */ +#define NTT_REDUC_COMP_POC /* NTT Contribution 10: Complexity reduction of phase spectrum in stereo downmix*/ +#define FIX_ISM_DECODER_PRINTOUT /* Issue 229: fix ISM decoder printout */ -/* NTT switches */ -#define NTT_REDUC_COMP_POC /* Contribution : Complexity reduction of phase spectrum in stereo downmix*/ /* ################## End DEVELOPMENT switches ######################### */ /* clang-format on */ -- GitLab