Commit 3bbd60f5 authored by Fabian Bauer's avatar Fabian Bauer
Browse files

fixed some warnings

parent 5a414bd1

lib_com/cldfb_fx.c

+3 −3
Original line number Diff line number Diff line
@@ -1434,7 +1434,7 @@ ivas_error openCldfb_ivas_fx( 
}



#ifdef FIX_2436_RENDERER_CLDFBSTATES_EACH_ISM_INPUT

ivas_error getLongCLDFBStates(  HANDLE_CLDFB_FILTER_BANK  h_cldfb  , /* i/o: filter bank handle                */

ivas_error getCLDFBMultiStates( HANDLE_CLDFB_FILTER_BANK h_cldfb, /* i/o: filter bank handle                */

                                Word16                    len  )

{

    free( h_cldfb->cldfb_state_fx );

lib_com/prot_fx.h

+1 −1
Original line number Diff line number Diff line
@@ -8903,7 +8903,7 @@ ivas_error openCldfb_ivas_fx( 
    const Word16 enc_dec );            /* i  : encoder/decoder flag            */



#ifdef FIX_2436_RENDERER_CLDFBSTATES_EACH_ISM_INPUT

ivas_error getLongCLDFBStates( HANDLE_CLDFB_FILTER_BANK h_cldfb , Word16 len) ;

ivas_error getCLDFBMultiStates( HANDLE_CLDFB_FILTER_BANK h_cldfb, Word16 len );

#endif



    Word32 rand_gauss_fx(

lib_dec/lib_dec_fx.c

+1 −1
Original line number Diff line number Diff line
@@ -6267,7 +6267,7 @@ static ivas_error ivas_dec_init_split_rend( 
    }



#ifdef FIX_2436_RENDERER_CLDFBSTATES_EACH_ISM_INPUT

    /*call with a flag indicating long ana states*/

    /*call with a flag indicating no long ana states*/

    error = ISAR_PRE_REND_open( &st_ivas->hSplitBinRend->splitrend, &st_ivas->hRenderConfig->split_rend_config, st_ivas->hDecoderConfig->output_Fs, cldfb_in_flag, pcm_out_flag, st_ivas->hDecoderConfig->render_num_subframes, mixed_td_cldfb_flag, 0 );

#else

    error = ISAR_PRE_REND_open( &st_ivas->hSplitBinRend->splitrend, &st_ivas->hRenderConfig->split_rend_config, st_ivas->hDecoderConfig->output_Fs, cldfb_in_flag, pcm_out_flag, st_ivas->hDecoderConfig->render_num_subframes, mixed_td_cldfb_flag );

lib_isar/lib_isar_pre_rend.c

+3 −3
Original line number Diff line number Diff line
@@ -63,7 +63,7 @@ ivas_error ISAR_PRE_REND_open( 
    const IVAS_RENDER_NUM_SUBFR render_num_subframes, /* i  : rendering number of subframes                   */

    const Word16 mixed_td_cldfb_flag                  /* i  : Flag to indicate combined TD and CLDFB input    */

#ifdef FIX_2436_RENDERER_CLDFBSTATES_EACH_ISM_INPUT

  , const int createLongStates

  , const int createMultiStates

#endif

)

{
@@ -131,13 +131,13 @@ ivas_error ISAR_PRE_REND_open( 
                return error;

            }

#ifdef FIX_2436_RENDERER_CLDFBSTATES_EACH_ISM_INPUT

            IF( createLongStates )

            IF( createMultiStates )

            {

                HANDLE_CLDFB_FILTER_BANK pCldfbAna = hSplitRendWrapper->hCldfbHandles->cldfbAna[ch];

                pCldfbAna->cldfb_state_multiStates = 1;

                /*Re-allocate CLDFB Analysis states*/

                Word16 buf_len = buf_len = sub( pCldfbAna->p_filter_length, pCldfbAna->no_channels );

                getLongCLDFBStates( pCldfbAna, buf_len * RENDERER_MAX_ISM_INPUTS );

                getCLDFBMultiStates( pCldfbAna, buf_len * RENDERER_MAX_ISM_INPUTS );

            }

#endif

        }

lib_isar/lib_isar_pre_rend.h

+1 −1
Original line number Diff line number Diff line
@@ -50,7 +50,7 @@ ivas_error ISAR_PRE_REND_open( 
    const IVAS_RENDER_NUM_SUBFR render_num_subframes,       /* i  : rendering number of subframes                   */

    const Word16 mixed_td_cldfb_flag                        /* i  : Flag to indicate combined TD and CLDFB input    */

#ifdef FIX_2436_RENDERER_CLDFBSTATES_EACH_ISM_INPUT

  , const int createLongStates

  , const int createMultiStates

#endif

);