Commit 45f42163 authored by vaclav's avatar vaclav
Browse files

ivas_jbm_dec_set_discard_samples() -> ivas_jbm_dec_set_discard_samples_fx

parent 6a8d918d

lib_com/ivas_prot_fx.h

+3 −3
Original line number Diff line number Diff line
@@ -6251,15 +6251,15 @@ int16_t is_DTXrate( 
 * JBM prototypes

 *----------------------------------------------------------------------------------*/



ivas_error ivas_jbm_dec_set_discard_samples(

ivas_error ivas_jbm_dec_set_discard_samples_fx(

    Decoder_Struct *st_ivas                                     /* i/o: main IVAS decoder structre                                  */

);



TC_BUFFER_MODE ivas_jbm_dec_get_tc_buffer_mode(

TC_BUFFER_MODE ivas_jbm_dec_get_tc_buffer_mode_fx(

    Decoder_Struct *st_ivas                                     /* i  : IVAS decoder handle                                         */

);



void ivas_jbm_dec_tc_buffer_close(

void ivas_jbm_dec_tc_buffer_close_fx(

    DECODER_TC_BUFFER_HANDLE *phTcBuffer                        /* i/o: TC buffer handle                                            */

);

lib_dec/ivas_init_dec_fx.c

+3 −3
Original line number Diff line number Diff line
@@ -3019,11 +3019,11 @@ ivas_error ivas_init_decoder_fx( 
        granularity = ivas_jbm_dec_get_render_granularity_fx( st_ivas->renderer_type, ivas_renderer_secondary_select_fx( st_ivas ), output_Fs );

        n_channels_transport_jbm = ivas_jbm_dec_get_num_tc_channels_fx( st_ivas );



        IF( NE_32( ( error = ivas_jbm_dec_tc_buffer_open_fx( st_ivas, ivas_jbm_dec_get_tc_buffer_mode( st_ivas ), n_channels_transport_jbm, n_channels_transport_jbm, n_channels_transport_jbm, granularity ) ), IVAS_ERR_OK ) )

        IF( NE_32( ( error = ivas_jbm_dec_tc_buffer_open_fx( st_ivas, ivas_jbm_dec_get_tc_buffer_mode_fx( st_ivas ), n_channels_transport_jbm, n_channels_transport_jbm, n_channels_transport_jbm, granularity ) ), IVAS_ERR_OK ) )

#else

        n_channels_transport_jbm = ivas_jbm_dec_get_num_tc_channels_fx( st_ivas );



        IF( NE_32( ( error = ivas_jbm_dec_tc_buffer_open_fx( st_ivas, ivas_jbm_dec_get_tc_buffer_mode( st_ivas ), n_channels_transport_jbm, n_channels_transport_jbm, n_channels_transport_jbm, NS2SA_FX2( st_ivas->hDecoderConfig->output_Fs, CLDFB_SLOT_NS ) ) ), IVAS_ERR_OK ) )

        IF( NE_32( ( error = ivas_jbm_dec_tc_buffer_open_fx( st_ivas, ivas_jbm_dec_get_tc_buffer_mode_fx( st_ivas ), n_channels_transport_jbm, n_channels_transport_jbm, n_channels_transport_jbm, NS2SA_FX2( st_ivas->hDecoderConfig->output_Fs, CLDFB_SLOT_NS ) ) ), IVAS_ERR_OK ) )

#endif

        {

            return error;
@@ -3544,7 +3544,7 @@ void ivas_destroy_dec_fx( 
        st_ivas->hDecoderConfig = NULL;

    }



    ivas_jbm_dec_tc_buffer_close( &st_ivas->hTcBuffer );

    ivas_jbm_dec_tc_buffer_close_fx( &st_ivas->hTcBuffer );



    IF( st_ivas->hJbmMetadata != NULL )

    {

lib_dec/ivas_ism_dec_fx.c

+3 −3
Original line number Diff line number Diff line
@@ -188,7 +188,7 @@ static ivas_error ivas_ism_bitrate_switching_dec_fx( 
        ELSE

            IF( GT_16( tc_granularity_new, st_ivas->hTcBuffer->n_samples_granularity ) )

        {

            IF( NE_32( ( error = ivas_jbm_dec_set_discard_samples( st_ivas ) ), IVAS_ERR_OK ) )

            IF( NE_32( ( error = ivas_jbm_dec_set_discard_samples_fx( st_ivas ) ), IVAS_ERR_OK ) )

            {

                return error;

            }
@@ -354,7 +354,7 @@ static ivas_error ivas_ism_bitrate_switching_dec_fx( 
        DECODER_TC_BUFFER_HANDLE hTcBuffer;



        hTcBuffer = st_ivas->hTcBuffer;

        tc_buffer_mode_new = ivas_jbm_dec_get_tc_buffer_mode( st_ivas );

        tc_buffer_mode_new = ivas_jbm_dec_get_tc_buffer_mode_fx( st_ivas );

        tc_nchan_tc_new = ivas_jbm_dec_get_num_tc_channels_fx( st_ivas );

        tc_nchan_allocate_new = tc_nchan_tc_new;

        move16();

lib_dec/ivas_jbm_dec_fx.c

+3 −3
Original line number Diff line number Diff line
@@ -2977,7 +2977,7 @@ ivas_error ivas_jbm_dec_flush_renderer_fx( 
 * Set number of samples to discard in the first subframe if the renderer granularity changes on a bitrate change

 *--------------------------------------------------------------------------*/



ivas_error ivas_jbm_dec_set_discard_samples(

ivas_error ivas_jbm_dec_set_discard_samples_fx(

    Decoder_Struct *st_ivas /* i/o: main IVAS decoder structre */

)

{
@@ -3878,7 +3878,7 @@ static void ivas_jbm_dec_tc_buffer_playout_fx( 
 * Close JBM transport channel buffer

 *--------------------------------------------------------------------------*/



void ivas_jbm_dec_tc_buffer_close(

void ivas_jbm_dec_tc_buffer_close_fx(

    DECODER_TC_BUFFER_HANDLE *phTcBuffer /* i/o: TC buffer handle */

)

{
@@ -3981,7 +3981,7 @@ void ivas_jbm_dec_td_renderers_adapt_subframes( 
 *

 *--------------------------------------------------------------------------*/



TC_BUFFER_MODE ivas_jbm_dec_get_tc_buffer_mode(

TC_BUFFER_MODE ivas_jbm_dec_get_tc_buffer_mode_fx(

    Decoder_Struct *st_ivas /* i/o: IVAS decoder structure  */

)

{

lib_dec/ivas_masa_dec_fx.c

+2 −2
Original line number Diff line number Diff line
@@ -2001,7 +2001,7 @@ ivas_error ivas_masa_dec_reconfigure_fx( 
        n_samples_granularity = NS2SA_FX2( st_ivas->hDecoderConfig->output_Fs, CLDFB_SLOT_NS );

        move16();

#endif

        buffer_mode_new = ivas_jbm_dec_get_tc_buffer_mode( st_ivas );

        buffer_mode_new = ivas_jbm_dec_get_tc_buffer_mode_fx( st_ivas );

        tc_nchan_transport = ivas_jbm_dec_get_num_tc_channels_fx( st_ivas );



        tc_nchan_to_allocate = tc_nchan_transport;
@@ -2033,7 +2033,7 @@ ivas_error ivas_masa_dec_reconfigure_fx( 
#endif

                IF( GT_16( n_samples_granularity, st_ivas->hTcBuffer->n_samples_granularity ) )

                {

                    IF( NE_32( ( error = ivas_jbm_dec_set_discard_samples( st_ivas ) ), IVAS_ERR_OK ) )

                    IF( NE_32( ( error = ivas_jbm_dec_set_discard_samples_fx( st_ivas ) ), IVAS_ERR_OK ) )

                    {

                        return error;

                    }