Commit c198e0f5 authored by ber's avatar ber
Browse files

some fixes

parent bdd6b451

lib_dec/ivas_jbm_dec.c

+1 −1
Original line number Diff line number Diff line
@@ -1965,7 +1965,7 @@ ivas_error ivas_jbm_dec_render_fx( 


            ivas_ls_setup_conversion_fx( st_ivas, st_ivas->nchan_transport, *nSamplesRendered, p_tc_fx, p_output_fx );

        }

        pop:wmops(); /*push_wmops( "IDR: RENDERER_MC " );*/

        pop_wmops(); /*push_wmops( "IDR: RENDERER_MC " );*/

    }

    ELSE IF( EQ_32( st_ivas->ivas_format, ISM_FORMAT ) )

    {

lib_rend/ivas_dirac_dec_binaural_functions.c

+3 −1
Original line number Diff line number Diff line
@@ -194,7 +194,7 @@ static void matrixTransp2Mul_fx( 
    Word32 outIm[BINAURAL_CHANNELS][BINAURAL_CHANNELS] /*q_out*/,

    Word16 *q_out );



#if defined( FIX_1072_SPEEDUP_matrixMul_fx ) || defined( FIX_1072_SPEEDUP_matrixTransp1Mul_fx ) || defined( FIX_1072_SPEEDUP_matrixTransp2Mul_fx_reducetest ) || defined( FIX1072_SPEEDUP_combinedMatrixCalculations )

#if defined( FIX_1072_SPEEDUP_matrixMul_fx ) || defined( FIX_1072_SPEEDUP_matrixTransp1Mul_fx ) || defined( FIX_1072_SPEEDUP_matrixTransp2Mul_fx_reducetest ) || defined( FIX1072_SPEEDUP_combinedMatrixCalculations ) || defined( FIX_1072_SPEEDUP_matrixTransp1Mul_fx_IN1EQIN2_BINCH2 )



/* ( (a && b) || (!a && !b) ) = ( ( !a || !b ) && ( a || b )) */

static inline Word32 matrixMul_func1( Word32 cond1, Word32 cond2, Word32 prod )
@@ -4031,6 +4031,7 @@ static void matrixMul_fx( 
    return;

}



#ifndef FIX_1072_SPEEDUP_matrixTransp1Mul_fx_IN1EQIN2_BINCH2

static void matrixTransp1Mul_fx(

    Word32 Are_fx[BINAURAL_CHANNELS][BINAURAL_CHANNELS], /*q_A*/

    Word32 Aim_fx[BINAURAL_CHANNELS][BINAURAL_CHANNELS], /*q_A*/
@@ -4186,6 +4187,7 @@ static void matrixTransp1Mul_fx( 
    }

    return;

}

#endif /*FIX_1072_SPEEDUP_matrixTransp1Mul_fx_IN1EQIN2_BINCH2*/



#ifdef FIX_1072_SPEEDUP_matrixTransp1Mul_fx_IN1EQIN2_BINCH2

static void matrixTransp1Mul_fx_in1isin2(