Commit 1592b3a7 authored by wkr's avatar wkr
Browse files

fix one more compiler warning

parent adb999d2

lib_com/ivas_prot.h

+1 −2
Original line number Diff line number Diff line
@@ -5561,8 +5561,7 @@ void ivas_osba_enc( 
    const int16_t input_frame,                                  /* i  : Input frame size                          */

    const int16_t nchan_ism,                                    /* i  : Number of objects for parameter analysis  */

    const ISM_MODE ism_mode,                                    /* i  : ISM mode                                  */

    const int16_t sba_analysis_order,                           /* i  : SBA order evaluated in DirAC/SPAR encoder */

    int16_t *idx_separated_object                               /* o  : Index of the separated object             */

    const int16_t sba_analysis_order                            /* i  : SBA order evaluated in DirAC/SPAR encoder */

);

#endif

lib_enc/ivas_enc.c

+1 −4
Original line number Diff line number Diff line
@@ -273,16 +273,13 @@ ivas_error ivas_enc( 
#ifdef SBA_AND_OBJECTS

    else if ( ivas_format == SBA_ISM_FORMAT )

    {

        float data_separated_object[L_FRAME48k];

        int16_t idx_separated_object;



        /*Default mode for OSBA*/

        st_ivas->ism_mode = ISM_MODE_NONE;



        if ( st_ivas->ism_mode == ISM_MODE_NONE ) /*rendering of objects in SBA signal*/

        {

            /* Analyze objects and determine needed audio signals */

            ivas_osba_enc( st_ivas->hOSba, st_ivas->hIsmMetaData, data_f, input_frame, hEncoderConfig->nchan_ism, st_ivas->ism_mode, st_ivas->sba_analysis_order, &idx_separated_object );

            ivas_osba_enc( st_ivas->hOSba, st_ivas->hIsmMetaData, data_f, input_frame, hEncoderConfig->nchan_ism, st_ivas->ism_mode, st_ivas->sba_analysis_order );

        }

        else /*not an option for now*/

        {

lib_enc/ivas_osba_enc.c

+1 −2
Original line number Diff line number Diff line
@@ -194,8 +194,7 @@ void ivas_osba_enc( 
    const int16_t input_frame,               /* i  : Input frame size                            */

    const int16_t nchan_ism,                 /* i  : Number of objects for parameter analysis    */

    const ISM_MODE ism_mode,                 /* i  : ISM mode                                    */

    const int16_t sba_analysis_order,        /* i  : SBA order evaluated in DirAC/SPAR encoder */

    int16_t *idx_separated_object            /* o  : Index of the separated object               */

    const int16_t sba_analysis_order         /* i  : SBA order evaluated in DirAC/SPAR encoder */

)

{

    float data_out_f[MAX_INPUT_CHANNELS][L_FRAME48k];