Commit 556206b3 authored by multrus's avatar multrus
Browse files

formatting

parent fbe36a7f

lib_com/bitstream.c

+2 −3
Original line number Diff line number Diff line
@@ -2222,8 +2222,7 @@ ivas_error read_indices( 
    }



    /* GOOD frame */

    if ( st_ivas->bfi == 0

         || st_ivas->bfi == FRAMEMODE_FUTURE /* TODO(mcjbm): This fixes channel-aware mode BE. Still requires review from a bitstream reading expert */

    if ( st_ivas->bfi == 0 || st_ivas->bfi == FRAMEMODE_FUTURE /* TODO(mcjbm): This fixes channel-aware mode BE. Still requires review from a bitstream reading expert */

    )

    {

        /* GOOD frame - convert ITU-T G.192 words to short values */

lib_dec/ivas_stereo_switching_dec.c

100755 → 100644
+2 −2

File changed.File mode changed from 100755 to 100644.

Contains only whitespace changes.

lib_dec/jbm_pcmdsp_apa.c

+3 −6
Original line number Diff line number Diff line
@@ -140,10 +140,8 @@ static bool extend_frm( apa_state_t *ps, const int16_t frm_in[], int16_t frm_out 


/* Allocates memory for state struct and initializes elements. */

uint8_t apa_init(

    apa_state_t **pps

    ,

    int32_t num_channels

)

    apa_state_t **pps,

    int32_t num_channels )

{

    apa_state_t *ps = NULL;
@@ -205,8 +203,7 @@ void apa_reset( 
/* Sets the audio configuration. */

bool apa_set_rate(

    apa_state_t *ps,

    const int32_t output_Fs

)

    const int32_t output_Fs )

{

    /* make sure pointer is valid */

    if ( ps == NULL )

lib_dec/jbm_pcmdsp_apa.h

+3 −6
Original line number Diff line number Diff line
@@ -91,10 +91,8 @@ typedef struct apa_state_t *PCMDSP_APA_HANDLE; 


/*! Allocates memory for state struct and initializes elements.

 *  @return 0 on success, 1 on failure */

uint8_t apa_init( apa_state_t **s

                  ,

                  int32_t num_channels

);

uint8_t apa_init( apa_state_t **s,

                  int32_t num_channels );



/*! Sets state variables to initial value. */

void apa_reset( apa_state_t *s );
@@ -108,8 +106,7 @@ void apa_reset( apa_state_t *s ); 
 *  @param[in] output_Fs sample rate [Hz]

 *  @param[in] num_channels number of channels

 *  @return 0 on success, 1 on failure */

bool apa_set_rate( apa_state_t *ps, const int32_t output_Fs

);

bool apa_set_rate( apa_state_t *ps, const int32_t output_Fs );



/*! Set scaling.

 *  The scale is given in % and will be valid until changed again.

lib_dec/lib_dec.c

+8 −11
Original line number Diff line number Diff line
@@ -564,12 +564,9 @@ ivas_error IVAS_DEC_EnableVoIP( 
        return IVAS_ERR_INIT_ERROR;

    }



    if ( apa_init( &hIvasDec->hVoIP->hTimeScaler

                   ,

                   hDecoderConfig->nchan_out

                   ) != 0 ||

         apa_set_rate( hIvasDec->hVoIP->hTimeScaler, hDecoderConfig->output_Fs

                       ) != 0 ||

    if ( apa_init( &hIvasDec->hVoIP->hTimeScaler,

                   hDecoderConfig->nchan_out ) != 0 ||

         apa_set_rate( hIvasDec->hVoIP->hTimeScaler, hDecoderConfig->output_Fs ) != 0 ||

         apa_set_complexity_options( hIvasDec->hVoIP->hTimeScaler, wss, css ) != 0 ||

         apa_set_quality( hIvasDec->hVoIP->hTimeScaler, 1, 4, 4 ) != 0 ||

         pcmdsp_fifo_create( &hIvasDec->hVoIP->hFifoAfterTimeScaler ) != 0 ||