Commit 6fadb2b4 authored by Nicolas Roussin's avatar Nicolas Roussin
Browse files

Address Thomas Dettbarn's comments.

parent 19bb0a2f

lib_rend/ivas_dirac_dec_binaural_functions_fx.c

+12 −7
Original line number Diff line number Diff line
@@ -2300,7 +2300,8 @@ static void ivas_dirac_dec_binaural_determine_processing_matrices_fx( 
#ifdef OPT_2182_MATRIX_SCALE_OPS

        matrixScale_fx( tmpMtxRe_fx, tmpMtxIm_fx, &q_tmp );

        matrixTransp2Mul_fx(

            tmpMtxRe_fx, tmpMtxIm_fx, &q_tmp, Mre_fx, Mim_fx, &q_M,

            tmpMtxRe_fx, tmpMtxIm_fx, &q_tmp,

            Mre_fx, Mim_fx, &q_M,

            resultMtxRe_fx, resultMtxIm_fx, &q_res );

#else

        matrixTransp2Mul_fx(
@@ -3964,7 +3965,7 @@ static void matrixScale_fx( 
    Word16 *q_A )

{

    Word16 shift;

    Word16 size = i_mult( BINAURAL_CHANNELS, BINAURAL_CHANNELS );

    Word16 size = BINAURAL_CHANNELS * BINAURAL_CHANNELS;

    shift = sub( s_min( L_norm_arr( Are_fx[0], size ), L_norm_arr( Aim_fx[0], size ) ), 1 );

    scale_sig32( Are_fx[0], size, shift );

    scale_sig32( Aim_fx[0], size, shift );
@@ -3986,7 +3987,7 @@ static void matrixMul_fx( 
{

#ifdef OPT_2182_MATRIX_SCALE_OPS

    Word16 chA, chB;

    Word16 size = i_mult( BINAURAL_CHANNELS, BINAURAL_CHANNELS );

    Word16 size = BINAURAL_CHANNELS * BINAURAL_CHANNELS;

#else

    Word16 chA, chB;

    Word16 min_q_shift1, min_q_shift2;
@@ -4874,7 +4875,9 @@ static void formulate2x2MixingMatrix_fx( 
    }



#ifdef OPT_2182_MATRIX_SCALE_OPS

    matrixTransp2Mul_fx( tmpRe_fx, tmpIm_fx, &q_temp, Ure_fx, Uim_fx, &q_U,

    matrixTransp2Mul_fx( 

        tmpRe_fx, tmpIm_fx, &q_temp, 

        Ure_fx, Uim_fx, &q_U,

        Pre_fx, Pim_fx, &q_P ); /* Nearest orthonormal matrix P to matrix A formulated */

#else

    matrixTransp2Mul_fx( tmpRe_fx, tmpIm_fx, &q_temp, Ure_fx, Uim_fx, &q_U,
@@ -5019,7 +5022,9 @@ static void formulate2x2MixingMatrix_fx( 
    matrixMul_fx( KyRe_fx, KyIm_fx, &q_ky, Pre_fx, Pim_fx, &q_P, tmpRe_fx, tmpIm_fx, &q_temp );

#ifdef OPT_2182_MATRIX_SCALE_OPS

    matrixScale_fx( tmpRe_fx, tmpIm_fx, &q_temp );

    matrixTransp2Mul_fx( tmpRe_fx, tmpIm_fx, &q_temp, Uxre_fx, Uxim_fx, &q_Ux,

    matrixTransp2Mul_fx( 

        tmpRe_fx, tmpIm_fx, &q_temp, 

        Uxre_fx, Uxim_fx, &q_Ux,

        Mre_fx, Mim_fx, q_M );

#else

    matrixTransp2Mul_fx( tmpRe_fx, tmpIm_fx, &q_temp, Uxre_fx, Uxim_fx, &q_Ux,