Commit bd6ce3b5 authored by vaclav's avatar vaclav
Browse files

Merge remote-tracking branch 'remotes/origin/main' into 749-splt_rendering-public-structure

parents 717a812f a59902ab

.gitlab-ci.yml

+1 −1
Original line number Diff line number Diff line
@@ -1334,7 +1334,7 @@ sanitizer-test-masa: 
    - if: $SANITIZER_SCHEDULE_A

      when: delayed

      start_in: 21 hours

  timeout: 3 hours

  timeout: 5 hours

  script:

    - *update-ltv-repo

    - python3 ci/run_scheduled_sanitizer_test.py MASA $OUT_FORMATS_CHANNEL_BASED $OUT_FORMATS_SCENE_BASED $OUT_FORMATS_BINAURAL EXT --tests $SANITIZER_TESTS

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/ivas_fb_mixer.c

+10 −6
Original line number Diff line number Diff line
@@ -727,18 +727,21 @@ void ivas_fb_mixer_process( 


void ivas_fb_mixer_get_in_out_mapping(

    const IVAS_FB_CFG *fb_cfg, /* i  : FB config. handle                             */

#ifndef REMOVE_UNUSED_FUNCTION

    const int16_t nchan_transport, /* i  : number of transport channels                  */

    const int16_t enc_dec_flag,    /* i  : encoder or decoder flag                       */

    const int16_t *order,          /* i  : downmix order                                 */

#endif

    int16_t in_out_mixer_map[IVAS_MAX_FB_MIXER_OUT_CH][IVAS_MAX_SPAR_FB_MIXER_IN_CH] /* i/o: mixing mapping */

)

{

    int16_t i, j;



    set_s( (int16_t *) in_out_mixer_map, 0, IVAS_MAX_FB_MIXER_OUT_CH * IVAS_MAX_SPAR_FB_MIXER_IN_CH );



#ifndef REMOVE_UNUSED_FUNCTION

    if ( enc_dec_flag == ENC )

    {

#endif

        if ( fb_cfg->active_w_mixing )

        {

            for ( i = 0; i < fb_cfg->num_out_chans; i++ )
@@ -757,6 +760,7 @@ void ivas_fb_mixer_get_in_out_mapping( 
                in_out_mixer_map[i][0] = 1;

            }

        }

#ifndef REMOVE_UNUSED_FUNCTION

    }

    else

    {
@@ -788,7 +792,7 @@ void ivas_fb_mixer_get_in_out_mapping( 
            }

        }

    }



#endif

    return;

}

lib_com/ivas_prot.h

+8 −4
Original line number Diff line number Diff line
@@ -110,12 +110,12 @@ ivas_error mct_enc_reconfigure( 
ivas_error ivas_sba_enc_reconfigure(

    Encoder_Struct *st_ivas                                     /* i/o: IVAS encoder structure                  */

);



#ifndef REMOVE_UNUSED_FUNCTION

/*! r: maximum SBA metadata bit-budget */

int16_t ivas_sba_get_max_md_bits(

    Encoder_Struct *st_ivas                                     /* i/o: IVAS encoder structure                  */

);



#endif

void destroy_sce_enc(

    SCE_ENC_HANDLE hSCE                                         /* i/o: SCE encoder structure                   */

);
@@ -4163,8 +4163,10 @@ ivas_error ivas_sba_linear_renderer( 
    const int16_t nchan_in,                                     /* i  : number of input ambisonics channels                     */

	const int16_t nchan_ism,

    const AUDIO_CONFIG output_config,                           /* i  : output audio configuration                              */

    const IVAS_OUTPUT_SETUP output_setup,                       /* i  : output format setup                                     */

    const float hoa_dec_mtx[]                                   /* i  : HOA decoding mtx                                        */

    const IVAS_OUTPUT_SETUP output_setup                        /* i  : output format setup                                     */

#ifndef REMOVE_UNUSED_FUNCTION

    ,const float hoa_dec_mtx[]                                   /* i  : HOA decoding mtx                                        */

#endif

);



void ivas_sba_mix_matrix_determiner(
@@ -6034,9 +6036,11 @@ void ivas_fb_mixer_process( 


void ivas_fb_mixer_get_in_out_mapping(

    const IVAS_FB_CFG *fb_cfg,                                  /* i  : FB config. handle                           */

#ifndef REMOVE_UNUSED_FUNCTION

    const int16_t nchan_transport,                              /* i  : number of transport channels                */

    const int16_t enc_dec_flag,                                 /* i  : encoder or decoder flag                     */

    const int16_t *order,                                       /* i  : downmix order                               */

#endif

    int16_t in_out_mixer_map[IVAS_MAX_FB_MIXER_OUT_CH][IVAS_MAX_SPAR_FB_MIXER_IN_CH]   /* i/o: mixing mapping       */

);

lib_com/ivas_spar_com.c

+4 −2
Original line number Diff line number Diff line
@@ -251,18 +251,20 @@ int16_t ivas_get_sba_num_TCs( 
)

{

    int16_t table_idx, nchan_transport;



#ifndef REMOVE_UNUSED_FUNCTION

    if ( ivas_total_brate == IVAS_SID_5k2 )

    {

        nchan_transport = 1;

    }

    else

    {

#endif

        table_idx = ivas_get_spar_table_idx( ivas_total_brate, sba_order, SPAR_CONFIG_BW, NULL, NULL );



        nchan_transport = ivas_spar_br_table_consts[table_idx].nchan_transport;

#ifndef REMOVE_UNUSED_FUNCTION

    }



#endif

    return nchan_transport;

}