Commit 7632fb03 authored by emerit's avatar emerit
Browse files

Merge branch '744-fix-sofa-to-rom-tables-and-binaural-binary-files' of... 

Merge branch '744-fix-sofa-to-rom-tables-and-binaural-binary-files' of https://forge.3gpp.org/rep/ivas-codec-pc/ivas-codec into 744-fix-sofa-to-rom-tables-and-binaural-binary-files
parents d586a531 827b6f66

ci/ivas_voip_be_test.sh

+1 −1
Original line number Diff line number Diff line
@@ -60,7 +60,7 @@ if [ $BUILD -eq 1 ];then 
fi



# Configuration

modes=('SBA_b128_wb_cbr' 'MC_7_1_b96_fb_cbr' 'ISM2_b48_fb_cbr')

modes=('HOA3_b128_wb_cbr' 'MC_7_1_b96_fb_cbr' 'ISM2_b48_fb_cbr')

output_formats=('STEREO' 'FOA' '7_1' 'HOA3')

limit_input_to_x_seconds=30

verbosity_cmd="-z console"

lib_com/options.h

+1 −0
Original line number Diff line number Diff line
@@ -194,6 +194,7 @@ 
#endif

#define NONBE_FIX_730_DPID_NOT_SET_CORRECTLY                  /* Eri: issue 730: write dpid read from file in correct index, print informative error message when DPID specified is not found. */

#define NONBE_FIX_825_SBA_JBM_MONO_STEREO_OUTPUT              /* FhG: issue #825: Resolve "JBM SBA: AGC and PCA run twice for MONO and STEREO output"   */

#define NONBE_FIX_808_JBM_PARAMUPMIX_RS                       /* FhG: Issue 808: fix JBM MC rate switching */



/* ##################### End NON-BE switches ########################### */

lib_dec/ivas_mc_paramupmix_dec.c

