Commit 4b9f5b30 authored by Andrea Genovese's avatar Andrea Genovese
Browse files

changed and deleted configs

parent 8f5f4df6

lib_rend/ivas_er_utils.h

deleted100644 → 0
+0 −54
Original line number Diff line number Diff line 
/******************************************************************************************************



   (C) 2022-2023 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 <stdint.h>

#include "options.h"

#include "ivas_cnst.h"



#ifdef EARLY_REFLECTIONS



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

 * Reflections utils prototypes

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



/* matrix memory handling */

ivas_error er_init_float_matrix(

    float ***mat,

    uint16_t rows,

    uint16_t cols );



ivas_error er_free_float_matrix(

    float **mat,

    uint16_t rows );



#endif

lib_rend/ivas_reflections_utils.c

deleted100644 → 0
+0 −86
Original line number Diff line number Diff line 
/******************************************************************************************************



   (C) 2022-2023 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"



#ifdef EARLY_REFLECTIONS



#include <stdio.h>

#include <stdlib.h>

#include <string.h>

#include "prot.h"

#include "ivas_prot_rend.h"

#include "ivas_stat_rend.h"

#include "ivas_error.h"

#include "ivas_er_utils.h"

#include "wmc_auto.h"



/* Initialize memory for a 2D matrix of floats */

ivas_error er_init_float_matrix( float ***mat, uint16_t rows, uint16_t cols )

{

    *mat = malloc( rows * sizeof( **mat ) );

    if ( !( *mat ) )

    {

        return IVAS_ERR_FAILED_ALLOC;

    }

    for ( uint16_t i = 0; i < rows; i++ )

    {

        ( *mat )[i] = malloc( cols * sizeof( ***mat ) );



        if ( !( ( *mat )[i] ) )

        {

            return IVAS_ERR_FAILED_ALLOC;

        }



        set_f( ( *mat )[i], 0.0f, cols );

    }

    return IVAS_ERR_OK;

}



/* Delete memory stored in a 2D matrix of floats */

ivas_error er_free_float_matrix( float **mat, uint16_t rows )

{

    if ( mat )

    {

        for ( uint16_t i = 0; i < rows; i++ )

        {

            if ( mat[i] )

            {

                free( mat[i] );

            }

        }

        free( mat );

    }

    return IVAS_ERR_OK;

}



#endif

scripts/testv/rend_config_ER_v0.cfg

0 → 100644
+38 −0
Original line number Diff line number Diff line 
[roomAcoustics]

frequencyGridCount = 1;

acousticEnvironmentCount = 1;



[frequencyGrid:0]

method = individualFrequencies;

nrBands = 24;

frequencies  = [50.0, 63.0, 80.0, 100.0,

                125.0, 160.0, 200.0, 250.0,

                315.0, 400.0, 500.0, 630.0,

                800.0, 1000.0, 1250.0, 1600.0,

                2000.0, 2500.0, 3150.0, 4000.0,

                5000.0, 6300.0, 8000.0, 10000.0];



[acousticEnvironment:0]

frequencyGridIndex = 0;

predelay =  0.108;

rt60 = [0.87, 0.66, 0.47, 0.41,

        0.32, 0.37, 0.28, 0.30,

        0.29, 0.29, 0.28, 0.30,

        0.31, 0.34, 0.34, 0.34,

        0.34, 0.33, 0.32, 0.29,

        0.28, 0.24, 0.24, 0.2];



dsr  = [2.511887e-07, 1e-07, 1.2589251e-07, 1e-07,

        5.01187e-08, 5.01187e-08, 7.9432844e-08, 1e-07,

        6.309576e-08, 5.01187e-08, 7.9432844e-08, 1e-07,

        5.01187e-08, 1e-07, 7.9432844e-08, 6.309576e-08,

        7.9432844e-08, 5.01187e-08, 6.309576e-08, 3.9810708e-08,

        3.9810708e-08, 2.511887e-08, 1.9952632e-08, 1.2589251e-08];



earlyReflectionsSize = [ 2.0, 2.0, 3.0 ];

absorptionCoeffs = [ 0.2, 0.1, 0.1, 0.1, 0.3, 0.1 ];

lowComplexity = TRUE;

listenerOrigin = [ 0.0, 0.0, 1.5 ];



[general]

binaryConfig = rend_config_ER_v0.dat;
 
 No newline at end of file

scripts/testv/rend_config_ERstrong_LISToff_DIRon.dat→scripts/testv/rend_config_ER_v0.dat

LFS
+3 −0
Original line number Diff line number Diff line 
version https://git-lfs.github.com/spec/v1

oid sha256:197e50d0904c240c8dedb3600aeb764f1c269289ac85da0c96a2359cb90a806e

size 91
 
oid sha256:a0e5cdb59fa93168feb1d4b973b1b2c2128fe103db5422b5ac4249f51bbf45a0

size 84

scripts/testv/rend_config_ER_v1.cfg

0 → 100644
+37 −0
Original line number Diff line number Diff line 
[roomAcoustics]

frequencyGridCount = 1;

acousticEnvironmentCount = 1;



[frequencyGrid:0]

method = individualFrequencies;

nrBands = 24;

frequencies  = [50.0, 63.0, 80.0, 100.0,

                125.0, 160.0, 200.0, 250.0,

                315.0, 400.0, 500.0, 630.0,

                800.0, 1000.0, 1250.0, 1600.0,

                2000.0, 2500.0, 3150.0, 4000.0,

                5000.0, 6300.0, 8000.0, 10000.0];



[acousticEnvironment:0]

frequencyGridIndex = 0;

predelay =  0.108;

rt60 = [0.87, 0.66, 0.47, 0.41,

        0.32, 0.37, 0.28, 0.30,

        0.29, 0.29, 0.28, 0.30,

        0.31, 0.34, 0.34, 0.34,

        0.34, 0.33, 0.32, 0.29,

        0.28, 0.24, 0.24, 0.2];



dsr  = [2.511887e-07, 1e-07, 1.2589251e-07, 1e-07,

        5.01187e-08, 5.01187e-08, 7.9432844e-08, 1e-07,

        6.309576e-08, 5.01187e-08, 7.9432844e-08, 1e-07,

        5.01187e-08, 1e-07, 7.9432844e-08, 6.309576e-08,

        7.9432844e-08, 5.01187e-08, 6.309576e-08, 3.9810708e-08,

        3.9810708e-08, 2.511887e-08, 1.9952632e-08, 1.2589251e-08];



earlyReflectionsSize = [3.0, 3.0, 4.0];

absorptionCoeffs = [ 0.3, 0.2, 0.2, 0.2, 0.3, 0.1 ];

lowComplexity = FALSE;



[general]

binaryConfig = rend_config_ER_v1.dat;
 
 No newline at end of file