Commit 5fb92634 authored by multrus's avatar multrus
Browse files

[cleanup] accept NONBE_FIX_798_OSBA_MC_DEC_CRASH

parent fc6f7e22

lib_com/options.h

+0 −1
Original line number Diff line number Diff line
@@ -179,7 +179,6 @@ 


#define NONBE_FIX_774_OSBA_MONO_DEC_CRASH                     /* FhG: issue 774: decoder crash for OSBA to mono */

#define NONBE_FIX_802_PARAMUPMIX_HIGHPASS                     /* Dlb: issue 802: Move HighPass filter operation for ParamUpmix */

#define NONBE_FIX_798_OSBA_MC_DEC_CRASH

#define NONBE_FIX_806_OMASA_ONE_SEP_TRANSPORT_MIX             /* Nokia: issue 806: fix one separated object mode transport mix of the separated object */

#define NONBE_FIX_809_EXTERNAL_TARGET_INTERPOLATION           /* FhG: issue 809: unify external target interpolation inter and intra frame behaviour */

#define NONBE_FIX_775_OSBA_BR_SWITCHING_CRASH                 /* FhG: issue 775: fix crash in OSBA with bitrate switching and output order lower than input order */

lib_dec/ivas_init_dec.c

+0 −4
Original line number Diff line number Diff line
@@ -2239,11 +2239,7 @@ ivas_error ivas_init_decoder( 


    if ( !st_ivas->hDecoderConfig->Opt_5ms )

    {

#ifdef NONBE_FIX_798_OSBA_MC_DEC_CRASH

        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

        {

            /* 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

+0 −8
Original line number Diff line number Diff line
@@ -81,11 +81,7 @@ 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;

#ifdef NONBE_FIX_798_OSBA_MC_DEC_CRASH

    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 )

    {
@@ -335,11 +331,7 @@ static ivas_error ivas_ism_bitrate_switching_dec( 


    if ( !st_ivas->hDecoderConfig->Opt_5ms )

    {

#ifdef NONBE_FIX_798_OSBA_MC_DEC_CRASH

        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

+0 −4
Original line number Diff line number Diff line
@@ -444,11 +444,7 @@ void ivas_mc_paramupmix_dec( 
        }

    }



#ifdef NONBE_FIX_798_OSBA_MC_DEC_CRASH

    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

    {

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

    }

lib_dec/ivas_omasa_dec.c

+0 −8
Original line number Diff line number Diff line
@@ -180,11 +180,7 @@ 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 );

#ifdef NONBE_FIX_798_OSBA_MC_DEC_CRASH

    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;
@@ -418,11 +414,7 @@ ivas_error ivas_omasa_dec_config( 


        if ( !st_ivas->hDecoderConfig->Opt_5ms )

        {

#ifdef NONBE_FIX_798_OSBA_MC_DEC_CRASH

            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 )

            {