Commit eefa535e authored by Dominik Weckbecker's avatar Dominik Weckbecker 💬
Browse files

wrap changes into new define FIX_632_USAN_ERROR_NULL_POINTER

parent 74da034e

lib_com/options.h

+1 −0
Original line number Diff line number Diff line
@@ -168,6 +168,7 @@ 
#define FIX_718_JBM_MD_UDPATE                           /* Fhg: fix issue #718, wrong setting of the update flag in the TD obj renderer in the JBM path */

#define FIX_719_CRASH_IN_CLEANUP                        /* VA: issue 719: fix Decoder crash after call to goto to cleanup */



#define FIX_632_USAN_ERROR_NULL_POINTER                /* FhG: issue 632 USAN offset to null pointer proto_diffuse_buffer_f in dirac rendering*/



/* ################## End BE DEVELOPMENT switches ######################### */

lib_rend/ivas_dirac_output_synthesis_dec.c

+99 −97
Original line number Diff line number Diff line
@@ -1522,10 +1522,12 @@ void ivas_dirac_dec_output_synthesis_process_subframe_psd_ls( 
        }



        /*Diffuse stream*/

#ifdef FIX_632_USAN_ERROR_NULL_POINTER

        if ( h_dirac_output_synthesis_params->max_band_decorr != 0 )

        {

            p_power_smooth_diff = h_dirac_output_synthesis_state->proto_diffuse_buffer_f + buf_idx * 2 * h_dirac_output_synthesis_params->max_band_decorr * nchan_out_woLFE;

        }

#endif

        p_gain_1 = gains_diff;

        p_gain_2 = h_dirac_output_synthesis_state->gains_diff_prev;

        for ( k = 0; k < nchan_out_woLFE; k++ )

lib_rend/ivas_dirac_rend.c

+2 −1
Original line number Diff line number Diff line
@@ -1641,11 +1641,12 @@ void ivas_dirac_dec_compute_diffuse_proto( 
    h_dirac_output_synthesis_state = &( hDirACRend->h_output_synthesis_psd_state );



    num_freq_bands_diff = h_dirac_output_synthesis_params->max_band_decorr;



#ifdef FIX_632_USAN_ERROR_NULL_POINTER

    if ( num_freq_bands_diff == 0 )

    {

        return;

    }

#endif



    p_diff_buffer = h_dirac_output_synthesis_state->proto_diffuse_buffer_f + slot_idx * 2 * num_freq_bands_diff * hDirACRend->hOutSetup.nchan_out_woLFE;

    p_diff_buffer_1 = p_diff_buffer + 1;