Commit f0b78426 authored by norvell's avatar norvell
Browse files

Merge with main

parents a76af6ad 0f051772

.gitlab-ci.yml

+1 −1
Original line number Diff line number Diff line
@@ -305,7 +305,7 @@ self-test-on-merge-request: 
    ### analyse test output



    # some helper variables - "|| true" to prevent failures from grep not finding anything

    - evs_non_be_flag=$(echo $CI_MERGE_REQUEST_TITLE | grep -c --ignore-case "\[evs[ -]non[ -]*be\]") || true

    - evs_non_be_flag=$(echo $CI_MERGE_REQUEST_TITLE | grep -c --ignore-case "\[evs[ -]*non[ -]*be\]") || true

    - non_be_flag=$(echo $CI_MERGE_REQUEST_TITLE | grep -c --ignore-case "\[non[ -]*be\]") || true

    - run_errors=$(cat test_output.txt test_output_evs.txt | grep -c "test conditions had run errors") || true

    - bitexact=$(cat test_output.txt | grep -c "All [0-9]* tests are bitexact") || true

lib_com/ivas_prot.h

+6 −20
Original line number Diff line number Diff line
@@ -4247,27 +4247,13 @@ int16_t ivas_map_num_decd_r_to_idx( const int16_t num_quant_points_decd_r ); 


/* Quantization utilities */

void ivas_quantise_real_values(

#ifdef QUANTISE_REAL_FCN_CLEAN_UP

    const float *values,

#else

        float **values,

#endif

    const int16_t q_levels,

    const float min_value,

    const float max_value,

#ifdef QUANTISE_REAL_FCN_CLEAN_UP

    int16_t *index,

    float *quant,

#else

        int16_t **index,

        float **quant,

#endif

#ifdef QUANTISE_REAL_FCN_CLEAN_UP

    const int16_t dim

#else

    const int16_t dim1,

    const int16_t dim2

#endif

);

lib_com/ivas_spar_com_quant_util.c

+1 −82
Original line number Diff line number Diff line
@@ -41,31 +41,6 @@ 
#include "ivas_rom_com.h"

#include <assert.h>

#include "wmops.h"

#ifndef QUANTISE_REAL_FCN_CLEAN_UP

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

 * Function ivas_limit_values()

 *

 * Limit values within given range

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



static void ivas_limit_values(

    float **ppValues,

    const float min_value,

    const float max_value,

    const int16_t dim1,

    const int16_t dim2 )

{

    int16_t i, j;

    for ( i = 0; i < dim1; i++ )

    {

        for ( j = 0; j < dim2; j++ )

        {

            ppValues[i][j] = max( min_value, min( ppValues[i][j], max_value ) );

        }

    }

    return;

}

#endif



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

 * Function ivas_quantise_real_values()
@@ -73,72 +48,28 @@ static void ivas_limit_values( 
 * Quantize real values

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

void ivas_quantise_real_values(

#ifdef QUANTISE_REAL_FCN_CLEAN_UP

    const float *values,

#else

    float **values,

#endif

    const int16_t q_levels,

    const float min_value,

    const float max_value,

#ifdef QUANTISE_REAL_FCN_CLEAN_UP

    int16_t *index,

    float *quant,

#else

    int16_t **index,

    float **quant,

#endif

#ifdef QUANTISE_REAL_FCN_CLEAN_UP

    const int16_t dim

#else

    const int16_t dim1,

    const int16_t dim2

#endif

)

    const int16_t dim )

