Commit 1f6221c0 authored by vaclav's avatar vaclav
Browse files

fix warnings

parent b1f36eca

lib_dec/ivas_masa_dec.c

+4 −1
Original line number Diff line number Diff line
@@ -696,6 +696,9 @@ ivas_error ivas_masa_dec_open( 
    if ( st_ivas->hTcBuffer == NULL && st_ivas->renderer_type != RENDERER_DISABLE && st_ivas->renderer_type != RENDERER_BINAURAL_PARAMETRIC && st_ivas->renderer_type != RENDERER_BINAURAL_PARAMETRIC_ROOM && st_ivas->renderer_type != RENDERER_STEREO_PARAMETRIC )

    {

        int16_t nchan_to_allocate, nchan_transport;

#ifdef NONBE_1303_REND_GRANULARITY

        int16_t granularity;

#endif

        TC_BUFFER_MODE buffer_mode;



        buffer_mode = TC_BUFFER_MODE_RENDERER;
@@ -728,7 +731,7 @@ ivas_error ivas_masa_dec_open( 
        }



#ifdef NONBE_1303_REND_GRANULARITY

        int16_t granularity = ivas_jbm_dec_get_render_granularity( st_ivas->renderer_type, RENDERER_DISABLE, st_ivas->hDecoderConfig->output_Fs );

        granularity = ivas_jbm_dec_get_render_granularity( st_ivas->renderer_type, RENDERER_DISABLE, st_ivas->hDecoderConfig->output_Fs );



        if ( ( error = ivas_jbm_dec_tc_buffer_open( st_ivas, buffer_mode, nchan_transport, nchan_to_allocate, nchan_to_allocate, granularity ) ) != IVAS_ERR_OK )

#else

lib_dec/ivas_mc_param_dec.c

+4 −1
Original line number Diff line number Diff line
@@ -437,6 +437,9 @@ ivas_error ivas_param_mc_dec_open( 
    if ( hParamMC->synthesis_conf != PARAM_MC_SYNTH_MONO_STEREO )

    {

        int16_t n_cldfb_slots;

#ifdef NONBE_1303_REND_GRANULARITY

        int16_t granularity;

#endif



        n_cldfb_slots = DEFAULT_JBM_CLDFB_TIMESLOTS;

        if ( st_ivas->hDecoderConfig->Opt_tsm )
@@ -458,7 +461,7 @@ ivas_error ivas_param_mc_dec_open( 
        if ( st_ivas->hTcBuffer == NULL )

        {

#ifdef NONBE_1303_REND_GRANULARITY

            int16_t granularity = ivas_jbm_dec_get_render_granularity( st_ivas->renderer_type, RENDERER_DISABLE, output_Fs );

            granularity = ivas_jbm_dec_get_render_granularity( st_ivas->renderer_type, RENDERER_DISABLE, output_Fs );



            if ( ( error = ivas_jbm_dec_tc_buffer_open( st_ivas, TC_BUFFER_MODE_RENDERER, nchan_transport, nchan_transport, 0, granularity ) ) != IVAS_ERR_OK )

#else

lib_dec/ivas_mc_paramupmix_dec.c

+4 −1
Original line number Diff line number Diff line
@@ -374,6 +374,9 @@ ivas_error ivas_mc_paramupmix_dec_open( 
    {

        int16_t nchan_to_allocate;

        int16_t nchan_tc;

#ifdef NONBE_1303_REND_GRANULARITY

        int16_t granularity;

#endif

        TC_BUFFER_MODE buffer_mode;



        buffer_mode = TC_BUFFER_MODE_RENDERER;
@@ -392,7 +395,7 @@ ivas_error ivas_mc_paramupmix_dec_open( 
        }



#ifdef NONBE_1303_REND_GRANULARITY

        int16_t granularity = ivas_jbm_dec_get_render_granularity( st_ivas->renderer_type, RENDERER_DISABLE, output_Fs );

        granularity = ivas_jbm_dec_get_render_granularity( st_ivas->renderer_type, RENDERER_DISABLE, output_Fs );



        if ( ( error = ivas_jbm_dec_tc_buffer_open( st_ivas, buffer_mode, nchan_tc, nchan_to_allocate, nchan_to_allocate, granularity ) ) != IVAS_ERR_OK )

#else

lib_dec/ivas_sba_dec.c

+2 −0
Original line number Diff line number Diff line
@@ -163,6 +163,7 @@ ivas_error ivas_sba_dec_reconfigure( 
    /* we may need to flush only for binaural and OSBA and TSM */

    if ( st_ivas->ivas_format == SBA_ISM_FORMAT && ( st_ivas->hDecoderConfig->output_config == IVAS_AUDIO_CONFIG_BINAURAL || st_ivas->hDecoderConfig->output_config == IVAS_AUDIO_CONFIG_BINAURAL_ROOM_IR || st_ivas->hDecoderConfig->output_config == IVAS_AUDIO_CONFIG_BINAURAL_ROOM_REVERB ) )

    {

#ifndef NONBE_1303_REND_GRANULARITY

        RENDERER_TYPE renderer_type_new;

        int16_t sba_order_internal;
@@ -193,6 +194,7 @@ ivas_error ivas_sba_dec_reconfigure( 
            }

        }



#endif

        /* determine new granularity */

#ifdef NONBE_1303_REND_GRANULARITY

        granularity_new = ivas_jbm_dec_get_render_granularity( st_ivas->renderer_type, ivas_renderer_secondary_select( st_ivas ), st_ivas->hDecoderConfig->output_Fs );

lib_dec/ivas_spar_decoder.c

+1 −1
Original line number Diff line number Diff line
@@ -265,7 +265,7 @@ ivas_error ivas_spar_dec_open( 
        }



        if ( ( error = ivas_jbm_dec_tc_buffer_open( st_ivas, buffer_mode, nchan_tc, nchan_to_allocate, nchan_to_allocate, granularity ) ) != IVAS_ERR_OK )

#endif `

#endif

        {

            return error;

        }