Commit e0d6e5bb authored by Sandesh Venkatesh's avatar Sandesh Venkatesh
Browse files

Merge branch 'high_mld_fixes_Q_info_updates_1' into 'main' 

Fix for high MLD cases for MASA and OMASA formats, Q-info updates

See merge request !925
parents 2f1bb4e3 0c012679

Workspace_msvc/lib_enc.vcxproj

+0 −2
Original line number Diff line number Diff line
@@ -280,9 +280,7 @@ 
    <ClCompile Include="..\lib_enc\energy.c" />

    <ClCompile Include="..\lib_enc\eval_pit_contr.c" />

    <ClCompile Include="..\lib_enc\evs_enc.c" />

    <ClCompile Include="..\lib_enc\ext_sig_ana.c" />

    <ClCompile Include="..\lib_enc\fd_cng_enc.c" />

    <ClCompile Include="..\lib_enc\find_tar.c" />

    <ClCompile Include="..\lib_enc\find_tilt.c" />

    <ClCompile Include="..\lib_enc\find_uv.c" />

    <ClCompile Include="..\lib_enc\find_wsp.c" />

Workspace_msvc/lib_enc.vcxproj.filters

+0 −6
Original line number Diff line number Diff line
@@ -181,15 +181,9 @@ 
    <ClCompile Include="..\lib_enc\eval_pit_contr.c">

      <Filter>enc_all_c</Filter>

    </ClCompile>

    <ClCompile Include="..\lib_enc\ext_sig_ana.c">

      <Filter>enc_all_c</Filter>

    </ClCompile>

    <ClCompile Include="..\lib_enc\fd_cng_enc.c">

      <Filter>enc_all_c</Filter>

    </ClCompile>

    <ClCompile Include="..\lib_enc\find_tar.c">

      <Filter>enc_all_c</Filter>

    </ClCompile>

    <ClCompile Include="..\lib_enc\find_tilt.c">

      <Filter>enc_all_c</Filter>

    </ClCompile>

lib_com/prot_fx.h

+3 −2
Original line number Diff line number Diff line
@@ -11006,8 +11006,9 @@ void core_coder_mode_switch_ivas_fx( 














void configureFdCngEnc_ivas_fx(















    HANDLE_FD_CNG_ENC hFdCngEnc, /* i/o: Contains the variables related to the FD-based CNG process */













    const Word16 bwidth,













    const Word32 total_brate );













    const Word16 bwidth,         /* Q0 */













    const Word32 total_brate     /* Q0 */













);





























Word16 getTcxonly_ivas_fx(















    const Word16 element_mode, /* i  : IVAS element mode                   */

























lib_enc/ext_sig_ana.c
deleted100644 → 0



+0
−43




























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.



























*******************************************************************************************************/



























/*====================================================================================













    EVS Codec 3GPP TS26.443 Nov 04, 2021. Version 12.14.0 / 13.10.0 / 14.6.0 / 15.4.0 / 16.3.0













  ====================================================================================*/



























#include <assert.h>













#include <stdint.h>













#include "options.h"













#include <math.h>













#include "prot.h"













#include "rom_com.h"













#include "wmc_auto.h"
























lib_enc/ext_sig_ana_fx.c



+108
−90


























File changed.
Preview size limit exceeded, changes collapsed.