Commit 106c5657 authored by Nicolas Roussin's avatar Nicolas Roussin
Browse files

Debug fx32.

parent bd1617b7

lib_com/ivas_filters_fx.c

+12 −14
Original line number Diff line number Diff line
@@ -183,7 +183,7 @@ void ivas_filters_init_fx( 
}



#ifdef OPT_2239_IVAS_FILTER_PROCESS

static void ivas_iir_2_filter_fx64( ivas_filters_process_state_t *filter_state, Word64 *pIn_Out_fx, const Word16 length, const Word16 stage, Word16 q );

static void ivas_iir_2_filter_fx64( ivas_filters_process_state_t *filter_state, Word64 *pIn_Out_fx, const Word16 length, const Word16 stage );

static Word64 Mpy_64_32( Word64 W_var1, Word32 L_var2 );



/*-----------------------------------------------------------------------------------------*
@@ -216,13 +216,12 @@ static Word64 Mpy_64_32( Word64 W_var1, Word32 L_var2 ) 
 * Process call for filtering a signal

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

#if 0

static void ivas_iir_2_filter_fx32( ivas_filters_process_state_t *filter_state, Word32 *pIn_Out_fx, const Word16 length, const Word16 stage, Word16 q );

static void ivas_iir_2_filter_fx32( ivas_filters_process_state_t *filter_state, Word32 *pIn_Out_fx, const Word16 length, const Word16 stage );

static void ivas_iir_2_filter_fx32(

    ivas_filters_process_state_t *filter_state,

    Word32 *pIn_Out_fx,

    const Word16 length,

    const Word16 stage,

    Word16 q )

    const Word16 stage )

{

    Word64 tmp_prod, tmp;

    Word32 in, out;
@@ -276,11 +275,11 @@ void ivas_filter_process_fx32( 
    SWITCH( filter_state->order )

    {

        case IVAS_FILTER_ORDER_1:

            ivas_iir_2_filter_fx32( filter_state, pIn_Out_fx, length, IVAS_FILTER_STAGE_0, q );

            ivas_iir_2_filter_fx32( filter_state, pIn_Out_fx, length, IVAS_FILTER_STAGE_0 );

            BREAK;

        case IVAS_FILTER_ORDER_4:

            ivas_iir_2_filter_fx32( filter_state, pIn_Out_fx, length, IVAS_FILTER_STAGE_0, q );

            ivas_iir_2_filter_fx32( filter_state, pIn_Out_fx, length, IVAS_FILTER_STAGE_1, q );

            ivas_iir_2_filter_fx32( filter_state, pIn_Out_fx, length, IVAS_FILTER_STAGE_0 );

            ivas_iir_2_filter_fx32( filter_state, pIn_Out_fx, length, IVAS_FILTER_STAGE_1 );

            BREAK;

        default:

            BREAK;
@@ -300,8 +299,7 @@ static void ivas_iir_2_filter_fx64( 
    ivas_filters_process_state_t *filter_state,

    Word64 *pIn_Out_fx,

    const Word16 length,

    const Word16 stage,

    Word16 q )

    const Word16 stage )

{

    Word64 tmp_prod, tmp, in, out;

    Word16 i, j, shift;
@@ -344,17 +342,17 @@ static void ivas_iir_2_filter_fx64( 
void ivas_filter_process_fx64(

    ivas_filters_process_state_t *filter_state, /* i/o: filter state handle             */

    Word64 *pIn_Out_fx,                         /* i/o: signal subject to filtering Q(q)   */

    const Word16 length,                        /* i  : filter order                    */

    Word16 q )

    const Word16 length )                       /* i  : filter order                    */



{

    SWITCH( filter_state->order )

    {

        case IVAS_FILTER_ORDER_1:

            ivas_iir_2_filter_fx64( filter_state, pIn_Out_fx, length, IVAS_FILTER_STAGE_0, q );

            ivas_iir_2_filter_fx64( filter_state, pIn_Out_fx, length, IVAS_FILTER_STAGE_0 );

            BREAK;

        case IVAS_FILTER_ORDER_4:

            ivas_iir_2_filter_fx64( filter_state, pIn_Out_fx, length, IVAS_FILTER_STAGE_0, q );

            ivas_iir_2_filter_fx64( filter_state, pIn_Out_fx, length, IVAS_FILTER_STAGE_1, q );

            ivas_iir_2_filter_fx64( filter_state, pIn_Out_fx, length, IVAS_FILTER_STAGE_0 );

            ivas_iir_2_filter_fx64( filter_state, pIn_Out_fx, length, IVAS_FILTER_STAGE_1 );

            BREAK;

        default:

            BREAK;

lib_com/ivas_prot_fx.h

+1 −2
Original line number Diff line number Diff line
@@ -3814,8 +3814,7 @@ void ivas_filter_process_fx32( 
void ivas_filter_process_fx64(

    ivas_filters_process_state_t *filter_state,                 /* i/o: filter state handle                             */

    Word64 *pIn_Out_fx,                                         /* i  : signal subject to filtering                     */

    const Word16 length,                                        /* i  : filter order                                    */

    Word16 q 

    const Word16 length                                         /* i  : filter order                                    */

);

// #else FIXME

void ivas_filter_process_fx(

lib_com/ivas_transient_det_fx.c

+3 −3
Original line number Diff line number Diff line
@@ -408,7 +408,7 @@ void ivas_td_decorr_get_ducking_gains_fx( 
    }



    /* env hpf */

    ivas_filter_process_fx64( &hTranDet->env_hpf, e_fast_fx, frame_len, Q43 );

    ivas_filter_process_fx64( &hTranDet->env_hpf, e_fast_fx, frame_len ); /*Q43*/



    FOR( i = 0; i < frame_len; i++ )

    {
@@ -419,10 +419,10 @@ void ivas_td_decorr_get_ducking_gains_fx( 
    }



    /* env fast*/

    ivas_filter_process_fx64( &hTranDet->env_fast, e_fast_fx, frame_len, Q43 );

    ivas_filter_process_fx64( &hTranDet->env_fast, e_fast_fx, frame_len ); /*Q43*/



    /* env slow */

    ivas_filter_process_fx64( &hTranDet->env_slow, e_slow_fx, frame_len, Q43 );

    ivas_filter_process_fx64( &hTranDet->env_slow, e_slow_fx, frame_len ); /*Q43*/



    IF( tdet_flag )

    {