Commit 000bd99e authored by sbsarac's avatar sbsarac
Browse files

Merge branch 'main' into 1053-reverb-reconfiguration-runtime-test

parents b809b7b5 220c4e7e

ci/remove_unsupported_testcases.py

0 → 100644
+79 −0
Original line number Diff line number Diff line 
__copyright__ = """

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

"""



from pathlib import Path

import argparse



# Enter tag of testcases to remove here WITHOUT the leading //

TESTCASES = [

    "OMASA 2Dir2TC 4ISM at br sw techs 13.2 to 512 kbps start 80 kbps, 48kHz in, 48kHz out, EXT out",

    "OSBA planar FOA 2ISM at 512 kbps, 48 kHz in, 48 kHz out, BINAURAL out",

    "4 ISM with extended metadata at 128 kbps, 48 kHz in, 48 kHz out, BINAURAL_ROOM_REVERB out, combined render config, directivity configuration with identifiers",

    "OSBA planar FOA 1ISM at 256 kbps, 48 kHz in, 48 kHz out, BINAURAL out",

    "Multi-channel 5_1 bitrate switching from 24.4 kbps to 256 kbps, 48kHz in, 48kHz out, BINAURAL out, FER at 10%, bandwidth switching",

    "OSBA FOA 4ISM at bitrate switching 13.2 to 512 kbps, 48kHz in, 48kHz out, BINAURAL out, FER at 5%, bandwidth switching",

    "OSBA FOA 2ISM at 64 kbps, 48kHz in, 48kHz out, HOA3 out, bandwidth switching",

    "OMASA 2Dir2TC 4ISM at br sw techs 13.2 to 512 kbps start 80 kbps, 48kHz in, 48kHz out, EXT out",

    "OSBA planar FOA 2ISM at 512 kbps, 48 kHz in, 48 kHz out, BINAURAL out",

    "OSBA planar FOA 1ISM at 256 kbps, 48 kHz in, 48 kHz out, BINAURAL out",

    "SBA 3OA at 128 kbps, 48kHz in 48kHz out, BINAURAL_ROOM_REVERB combined renderer configuration with selected acoustic environment",

    "OSBA FOA 4ISM at bitrate switching 13.2 to 512 kbps, 48kHz in, 16kHz out, BINAURAL out (Model from file), FER at 5%, bandwidth switching",

]





def remove_testcases(cfg: Path, testcases: list):

    """

    Go through file line by line and copy all testcases except the given ones

    """

    with open(cfg, "r") as f:

        content_in = f.readlines()



    content_out = list()

    copy_flag = True

    for line in content_in:

        if any([tc in line for tc in testcases]):

            copy_flag = False



        if copy_flag:

            content_out.append(line)

        elif line == "\n":

            copy_flag = True



    with open(cfg, "w") as f:

        f.write("".join(content_out))





if __name__ == "__main__":

    parser = argparse.ArgumentParser()

    parser.add_argument("cfg_files", nargs="+", type=Path)

    args = parser.parse_args()



    for f in args.cfg_files:

        remove_testcases(f, TESTCASES)

lib_com/bitstream.c

+16 −0
Original line number Diff line number Diff line
@@ -884,7 +884,11 @@ ivas_error check_ind_list_limits( 
        }

        else

        {

#ifdef DEBUGGING

            return IVAS_ERROR( IVAS_ERR_INTERNAL_FATAL, "Buffer of indices corrupted in frame %d! Attempt to overwrite indice ID = %d (value: %d, bits: %d)!\n", frame, hBstr->ind_list[hBstr->nb_ind_tot].id, hBstr->ind_list[hBstr->nb_ind_tot].value, hBstr->ind_list[hBstr->nb_ind_tot].nb_bits );

#else

            return IVAS_ERROR( IVAS_ERR_INTERNAL_FATAL, "Buffer of indices corrupted! Attempt to overwrite indice ID = %d (value: %d, bits: %d)!\n", hBstr->ind_list[hBstr->nb_ind_tot].id, hBstr->ind_list[hBstr->nb_ind_tot].value, hBstr->ind_list[hBstr->nb_ind_tot].nb_bits );

#endif

        }

    }