{

#ifndef QUANTISE_REAL_FCN_CLEAN_UP

    int16_t i, j;

#else

    int16_t i;

#endif

    float q_step, one_by_q_step;

    if ( q_levels == 1 )

    {

#ifndef QUANTISE_REAL_FCN_CLEAN_UP

        for ( i = 0; i < dim1; i++ )

        {

            for ( j = 0; j < dim2; j++ )

            {



                quant[i][j] = 0;

                index[i][j] = 0;

            }

        }

#else

        for ( i = 0; i < dim; i++ )

        {

            quant[i] = 0;

            index[i] = 0;

        }

#endif

    }

    else if ( q_levels && max_value != min_value )

    {

#ifndef QUANTISE_REAL_FCN_CLEAN_UP

        ivas_limit_values( values, min_value, max_value, dim1, dim2 );

#endif

        q_step = ( max_value - min_value ) / ( q_levels - 1 );

        one_by_q_step = ( q_levels - 1 ) / ( max_value - min_value );

#ifndef QUANTISE_REAL_FCN_CLEAN_UP

        for ( i = 0; i < dim1; i++ )

        {

            for ( j = 0; j < dim2; j++ )

            {

                index[i][j] = (int16_t) round( one_by_q_step * values[i][j] );

                quant[i][j] = index[i][j] * q_step;

            }

        }

#else

        float val;

        for ( i = 0; i < dim; i++ )

        {
@@ -146,24 +77,13 @@ void ivas_quantise_real_values( 
            index[i] = (int16_t) round( one_by_q_step * val );

            quant[i] = index[i] * q_step;

        }

#endif

    }

    else

    {

#ifndef QUANTISE_REAL_FCN_CLEAN_UP

        for ( i = 0; i < dim1; i++ )

        {

            for ( j = 0; j < dim2; j++ )

            {

                quant[i][j] = values[i][j];

            }

        }

#else

        for ( i = 0; i < dim; i++ )

        {

            quant[i] = values[i];

        }

#endif

    }

    return;

}
@@ -425,7 +345,6 @@ void ivas_clear_band_coeff_idx( 
    for ( i = 0; i < num_bands; i++ )

    {

        set_s( pband_coeff_idx[i].pred_index_re, 0, ( IVAS_SPAR_MAX_CH - 1 ) );



        set_s( pband_coeff_idx[i].drct_index_re, 0, IVAS_SPAR_MAX_C_COEFF );

        set_s( pband_coeff_idx[i].decd_index_re, 0, ( IVAS_SPAR_MAX_CH - 1 ) );

    }

lib_com/options.h

+0 −1
Original line number Diff line number Diff line
@@ -147,7 +147,6 @@ 
/*#define FIX_I1_113*/                                  /* under review : MCT bit distribution optimization for SBA high bitrates*/



#define SPAR_SCALING_HARMONIZATION                      /* Issue 80: Changes to harmonize scaling in spar */

#define SBA_INTERN_CONFIG_FIX_HOA2                      /* Issue 99 : Fix for incorrect internal_config when output format is HOA2 or FOA*/

#define FIX_I98_HANDLES_TO_NULL                         /* Issue 98: do the setting of all handles to NULL in one place */

#define FIX_I106_TDREND_5MS                             /* Issue 106: 5 ms update rate in TD object renderer */

#define QUANTISE_REAL_FCN_CLEAN_UP                      /*Clean up the ivas_quantise_real_values() function*/

lib_dec/ivas_output_init.c

+0 −4
Original line number Diff line number Diff line
@@ -511,7 +511,6 @@ void ivas_renderer_select( 
        if ( st_ivas->ivas_format == SBA_FORMAT && st_ivas->sba_mode == SBA_MODE_SPAR &&

             ( output_config != AUDIO_CONFIG_5_1 && output_config != AUDIO_CONFIG_5_1_2 && output_config != AUDIO_CONFIG_5_1_4 && output_config != AUDIO_CONFIG_7_1 && output_config != AUDIO_CONFIG_7_1_4 && output_config != AUDIO_CONFIG_LS_CUSTOM ) )

        {

#ifdef SBA_INTERN_CONFIG_FIX_HOA2

            if ( output_config == AUDIO_CONFIG_HOA2 || output_config == AUDIO_CONFIG_FOA )

            {

                *internal_config = output_config;
@@ -520,9 +519,6 @@ void ivas_renderer_select( 
            {

                *internal_config = AUDIO_CONFIG_HOA3;

            }

#else

            *internal_config = AUDIO_CONFIG_HOA3;

#endif

            st_ivas->renderer_type = RENDERER_SBA_LINEAR_DEC;

        }

        else if ( ( st_ivas->ivas_format == MASA_FORMAT && output_config == AUDIO_CONFIG_MONO && st_ivas->nchan_transport == 1 ) ||