From abffaad515cacd2dd4973103e4ca1004496e15f0 Mon Sep 17 00:00:00 2001 From: Dominik Weckbecker Date: Fri, 30 May 2025 11:22:36 +0200 Subject: [PATCH 01/12] port float MR 1347 --- Workspace_msvc/lib_com.vcxproj | 3 +- Workspace_msvc/lib_com.vcxproj.filters | 5 ++++ lib_com/ivas_prot.h | 4 +++ lib_com/options.h | 1 + lib_dec/ivas_corecoder_dec_reconfig.c | 16 +++++++--- lib_dec/ivas_init_dec.c | 21 ++++++++++--- lib_dec/ivas_osba_dec.c | 4 +++ lib_dec/ivas_sba_dec.c | 41 +++++++++++++++++++++----- lib_enc/ivas_corecoder_enc_reconfig.c | 9 ++++-- lib_enc/ivas_init_enc.c | 23 +++++++++++---- lib_enc/ivas_osba_enc.c | 34 +++++++++++++++++++-- 11 files changed, 135 insertions(+), 26 deletions(-) diff --git a/Workspace_msvc/lib_com.vcxproj b/Workspace_msvc/lib_com.vcxproj index 9eb1af512..df854316e 100644 --- a/Workspace_msvc/lib_com.vcxproj +++ b/Workspace_msvc/lib_com.vcxproj @@ -220,7 +220,7 @@ - + @@ -275,6 +275,7 @@ + diff --git a/Workspace_msvc/lib_com.vcxproj.filters b/Workspace_msvc/lib_com.vcxproj.filters index 85fd7e8d6..35fbdffe8 100644 --- a/Workspace_msvc/lib_com.vcxproj.filters +++ b/Workspace_msvc/lib_com.vcxproj.filters @@ -469,6 +469,11 @@ common_ivas_c + + + + common_ivas_c + diff --git a/lib_com/ivas_prot.h b/lib_com/ivas_prot.h index 31860368b..a7194d530 100644 --- a/lib_com/ivas_prot.h +++ b/lib_com/ivas_prot.h @@ -5662,6 +5662,10 @@ void ivas_osba_data_close( SBA_ISM_DATA_HANDLE *hSbaIsmData /* i/o: OSBA rendering handle */ ); +ISM_MODE ivas_osba_ism_mode_select( + const int32_t ivas_total_brate, /* i : IVAS total bitrate */ + const int16_t nchan_ism /* i : number of input ISM's */ +); /*----------------------------------------------------------------------------------* * OMASA prototypes diff --git a/lib_com/options.h b/lib_com/options.h index 8e7f23a70..7cf71e5c0 100644 --- a/lib_com/options.h +++ b/lib_com/options.h @@ -210,6 +210,7 @@ #define FIX_1001_ARI_HM_OVERFLOW /* FhG: fix for undef behaviour in in the harmonic TCX model arithmetic coder */ #define NONBE_FIX_1005_MC_RS_TCBUFFER_UPDATE /* FhG: issue #1005: fix TC Buffer update at a MC rate switch */ + /* #################### End BASOP porting switches ############################ */ /* clang-format on */ diff --git a/lib_dec/ivas_corecoder_dec_reconfig.c b/lib_dec/ivas_corecoder_dec_reconfig.c index be20a65d1..ae385664a 100644 --- a/lib_dec/ivas_corecoder_dec_reconfig.c +++ b/lib_dec/ivas_corecoder_dec_reconfig.c @@ -270,8 +270,12 @@ ivas_error ivas_corecoder_dec_reconfig( } else if ( st_ivas->hMCT != NULL && st_ivas->nCPE > 1 ) { - if ( ( error = mct_dec_reconfigure( st_ivas, st_ivas->nchan_transport != nchan_transport_old ) ) != IVAS_ERR_OK ) - { +#ifdef NONBE_FIX_ISM_XOVER_BR + if ((error = mct_dec_reconfigure(st_ivas, nchan_transport_real != nchan_transport_old)) != IVAS_ERR_OK) +#else + if ((error = mct_dec_reconfigure(st_ivas, st_ivas->nchan_transport != nchan_transport_old)) != IVAS_ERR_OK) +#endif + { return error; } } @@ -351,8 +355,12 @@ ivas_error ivas_corecoder_dec_reconfig( * Set CNA/CNG flags *-----------------------------------------------------------------*/ - if ( st_ivas->ivas_format == SBA_FORMAT || st_ivas->ivas_format == MASA_FORMAT ) - { +#ifdef NONBE_FIX_ISM_XOVER_BR + if (st_ivas->ivas_format == SBA_FORMAT || st_ivas->ivas_format == MASA_FORMAT || st_ivas->ivas_format == SBA_ISM_FORMAT) +#else + if (st_ivas->ivas_format == SBA_FORMAT || st_ivas->ivas_format == MASA_FORMAT) +#endif + { ivas_sba_set_cna_cng_flag( st_ivas ); } diff --git a/lib_dec/ivas_init_dec.c b/lib_dec/ivas_init_dec.c index 741a99c2a..33e962c25 100644 --- a/lib_dec/ivas_init_dec.c +++ b/lib_dec/ivas_init_dec.c @@ -464,14 +464,27 @@ ivas_error ivas_dec_setup( ivas_sba_config( ivas_total_brate, st_ivas->sba_analysis_order, -1, &( st_ivas->nchan_transport ), st_ivas->sba_planar, &st_ivas->nSCE, &st_ivas->nCPE, &st_ivas->element_mode_init ); /*correct number of CPEs for discrete ISM coding*/ - if ( st_ivas->ini_frame > 0 && st_ivas->ism_mode == ISM_SBA_MODE_DISC ) - { +#ifdef NONBE_FIX_ISM_XOVER_BR + { + int16_t n; + + n = st_ivas->nchan_transport + st_ivas->nchan_ism; + st_ivas->nCPE = (n + 1) >> 1; + } +#else + st_ivas->nCPE += (st_ivas->nchan_ism + 1) >> 1; +#endif + { st_ivas->nCPE += ( st_ivas->nchan_ism + 1 ) >> 1; } } - if ( ivas_total_brate >= IVAS_256k ) - { +#ifdef NONBE_FIX_ISM_XOVER_BR + if (ivas_osba_ism_mode_select(ivas_total_brate, st_ivas->nchan_ism) == ISM_SBA_MODE_DISC) +#else + if (ivas_total_brate >= IVAS_256k) +#endif + { st_ivas->ism_mode = ISM_SBA_MODE_DISC; } else diff --git a/lib_dec/ivas_osba_dec.c b/lib_dec/ivas_osba_dec.c index 74321e83c..6ec9bcb13 100644 --- a/lib_dec/ivas_osba_dec.c +++ b/lib_dec/ivas_osba_dec.c @@ -155,6 +155,10 @@ ivas_error ivas_osba_dirac_td_binaural_jbm( return error; } +#ifdef NONBE_FIX_ISM_XOVER_BR + ivas_combined_orientation_set_to_start_index(st_ivas->hCombinedOrientationData); +#endif + #ifdef SPLIT_REND_WITH_HEAD_ROT if ( st_ivas->hDecoderConfig->output_config == IVAS_AUDIO_CONFIG_BINAURAL_SPLIT_CODED || st_ivas->hDecoderConfig->output_config == IVAS_AUDIO_CONFIG_BINAURAL_SPLIT_PCM ) diff --git a/lib_dec/ivas_sba_dec.c b/lib_dec/ivas_sba_dec.c index a50dcf348..1dc8a01b1 100644 --- a/lib_dec/ivas_sba_dec.c +++ b/lib_dec/ivas_sba_dec.c @@ -124,6 +124,9 @@ ivas_error ivas_sba_dec_reconfigure( ivas_error error; ISM_MODE ism_mode_old; int16_t granularity_new; +#ifdef NONBE_FIX_ISM_XOVER_BR + int16_t nchan_transport; +#endif ism_mode_old = st_ivas->ism_mode; hDecoderConfig = st_ivas->hDecoderConfig; @@ -143,8 +146,12 @@ ivas_error ivas_sba_dec_reconfigure( if ( st_ivas->ivas_format == SBA_ISM_FORMAT ) { - if ( ivas_total_brate >= IVAS_256k ) - { +#ifdef NONBE_FIX_ISM_XOVER_BR + if (ivas_osba_ism_mode_select(ivas_total_brate, st_ivas->nchan_ism) == ISM_SBA_MODE_DISC) +#else + if (ivas_total_brate >= IVAS_256k) +#endif + { st_ivas->ism_mode = ISM_SBA_MODE_DISC; } else @@ -449,6 +456,9 @@ ivas_error ivas_sba_dec_reconfigure( * Allocate, initialize, and configure SCE/CPE/MCT handles *-----------------------------------------------------------------*/ +#ifdef NONBE_FIX_ISM_XOVER_BR + nchan_transport = st_ivas->nchan_transport; +#endif if ( st_ivas->ivas_format == SBA_ISM_FORMAT ) { if ( ism_mode_old == ISM_MODE_NONE && st_ivas->ism_mode == ISM_SBA_MODE_DISC ) @@ -510,8 +520,13 @@ ivas_error ivas_sba_dec_reconfigure( return error; } - st_ivas->nCPE += ( st_ivas->nchan_ism + 1 ) >> 1; - } +#ifdef NONBE_FIX_ISM_XOVER_BR + nchan_transport += st_ivas->nchan_ism; + st_ivas->nCPE = (nchan_transport + 1) >> 1; +#else + st_ivas->nCPE += (st_ivas->nchan_ism + 1) >> 1; +#endif + } else if ( ism_mode_old == ISM_SBA_MODE_DISC && st_ivas->ism_mode == ISM_MODE_NONE ) { /* ISM renderer handle */ @@ -528,15 +543,25 @@ ivas_error ivas_sba_dec_reconfigure( st_ivas->hHrtfTD = NULL; } } +#ifdef NONBE_FIX_ISM_XOVER_BR + nchan_transport = st_ivas->nchan_transport; +#endif nchan_transport_old += st_ivas->nchan_ism; st_ivas->ism_mode = ISM_MODE_NONE; } else if ( st_ivas->ism_mode == ISM_SBA_MODE_DISC ) { - st_ivas->nCPE += ( st_ivas->nchan_ism + 1 ) >> 1; - nCPE_old = st_ivas->nCPE; - nchan_transport_old = st_ivas->nchan_transport; - nchan_transport_old += st_ivas->nchan_ism; +#ifdef NONBE_FIX_ISM_XOVER_BR + nchan_transport = st_ivas->nchan_transport + st_ivas->nchan_ism; + st_ivas->nCPE = (nchan_transport + 1) >> 1; + nchan_transport_old += st_ivas->nchan_ism; +#else + st_ivas->nCPE += (st_ivas->nchan_ism + 1) >> 1; + nCPE_old = st_ivas->nCPE; + nchan_transport_old = st_ivas->nchan_transport; + nchan_transport_old += st_ivas->nchan_ism; +#endif + } } diff --git a/lib_enc/ivas_corecoder_enc_reconfig.c b/lib_enc/ivas_corecoder_enc_reconfig.c index f7b5a4dd7..439711074 100644 --- a/lib_enc/ivas_corecoder_enc_reconfig.c +++ b/lib_enc/ivas_corecoder_enc_reconfig.c @@ -458,8 +458,13 @@ ivas_error ivas_corecoder_enc_reconfig( } else if ( st_ivas->hMCT != NULL && st_ivas->nCPE > 1 ) { - if ( ( error = mct_enc_reconfigure( st_ivas, st_ivas->nchan_transport != nchan_transport_old ) ) != IVAS_ERR_OK ) - { + +#ifdef NONBE_FIX_ISM_XOVER_BR + if ((error = mct_enc_reconfigure(st_ivas, nchan_transport_old_real != nchan_transport_real)) != IVAS_ERR_OK) +#else + if ((error = mct_enc_reconfigure(st_ivas, st_ivas->nchan_transport != nchan_transport_old)) != IVAS_ERR_OK) +#endif + { return error; } } diff --git a/lib_enc/ivas_init_enc.c b/lib_enc/ivas_init_enc.c index cd6a43f2b..5c426962c 100644 --- a/lib_enc/ivas_init_enc.c +++ b/lib_enc/ivas_init_enc.c @@ -686,10 +686,14 @@ ivas_error ivas_init_encoder( { st_ivas->ism_mode = ISM_MODE_NONE; - if ( ivas_total_brate >= IVAS_256k ) - { - st_ivas->ism_mode = ISM_SBA_MODE_DISC; - } +#ifdef NONBE_FIX_ISM_XOVER_BR + st_ivas->ism_mode = ivas_osba_ism_mode_select(ivas_total_brate, st_ivas->hEncoderConfig->nchan_ism); +#else + if (ivas_total_brate >= IVAS_256k) + { + st_ivas->ism_mode = ISM_SBA_MODE_DISC; + } +#endif if ( ( error = ivas_ism_metadata_enc_create( st_ivas, hEncoderConfig->nchan_ism, element_brate_tmp ) ) != IVAS_ERR_OK ) { @@ -744,7 +748,16 @@ ivas_error ivas_init_encoder( else { /* allocate and initialize MCT core coder */ - st_ivas->nCPE += ( st_ivas->hEncoderConfig->nchan_ism + 1 ) >> 1; +#ifdef NONBE_FIX_ISM_XOVER_BR + { + int16_t n_all; + + n_all = st_ivas->nchan_transport + st_ivas->hEncoderConfig->nchan_ism; + st_ivas->nCPE = (n_all + 1) >> 1; + } +#else + st_ivas->nCPE += (st_ivas->hEncoderConfig->nchan_ism + 1) >> 1; +#endif for ( cpe_id = 0; cpe_id < st_ivas->nCPE; cpe_id++ ) { diff --git a/lib_enc/ivas_osba_enc.c b/lib_enc/ivas_osba_enc.c index 5def5e5a4..acd80d7cb 100644 --- a/lib_enc/ivas_osba_enc.c +++ b/lib_enc/ivas_osba_enc.c @@ -185,6 +185,10 @@ ivas_error ivas_osba_enc_reconfig( error = IVAS_ERR_OK; hEncoderConfig = st_ivas->hEncoderConfig; ivas_total_brate = hEncoderConfig->ivas_total_brate; +#ifdef NONBE_FIX_ISM_XOVER_BR + int16_t nchan_transport; +#endif + if ( ivas_total_brate != hEncoderConfig->last_ivas_total_brate ) { @@ -197,6 +201,9 @@ ivas_error ivas_osba_enc_reconfig( spar_reconfig_flag = 0; old_ism_mode = st_ivas->ism_mode; +#ifdef NONBE_FIX_ISM_XOVER_BR + st_ivas->ism_mode = ivas_osba_ism_mode_select(ivas_total_brate, st_ivas->hEncoderConfig->nchan_ism); +#else if ( ivas_total_brate >= IVAS_256k ) { st_ivas->ism_mode = ISM_SBA_MODE_DISC; @@ -205,9 +212,11 @@ ivas_error ivas_osba_enc_reconfig( { st_ivas->ism_mode = ISM_MODE_NONE; } +#endif nchan_transport_old = st_ivas->nchan_transport; nCPE_old = st_ivas->nCPE; nSCE_old = st_ivas->nSCE; + st_ivas->sba_analysis_order = ivas_sba_get_analysis_order( ivas_total_brate, hEncoderConfig->sba_order ); analysis_order_old = ivas_sba_get_analysis_order( hEncoderConfig->last_ivas_total_brate, hEncoderConfig->sba_order ); nbands_old = st_ivas->hQMetaData->q_direction->cfg.nbands; @@ -333,21 +342,42 @@ ivas_error ivas_osba_enc_reconfig( /*-----------------------------------------------------------------* * Allocate, initialize, and configure SCE/CPE/MCT handles *-----------------------------------------------------------------*/ +#ifdef NONBE_FIX_ISM_XOVER_BR + nchan_transport = st_ivas->nchan_transport; +#endif if ( old_ism_mode == ISM_MODE_NONE && st_ivas->ism_mode == ISM_SBA_MODE_DISC ) { - st_ivas->nCPE += ( st_ivas->hEncoderConfig->nchan_ism + 1 ) >> 1; - } +#ifdef NONBE_FIX_ISM_XOVER_BR + { + nchan_transport = st_ivas->nchan_transport + st_ivas->hEncoderConfig->nchan_ism; + st_ivas->nCPE = (nchan_transport + 1) >> 1; + } +#else + st_ivas->nCPE += (st_ivas->hEncoderConfig->nchan_ism + 1) >> 1; +#endif + } else if ( old_ism_mode == ISM_SBA_MODE_DISC && st_ivas->ism_mode == ISM_MODE_NONE ) { + nchan_transport_old += st_ivas->hEncoderConfig->nchan_ism; + +#ifdef NONBE_FIX_ISM_XOVER_BR + nchan_transport = st_ivas->nchan_transport; +#endif } else if ( st_ivas->ism_mode == ISM_SBA_MODE_DISC ) { +#ifdef NONBE_FIX_ISM_XOVER_BR + nchan_transport_old += st_ivas->hEncoderConfig->nchan_ism; + nchan_transport = st_ivas->nchan_transport + st_ivas->hEncoderConfig->nchan_ism; + st_ivas->nCPE = (nchan_transport + 1) >> 1; +#else st_ivas->nCPE += ( st_ivas->hEncoderConfig->nchan_ism + 1 ) >> 1; nCPE_old = st_ivas->nCPE; nchan_transport_old = st_ivas->nchan_transport; nchan_transport_old += st_ivas->hEncoderConfig->nchan_ism; +#endif } if ( ( error = ivas_corecoder_enc_reconfig( st_ivas, nSCE_old, nCPE_old, nchan_transport_old, ivas_total_brate / st_ivas->nchan_transport, ( ivas_total_brate / st_ivas->nchan_transport ) * CPE_CHANNELS, MC_MODE_NONE ) ) != IVAS_ERR_OK ) -- GitLab From 307d062c3805c4c0e4cf44c56d121dc8a86d1802 Mon Sep 17 00:00:00 2001 From: Dominik Weckbecker Date: Fri, 30 May 2025 13:40:47 +0200 Subject: [PATCH 02/12] add missing file lib_com/ivas_osba_com.c --- lib_com/ivas_osba_com.c | 73 +++++++++++++++++++++++++++++++++++++++++ 1 file changed, 73 insertions(+) create mode 100644 lib_com/ivas_osba_com.c diff --git a/lib_com/ivas_osba_com.c b/lib_com/ivas_osba_com.c new file mode 100644 index 000000000..a3cce745f --- /dev/null +++ b/lib_com/ivas_osba_com.c @@ -0,0 +1,73 @@ +/****************************************************************************************************** + + (C) 2022-2024 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB, + Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD., + Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange, + Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other + contributors to this repository. All Rights Reserved. + + This software is protected by copyright law and by international treaties. + The IVAS codec Public Collaboration consisting of Dolby International AB, Ericsson AB, + Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD., + Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange, + Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other + contributors to this repository retain full ownership rights in their respective contributions in + the software. This notice grants no license of any kind, including but not limited to patent + license, nor is any license granted by implication, estoppel or otherwise. + + Contributors are required to enter into the IVAS codec Public Collaboration agreement before making + contributions. + + This software is provided "AS IS", without any express or implied warranties. The software is in the + development stage. It is intended exclusively for experts who have experience with such software and + solely for the purpose of inspection. All implied warranties of non-infringement, merchantability + and fitness for a particular purpose are hereby disclaimed and excluded. + + Any dispute, controversy or claim arising under or in relation to providing this software shall be + submitted to and settled by the final, binding jurisdiction of the courts of Munich, Germany in + accordance with the laws of the Federal Republic of Germany excluding its conflict of law rules and + the United Nations Convention on Contracts on the International Sales of Goods. + +*******************************************************************************************************/ + +#include "options.h" +#include "ivas_cnst.h" +#include "ivas_prot.h" +#include "prot.h" +#include "ivas_rom_com.h" +#ifdef DEBUGGING +#include "debug.h" +#endif + +/*! r : ISM format mode */ +ISM_MODE ivas_osba_ism_mode_select( + const int32_t ivas_total_brate, /* i : IVAS total bitrate */ + const int16_t nchan_ism /* i : number of input ISM's */ +) +{ + ISM_MODE ism_mode = ISM_MODE_NONE; + + switch ( nchan_ism ) + { + case 1: + if ( ivas_total_brate >= IVAS_96k ) + { + ism_mode = ISM_SBA_MODE_DISC; + } + break; + + + + + case 2: + case 3: + case 4: + if ( ivas_total_brate >= IVAS_128k ) + { + ism_mode = ISM_SBA_MODE_DISC; + } + break; + } + + return ism_mode; +} -- GitLab From a8fdf611c229a6a4e263177bfe676157296aca47 Mon Sep 17 00:00:00 2001 From: Dominik Weckbecker Date: Fri, 30 May 2025 13:55:51 +0200 Subject: [PATCH 03/12] fix VS project files --- Workspace_msvc/lib_com.vcxproj | 2 +- Workspace_msvc/lib_com.vcxproj.filters | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Workspace_msvc/lib_com.vcxproj b/Workspace_msvc/lib_com.vcxproj index df854316e..80985de5b 100644 --- a/Workspace_msvc/lib_com.vcxproj +++ b/Workspace_msvc/lib_com.vcxproj @@ -203,6 +203,7 @@ + @@ -275,7 +276,6 @@ - diff --git a/Workspace_msvc/lib_com.vcxproj.filters b/Workspace_msvc/lib_com.vcxproj.filters index 35fbdffe8..1f950d731 100644 --- a/Workspace_msvc/lib_com.vcxproj.filters +++ b/Workspace_msvc/lib_com.vcxproj.filters @@ -471,7 +471,7 @@ - + common_ivas_c -- GitLab From f52c22ba31115277d4049f46239a60635e664e42 Mon Sep 17 00:00:00 2001 From: Dominik Weckbecker Date: Fri, 30 May 2025 14:09:04 +0200 Subject: [PATCH 04/12] fix formatting --- lib_com/ivas_osba_com.c | 2 -- lib_dec/ivas_corecoder_dec_reconfig.c | 12 ++++----- lib_dec/ivas_init_dec.c | 20 +++++++-------- lib_dec/ivas_osba_dec.c | 2 +- lib_dec/ivas_sba_dec.c | 35 +++++++++++++-------------- lib_enc/ivas_corecoder_enc_reconfig.c | 6 ++--- lib_enc/ivas_init_enc.c | 22 ++++++++--------- lib_enc/ivas_osba_enc.c | 26 ++++++++++---------- 8 files changed, 61 insertions(+), 64 deletions(-) diff --git a/lib_com/ivas_osba_com.c b/lib_com/ivas_osba_com.c index a3cce745f..2f052f045 100644 --- a/lib_com/ivas_osba_com.c +++ b/lib_com/ivas_osba_com.c @@ -56,9 +56,7 @@ ISM_MODE ivas_osba_ism_mode_select( } break; - - case 2: case 3: case 4: diff --git a/lib_dec/ivas_corecoder_dec_reconfig.c b/lib_dec/ivas_corecoder_dec_reconfig.c index ae385664a..7a6db2376 100644 --- a/lib_dec/ivas_corecoder_dec_reconfig.c +++ b/lib_dec/ivas_corecoder_dec_reconfig.c @@ -271,11 +271,11 @@ ivas_error ivas_corecoder_dec_reconfig( else if ( st_ivas->hMCT != NULL && st_ivas->nCPE > 1 ) { #ifdef NONBE_FIX_ISM_XOVER_BR - if ((error = mct_dec_reconfigure(st_ivas, nchan_transport_real != nchan_transport_old)) != IVAS_ERR_OK) + if ( ( error = mct_dec_reconfigure( st_ivas, nchan_transport_real != nchan_transport_old ) ) != IVAS_ERR_OK ) #else - if ((error = mct_dec_reconfigure(st_ivas, st_ivas->nchan_transport != nchan_transport_old)) != IVAS_ERR_OK) + if ( ( error = mct_dec_reconfigure( st_ivas, st_ivas->nchan_transport != nchan_transport_old ) ) != IVAS_ERR_OK ) #endif - { + { return error; } } @@ -356,11 +356,11 @@ ivas_error ivas_corecoder_dec_reconfig( *-----------------------------------------------------------------*/ #ifdef NONBE_FIX_ISM_XOVER_BR - if (st_ivas->ivas_format == SBA_FORMAT || st_ivas->ivas_format == MASA_FORMAT || st_ivas->ivas_format == SBA_ISM_FORMAT) + if ( st_ivas->ivas_format == SBA_FORMAT || st_ivas->ivas_format == MASA_FORMAT || st_ivas->ivas_format == SBA_ISM_FORMAT ) #else - if (st_ivas->ivas_format == SBA_FORMAT || st_ivas->ivas_format == MASA_FORMAT) + if ( st_ivas->ivas_format == SBA_FORMAT || st_ivas->ivas_format == MASA_FORMAT ) #endif - { + { ivas_sba_set_cna_cng_flag( st_ivas ); } diff --git a/lib_dec/ivas_init_dec.c b/lib_dec/ivas_init_dec.c index 33e962c25..448480809 100644 --- a/lib_dec/ivas_init_dec.c +++ b/lib_dec/ivas_init_dec.c @@ -465,26 +465,26 @@ ivas_error ivas_dec_setup( /*correct number of CPEs for discrete ISM coding*/ #ifdef NONBE_FIX_ISM_XOVER_BR - { - int16_t n; + { + int16_t n; - n = st_ivas->nchan_transport + st_ivas->nchan_ism; - st_ivas->nCPE = (n + 1) >> 1; - } + n = st_ivas->nchan_transport + st_ivas->nchan_ism; + st_ivas->nCPE = ( n + 1 ) >> 1; + } #else - st_ivas->nCPE += (st_ivas->nchan_ism + 1) >> 1; + st_ivas->nCPE += ( st_ivas->nchan_ism + 1 ) >> 1; #endif - { + { st_ivas->nCPE += ( st_ivas->nchan_ism + 1 ) >> 1; } } #ifdef NONBE_FIX_ISM_XOVER_BR - if (ivas_osba_ism_mode_select(ivas_total_brate, st_ivas->nchan_ism) == ISM_SBA_MODE_DISC) + if ( ivas_osba_ism_mode_select( ivas_total_brate, st_ivas->nchan_ism ) == ISM_SBA_MODE_DISC ) #else - if (ivas_total_brate >= IVAS_256k) + if ( ivas_total_brate >= IVAS_256k ) #endif - { + { st_ivas->ism_mode = ISM_SBA_MODE_DISC; } else diff --git a/lib_dec/ivas_osba_dec.c b/lib_dec/ivas_osba_dec.c index 6ec9bcb13..ee755d2d3 100644 --- a/lib_dec/ivas_osba_dec.c +++ b/lib_dec/ivas_osba_dec.c @@ -156,7 +156,7 @@ ivas_error ivas_osba_dirac_td_binaural_jbm( } #ifdef NONBE_FIX_ISM_XOVER_BR - ivas_combined_orientation_set_to_start_index(st_ivas->hCombinedOrientationData); + ivas_combined_orientation_set_to_start_index( st_ivas->hCombinedOrientationData ); #endif diff --git a/lib_dec/ivas_sba_dec.c b/lib_dec/ivas_sba_dec.c index 1dc8a01b1..60d0e8281 100644 --- a/lib_dec/ivas_sba_dec.c +++ b/lib_dec/ivas_sba_dec.c @@ -125,7 +125,7 @@ ivas_error ivas_sba_dec_reconfigure( ISM_MODE ism_mode_old; int16_t granularity_new; #ifdef NONBE_FIX_ISM_XOVER_BR - int16_t nchan_transport; + int16_t nchan_transport; #endif ism_mode_old = st_ivas->ism_mode; @@ -147,11 +147,11 @@ ivas_error ivas_sba_dec_reconfigure( if ( st_ivas->ivas_format == SBA_ISM_FORMAT ) { #ifdef NONBE_FIX_ISM_XOVER_BR - if (ivas_osba_ism_mode_select(ivas_total_brate, st_ivas->nchan_ism) == ISM_SBA_MODE_DISC) + if ( ivas_osba_ism_mode_select( ivas_total_brate, st_ivas->nchan_ism ) == ISM_SBA_MODE_DISC ) #else - if (ivas_total_brate >= IVAS_256k) + if ( ivas_total_brate >= IVAS_256k ) #endif - { + { st_ivas->ism_mode = ISM_SBA_MODE_DISC; } else @@ -457,7 +457,7 @@ ivas_error ivas_sba_dec_reconfigure( *-----------------------------------------------------------------*/ #ifdef NONBE_FIX_ISM_XOVER_BR - nchan_transport = st_ivas->nchan_transport; + nchan_transport = st_ivas->nchan_transport; #endif if ( st_ivas->ivas_format == SBA_ISM_FORMAT ) { @@ -521,12 +521,12 @@ ivas_error ivas_sba_dec_reconfigure( } #ifdef NONBE_FIX_ISM_XOVER_BR - nchan_transport += st_ivas->nchan_ism; - st_ivas->nCPE = (nchan_transport + 1) >> 1; + nchan_transport += st_ivas->nchan_ism; + st_ivas->nCPE = ( nchan_transport + 1 ) >> 1; #else - st_ivas->nCPE += (st_ivas->nchan_ism + 1) >> 1; + st_ivas->nCPE += ( st_ivas->nchan_ism + 1 ) >> 1; #endif - } + } else if ( ism_mode_old == ISM_SBA_MODE_DISC && st_ivas->ism_mode == ISM_MODE_NONE ) { /* ISM renderer handle */ @@ -544,7 +544,7 @@ ivas_error ivas_sba_dec_reconfigure( } } #ifdef NONBE_FIX_ISM_XOVER_BR - nchan_transport = st_ivas->nchan_transport; + nchan_transport = st_ivas->nchan_transport; #endif nchan_transport_old += st_ivas->nchan_ism; st_ivas->ism_mode = ISM_MODE_NONE; @@ -552,16 +552,15 @@ ivas_error ivas_sba_dec_reconfigure( else if ( st_ivas->ism_mode == ISM_SBA_MODE_DISC ) { #ifdef NONBE_FIX_ISM_XOVER_BR - nchan_transport = st_ivas->nchan_transport + st_ivas->nchan_ism; - st_ivas->nCPE = (nchan_transport + 1) >> 1; - nchan_transport_old += st_ivas->nchan_ism; + nchan_transport = st_ivas->nchan_transport + st_ivas->nchan_ism; + st_ivas->nCPE = ( nchan_transport + 1 ) >> 1; + nchan_transport_old += st_ivas->nchan_ism; #else - st_ivas->nCPE += (st_ivas->nchan_ism + 1) >> 1; - nCPE_old = st_ivas->nCPE; - nchan_transport_old = st_ivas->nchan_transport; - nchan_transport_old += st_ivas->nchan_ism; + st_ivas->nCPE += ( st_ivas->nchan_ism + 1 ) >> 1; + nCPE_old = st_ivas->nCPE; + nchan_transport_old = st_ivas->nchan_transport; + nchan_transport_old += st_ivas->nchan_ism; #endif - } } diff --git a/lib_enc/ivas_corecoder_enc_reconfig.c b/lib_enc/ivas_corecoder_enc_reconfig.c index 439711074..4798b64d4 100644 --- a/lib_enc/ivas_corecoder_enc_reconfig.c +++ b/lib_enc/ivas_corecoder_enc_reconfig.c @@ -460,11 +460,11 @@ ivas_error ivas_corecoder_enc_reconfig( { #ifdef NONBE_FIX_ISM_XOVER_BR - if ((error = mct_enc_reconfigure(st_ivas, nchan_transport_old_real != nchan_transport_real)) != IVAS_ERR_OK) + if ( ( error = mct_enc_reconfigure( st_ivas, nchan_transport_old_real != nchan_transport_real ) ) != IVAS_ERR_OK ) #else - if ((error = mct_enc_reconfigure(st_ivas, st_ivas->nchan_transport != nchan_transport_old)) != IVAS_ERR_OK) + if ( ( error = mct_enc_reconfigure( st_ivas, st_ivas->nchan_transport != nchan_transport_old ) ) != IVAS_ERR_OK ) #endif - { + { return error; } } diff --git a/lib_enc/ivas_init_enc.c b/lib_enc/ivas_init_enc.c index 5c426962c..64634ef86 100644 --- a/lib_enc/ivas_init_enc.c +++ b/lib_enc/ivas_init_enc.c @@ -687,12 +687,12 @@ ivas_error ivas_init_encoder( st_ivas->ism_mode = ISM_MODE_NONE; #ifdef NONBE_FIX_ISM_XOVER_BR - st_ivas->ism_mode = ivas_osba_ism_mode_select(ivas_total_brate, st_ivas->hEncoderConfig->nchan_ism); + st_ivas->ism_mode = ivas_osba_ism_mode_select( ivas_total_brate, st_ivas->hEncoderConfig->nchan_ism ); #else - if (ivas_total_brate >= IVAS_256k) - { - st_ivas->ism_mode = ISM_SBA_MODE_DISC; - } + if ( ivas_total_brate >= IVAS_256k ) + { + st_ivas->ism_mode = ISM_SBA_MODE_DISC; + } #endif if ( ( error = ivas_ism_metadata_enc_create( st_ivas, hEncoderConfig->nchan_ism, element_brate_tmp ) ) != IVAS_ERR_OK ) @@ -749,14 +749,14 @@ ivas_error ivas_init_encoder( { /* allocate and initialize MCT core coder */ #ifdef NONBE_FIX_ISM_XOVER_BR - { - int16_t n_all; + { + int16_t n_all; - n_all = st_ivas->nchan_transport + st_ivas->hEncoderConfig->nchan_ism; - st_ivas->nCPE = (n_all + 1) >> 1; - } + n_all = st_ivas->nchan_transport + st_ivas->hEncoderConfig->nchan_ism; + st_ivas->nCPE = ( n_all + 1 ) >> 1; + } #else - st_ivas->nCPE += (st_ivas->hEncoderConfig->nchan_ism + 1) >> 1; + st_ivas->nCPE += ( st_ivas->hEncoderConfig->nchan_ism + 1 ) >> 1; #endif for ( cpe_id = 0; cpe_id < st_ivas->nCPE; cpe_id++ ) diff --git a/lib_enc/ivas_osba_enc.c b/lib_enc/ivas_osba_enc.c index acd80d7cb..4e6b4dde6 100644 --- a/lib_enc/ivas_osba_enc.c +++ b/lib_enc/ivas_osba_enc.c @@ -186,7 +186,7 @@ ivas_error ivas_osba_enc_reconfig( hEncoderConfig = st_ivas->hEncoderConfig; ivas_total_brate = hEncoderConfig->ivas_total_brate; #ifdef NONBE_FIX_ISM_XOVER_BR - int16_t nchan_transport; + int16_t nchan_transport; #endif @@ -202,7 +202,7 @@ ivas_error ivas_osba_enc_reconfig( spar_reconfig_flag = 0; old_ism_mode = st_ivas->ism_mode; #ifdef NONBE_FIX_ISM_XOVER_BR - st_ivas->ism_mode = ivas_osba_ism_mode_select(ivas_total_brate, st_ivas->hEncoderConfig->nchan_ism); + st_ivas->ism_mode = ivas_osba_ism_mode_select( ivas_total_brate, st_ivas->hEncoderConfig->nchan_ism ); #else if ( ivas_total_brate >= IVAS_256k ) { @@ -343,35 +343,35 @@ ivas_error ivas_osba_enc_reconfig( * Allocate, initialize, and configure SCE/CPE/MCT handles *-----------------------------------------------------------------*/ #ifdef NONBE_FIX_ISM_XOVER_BR - nchan_transport = st_ivas->nchan_transport; + nchan_transport = st_ivas->nchan_transport; #endif if ( old_ism_mode == ISM_MODE_NONE && st_ivas->ism_mode == ISM_SBA_MODE_DISC ) { #ifdef NONBE_FIX_ISM_XOVER_BR - { - nchan_transport = st_ivas->nchan_transport + st_ivas->hEncoderConfig->nchan_ism; - st_ivas->nCPE = (nchan_transport + 1) >> 1; - } + { + nchan_transport = st_ivas->nchan_transport + st_ivas->hEncoderConfig->nchan_ism; + st_ivas->nCPE = ( nchan_transport + 1 ) >> 1; + } #else - st_ivas->nCPE += (st_ivas->hEncoderConfig->nchan_ism + 1) >> 1; + st_ivas->nCPE += ( st_ivas->hEncoderConfig->nchan_ism + 1 ) >> 1; #endif - } + } else if ( old_ism_mode == ISM_SBA_MODE_DISC && st_ivas->ism_mode == ISM_MODE_NONE ) { nchan_transport_old += st_ivas->hEncoderConfig->nchan_ism; #ifdef NONBE_FIX_ISM_XOVER_BR - nchan_transport = st_ivas->nchan_transport; + nchan_transport = st_ivas->nchan_transport; #endif } else if ( st_ivas->ism_mode == ISM_SBA_MODE_DISC ) { #ifdef NONBE_FIX_ISM_XOVER_BR - nchan_transport_old += st_ivas->hEncoderConfig->nchan_ism; - nchan_transport = st_ivas->nchan_transport + st_ivas->hEncoderConfig->nchan_ism; - st_ivas->nCPE = (nchan_transport + 1) >> 1; + nchan_transport_old += st_ivas->hEncoderConfig->nchan_ism; + nchan_transport = st_ivas->nchan_transport + st_ivas->hEncoderConfig->nchan_ism; + st_ivas->nCPE = ( nchan_transport + 1 ) >> 1; #else st_ivas->nCPE += ( st_ivas->hEncoderConfig->nchan_ism + 1 ) >> 1; nCPE_old = st_ivas->nCPE; -- GitLab From 9d3207017068489e3b0a739068e620ffac51c47d Mon Sep 17 00:00:00 2001 From: Dominik Weckbecker Date: Fri, 30 May 2025 14:26:53 +0200 Subject: [PATCH 05/12] fix curly brackets in ivas_error ivas_dec_setup --- lib_dec/ivas_init_dec.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/lib_dec/ivas_init_dec.c b/lib_dec/ivas_init_dec.c index 448480809..bab4055ee 100644 --- a/lib_dec/ivas_init_dec.c +++ b/lib_dec/ivas_init_dec.c @@ -472,11 +472,10 @@ ivas_error ivas_dec_setup( st_ivas->nCPE = ( n + 1 ) >> 1; } #else - st_ivas->nCPE += ( st_ivas->nchan_ism + 1 ) >> 1; -#endif { st_ivas->nCPE += ( st_ivas->nchan_ism + 1 ) >> 1; } +#endif } #ifdef NONBE_FIX_ISM_XOVER_BR -- GitLab From 58c18aa9e4d5f95585cd874a30f4401ffbe9dfd0 Mon Sep 17 00:00:00 2001 From: Dominik Weckbecker Date: Fri, 30 May 2025 15:20:31 +0200 Subject: [PATCH 06/12] fix if condition in ivas_dec_setup --- lib_dec/ivas_init_dec.c | 1 + 1 file changed, 1 insertion(+) diff --git a/lib_dec/ivas_init_dec.c b/lib_dec/ivas_init_dec.c index bab4055ee..6bbf51a58 100644 --- a/lib_dec/ivas_init_dec.c +++ b/lib_dec/ivas_init_dec.c @@ -464,6 +464,7 @@ ivas_error ivas_dec_setup( ivas_sba_config( ivas_total_brate, st_ivas->sba_analysis_order, -1, &( st_ivas->nchan_transport ), st_ivas->sba_planar, &st_ivas->nSCE, &st_ivas->nCPE, &st_ivas->element_mode_init ); /*correct number of CPEs for discrete ISM coding*/ + if (st_ivas->ini_frame > 0 && st_ivas->ism_mode == ISM_SBA_MODE_DISC) #ifdef NONBE_FIX_ISM_XOVER_BR { int16_t n; -- GitLab From 6e11fcf6ae478ca0173a95130206c1622e42a4ba Mon Sep 17 00:00:00 2001 From: Dominik Weckbecker Date: Fri, 30 May 2025 15:31:55 +0200 Subject: [PATCH 07/12] fix formatting --- lib_dec/ivas_init_dec.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib_dec/ivas_init_dec.c b/lib_dec/ivas_init_dec.c index 6bbf51a58..9de04ffda 100644 --- a/lib_dec/ivas_init_dec.c +++ b/lib_dec/ivas_init_dec.c @@ -464,7 +464,7 @@ ivas_error ivas_dec_setup( ivas_sba_config( ivas_total_brate, st_ivas->sba_analysis_order, -1, &( st_ivas->nchan_transport ), st_ivas->sba_planar, &st_ivas->nSCE, &st_ivas->nCPE, &st_ivas->element_mode_init ); /*correct number of CPEs for discrete ISM coding*/ - if (st_ivas->ini_frame > 0 && st_ivas->ism_mode == ISM_SBA_MODE_DISC) + if ( st_ivas->ini_frame > 0 && st_ivas->ism_mode == ISM_SBA_MODE_DISC ) #ifdef NONBE_FIX_ISM_XOVER_BR { int16_t n; -- GitLab From c5bffcbcb7043a98331e776a440e99be8eb3e556 Mon Sep 17 00:00:00 2001 From: Dominik Weckbecker Date: Mon, 2 Jun 2025 11:40:37 +0200 Subject: [PATCH 08/12] enable NONBE_FIX_ISM_XOVER_BR --- 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 8a32f8e9a..4d7b2365b 100644 --- a/lib_com/options.h +++ b/lib_com/options.h @@ -209,8 +209,8 @@ #define FIX_1003_PARAMISM_BINAURAL_RECONFIG_USAN /* FhG: fix for #1003: fix USAN caused by ParamISM reconfig */ #define FIX_1001_ARI_HM_OVERFLOW /* FhG: fix for undef behaviour in in the harmonic TCX model arithmetic coder */ #define NONBE_FIX_1005_MC_RS_TCBUFFER_UPDATE /* FhG: issue #1005: fix TC Buffer update at a MC rate switch */ -#define NONBE_FIX_1004_USAN_DTX_MASA_NO_DIRS /* Nokia: fix USAN error caused by non-setting of correctly the number of MASA directions in DTX */ - +#define NONBE_FIX_1004_USAN_DTX_MASA_NO_DIRS /* Nokia: fix USAN error caused by non-setting of correctly the number of MASA directions in DTX */ +#define NONBE_FIX_ISM_XOVER_BR /* FhG: issue 1072: select OSBA coding method depending on number of object and bitrate */ /* #################### End BASOP porting switches ############################ */ -- GitLab From dff9d19b4ea2c28bb3f3e3d4871c9b849f205e65 Mon Sep 17 00:00:00 2001 From: Dominik Weckbecker Date: Mon, 2 Jun 2025 14:02:44 +0200 Subject: [PATCH 09/12] add missing a instance of a chenged channel count --- lib_dec/ivas_init_dec.c | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/lib_dec/ivas_init_dec.c b/lib_dec/ivas_init_dec.c index 9de04ffda..2b14a1788 100644 --- a/lib_dec/ivas_init_dec.c +++ b/lib_dec/ivas_init_dec.c @@ -1539,8 +1539,17 @@ ivas_error ivas_init_decoder( if ( st_ivas->ism_mode == ISM_SBA_MODE_DISC ) { - st_ivas->nCPE += ( st_ivas->nchan_ism + 1 ) >> 1; - st_ivas->element_mode_init = IVAS_CPE_MDCT; +#ifdef NONBE_FIX_ISM_XOVER_BR + { + int16_t n_all; + + n_all = st_ivas->nchan_transport + st_ivas->nchan_ism; + st_ivas->nCPE = (n_all + 1) >> 1; + } +#else + st_ivas->nCPE += (st_ivas->nchan_ism + 1) >> 1; +#endif + st_ivas->element_mode_init = IVAS_CPE_MDCT; } for ( cpe_id = 0; cpe_id < st_ivas->nCPE; cpe_id++ ) -- GitLab From 9b8d661a5c63b80c22adebf9193cc75d135c53a8 Mon Sep 17 00:00:00 2001 From: Dominik Weckbecker Date: Mon, 2 Jun 2025 14:04:53 +0200 Subject: [PATCH 10/12] fix problem with CNG configuration --- lib_dec/ivas_sba_dec.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/lib_dec/ivas_sba_dec.c b/lib_dec/ivas_sba_dec.c index 60d0e8281..89e03fc84 100644 --- a/lib_dec/ivas_sba_dec.c +++ b/lib_dec/ivas_sba_dec.c @@ -70,8 +70,12 @@ void ivas_sba_set_cna_cng_flag( st_ivas->hSCE[0]->hCoreCoder[0]->cna_dirac_flag = 1; st_ivas->hSCE[0]->hCoreCoder[0]->cng_sba_flag = 1; } - else if ( st_ivas->nchan_transport == 2 ) - { +#ifdef NONBE_FIX_ISM_XOVER_BR + else if (st_ivas->nchan_transport == 2 && st_ivas->ivas_format != SBA_ISM_FORMAT) +#else + else if (st_ivas->nchan_transport == 2) +#endif + { for ( n = 0; n < CPE_CHANNELS; n++ ) { st_ivas->hCPE[0]->hCoreCoder[n]->cna_dirac_flag = 0; -- GitLab From f86c7e044f9e5fe552f4367937557d8029eeb746 Mon Sep 17 00:00:00 2001 From: Dominik Weckbecker Date: Mon, 2 Jun 2025 14:20:19 +0200 Subject: [PATCH 11/12] fix formatting --- lib_dec/ivas_init_dec.c | 14 +++++++------- lib_dec/ivas_sba_dec.c | 6 +++--- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/lib_dec/ivas_init_dec.c b/lib_dec/ivas_init_dec.c index 2b14a1788..d6d8d3410 100644 --- a/lib_dec/ivas_init_dec.c +++ b/lib_dec/ivas_init_dec.c @@ -1540,16 +1540,16 @@ ivas_error ivas_init_decoder( if ( st_ivas->ism_mode == ISM_SBA_MODE_DISC ) { #ifdef NONBE_FIX_ISM_XOVER_BR - { - int16_t n_all; + { + int16_t n_all; - n_all = st_ivas->nchan_transport + st_ivas->nchan_ism; - st_ivas->nCPE = (n_all + 1) >> 1; - } + n_all = st_ivas->nchan_transport + st_ivas->nchan_ism; + st_ivas->nCPE = ( n_all + 1 ) >> 1; + } #else - st_ivas->nCPE += (st_ivas->nchan_ism + 1) >> 1; + st_ivas->nCPE += ( st_ivas->nchan_ism + 1 ) >> 1; #endif - st_ivas->element_mode_init = IVAS_CPE_MDCT; + st_ivas->element_mode_init = IVAS_CPE_MDCT; } for ( cpe_id = 0; cpe_id < st_ivas->nCPE; cpe_id++ ) diff --git a/lib_dec/ivas_sba_dec.c b/lib_dec/ivas_sba_dec.c index 89e03fc84..8b60bb03d 100644 --- a/lib_dec/ivas_sba_dec.c +++ b/lib_dec/ivas_sba_dec.c @@ -71,11 +71,11 @@ void ivas_sba_set_cna_cng_flag( st_ivas->hSCE[0]->hCoreCoder[0]->cng_sba_flag = 1; } #ifdef NONBE_FIX_ISM_XOVER_BR - else if (st_ivas->nchan_transport == 2 && st_ivas->ivas_format != SBA_ISM_FORMAT) + else if ( st_ivas->nchan_transport == 2 && st_ivas->ivas_format != SBA_ISM_FORMAT ) #else - else if (st_ivas->nchan_transport == 2) + else if ( st_ivas->nchan_transport == 2 ) #endif - { + { for ( n = 0; n < CPE_CHANNELS; n++ ) { st_ivas->hCPE[0]->hCoreCoder[n]->cna_dirac_flag = 0; -- GitLab From 1b455017df3dff4eded568973df258db0f280251 Mon Sep 17 00:00:00 2001 From: Dominik Weckbecker Date: Thu, 5 Jun 2025 10:57:39 +0200 Subject: [PATCH 12/12] update copyright year in ivas_osba_com.c --- lib_com/ivas_osba_com.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib_com/ivas_osba_com.c b/lib_com/ivas_osba_com.c index 2f052f045..ae89edcfc 100644 --- a/lib_com/ivas_osba_com.c +++ b/lib_com/ivas_osba_com.c @@ -1,6 +1,6 @@ /****************************************************************************************************** - (C) 2022-2024 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB, + (C) 2022-2025 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB, Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD., Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange, Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other -- GitLab