Commit d9deaa78 authored by PLAINSI's avatar PLAINSI
Browse files

Adapt interpolators

parent 15281eaf

lib_dec/ivas_mc_paramupmix_dec.c

+20 −9
Original line number Diff line number Diff line
@@ -317,7 +317,14 @@ void ivas_mc_paramupmix_dec_digest_tc( 
    /* adapt subframes */

    ivas_jbm_dec_td_renderers_adapt_subframes( st_ivas );



    if (st_ivas->renderer_type == RENDERER_BINAURAL_MIXER_CONV || st_ivas->renderer_type == RENDERER_BINAURAL_MIXER_CONV_ROOM)

    {

        ivas_jbm_dec_get_adapted_linear_interpolator( DEFAULT_JBM_SUBFRAMES_5MS, nCldfbSlots, hMCParamUpmix->param_interpolator );

    }

    else

    {

        ivas_jbm_dec_get_adapted_linear_interpolator( DEFAULT_JBM_CLDFB_TIMESLOTS, nCldfbSlots, hMCParamUpmix->param_interpolator );

    }

    

    pop_wmops();

}
@@ -394,7 +401,6 @@ void ivas_mc_paramupmix_dec_render( 
        st_ivas->hTcBuffer->subframes_rendered = 0;

    }





    pop_wmops();

}

#endif
@@ -475,6 +481,11 @@ ivas_error ivas_mc_paramupmix_dec_open( 
        buffer_mode = TC_BUFFER_MODE_RENDERER;

        nchan_tc = ivas_jbm_dec_get_num_tc_channels( st_ivas );

        nchan_to_allocate = nchan_tc;

        if ( ( hMCParamUpmix->param_interpolator = (float *) malloc( MAX_JBM_CLDFB_TIMESLOTS * sizeof( float ) ) ) == NULL )

        {

            return ( IVAS_ERROR( IVAS_ERR_FAILED_ALLOC, "Can not allocate memory for interpolator\n" ) );

        }



        if ( st_ivas->hDecoderConfig->output_config == AUDIO_CONFIG_STEREO || st_ivas->hDecoderConfig->output_config == AUDIO_CONFIG_MONO )

        {

            buffer_mode = TC_BUFFER_MODE_BUFFER;
@@ -485,19 +496,19 @@ ivas_error ivas_mc_paramupmix_dec_open( 
        {

            nchan_to_allocate = 2 * BINAURAL_CHANNELS;

        }

        if ( st_ivas->renderer_type != RENDERER_BINAURAL_MIXER_CONV && st_ivas->renderer_type != RENDERER_BINAURAL_MIXER_CONV_ROOM )

        if ( st_ivas->renderer_type == RENDERER_BINAURAL_MIXER_CONV || st_ivas->renderer_type == RENDERER_BINAURAL_MIXER_CONV_ROOM )

        {

            ivas_jbm_dec_get_adapted_linear_interpolator( DEFAULT_JBM_SUBFRAMES_5MS, DEFAULT_JBM_SUBFRAMES_5MS, hMCParamUpmix->param_interpolator );

        }

        else

        {

            if ( ( error = ivas_jbm_dec_tc_buffer_open( st_ivas, buffer_mode, nchan_tc, nchan_to_allocate, nchan_to_allocate, NS2SA( st_ivas->hDecoderConfig->output_Fs, CLDFB_SLOT_NS ) ) ) != IVAS_ERR_OK )

            {

                return error;

            }

        }

        if ( ( hMCParamUpmix->param_interpolator = (float *) malloc( MAX_JBM_CLDFB_TIMESLOTS * sizeof( float ) ) ) == NULL )

        {

            return ( IVAS_ERROR( IVAS_ERR_FAILED_ALLOC, "Can not allocate memory for interpolator\n" ) );

        }

            ivas_jbm_dec_get_adapted_linear_interpolator( DEFAULT_JBM_CLDFB_TIMESLOTS, DEFAULT_JBM_CLDFB_TIMESLOTS, hMCParamUpmix->param_interpolator );

        }

    }

#endif



    st_ivas->hMCParamUpmix = hMCParamUpmix;