Commit 8835866f authored by vaclav's avatar vaclav
Browse files

adding comments

parent 96187f63

lib_com/ivas_mc_param_com.c

+7 −0
Original line number Diff line number Diff line
@@ -329,7 +329,14 @@ void ivas_param_mc_default_icc_map( 
    return;

}





#ifdef MC_BITRATE_SWITCHING

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

 * ivas_param_mc_get_num_param_bands()

 *

 *

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



static int16_t ivas_param_mc_get_num_param_bands(

    const MC_LS_SETUP mc_ls_setup, /* i  : MC ls setup                      */

    const int32_t ivas_total_brate /* i  : IVAS total bitrate               */

lib_com/ivas_prot.h

+6 −16
Original line number Diff line number Diff line
@@ -626,23 +626,10 @@ ivas_error ivas_mc_enc_config( 
    Encoder_Struct *st_ivas                                     /* i/o: IVAS encoder structure                  */

);



#ifdef MC_BITRATE_SWITCHING

ivas_error ivas_mc_enc_reconfig(

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

    const int16_t last_mc_mode                                  /* i: last frame mc mode            */

);

#endif



ivas_error ivas_mc_dec_config(

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

    const int16_t idx                                           /* i  : LS config. index                        */

);

#ifdef MC_BITRATE_SWITCHING

ivas_error ivas_mc_dec_reconfig(

    Decoder_Struct *st_ivas,   /* i/o: IVAS encoder structure      */

    const int16_t last_mc_mode /* i  : last frame MC mode          */

);

#endif



/*! r: MC format mode (MCT, McMASA, ParamMC) */

MC_MODE ivas_mc_mode_select(
@@ -3506,11 +3493,13 @@ int16_t ivas_param_mc_getNumTransportChannels( 
ivas_error ivas_param_mc_enc_open(

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

);



#ifdef MC_BITRATE_SWITCHING

ivas_error ivas_param_mc_reconfig(

ivas_error ivas_param_mc_enc_reconfig(

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

);

#endif



void ivas_param_mc_enc_close(

    PARAM_MC_ENC_HANDLE hParamMC,                               /* i/o: Parametric MC encoder handle                        */

    const int32_t input_Fs                                      /* i  : input sampling rate                                 */
@@ -3526,6 +3515,7 @@ void ivas_param_mc_enc( 
ivas_error ivas_param_mc_dec_open(

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

);



#ifdef MC_BITRATE_SWITCHING

ivas_error ivas_param_mc_dec_reconfig(

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

lib_dec/ivas_mc_param_dec.c

+14 −0
Original line number Diff line number Diff line
@@ -428,7 +428,14 @@ ivas_error ivas_param_mc_dec_open( 
    return error;

}





#ifdef MC_BITRATE_SWITCHING

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

 * ivas_param_mc_get_param_band_mapping()

 *

 * 

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



static void ivas_param_mc_get_param_band_mapping(

    const int16_t n_target_bands,

    const int16_t *target_band_grouping,
@@ -479,6 +486,13 @@ static void ivas_param_mc_get_param_band_mapping( 
    return;

}





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

 * ivas_param_mc_dec_reconfig()

 *

 * Reconfiguration of ParamMC decoder

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



ivas_error ivas_param_mc_dec_reconfig(

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

)

lib_dec/ivas_mct_dec.c

+24 −2
Original line number Diff line number Diff line
@@ -48,6 +48,16 @@ 
#include "deb_out.h"

#endif





#ifdef MC_BITRATE_SWITCHING

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

 * Local function prototypes

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



static ivas_error ivas_mc_dec_reconfig( Decoder_Struct *st_ivas, const int16_t last_mc_mode );

#endif





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

 * ivas_mct_dec()

 *
@@ -638,8 +648,16 @@ ivas_error ivas_mc_dec_config( 


    return error;

}





#ifdef MC_BITRATE_SWITCHING

ivas_error ivas_mc_dec_reconfig(

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

 * ivas_mc_dec_reconfig()

 *

 * reconfigure the MC format decoder

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



static ivas_error ivas_mc_dec_reconfig(

    Decoder_Struct *st_ivas,   /* i/o: IVAS encoder structure      */

    const int16_t last_mc_mode /* i  : last frame MC mode          */

)
@@ -924,7 +942,10 @@ ivas_error ivas_mc_dec_reconfig( 
    }





    /* renderers */

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

     * Renderers

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



    if ( renderer_type_old != st_ivas->renderer_type )

    {

        AUDIO_CONFIG output_config;
@@ -1009,6 +1030,7 @@ ivas_error ivas_mc_dec_reconfig( 
        }

#endif

    }



    return error;

}

#endif

lib_enc/ivas_cpe_enc.c

+3 −3
Original line number Diff line number Diff line
@@ -817,7 +817,7 @@ ivas_error create_cpe_enc( 
     *-----------------------------------------------------------------*/





#ifdef MC_BITRATE_SWITCHING

#ifdef MC_BITRATE_SWITCHING // !!! what is this for?

    /* we need the meta data handle also if we init as MC_FORMAT/MCT since it might be needed

       at a bit rate switch to ParamMC or McMASA and the metadata index list is only really reachable

       in the ivas_init_encoder() function and has to be connected to the MD handle there */