Commit 5de94df8 authored by Dominik Weckbecker's avatar Dominik Weckbecker 💬
Browse files

fix formatting

parent 6cfcf1d2

lib_dec/ivas_init_dec.c

+3 −6
Original line number Diff line number Diff line
@@ -2204,14 +2204,11 @@ ivas_error ivas_init_decoder( 


    if ( !st_ivas->hDecoderConfig->Opt_5ms )

    {

        for ( n = 0; n < ivas_get_nchan_buffers_dec( st_ivas

#ifdef NONBE_FIX_798_OSBA_MC_DEC_CRASH

                                                     ,

                                                     st_ivas->sba_analysis_order,

                                                     st_ivas->hDecoderConfig->ivas_total_brate

        for ( n = 0; n < ivas_get_nchan_buffers_dec( st_ivas, st_ivas->sba_analysis_order, st_ivas->hDecoderConfig->ivas_total_brate ); n++ )

#else

        for ( n = 0; n < ivas_get_nchan_buffers_dec( st_ivas ); n++ )

#endif

                         );

              n++ )

        {

            /* note: these are intra-frame heap memories */

            if ( ( st_ivas->p_output_f[n] = (float *) malloc( ( 48000 / FRAMES_PER_SEC ) * sizeof( float ) ) ) == NULL )

lib_dec/ivas_ism_dec.c

+6 −10
Original line number Diff line number Diff line
@@ -81,13 +81,11 @@ static ivas_error ivas_ism_bitrate_switching_dec( 
    st_ivas->ism_mode = last_ism_mode;

    ivas_init_dec_get_num_cldfb_instances( st_ivas, &numCldfbAnalyses_old, &numCldfbSyntheses_old );

    st_ivas->ism_mode = ism_mode;

    nchan_out_buff_old = ivas_get_nchan_buffers_dec( st_ivas

#ifdef NONBE_FIX_798_OSBA_MC_DEC_CRASH

                                                     ,

                                                     st_ivas->sba_analysis_order,

                                                     st_ivas->hDecoderConfig->ivas_total_brate

    nchan_out_buff_old = ivas_get_nchan_buffers_dec( st_ivas, st_ivas->sba_analysis_order, st_ivas->hDecoderConfig->ivas_total_brate );

#else

    nchan_out_buff_old = ivas_get_nchan_buffers_dec( st_ivas );

#endif

    );



    if ( ( error = ivas_ism_config( st_ivas->hDecoderConfig->ivas_total_brate, st_ivas->nchan_transport, st_ivas->nchan_ism, NULL, 0, NULL, NULL, element_brate_tmp, NULL, NULL,

                                    0 ) ) != IVAS_ERR_OK )
@@ -356,13 +354,11 @@ static ivas_error ivas_ism_bitrate_switching_dec( 


    if ( !st_ivas->hDecoderConfig->Opt_5ms )

    {

        nchan_out_buff = ivas_get_nchan_buffers_dec( st_ivas

#ifdef NONBE_FIX_798_OSBA_MC_DEC_CRASH

                                                     ,

                                                     st_ivas->sba_analysis_order,

                                                     st_ivas->hDecoderConfig->ivas_total_brate

        nchan_out_buff = ivas_get_nchan_buffers_dec( st_ivas, st_ivas->sba_analysis_order, st_ivas->hDecoderConfig->ivas_total_brate );

#else

        nchan_out_buff = ivas_get_nchan_buffers_dec( st_ivas );

#endif

        );



        if ( nchan_out_buff > nchan_out_buff_old )

        {

lib_dec/ivas_mc_paramupmix_dec.c

+3 −6
Original line number Diff line number Diff line
@@ -483,14 +483,11 @@ void ivas_mc_paramupmix_dec( 
        }

    }



    for ( ch = first_empty_channel; ch < ivas_get_nchan_buffers_dec( st_ivas

#ifdef NONBE_FIX_798_OSBA_MC_DEC_CRASH

                                                                     ,

                                                                     st_ivas->sba_analysis_order,

                                                                     st_ivas->hDecoderConfig->ivas_total_brate

    for ( ch = first_empty_channel; ch < ivas_get_nchan_buffers_dec( st_ivas, st_ivas->sba_analysis_order, st_ivas->hDecoderConfig->ivas_total_brate ); ch++ )

#else

    for ( ch = first_empty_channel; ch < ivas_get_nchan_buffers_dec( st_ivas ); ch++ )

#endif

                                         );

          ch++ )

    {

        set_f( output_f[ch], 0.0f, output_frame );

    }

lib_dec/ivas_omasa_dec.c

+7 −10
Original line number Diff line number Diff line
@@ -181,13 +181,12 @@ ivas_error ivas_omasa_dec_config( 
    ivas_format_orig = st_ivas->ivas_format;

    st_ivas->ivas_format = st_ivas->last_ivas_format;

    ivas_init_dec_get_num_cldfb_instances( st_ivas, &numCldfbAnalyses_old, &numCldfbSyntheses_old );

    nchan_out_buff_old = ivas_get_nchan_buffers_dec( st_ivas

#ifdef NONBE_FIX_798_OSBA_MC_DEC_CRASH

                                                     ,

                                                     st_ivas->sba_analysis_order,

                                                     st_ivas->hDecoderConfig->ivas_total_brate

    nchan_out_buff_old = ivas_get_nchan_buffers_dec( st_ivas, st_ivas->sba_analysis_order, st_ivas->hDecoderConfig->ivas_total_brate );

#else

    nchan_out_buff_old = ivas_get_nchan_buffers_dec( st_ivas );

#endif

    );



    st_ivas->ivas_format = ivas_format_orig;



    nSCE_old = st_ivas->nSCE;
@@ -420,13 +419,11 @@ ivas_error ivas_omasa_dec_config( 


        if ( !st_ivas->hDecoderConfig->Opt_5ms )

        {

            nchan_out_buff = ivas_get_nchan_buffers_dec( st_ivas

#ifdef NONBE_FIX_798_OSBA_MC_DEC_CRASH

                                                         ,

                                                         st_ivas->sba_analysis_order,

                                                         st_ivas->hDecoderConfig->ivas_total_brate

            nchan_out_buff = ivas_get_nchan_buffers_dec( st_ivas, st_ivas->sba_analysis_order, st_ivas->hDecoderConfig->ivas_total_brate );

#else

            nchan_out_buff = ivas_get_nchan_buffers_dec( st_ivas, st_ivas->sba_analysis_order, st_ivas->hDecoderConfig->ivas_total_brate );

#endif

            );



            if ( nchan_out_buff > nchan_out_buff_old )

            {

lib_dec/ivas_osba_dec.c

+2 −4
Original line number Diff line number Diff line
@@ -319,13 +319,11 @@ ivas_error ivas_osba_render( 
        sba_ch_idx = 0;

    }



    for ( n = 0; n <

#ifdef NONBE_FIX_798_OSBA_MC_DEC_CRASH

                 max( nchan_out, nchan_ism );

    for ( n = 0; n < max( nchan_out, nchan_ism ); n++ )

#else

                 nchan_out;

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

#endif

          n++ )

    {

        p_tmp_ism_out[n] = &tmp_ism_out[n][0];

    }