@@ -939,7 +943,11 @@ ivas_error push_indice( 
    /* check the limits of the list of indices */

    if ( ( error = check_ind_list_limits( hBstr ) ) != IVAS_ERR_OK )

    {

#ifdef DEBUGGING

        return IVAS_ERROR( error, "Error occured in push_indice() while re-allocating the list of indices (frame %d) !\n", frame );

#else

        return IVAS_ERROR( error, "Error occured in push_indice() while re-allocating the list of indices!\n" );

#endif

    }



    /* find the location in the list of indices based on ID */
@@ -1095,7 +1103,11 @@ ivas_error push_next_bits( 
        /* check the limits of the list of indices */

        if ( ( error = check_ind_list_limits( hBstr ) ) != IVAS_ERR_OK )

        {

#ifdef DEBUGGING

            return IVAS_ERROR( error, "Error occured in push_next_bits() while re-allocating the list of indices (frame %d) !\n", frame );

#else

            return IVAS_ERROR( error, "Error occured in push_next_bits() while re-allocating the list of indices!\n" );

#endif

        }

        ptr = &hBstr->ind_list[hBstr->nb_ind_tot];
@@ -1114,7 +1126,11 @@ ivas_error push_next_bits( 
        /* check the limits of the list of indices */

        if ( ( error = check_ind_list_limits( hBstr ) ) != IVAS_ERR_OK )

        {

#ifdef DEBUGGING

            return IVAS_ERROR( error, "Error occured in push_next_bits() while re-allocating the list of indices (frame %d) !\n", frame );

#else

            return IVAS_ERROR( error, "Error occured in push_next_bits() while re-allocating the list of indices!\n" );

#endif

        }

        ptr = &hBstr->ind_list[hBstr->nb_ind_tot];

lib_com/options.h

+3 −0
Original line number Diff line number Diff line
@@ -161,6 +161,9 @@ 
#define FIX_1081_BINAURAL_SPLIT_PCM_SANITY_CHECK        /* VA: issue 1081: correct error print-out when BINAURAL_SPLIT_PCM is requested */

#endif



//#define FIX_CREND_FIX_POINT_HRTF_FILE_FORMAT          /* Orange issue 1031 : new fix point hrtf binary file format */

//#define FIX_CREND_SIMPLIFY_CODE                         /* Ora : simplify line code in crend */

#define FLOAT_FIX_POINT_HRTF_FILE_FORMAT                /* allows reading floation or fix point hrtf binary file format */

#define FIX_1053_REVERB_RECONFIGURATION                 /* Philips: issue 1053: fix for dynamic switching of acoustic environment */

#define CONF_DISTATT                                    /* Eri: Make distance attenuation configurable */

#define FIX_1082_INSTRUM_FAILED_LC3PLUS                 /* VoiceAge: issue 1082: fix ambiguous syntax in LC3Plus code leading to fails of instrumented builds */

lib_rend/ivas_crend.c

+31 −0
Original line number Diff line number Diff line
@@ -1642,7 +1642,11 @@ static ivas_error ivas_rend_crendConvolver( 
    const float *pIn;

    float *pFreq_buf_re, *pFreq_buf_im;

    float *pFreq_buf2_re, *pFreq_buf2_im;

#ifdef FIX_CREND_SIMPLIFY_CODE

    float *pFreq_filt_re, *pFreq_filt_im;

#else

    const float *pFreq_filt_re, *pFreq_filt_im;

#endif

    float pOut[L_FRAME48k * 2];

    float tmp_out_re[L_FRAME48k], tmp_out_im[L_FRAME48k];

    CREND_HANDLE hCrend;
@@ -1694,6 +1698,23 @@ static ivas_error ivas_rend_crendConvolver( 
    }



    i = 0;

#ifdef FIX_CREND_SIMPLIFY_CODE

    if ( pCrend->hHrtfCrend->num_iterations_diffuse[0] > 0 )

    {

        if ( pCrend->hHrtfCrend->same_inv_diffuse_weight )

        {

            pFreq_buf_re = &hCrend->freq_buffer_re_diffuse[0][offset_diffuse];

            pFreq_buf_im = &hCrend->freq_buffer_im_diffuse[0][offset_diffuse];

        }

        else

        {

            pFreq_buf_re = &hCrend->freq_buffer_re_diffuse[0][offset_diffuse];

            pFreq_buf_im = &hCrend->freq_buffer_im_diffuse[0][offset_diffuse];

            pFreq_buf2_re = &hCrend->freq_buffer_re_diffuse[1][offset_diffuse];

            pFreq_buf2_im = &hCrend->freq_buffer_im_diffuse[1][offset_diffuse];

        }

    }

#endif

    for ( idx_in = 0; idx_in < nchan_in; idx_in++ )

    {

        pIn = &pcm_in[idx_in][i_ts * subframe_length];
@@ -1703,8 +1724,10 @@ static ivas_error ivas_rend_crendConvolver( 
            {

                if ( pCrend->hHrtfCrend->same_inv_diffuse_weight )

                {

#ifndef FIX_CREND_SIMPLIFY_CODE

                    pFreq_buf_re = &hCrend->freq_buffer_re_diffuse[0][offset_diffuse];

                    pFreq_buf_im = &hCrend->freq_buffer_im_diffuse[0][offset_diffuse];

#endif

                    pFreq_filt_re = &hCrend->freq_buffer_re[i][offset];

                    pFreq_filt_im = &hCrend->freq_buffer_im[i][offset];
@@ -1716,10 +1739,12 @@ static ivas_error ivas_rend_crendConvolver( 
                }

                else

                {

#ifndef FIX_CREND_SIMPLIFY_CODE

                    pFreq_buf_re = &hCrend->freq_buffer_re_diffuse[0][offset_diffuse];

                    pFreq_buf_im = &hCrend->freq_buffer_im_diffuse[0][offset_diffuse];

                    pFreq_buf2_re = &hCrend->freq_buffer_re_diffuse[1][offset_diffuse];

                    pFreq_buf2_im = &hCrend->freq_buffer_im_diffuse[1][offset_diffuse];

#endif

                    pFreq_filt_re = &hCrend->freq_buffer_re[i][offset];

                    pFreq_filt_im = &hCrend->freq_buffer_im[i][offset];
@@ -1732,11 +1757,17 @@ static ivas_error ivas_rend_crendConvolver( 
                    }

                }

            }

#ifdef FIX_CREND_SIMPLIFY_CODE

            pFreq_filt_re = &hCrend->freq_buffer_re[i][offset];

            pFreq_filt_im = &hCrend->freq_buffer_im[i][offset];



            ivas_mdft( pIn, pFreq_filt_re, pFreq_filt_im, subframe_length, subframe_length );

#else

            pFreq_buf_re = &hCrend->freq_buffer_re[i][offset];

            pFreq_buf_im = &hCrend->freq_buffer_im[i][offset];



            ivas_mdft( pIn, pFreq_buf_re, pFreq_buf_im, subframe_length, subframe_length );

#endif

            i++;

        }

    }

lib_util/hrtf_file_reader.c

+1115 −118

File changed.

Preview size limit exceeded, changes collapsed.