Commit 98baf01c authored by PLAINSI's avatar PLAINSI
Browse files

Fix memory sanitize error

parent c5bf085f

lib_com/ivas_prot.h

+2 −6
Original line number Diff line number Diff line
@@ -4880,22 +4880,18 @@ void ivas_ls_setup_conversion( 
    const int16_t output_frame,                                 /* i  : frame length                                    */

    float output[][L_FRAME48k]                                  /* i/o: LS input/output synthesis signal                */

);

void ivas_ls_setup_conversion_process_mdct(

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

    const int16_t input_chans,                                  /* i  : number of input channels to the renderer        */

    float output[][L_FRAME48k]                                  /* i/o: output synthesis signal                         */

);

#else

void ivas_ls_setup_conversion(

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

    const int16_t output_frame,                                 /* i  : frame length                                    */

    float output[][L_FRAME48k]                                  /* i/o: LS input/output synthesis signal                */

);

#endif



void ivas_ls_setup_conversion_process_mdct(

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

    float output[][L_FRAME48k]                                  /* i/o: output synthesis signal                         */

);

#endif



void ivas_ls_setup_conversion_process_mdct_param_mc(

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

lib_dec/ivas_mct_dec.c

+3 −7
Original line number Diff line number Diff line
@@ -191,15 +191,11 @@ ivas_error ivas_mct_dec( 
    }



#ifdef MC_PARAMUPMIX_MODE

    if ( st_ivas->renderer_type == RENDERER_MC )

    if ( ( st_ivas->renderer_type == RENDERER_MC )

        || ( st_ivas->renderer_type == RENDERER_MC_PARAMUPMIX ) )

    {

        /* Equalization in MDCT Domain */

        ivas_ls_setup_conversion_process_mdct( st_ivas, st_ivas->nchan_transport, output );

    }

    else if ( st_ivas->renderer_type == RENDERER_MC_PARAMUPMIX )

    {

        /* Equalization in MDCT Domain */

        ivas_ls_setup_conversion_process_mdct( st_ivas, MC_PARAMUPMIX_MAX_INPUT_CHANS, output );

        ivas_ls_setup_conversion_process_mdct( st_ivas, output );

    }

#else

    if ( st_ivas->renderer_type == RENDERER_MC )

lib_dec/ivas_out_setup_conversion.c

+0 −7
Original line number Diff line number Diff line
@@ -546,9 +546,6 @@ void ivas_ls_setup_conversion( 


void ivas_ls_setup_conversion_process_mdct(

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

#ifdef MC_PARAMUPMIX_MODE

    const int16_t input_chans, /* i  : number of input channels to the renderer        */

#endif

    float output[][L_FRAME48k] /* i/o: output synthesis signal         */

)

{
@@ -574,11 +571,7 @@ void ivas_ls_setup_conversion_process_mdct( 
    push_wmops( "LS_Renderer_MDCT" );



    /* Assign all the declared variables */

#ifdef MC_PARAMUPMIX_MODE

    inChannels = input_chans;

#else

    inChannels = st_ivas->nchan_transport;

#endif

    outChannels = st_ivas->hDecoderConfig->nchan_out;

    num_CPE = st_ivas->nCPE;