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

fix channel offset in ivas_spar_dec_upmixer

parent be0ae97e

lib_dec/ivas_spar_decoder.c

+0 −7
Original line number Original line Diff line number Diff line
@@ -1422,7 +1422,6 @@ void ivas_spar_dec_upmixer( 
    float *pPcm_tmp[MAX_OUTPUT_CHANNELS];

    float *pPcm_tmp[MAX_OUTPUT_CHANNELS];

#ifdef JBM_FOR_OSBA

#ifdef JBM_FOR_OSBA

    int16_t nchan_internal_total;

    int16_t nchan_internal_total;

    int16_t sba_ch_offset;

#endif

#endif





    hSpar = st_ivas->hSpar;

    hSpar = st_ivas->hSpar;
@@ -1431,20 +1430,14 @@ void ivas_spar_dec_upmixer( 
    n_samples_sf = JBM_CLDFB_SLOTS_IN_SUBFRAME * NS2SA( st_ivas->hDecoderConfig->output_Fs, CLDFB_SLOT_NS );

    n_samples_sf = JBM_CLDFB_SLOTS_IN_SUBFRAME * NS2SA( st_ivas->hDecoderConfig->output_Fs, CLDFB_SLOT_NS );

#ifdef JBM_FOR_OSBA

#ifdef JBM_FOR_OSBA

    nchan_internal_total = nchan_internal;

    nchan_internal_total = nchan_internal;

    sba_ch_offset = 0;

    if ( st_ivas->ivas_format == SBA_ISM_FORMAT && st_ivas->ism_mode == ISM_SBA_MODE_DISC )

    if ( st_ivas->ivas_format == SBA_ISM_FORMAT && st_ivas->ism_mode == ISM_SBA_MODE_DISC )

    {

    {

        nchan_internal_total += st_ivas->nchan_ism;

        nchan_internal_total += st_ivas->nchan_ism;

        sba_ch_offset = st_ivas->nchan_ism;

    }

    }

#endif

#endif

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

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

    {

    {

#ifdef JBM_FOR_OSBA

        output_f_local[n] = output[n + sba_ch_offset];

#else

        output_f_local[n] = output[n];

        output_f_local[n] = output[n];

#endif

    }

    }





#ifdef JBM_FOR_OSBA

#ifdef JBM_FOR_OSBA