Commit e4f2974f authored by vaclav's avatar vaclav
Browse files

Merge branch 'FRAMES_PER_SEC_in_JBM' into 'main' 

frames_per_sec in jbm

See merge request !714
parents c3f38e25 d72b2f68

lib_dec/ivas_ism_param_dec.c

+3 −5
Original line number Diff line number Diff line
@@ -1131,9 +1131,9 @@ void ivas_ism_dec_digest_tc( 


        /* we have a full frame interpolator, adapt it */

        /* for BE testing */

        if ( ( st_ivas->hDecoderConfig->output_Fs / (int32_t) FRAMES_PER_SECOND ) == st_ivas->hTcBuffer->n_samples_available )

        if ( ( st_ivas->hDecoderConfig->output_Fs / FRAMES_PER_SEC ) == st_ivas->hTcBuffer->n_samples_available )

        {

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

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

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

            {

                st_ivas->hIsmRendererData->interpolator[0] = 0.0f;
@@ -1152,9 +1152,7 @@ void ivas_ism_dec_digest_tc( 
        }

        else

        {

            ivas_jbm_dec_get_adapted_linear_interpolator( (int16_t) ( st_ivas->hDecoderConfig->output_Fs / (int32_t) FRAMES_PER_SECOND ),

                                                          st_ivas->hTcBuffer->n_samples_available,

                                                          st_ivas->hIsmRendererData->interpolator );

            ivas_jbm_dec_get_adapted_linear_interpolator( (int16_t) ( st_ivas->hDecoderConfig->output_Fs / FRAMES_PER_SEC ), st_ivas->hTcBuffer->n_samples_available, st_ivas->hIsmRendererData->interpolator );

        }

        /* also get the gains here */

        num_objects = st_ivas->nchan_transport;