From 98aad590934251dae4641ea83c25a0700f3c9169 Mon Sep 17 00:00:00 2001 From: Jouni Paulus Date: Mon, 4 Aug 2025 10:22:36 +0200 Subject: [PATCH 1/4] add piece of code responsible for determining OMASA output channel count missed in !1937 --- lib_rend/ivas_output_init_fx.c | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/lib_rend/ivas_output_init_fx.c b/lib_rend/ivas_output_init_fx.c index 5c19acb5f..055e75d44 100644 --- a/lib_rend/ivas_output_init_fx.c +++ b/lib_rend/ivas_output_init_fx.c @@ -384,6 +384,12 @@ Word16 ivas_get_nchan_buffers_dec( nchan_out_buff = s_max( nchan_out_buff, audioCfg2channels( st_ivas->intern_config ) ); nchan_out_buff = s_max( nchan_out_buff, audioCfg2channels( output_config ) ); } +#ifdef NONBE_FIX_984_OMASA_EXT_OUTPUT + IF( EQ_32( output_config, IVAS_AUDIO_CONFIG_EXTERNAL ) && GT_16( st_ivas->nchan_ism, 0 ) ) + { + nchan_out_buff = add(st_ivas->nchan_ism, CPE_CHANNELS); + } +#endif } ELSE IF( EQ_32( st_ivas->ivas_format, MASA_ISM_FORMAT ) ) { @@ -543,6 +549,12 @@ Word16 ivas_get_nchan_buffers_dec_ivas_fx( nchan_out_buff = s_max( nchan_out_buff, audioCfg2channels( st_ivas->intern_config ) ); nchan_out_buff = s_max( nchan_out_buff, audioCfg2channels( output_config ) ); } +#ifdef NONBE_FIX_984_OMASA_EXT_OUTPUT + IF( EQ_32( output_config, IVAS_AUDIO_CONFIG_EXTERNAL ) && GT_16( st_ivas->nchan_ism, 0 ) ) + { + nchan_out_buff = add(st_ivas->nchan_ism, CPE_CHANNELS); + } +#endif } ELSE IF( EQ_16( st_ivas->ivas_format, MASA_ISM_FORMAT ) ) { -- GitLab From 2f3e65bb6be789fdd15dd03985970a4ba4fafe77 Mon Sep 17 00:00:00 2001 From: Jouni Paulus Date: Mon, 4 Aug 2025 10:28:25 +0200 Subject: [PATCH 2/4] clang formatting --- lib_rend/ivas_output_init_fx.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/lib_rend/ivas_output_init_fx.c b/lib_rend/ivas_output_init_fx.c index 055e75d44..e8c87e3dd 100644 --- a/lib_rend/ivas_output_init_fx.c +++ b/lib_rend/ivas_output_init_fx.c @@ -387,7 +387,7 @@ Word16 ivas_get_nchan_buffers_dec( #ifdef NONBE_FIX_984_OMASA_EXT_OUTPUT IF( EQ_32( output_config, IVAS_AUDIO_CONFIG_EXTERNAL ) && GT_16( st_ivas->nchan_ism, 0 ) ) { - nchan_out_buff = add(st_ivas->nchan_ism, CPE_CHANNELS); + nchan_out_buff = add( st_ivas->nchan_ism, CPE_CHANNELS ); } #endif } @@ -552,7 +552,7 @@ Word16 ivas_get_nchan_buffers_dec_ivas_fx( #ifdef NONBE_FIX_984_OMASA_EXT_OUTPUT IF( EQ_32( output_config, IVAS_AUDIO_CONFIG_EXTERNAL ) && GT_16( st_ivas->nchan_ism, 0 ) ) { - nchan_out_buff = add(st_ivas->nchan_ism, CPE_CHANNELS); + nchan_out_buff = add( st_ivas->nchan_ism, CPE_CHANNELS ); } #endif } -- GitLab From adde76facd58709cacc46a0841814c18c7316ca5 Mon Sep 17 00:00:00 2001 From: Tapani Pihlajakuja Date: Tue, 5 Aug 2025 09:58:45 +0300 Subject: [PATCH 3/4] Add BASOP instrumentation --- lib_rend/ivas_output_init_fx.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/lib_rend/ivas_output_init_fx.c b/lib_rend/ivas_output_init_fx.c index e8c87e3dd..44c935c7b 100644 --- a/lib_rend/ivas_output_init_fx.c +++ b/lib_rend/ivas_output_init_fx.c @@ -385,9 +385,11 @@ Word16 ivas_get_nchan_buffers_dec( nchan_out_buff = s_max( nchan_out_buff, audioCfg2channels( output_config ) ); } #ifdef NONBE_FIX_984_OMASA_EXT_OUTPUT + test(); IF( EQ_32( output_config, IVAS_AUDIO_CONFIG_EXTERNAL ) && GT_16( st_ivas->nchan_ism, 0 ) ) { nchan_out_buff = add( st_ivas->nchan_ism, CPE_CHANNELS ); + move16(); } #endif } @@ -550,9 +552,11 @@ Word16 ivas_get_nchan_buffers_dec_ivas_fx( nchan_out_buff = s_max( nchan_out_buff, audioCfg2channels( output_config ) ); } #ifdef NONBE_FIX_984_OMASA_EXT_OUTPUT + test(); IF( EQ_32( output_config, IVAS_AUDIO_CONFIG_EXTERNAL ) && GT_16( st_ivas->nchan_ism, 0 ) ) { nchan_out_buff = add( st_ivas->nchan_ism, CPE_CHANNELS ); + move16(); } #endif } -- GitLab From 1b210f63d1225d885ed1c6ac8a9abbb5a85fca23 Mon Sep 17 00:00:00 2001 From: Tapani Pihlajakuja Date: Tue, 5 Aug 2025 11:33:37 +0300 Subject: [PATCH 4/4] Remove unnecessary move-instrumentation --- lib_rend/ivas_output_init_fx.c | 2 -- 1 file changed, 2 deletions(-) diff --git a/lib_rend/ivas_output_init_fx.c b/lib_rend/ivas_output_init_fx.c index 44c935c7b..6b8e32d00 100644 --- a/lib_rend/ivas_output_init_fx.c +++ b/lib_rend/ivas_output_init_fx.c @@ -389,7 +389,6 @@ Word16 ivas_get_nchan_buffers_dec( IF( EQ_32( output_config, IVAS_AUDIO_CONFIG_EXTERNAL ) && GT_16( st_ivas->nchan_ism, 0 ) ) { nchan_out_buff = add( st_ivas->nchan_ism, CPE_CHANNELS ); - move16(); } #endif } @@ -556,7 +555,6 @@ Word16 ivas_get_nchan_buffers_dec_ivas_fx( IF( EQ_32( output_config, IVAS_AUDIO_CONFIG_EXTERNAL ) && GT_16( st_ivas->nchan_ism, 0 ) ) { nchan_out_buff = add( st_ivas->nchan_ism, CPE_CHANNELS ); - move16(); } #endif } -- GitLab