Commit e0b88d2f authored by vaclav's avatar vaclav
Browse files

editorial changes + fix MSVC compilation warnings

parent 6c995cbc

lib_com/ivas_prot.h

+3 −9
Original line number Diff line number Diff line
@@ -346,8 +346,8 @@ void ivas_mct_dec_close( 


ivas_error ivas_corecoder_dec_reconfig(

#ifdef MC_BITRATE_SWITCHING

    const int16_t nSCE_old,                                     /* i  : number of SCEs in previous frame                          */

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

    const int16_t nSCE_old,                                     /* i  : number of SCEs in previous frame                          */

    int16_t nCPE_old,                                           /* i  : number of CPEs in previous frame                          */

    const int16_t nchan_transport_old,                          /* i  : number of TCs in previous frame                           */

    const int16_t sba_dirac_stereo_flag_old,                    /* i  : signal stereo rendering using DFT upmix in previous frame */
@@ -650,12 +650,6 @@ ivas_error ivas_mc_dec_config( 
    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                  */

);

#endif



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

MC_MODE ivas_mc_mode_select(

    const MC_LS_SETUP mc_ls_setup,                              /* i  : loudspeaker setup (CICP)                */
@@ -4906,8 +4900,8 @@ void ivas_mcmasa_param_est_enc( 
void ivas_mcmasa_dmx_modify(

    const int16_t n_samples,                                        /* i  : input frame length in samples                        */

    float dmx[][L_FRAME48k + NS2SA( 48000, IVAS_FB_ENC_DELAY_NS )], /* i/o: downmix signal to be transformed into another format */

    const uint8_t n_chnls_dmx_old,                                  /* i  : number of downmix channels in the old format         */

    const uint8_t n_chnls_dmx_new                                   /* i  : number of downmix channels in the target format      */

    const int16_t n_chnls_dmx_old,                                  /* i  : number of downmix channels in the old format         */

    const int16_t n_chnls_dmx_new                                   /* i  : number of downmix channels in the target format      */

);

#endif

lib_com/options.h

+0 −2
Original line number Diff line number Diff line
@@ -158,9 +158,7 @@ 






#define CORECODER_BITRATE_SWITCHING                     /* Issue 133: support bitrate switching in core-coder */

#define MC_BITRATE_SWITCHING                            /* Issue 116: support bitrate switching in MC format  */



#ifdef MC_BITRATE_SWITCHING

#define MCMASA_BITRATE_SWITCHING                        /* Issue 116: support bitrate switching in MC format: sub-part of McMASA modes */

#endif

lib_dec/ivas_mct_dec.c

+3 −2
Original line number Diff line number Diff line
@@ -54,7 +54,7 @@ 
 * Local function prototypes

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



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

static ivas_error ivas_mc_dec_reconfig( Decoder_Struct *st_ivas );

#endif
@@ -900,7 +900,8 @@ static ivas_error ivas_mc_dec_reconfig( 
#ifdef DEBUGGING

        assert( st_ivas->hCPE[1] != NULL );

#endif

        st_ivas->hCPE[1]->hCoreCoder[1]->mct_chan_mode = MCT_CHAN_MODE_LFE;

        Decoder_State *st = st_ivas->hCPE[1]->hCoreCoder[1];

        st->mct_chan_mode = MCT_CHAN_MODE_LFE;

        st->hTcxCfg->fIsTNSAllowed = 0;

    }

lib_enc/ivas_corecoder_enc_reconfig.c

+2 −0
Original line number Diff line number Diff line
@@ -199,6 +199,7 @@ ivas_error ivas_corecoder_enc_reconfig( 
                set_zero( input_buff[0], len_inp_memory );

                mvr2r( st_ivas->hSCE[0]->hCoreCoder[0]->input_buff, input_buff[0], len_inp_memory );

            }



            for ( n = 0; n < CPE_CHANNELS; n++ )

            {

                set_zero( input_buff[n + 1], len_inp_memory );
@@ -207,6 +208,7 @@ ivas_error ivas_corecoder_enc_reconfig( 
                    mvr2r( st_ivas->hCPE[0]->hCoreCoder[n]->input_buff, input_buff[n + 1], len_inp_memory );

                }

            }



            ivas_mcmasa_dmx_modify( len_inp_memory, input_buff, nSCE_old + CPE_CHANNELS * nCPE_old, st_ivas->nSCE + CPE_CHANNELS * st_ivas->nCPE );



            n_CoreCoder_existing = 0;

lib_enc/ivas_mcmasa_enc.c

+2 −2
Original line number Diff line number Diff line
@@ -1207,8 +1207,8 @@ void ivas_mcmasa_param_est_enc( 
void ivas_mcmasa_dmx_modify(

    const int16_t n_samples,                                        /* i  : input frame length in samples                                                        */

    float dmx[][L_FRAME48k + NS2SA( 48000, IVAS_FB_ENC_DELAY_NS )], /* i/o: downmix signal to be transformed into another format. TODO: buffer size into define? */

    const uint8_t n_chnls_dmx_old,                                  /* i  : number of downmix channels in the old format                                         */

    const uint8_t n_chnls_dmx_new )                                 /* i  : number of downmix channels in the target format                                      */

    const int16_t n_chnls_dmx_old,                                  /* i  : number of downmix channels in the old format                                         */

    const int16_t n_chnls_dmx_new )                                 /* i  : number of downmix channels in the target format                                      */

{

    /* assumed data ordering in **dmx: [sce][cpe_chnl0][cpe_chnl1], i.e., [c][l][r] */

    int16_t i;

lib_dec/ivas_ism_param_dec.c

+2 −2

File changed.

Contains only whitespace changes.