Commit 604544d3 authored by Jouni Paulus's avatar Jouni Paulus
Browse files

fix the build-time warnings of unused parameters when the flag FIX_350_MASA_DELAY_COMP is active

parent 59ea3dba

lib_com/ivas_prot.h

+4 −1
Original line number Diff line number Diff line
@@ -4462,9 +4462,12 @@ ivas_error ivas_masa_enc_open( 
);



void ivas_masa_enc_close(

    MASA_ENCODER_HANDLE hMasa,                                  /* i/o: MASA metadata structure                         */

    MASA_ENCODER_HANDLE hMasa                                  /* i/o: MASA metadata structure                         */

 #ifndef FIX_350_MASA_DELAY_COMP

    ,

    const int16_t nchan_transport,                              /* i  : Number of transport channels                    */

    const IVAS_FORMAT ivas_format                               /* i  : IVAS format                                     */

 #endif

);



void ivas_masa_enc_reconfigure(

lib_enc/ivas_init_enc.c

+4 −0
Original line number Diff line number Diff line
@@ -974,7 +974,11 @@ void ivas_destroy_enc( 
    /* MASA handle */

    if ( st_ivas->hMasa != NULL )

    {

#ifdef FIX_350_MASA_DELAY_COMP

        ivas_masa_enc_close( st_ivas->hMasa );

#else

        ivas_masa_enc_close( st_ivas->hMasa, st_ivas->nchan_transport, ivas_format );

#endif

        st_ivas->hMasa = NULL;

    }

lib_enc/ivas_masa_enc.c

+4 −1
Original line number Diff line number Diff line
@@ -149,9 +149,12 @@ ivas_error ivas_masa_enc_open( 
 *-----------------------------------------------------------------------*/



void ivas_masa_enc_close(

    MASA_ENCODER_HANDLE hMasa,     /* i/o: MASA metadata structure      */

    MASA_ENCODER_HANDLE hMasa /* i/o: MASA metadata structure      */

#ifndef FIX_350_MASA_DELAY_COMP

    ,

    const int16_t nchan_transport, /* i  : Number of transport channels */

    const IVAS_FORMAT ivas_format  /* i  : IVAS format                  */

#endif

)

{

    int16_t i;

lib_enc/ivas_mcmasa_enc.c

+4 −0
Original line number Diff line number Diff line
@@ -418,7 +418,11 @@ ivas_error ivas_mcmasa_enc_reconfig( 
        /* bitrate changed, may need to do something */



        /* brute-force solution: close McMASA and re-instantiate with new settings */

#ifdef FIX_350_MASA_DELAY_COMP

        ivas_masa_enc_close( st_ivas->hMasa );

#else

        ivas_masa_enc_close( st_ivas->hMasa, st_ivas->nchan_transport, st_ivas->hEncoderConfig->ivas_format );

#endif

        ivas_mcmasa_enc_close( st_ivas->hMcMasa, st_ivas->hEncoderConfig->input_Fs );



        /* Determine if to separate some channels from the analysis */

lib_enc/ivas_mct_enc.c

+8 −0
Original line number Diff line number Diff line
@@ -621,7 +621,11 @@ static ivas_error ivas_mc_enc_reconfig( 


            if ( st_ivas->hMasa != NULL )

            {

#ifdef FIX_350_MASA_DELAY_COMP

                ivas_masa_enc_close( st_ivas->hMasa );

#else

                ivas_masa_enc_close( st_ivas->hMasa, nchan_transport_old, MC_FORMAT );

#endif

                st_ivas->hMasa = NULL;

            }
@@ -654,7 +658,11 @@ static ivas_error ivas_mc_enc_reconfig( 
        }

        if ( st_ivas->hMasa != NULL )

        {

#ifdef FIX_350_MASA_DELAY_COMP

            ivas_masa_enc_close( st_ivas->hMasa );

#else

            ivas_masa_enc_close( st_ivas->hMasa, nchan_transport_old, MC_FORMAT );

#endif

            st_ivas->hMasa = NULL;

        }