Commit 7baf20ee authored by vaillancour's avatar vaillancour
Browse files

fix another linux compiler issue

parent 0310b914

lib_com/ivas_prot_fx.h

+52 B (132 KiB)

File changed.

No diff preview for this file type.

View original file
View changed file

lib_dec/ivas_cpe_dec_fx.c

+5 −2
Original line number Diff line number Diff line
@@ -66,8 +66,11 @@ ivas_error ivas_cpe_dec_fx( 
    const Word16 cpe_id,           /* i  : CPE # identifier                */

    Word32 *output[CPE_CHANNELS],  /* o  : output synthesis signal         */

    const Word16 output_frame,     /* i  : output frame length per channel */

    const Word16 nb_bits_metadata, /* i  : number of metadata bits         */

    const Word16 nb_bits_metadata  /* i  : number of metadata bits         */

#ifndef FIX_826_PRECISION_LOST_AND_COMPL

    ,

    Word16 *q_output /* i/o : Q of output synthesis signal         */

#endif

)

{

    Word16 i, n, n_channels;

lib_dec/ivas_jbm_dec.c

+28 −0
Original line number Diff line number Diff line
@@ -175,7 +175,11 @@ ivas_error ivas_jbm_dec_tc_fx( 
        set32_fx( &p_output_fx[0][0], 0, L_FRAME48k );

        set32_fx( &p_output_fx[1][0], 0, L_FRAME48k );



#ifndef FIX_826_PRECISION_LOST_AND_COMPL

        IF( ( error = ivas_cpe_dec_fx( st_ivas, 0, &p_output_fx[0], output_frame, 0, &q_output ) ) != IVAS_ERR_OK )

#else

        IF( ( error = ivas_cpe_dec_fx( st_ivas, 0, &p_output_fx[0], output_frame, 0) ) != IVAS_ERR_OK )

#endif

        {

            return error;

        }
@@ -338,7 +342,11 @@ ivas_error ivas_jbm_dec_tc_fx( 
            set32_fx( &p_output_fx[0][0], 0, L_FRAME48k );

            set32_fx( &p_output_fx[1][0], 0, L_FRAME48k );



#ifndef FIX_826_PRECISION_LOST_AND_COMPL

            IF( ( error = ivas_cpe_dec_fx( st_ivas, 0, &p_output_fx[0], output_frame, nb_bits_metadata[0], &q_output ) ) != IVAS_ERR_OK )

#else

            IF( ( error = ivas_cpe_dec_fx( st_ivas, 0, &p_output_fx[0], output_frame, nb_bits_metadata[0]) ) != IVAS_ERR_OK )

#endif

            {

                return error;

            }
@@ -719,7 +727,11 @@ ivas_error ivas_jbm_dec_tc_fx( 
        }



        /* decode MASA channels */

#ifndef FIX_826_PRECISION_LOST_AND_COMPL

        IF( ( error = ivas_cpe_dec_fx( st_ivas, 0, p_output_fx, output_frame, nb_bits_metadata[0], &q_output ) ) != IVAS_ERR_OK )

#else

        IF( ( error = ivas_cpe_dec_fx( st_ivas, 0, p_output_fx, output_frame, nb_bits_metadata[0]) ) != IVAS_ERR_OK )

#endif

        {

            return error;

        }
@@ -823,7 +835,11 @@ ivas_error ivas_jbm_dec_tc_fx( 
        ELSE IF( EQ_16( st_ivas->nCPE, 1 ) )

        {



#ifndef FIX_826_PRECISION_LOST_AND_COMPL

            IF( ( error = ivas_cpe_dec_fx( st_ivas, 0, &p_output_fx[0], output_frame, nb_bits_metadata[0] + nb_bits_metadata[1], &q_output ) ) != IVAS_ERR_OK )

#else

            IF( ( error = ivas_cpe_dec_fx( st_ivas, 0, &p_output_fx[0], output_frame, nb_bits_metadata[0] + nb_bits_metadata[1] ) ) != IVAS_ERR_OK )

#endif

            {

                return error;

            }
@@ -1142,7 +1158,11 @@ ivas_error ivas_jbm_dec_tc_fx( 
            {

                Word16 q_output = 11;



#ifndef FIX_826_PRECISION_LOST_AND_COMPL

                IF( ( error = ivas_cpe_dec_fx( st_ivas, 0, &p_output_fx[0], output_frame, nb_bits_metadata[0], &q_output ) ) != IVAS_ERR_OK )

#else

                IF( ( error = ivas_cpe_dec_fx( st_ivas, 0, &p_output_fx[0], output_frame, nb_bits_metadata[0] ) ) != IVAS_ERR_OK )

#endif

                {

                    return error;

                }
@@ -1202,7 +1222,11 @@ ivas_error ivas_jbm_dec_tc_fx( 
                /* Decode the transport audio signals */

                Word16 q_output = 11;



#ifndef FIX_826_PRECISION_LOST_AND_COMPL

                IF( ( error = ivas_cpe_dec_fx( st_ivas, 0, &p_output_fx[0], output_frame, nb_bits_metadata[0], &q_output ) ) != IVAS_ERR_OK )

#else

                IF( ( error = ivas_cpe_dec_fx( st_ivas, 0, &p_output_fx[0], output_frame, nb_bits_metadata[0] ) ) != IVAS_ERR_OK )

#endif

                {

                    return error;

                }
@@ -1252,7 +1276,11 @@ ivas_error ivas_jbm_dec_tc_fx( 
                ELSE IF( EQ_16( st_ivas->nCPE, 1 ) )

                {



#ifndef FIX_826_PRECISION_LOST_AND_COMPL

                    IF( ( error = ivas_cpe_dec_fx( st_ivas, 0, &p_output_fx[0], output_frame, nb_bits_metadata[0], &q_output ) ) != IVAS_ERR_OK )

#else

                    IF( ( error = ivas_cpe_dec_fx( st_ivas, 0, &p_output_fx[0], output_frame, nb_bits_metadata[0] ) ) != IVAS_ERR_OK )

#endif

                    {

                        return error;

                    }

lib_dec/ivas_mct_dec.c

+4 −1
Original line number Diff line number Diff line
@@ -363,8 +363,11 @@ ivas_error ivas_mct_dec_fx( 


        set32_fx( &output_fx[0][0], 0, L_FRAME48k );

        set32_fx( &output_fx[1][0], 0, L_FRAME48k );



#ifndef FIX_826_PRECISION_LOST_AND_COMPL

        IF( NE_32( ( error = ivas_cpe_dec_fx( st_ivas, cpe_id, &output_fx[0], output_frame, 0, &q_output ) ), IVAS_ERR_OK ) )

#else

        IF( NE_32( ( error = ivas_cpe_dec_fx( st_ivas, cpe_id, &output_fx[0], output_frame, 0) ), IVAS_ERR_OK ) )

#endif

        {

            return error;

        }