Commit 92566d46 authored by vaclav's avatar vaclav
Browse files

fix split rendering + UBAN errors

parent ceab7721

lib_dec/ivas_dirac_dec.c

+4 −0
Original line number Diff line number Diff line
@@ -1646,7 +1646,11 @@ void ivas_dirac_dec( 


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

    {

#ifdef FIX_264_AUDIO_CHANNELS_TO_HEAP

        output_f_local[n] = output_f[n];

#else

        output_f_local[n] = &output_f[n][0];

#endif

    }



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

lib_dec/ivas_mct_core_dec.c

+5 −0
Original line number Diff line number Diff line
@@ -221,8 +221,13 @@ void ivas_mct_core_dec( 
    {

        /* Initialization or re-configuration of Stereo TCX */

        sts[ch]->enablePlcWaveadjust = 0;

#ifdef FIX_264_AUDIO_CHANNELS_TO_HEAP

        x[ch][0] = signal_out[ch];

        x[ch][1] = signal_out[ch] + ( L_FRAME48k / 2 );

#else

        x[ch][0] = &signal_out[ch][0];

        x[ch][1] = &signal_out[ch][0] + L_FRAME48k / 2;

#endif

    }



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

lib_dec/ivas_mct_dec.c

+20 −0
Original line number Diff line number Diff line
@@ -158,8 +158,13 @@ ivas_error ivas_mct_dec( 


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

        {

#ifdef FIX_264_AUDIO_CHANNELS_TO_HEAP

            x[n][0] = output[n + cpe_id * CPE_CHANNELS];

            x[n][1] = output[n + cpe_id * CPE_CHANNELS] + ( L_FRAME48k / 2 );

#else

            x[n][0] = &output[n + cpe_id * CPE_CHANNELS][0];

            x[n][1] = &output[n + cpe_id * CPE_CHANNELS][L_FRAME48k / 2];

#endif

            set_zero( x[n][0], L_FRAME48k / 2 );

            set_zero( x[n][1], L_FRAME48k / 2 );

        }
@@ -193,8 +198,13 @@ ivas_error ivas_mct_dec( 


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

        {

#ifdef FIX_264_AUDIO_CHANNELS_TO_HEAP

            x[n][0] = output[n + cpe_id * CPE_CHANNELS];

            x[n][1] = output[n + cpe_id * CPE_CHANNELS] + ( L_FRAME48k / 2 );

#else

            x[n][0] = &output[n + cpe_id * CPE_CHANNELS][0];

            x[n][1] = &output[n + cpe_id * CPE_CHANNELS][L_FRAME48k / 2];

#endif

        }



        ivas_mdct_core_tns_ns( hCPE, fUseTns[cpe_id], tnsData[cpe_id], x, Aq[cpe_id], 1 );
@@ -214,8 +224,13 @@ ivas_error ivas_mct_dec( 
        {

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

            {

#ifdef FIX_264_AUDIO_CHANNELS_TO_HEAP

                x_all[n + cpe_id * CPE_CHANNELS][0] = output[n + cpe_id * CPE_CHANNELS];

                x_all[n + cpe_id * CPE_CHANNELS][1] = output[n + cpe_id * CPE_CHANNELS] + ( L_FRAME48k / 2 );

#else

                x_all[n + cpe_id * CPE_CHANNELS][0] = &output[n + cpe_id * CPE_CHANNELS][0];

                x_all[n + cpe_id * CPE_CHANNELS][1] = &output[n + cpe_id * CPE_CHANNELS][L_FRAME48k / 2];

#endif

            }

        }
@@ -229,8 +244,13 @@ ivas_error ivas_mct_dec( 


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

        {

#ifdef FIX_264_AUDIO_CHANNELS_TO_HEAP

            x[n][0] = output[n + cpe_id * CPE_CHANNELS];

            x[n][1] = output[n + cpe_id * CPE_CHANNELS] + ( L_FRAME48k / 2 );

#else

            x[n][0] = &output[n + cpe_id * CPE_CHANNELS][0];

            x[n][1] = &output[n + cpe_id * CPE_CHANNELS][L_FRAME48k / 2];

#endif

        }



        ivas_mdct_core_reconstruct( hCPE, x, synth, fUseTns[cpe_id], 1 );

lib_dec/ivas_out_setup_conversion.c

+5 −0
Original line number Diff line number Diff line
@@ -596,8 +596,13 @@ void ivas_ls_setup_conversion_process_mdct( 
    /* Assign output pointer to variable x */

    for ( chInIdx = 0; chInIdx < inChannels; chInIdx++ )

    {

#ifdef FIX_264_AUDIO_CHANNELS_TO_HEAP

        x[chInIdx][0] = output[chInIdx];

        x[chInIdx][1] = output[chInIdx] + ( L_FRAME48k / 2 );

#else

        x[chInIdx][0] = &output[chInIdx][0];

        x[chInIdx][1] = &output[chInIdx][0] + L_FRAME48k / 2;

#endif

    }



    /* Assign all the declared handles*/

lib_dec/ivas_spar_decoder.c

+4 −0
Original line number Diff line number Diff line
@@ -1348,7 +1348,11 @@ void ivas_spar_dec_upmixer( 


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

    {

#ifdef FIX_264_AUDIO_CHANNELS_TO_HEAP

        output_f_local[n] = output[n];

#else

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

#endif

    }



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