Commit db6c971e authored by vaclav's avatar vaclav
Browse files

revert dynamic allocation in JBM path due to a non-BE output for ParamISM FOA output

parent f15ff12f

lib_dec/ivas_init_dec.c

+18 −10
Original line number Diff line number Diff line
@@ -1915,6 +1915,8 @@ ivas_error ivas_init_decoder( 
     * Allocate floating-point output audio buffers

     *-----------------------------------------------------------------*/



    if ( !st_ivas->hDecoderConfig->voip_active )

    {

        output_Fs_buffers = max( output_Fs, 32000 ); /* note: 32000 == max internal sampling rate in TCX core */

        if ( st_ivas->ivas_format == SBA_FORMAT || st_ivas->ivas_format == MC_FORMAT )

        {
@@ -1930,6 +1932,12 @@ ivas_error ivas_init_decoder( 
                return ( IVAS_ERROR( IVAS_ERR_FAILED_ALLOC, "Can not allocate memory for floating-point output audio buffer!\n" ) );

            }

        }

    }

    else

    {

        n = 0;

    }



    for ( ; n < MAX_OUTPUT_CHANNELS; n++ )

    {

        st_ivas->p_output_f[n] = NULL;

lib_dec/ivas_jbm_dec.c

+3 −2
Original line number Diff line number Diff line
@@ -75,7 +75,8 @@ ivas_error ivas_jbm_dec_tc( 
    int16_t n, output_frame, nchan_out;

    Decoder_State *st; /* used for bitstream handling */

#ifdef FIX_264_AUDIO_CHANNELS_TO_HEAP

    float *output[MAX_OUTPUT_CHANNELS]; /* 'float' buffer for output synthesis */

    float *output[MAX_OUTPUT_CHANNELS]; /* 'float' buffer for output synthesis */ /* TODO: can be allocated dynamically using st_ivas->p_output_f */

    float p_output_f[MAX_TRANSPORT_CHANNELS][L_FRAME48k];

#else

    float output[MAX_TRANSPORT_CHANNELS][L_FRAME48k]; /* 'float' buffer for transport channels, MAX_TRANSPORT_CHANNELS channels */

#endif
@@ -110,7 +111,7 @@ ivas_error ivas_jbm_dec_tc( 
    for ( n = 0; n < MAX_TRANSPORT_CHANNELS; n++ )

    {

#ifdef FIX_264_AUDIO_CHANNELS_TO_HEAP

        output[n] = st_ivas->p_output_f[n];

        output[n] = p_output_f[n];

#endif

        p_output[n] = &output[n][0];

    }