Commit 09570f9a authored by Jan Kiene's avatar Jan Kiene
Browse files

Merge branch 'b_20240126_OSBA-Xover-BR' into 'main' 

adjust OSBA discrete-coding x-over BR[non BE][non-io]

See merge request !1347
parents 03e35920 ca0de138

Workspace_msvc/lib_com.vcxproj

+1 −0
Original line number Diff line number Diff line
@@ -205,6 +205,7 @@ 
    <ClCompile Include="..\lib_com\ivas_mdct_imdct.c" />

    <ClCompile Include="..\lib_com\ivas_mdft_imdft.c" />

    <ClCompile Include="..\lib_com\ivas_omasa_com.c" />

    <ClCompile Include="..\lib_com\ivas_osba_com.c" />

    <ClCompile Include="..\lib_com\ivas_pca_tools.c" />

    <ClCompile Include="..\lib_com\ivas_qmetadata_com.c" />

    <ClCompile Include="..\lib_com\ivas_qspherical_com.c" />

Workspace_msvc/lib_com.vcxproj.filters

+4 −1
Original line number Diff line number Diff line
@@ -469,6 +469,9 @@ 
    <ClCompile Include="..\lib_com\ivas_lfe_com.c">

      <Filter>common_ivas_c</Filter>

    </ClCompile>

    <ClCompile Include="..\lib_com\ivas_osba_com.c">

      <Filter>common_ivas_c</Filter>

    </ClCompile>

    <ClCompile Include="..\lib_com\ivas_rotation_com.c" />

  </ItemGroup>

  <ItemGroup>

lib_com/ivas_osba_com.c

0 → 100644
+69 −0
Original line number Diff line number Diff line 
/******************************************************************************************************



   (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;

}

lib_com/ivas_prot.h

+4 −1
Original line number Diff line number Diff line
@@ -5612,7 +5612,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

*---------------------------------------------------------------------------------*/

lib_com/options.h

+1 −0
Original line number Diff line number Diff line
@@ -172,6 +172,7 @@ 
/* any switch which is non-be wrt selection floating point code */

/* all switches in this category should start with "NONBE_" */



#define NONBE_FIX_ISM_XOVER_BR                          /* FhG: issue 1072: select OSBA coding method depending on number of object and bitrate */

#define NONBE_FIX_1028_1DB_TCX_LEVEL_DROP               /* VA: Harmonize the logic setting LP weighting factor between TCX encoder and TCX decoder */



#define NONBE_FIX_SBA_SIGNALING_BITS_B                  /* FhG: issue 1061: option B: signal sba order additionally in OSBA */