Commit 9857f232 authored by bayers's avatar bayers
Browse files

revert last commits accidental deletion of ivas_dirac_dec.c

parent 1d5c76a4

lib_dec/ivas_ism_param_dec.c

+13 −4
Original line number Diff line number Diff line
@@ -1190,7 +1190,6 @@ void ivas_param_ism_dec( 
    for ( subframe_idx = 0; subframe_idx < hDirAC->nb_subframes; subframe_idx++ )

    {

#ifdef JBM_TSM_ON_TCS

        /* TODO: JBM just a quick fix to gewt SBA running, change to the right thing later...*/

        uint16_t slot_idx_start = subframe_idx * hDirAC->subframe_nbslots[subframe_idx];

#else

        uint16_t slot_idx_start = subframe_idx * hDirAC->subframe_nbslots;
@@ -1317,11 +1316,22 @@ void ivas_ism_dec_digest_tc( 
        if ( ( st_ivas->hDecoderConfig->output_Fs / (int32_t) FRAMES_PER_SECOND ) == st_ivas->hTcBuffer->n_samples_available )

        {

            int16_t interpolator_length = (int16_t) ( st_ivas->hDecoderConfig->output_Fs / (int32_t) FRAMES_PER_SECOND );

            if ( st_ivas->renderer_type == RENDERER_SBA_LINEAR_ENC || st_ivas->renderer_type == RENDERER_BINAURAL_FASTCONV )

            {

                st_ivas->hIsmRendererData->interpolator[0] = 0.0f;

                for ( i = 1; i < interpolator_length; i++ )

                {

                    st_ivas->hIsmRendererData->interpolator[i] = st_ivas->hIsmRendererData->interpolator[i - 1] + 1.f / ( interpolator_length - 1 );

                }

            }

            else

            {

                for ( i = 0; i < interpolator_length; i++ )

                {

                    st_ivas->hIsmRendererData->interpolator[i] = (float) i / ( (float) interpolator_length - 1 );

                }

            }

        }

        else

        {

            ivas_jbm_dec_get_adapted_linear_interpolator( (int16_t) ( st_ivas->hDecoderConfig->output_Fs / (int32_t) FRAMES_PER_SECOND ),
@@ -1525,7 +1535,6 @@ static void ivas_ism_param_dec_render_sf( Decoder_Struct *st_ivas, 
    float *Cldfb_ImagBuffer_in[PARAM_ISM_MAX_DMX];

    DIRAC_DEC_HANDLE hDirAC;



    /* TODO: JBM just a quick fix to gewt SBA running, change to the right thing later...*/

    int16_t slot_idx_start;

    int16_t idx_in;

    int16_t idx_lfe;

lib_dec/ivas_spar_md_dec.c

+1 −1
Original line number Diff line number Diff line
@@ -2957,7 +2957,7 @@ void ivas_spar_to_dirac( 


                    hDirAC->energy_ratio1[block][b] = en_ratio;

                    tmp_write_idx_band = tmp_write_idx_param_band;

                    /* TODO: JBM */



                    if ( hDirAC->hConfig->dec_param_estim == FALSE )

                    {

                        hDirAC->elevation[tmp_write_idx_band][b] = ele_dith;

lib_dec/lib_dec.c

+1 −2
Original line number Diff line number Diff line
@@ -890,8 +890,7 @@ static ivas_error IVAS_DEC_Setup( 
                return error;

            }

        }

        /* TODO: JBM replace with a function that gets the real number of TCs generated,

        depending of remapping, td rendering already done in the TC decoding part, ....*/



        *nTransportChannels = (uint8_t) st_ivas->hTcBuffer->nchan_transport_jbm;

        *nTcBufferGranularity = (uint16_t) st_ivas->hTcBuffer->n_samples_granularity;

        *nOutChannels = (uint8_t) st_ivas->hDecoderConfig->nchan_out;

lib_rend/ivas_dirac_dec_binaural_functions.c

+0 −1
Original line number Diff line number Diff line
@@ -2759,7 +2759,6 @@ static void ivas_dirac_dec_binaural_formulate_input_and_target_covariance_matric 
#endif

        {

#ifdef JBM_TSM_ON_TCS

            /* TODO: JBM this needs to be adapted to the variable size subframes */

            int16_t slotThis = slot + slot_idx_start;

#else

            int16_t slotThis = slot + ( hDirAC->subframe_nbslots * subframe );