+16 −1
Original line number Diff line number Diff line
@@ -658,6 +658,18 @@ ivas_error ivas_mc_paramupmix_dec_open( 
    /* allocate transport channels*/

    hMCParamUpmix->free_param_interpolator = 0;

    hMCParamUpmix->param_interpolator = NULL;

#ifdef NONBE_FIX_808_JBM_PARAMUPMIX_RS

    if ( st_ivas->hDecoderConfig->Opt_5ms == 1 )

    {

        if ( ( hMCParamUpmix->param_interpolator = (float *) malloc( MAX_JBM_CLDFB_TIMESLOTS * sizeof( float ) ) ) == NULL )

        {

            return ( IVAS_ERROR( IVAS_ERR_FAILED_ALLOC, "Can not allocate memory for interpolator\n" ) );

        }

        hMCParamUpmix->free_param_interpolator = 1;



        ivas_jbm_dec_get_adapted_linear_interpolator( DEFAULT_JBM_CLDFB_TIMESLOTS, DEFAULT_JBM_CLDFB_TIMESLOTS, hMCParamUpmix->param_interpolator );

    }

#endif

    if ( st_ivas->hDecoderConfig->Opt_5ms == 1 && st_ivas->hTcBuffer == NULL )

    {

        int16_t nchan_to_allocate;
@@ -667,11 +679,12 @@ ivas_error ivas_mc_paramupmix_dec_open( 
        buffer_mode = TC_BUFFER_MODE_RENDERER;

        nchan_tc = ivas_jbm_dec_get_num_tc_channels( st_ivas );

        nchan_to_allocate = MC_PARAMUPMIX_MAX_INPUT_CHANS;

#ifndef NONBE_FIX_808_JBM_PARAMUPMIX_RS

        if ( ( hMCParamUpmix->param_interpolator = (float *) malloc( MAX_JBM_CLDFB_TIMESLOTS * sizeof( float ) ) ) == NULL )

        {

            return ( IVAS_ERROR( IVAS_ERR_FAILED_ALLOC, "Can not allocate memory for interpolator\n" ) );

        }



#endif

        if ( st_ivas->hDecoderConfig->output_config == IVAS_AUDIO_CONFIG_STEREO || st_ivas->hDecoderConfig->output_config == IVAS_AUDIO_CONFIG_MONO )

        {

            buffer_mode = TC_BUFFER_MODE_BUFFER;
@@ -686,9 +699,11 @@ ivas_error ivas_mc_paramupmix_dec_open( 
        {

            return error;

        }

#ifndef NONBE_FIX_808_JBM_PARAMUPMIX_RS

        hMCParamUpmix->free_param_interpolator = 1;



        ivas_jbm_dec_get_adapted_linear_interpolator( DEFAULT_JBM_CLDFB_TIMESLOTS, DEFAULT_JBM_CLDFB_TIMESLOTS, hMCParamUpmix->param_interpolator );

#endif

    }



    st_ivas->hMCParamUpmix = hMCParamUpmix;

lib_dec/ivas_mct_dec.c

+13 −0
Original line number Diff line number Diff line
@@ -1346,6 +1346,19 @@ static ivas_error ivas_mc_dec_reconfig( 
        {

            tc_nchan_full_new = 0;

        }

#ifdef NONBE_FIX_808_JBM_PARAMUPMIX_RS

        else if ( st_ivas->mc_mode == MC_MODE_PARAMUPMIX )

        {

            tc_nchan_allocate_new = MC_PARAMUPMIX_MAX_INPUT_CHANS;

            if ( st_ivas->hDecoderConfig->output_config == IVAS_AUDIO_CONFIG_STEREO || st_ivas->hDecoderConfig->output_config == IVAS_AUDIO_CONFIG_MONO )

            {

                tc_buffer_mode_new = TC_BUFFER_MODE_BUFFER;

                tc_nchan_tc_new = st_ivas->hDecoderConfig->nchan_out;

                tc_nchan_allocate_new = tc_nchan_tc_new;

            }

            tc_nchan_full_new = tc_nchan_allocate_new;

        }

#endif



        /* reconfigure buffer */

        if ( hTcBuffer->tc_buffer_mode != tc_buffer_mode_new || hTcBuffer->nchan_transport_jbm != tc_nchan_tc_new ||

scripts/config/ci_linux.json

+10 −20
Original line number Diff line number Diff line
@@ -8,10 +8,8 @@ 
        "HOA2": "/usr/local/testv/stv2OA48c.wav",

        "HOA3": "/usr/local/testv/stv3OA48c.wav",

        "SBA": "/usr/local/testv/stv3OA48c.wav",

        "MASA1TC1DIR": "/usr/local/testv/stv1MASA1TC48c.wav",

        "MASA1TC2DIR": "/usr/local/testv/stv2MASA1TC48c.wav",

        "MASA2TC1DIR": "/usr/local/testv/stv1MASA2TC48c.wav",

        "MASA2TC2DIR": "/usr/local/testv/stv2MASA2TC48c.wav",

        "MASA1TC": "/usr/local/testv/stv1MASA1TC48c.wav",

        "MASA2TC": "/usr/local/testv/stv1MASA2TC48c.wav",

        "5_1": "/usr/local/testv/stv51MC48c.wav",

        "5_1_2": "/usr/local/testv/stv512MC48c.wav",

        "5_1_4": "/usr/local/testv/stv514MC48c.wav",
@@ -21,22 +19,14 @@ 
        "ISM2": "/usr/local/testv/stv2ISM48s.wav",

        "ISM3": "/usr/local/testv/stv3ISM48s.wav",

        "ISM4": "/usr/local/testv/stv4ISM48s.wav",

        "OMASA_ISM1_1TC1DIR": "/usr/local/testv/stvOMASA_1ISM_1MASA1TC48c.wav",

        "OMASA_ISM1_1TC2DIR": "/usr/local/testv/stvOMASA_1ISM_2MASA1TC48c.wav",

        "OMASA_ISM1_2TC1DIR": "/usr/local/testv/stvOMASA_1ISM_1MASA2TC48c.wav",

        "OMASA_ISM1_2TC2DIR": "/usr/local/testv/stvOMASA_1ISM_2MASA2TC48c.wav",

        "OMASA_ISM2_1TC1DIR": "/usr/local/testv/stvOMASA_2ISM_1MASA1TC48c.wav",

        "OMASA_ISM2_1TC2DIR": "/usr/local/testv/stvOMASA_2ISM_2MASA1TC48c.wav",

        "OMASA_ISM2_2TC1DIR": "/usr/local/testv/stvOMASA_2ISM_1MASA2TC48c.wav",

        "OMASA_ISM2_2TC2DIR": "/usr/local/testv/stvOMASA_2ISM_2MASA2TC48c.wav",

        "OMASA_ISM3_1TC1DIR": "/usr/local/testv/stvOMASA_3ISM_1MASA1TC48c.wav",

        "OMASA_ISM3_1TC2DIR": "/usr/local/testv/stvOMASA_3ISM_2MASA1TC48c.wav",

        "OMASA_ISM3_2TC1DIR": "/usr/local/testv/stvOMASA_3ISM_1MASA2TC48c.wav",

        "OMASA_ISM3_2TC2DIR": "/usr/local/testv/stvOMASA_3ISM_2MASA2TC48c.wav",

        "OMASA_ISM4_1TC1DIR": "/usr/local/testv/stvOMASA_4ISM_1MASA1TC48c.wav",

        "OMASA_ISM4_1TC2DIR": "/usr/local/testv/stvOMASA_4ISM_2MASA1TC48c.wav",

        "OMASA_ISM4_2TC1DIR": "/usr/local/testv/stvOMASA_4ISM_1MASA2TC48c.wav",

        "OMASA_ISM4_2TC2DIR": "/usr/local/testv/stvOMASA_4ISM_2MASA2TC48c.wav",

        "OMASA_ISM1_1TC": "/usr/local/testv/stvOMASA_1ISM_1MASA1TC48c.wav",

        "OMASA_ISM1_2TC": "/usr/local/testv/stvOMASA_1ISM_1MASA2TC48c.wav",

        "OMASA_ISM2_1TC": "/usr/local/testv/stvOMASA_2ISM_1MASA1TC48c.wav",

        "OMASA_ISM2_2TC": "/usr/local/testv/stvOMASA_2ISM_1MASA2TC48c.wav",

        "OMASA_ISM3_1TC": "/usr/local/testv/stvOMASA_3ISM_1MASA1TC48c.wav",

        "OMASA_ISM3_2TC": "/usr/local/testv/stvOMASA_3ISM_1MASA2TC48c.wav",

        "OMASA_ISM4_1TC": "/usr/local/testv/stvOMASA_4ISM_1MASA1TC48c.wav",

        "OMASA_ISM4_2TC": "/usr/local/testv/stvOMASA_4ISM_1MASA2TC48c.wav",

        "OSBA_ISM1_FOA":      "/usr/local/testv/stvOSBA_1ISM_FOA48c.wav",

        "OSBA_ISM1_HOA2":     "/usr/local/testv/stvOSBA_1ISM_2OA48c.wav",

        "OSBA_ISM1_HOA3":     "/usr/local/testv/stvOSBA_1ISM_3OA48c.wav",