Commit 2985271b authored by emerit's avatar emerit
Browse files

Merge branch 'orange/no-diegetic-pan-with-radius' of... 

Merge branch 'orange/no-diegetic-pan-with-radius' of forge.3gpp.org:ivas-codec-pc/ivas-codec into orange/no-diegetic-pan-with-radius
parents be69e89b 9d09abfb

lib_com/ivas_ism_com.c

+2 −3
Original line number Diff line number Diff line
@@ -469,8 +469,7 @@ float ism_dequant_meta( 
 * ---------------------------------------------------------------*/



void ivas_param_ism_config(

    PARAM_ISM_CONFIG_HANDLE hParamIsm /* i/o: IVAS Param ISM Config Structure      */

    ,

    PARAM_ISM_CONFIG_HANDLE hParamIsm, /* i/o: IVAS Param ISM Config Structure      */

    const int16_t nchan_obj            /* i  : number of ISM channels                      */

)

{

lib_dec/ivas_ism_dtx_dec.c

+2 −1
Original line number Diff line number Diff line
@@ -145,7 +145,8 @@ ivas_error ivas_ism_dtx_dec( 
    }



    /* Metadata decoding and dequantization  */

    ivas_ism_metadata_sid_dec( st_ivas->hSCE, ivas_total_brate, st_ivas->bfi, nchan_ism, st_ivas->nchan_transport, st_ivas->ism_mode,

    ivas_ism_metadata_sid_dec( st_ivas->hSCE, ivas_total_brate,

                               st_ivas->bfi, nchan_ism, st_ivas->nchan_transport, st_ivas->ism_mode,

                               &flag_noisy_speech, &sce_id_dtx, st_ivas->hIsmMetaData, nb_bits_metadata );



    if ( ivas_total_brate == IVAS_SID_5k2 && !st_ivas->bfi )

lib_dec/ivas_ism_metadata_dec.c

+1 −0
Original line number Diff line number Diff line
@@ -984,6 +984,7 @@ void ivas_ism_metadata_sid_dec( 
        for ( ch = 0; ch < nchan_ism; ch++ )

        {

            hIsmMetaData = hIsmMeta[ch];



            if ( md_diff_flag[ch] == 1 )

            {

                /* Azimuth decoding */

readme.txt

+1 −1

File changed.

Contains only whitespace changes.