Commit 8a60f330 authored by vaclav's avatar vaclav
Browse files

Merge branch 'maintenance_20230222' into 'main' 

Editorial improvements

See merge request !454
parents f384a864 afbb8b8d

lib_com/ivas_masa_com.c

+1 −0
Original line number Diff line number Diff line
@@ -302,6 +302,7 @@ void ivas_masa_set_coding_config( 
    return;

}





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

 * masa_sample_rate_band_correction()

 *

lib_com/ivas_mc_com.c

+3 −0
Original line number Diff line number Diff line
@@ -115,6 +115,7 @@ MC_MODE ivas_mc_mode_select( 
    return mc_mode;

}





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

 * ivas_mc_setup_get_num_channels()

 *
@@ -154,6 +155,7 @@ int16_t ivas_mc_ls_setup_get_num_channels( 
    return nchan;

}





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

 * ivas_mc_map_output_config_to_mc_ls_setup()

 *
@@ -193,6 +195,7 @@ MC_LS_SETUP ivas_mc_map_output_config_to_mc_ls_setup( 
    return mc_ls_setup;

}





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

 * ivas_mc_map_ls_setup_to_output_config

 *

lib_com/ivas_mc_param_com.c

+2 −2
Original line number Diff line number Diff line
@@ -212,7 +212,6 @@ void ivas_param_mc_metadata_close( 
{

    uint16_t i;





    /* adaptive ICC mapping */

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

    {
@@ -422,6 +421,7 @@ static int16_t ivas_param_mc_get_num_param_bands( 
    return num_parameter_bands;

}





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

 * Local functions

 *------------------------------------------------------------------------*/
@@ -438,7 +438,6 @@ static void ivas_param_mc_set_coding_scheme( 
    HANDLE_IVAS_PARAM_MC_METADATA hMetadataPMC /* i/o: Parametric MC metadata handle    */

)

{



    /* quantizer and coding tables */

    switch ( mc_ls_setup )

    {
@@ -520,5 +519,6 @@ static void ivas_param_mc_set_coding_scheme( 
    }



    hMetadataPMC->num_parameter_bands = ivas_param_mc_get_num_param_bands( mc_ls_setup, ivas_total_brate );



    return;

}

lib_com/ivas_mcmasa_com.c

+1 −0
Original line number Diff line number Diff line
@@ -65,6 +65,7 @@ void ivas_mcmasa_setNumTransportChannels( 
    return;

}





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

 * ivas_mcmasa_set_separate_channel_mode()

 *

lib_com/ivas_mct_com.c

+0 −1
Original line number Diff line number Diff line
@@ -94,7 +94,6 @@ void splitAvailableBitsMCT( 
        }

    }





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

    {

        if ( mct_chan_mode[i] != MCT_CHAN_MODE_LFE && mct_chan_mode[i] != MCT_CHAN_MODE_IGNORE )