Commit ef23d209 authored by Jan Kiene's avatar Jan Kiene
Browse files

Merge branch 'main' into 124-hplcinfo-handle-in-decoder

parents 089196f7 cc903b6b

ci/run_scheduled_sanitizer_test.py

+0 −3
Original line number Diff line number Diff line
@@ -48,9 +48,6 @@ def get_modes(in_format: str) -> list: 
        in_format = "MC_" + in_format + "_b"



    mode_list = [m for m in output.splitlines() if in_format in m]

    if "SBA" in in_format:

        # rate switching not implemented yet

        mode_list = [m for m in mode_list if not "_rs" in m]



    return mode_list

ci/smoke_test.sh

+2 −5
Original line number Diff line number Diff line
@@ -8,8 +8,5 @@ fi 
make clean

make all -j 8



# get all modes except SBA rate switching (which is broken currently)

list=$(./scripts/runIvasCodec.py -l | grep -v "SBA.*rs")

./scripts/runIvasCodec.py -p ./scripts/config/ci_linux.json -m $list -U 1 | tee smoke_test_output.txt



./scripts/runIvasCodec.py -p ./scripts/config/ci_linux.json -m $list -U 1 -D="-fec 15" --decoder_only | tee smoke_test_output_plc.txt
 
./scripts/runIvasCodec.py -p ./scripts/config/ci_linux.json -U 1 | tee smoke_test_output.txt

./scripts/runIvasCodec.py -p ./scripts/config/ci_linux.json -U 1 -D="-fec 15" --decoder_only | tee smoke_test_output_plc.txt

lib_com/ivas_prot.h

+18 −3
Original line number Diff line number Diff line
@@ -105,7 +105,17 @@ ivas_error mct_enc_reconfigure( 
    Encoder_Struct *st_ivas,                                    /* i/o: IVAS encoder structure                  */

    const uint16_t b_nchan_change                               /* i  : flag indicating different channel count */

);



#ifdef SBA_BR_SWITCHING

ivas_error ivas_sba_enc_reinit(

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

);

#endif

#ifdef SBA_BR_SWITCHING

int16_t get_sba_reinit_flag(

    int32_t ivas_total_bitrate,                                /* i: current bitrate                  */

    int32_t last_ivas_total_brate                              /* i: previous bitrate                  */

);

#endif

ivas_error ivas_sba_enc_reconfigure( 

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

);
@@ -3038,7 +3048,11 @@ void ivas_sba_config( 
    int16_t *nCPE,                                              /* o  : number of CPEs                          */

    int16_t *element_mode                                       /* o  : element mode of the core coder          */

);



#ifdef SBA_BR_SWITCHING

ivas_error ivas_sba_dec_reinit(

    Decoder_Struct *st_ivas                                     /* i/o: IVAS decoder structure                  */

);

#endif

ivas_error ivas_sba_dec_reconfigure(

    Decoder_Struct *st_ivas                                     /* i/o: IVAS decoder structure                  */

);
@@ -3992,7 +4006,8 @@ void ivas_spar_get_parameters( 
ivas_error ivas_spar_md_dec_init(

    ivas_spar_md_dec_state_t *hMdDec,                           /* i/o: SPAR MD decoder handle                  */

    const DECODER_CONFIG_HANDLE hDecoderConfig,                 /* i  : configuration structure                 */

    const int16_t num_channels                                  /* i  : number of internal channels             */

    const int16_t num_channels,                                 /* i  : number of internal channels             */

    const int16_t sba_order                                     /* i  : SBA order                               */

);



void ivas_spar_md_dec_process(

lib_com/ivas_sba_config.c

+20 −2
Original line number Diff line number Diff line
@@ -71,8 +71,26 @@ SBA_MODE ivas_sba_mode_select( 


    return sba_mode;

}





#ifdef SBA_BR_SWITCHING

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

 * get_sba_reinit_flag()

 *

 * Get SBA reinitialisation flag

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

int16_t get_sba_reinit_flag(

    int32_t ivas_total_bitrate,   /* i  : Current bitrate  */

    int32_t last_ivas_total_brate /* i  : Previous bitrate  */

)

{

    int16_t sba_reinit_flag;

    sba_reinit_flag = 0;

    if ( ivas_total_bitrate != last_ivas_total_brate && ( last_ivas_total_brate > IVAS_SID_5k2 ) && ( ivas_total_bitrate > IVAS_SID_5k2 ) )

    {

        sba_reinit_flag = 1;

    }

    return sba_reinit_flag;

}

#endif

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

 * ivas_sba_config()

 *

lib_com/ivas_spar_com.c

+1 −1
Original line number Diff line number Diff line
@@ -2131,7 +2131,7 @@ void ivas_spar_set_bitrate_config( 


    ivas_total_brate = ivas_spar_br_table_consts[table_idx].ivas_total_brate;

    sba_order = ivas_spar_br_table_consts[table_idx].sba_order;

    ivas_get_spar_table_idx( ivas_total_brate, sba_order, ivas_spar_br_table_consts[table_idx].bwidth, &code, &length );

    ivas_get_spar_table_idx( ivas_total_brate, sba_order, ivas_spar_br_table_consts[table_idx].bwidth, &length, &code );



    for ( i = 0; i < pSpar_md_cfg->nchan_transport; i++ )

    {