Commit 12a42a9e authored by Dominik Weckbecker's avatar Dominik Weckbecker 💬
Browse files

rewrite condition for apply_dmx_weights_fx

parent 5d862e62

lib_dec/ivas_sba_dirac_stereo_dec_fx.c

+2 −2
Original line number Diff line number Diff line
@@ -1504,9 +1504,9 @@ void ivas_sba_dirac_stereo_dec_fx( 
    /* output scaling */

#ifdef FIX_FLOAT_1518

    test();

    if ( !sba_mono_flag && !( EQ_16( st_ivas->ivas_format, SBA_ISM_FORMAT ) && EQ_16( st_ivas->ism_mode, ISM_MODE_NONE ) ) )

    IF( !sba_mono_flag && !( EQ_16( st_ivas->ivas_format, SBA_ISM_FORMAT ) && EQ_16( st_ivas->ism_mode, ISM_MODE_NONE ) ) )

#else

    if ( !sba_mono_flag )

    IF( !sba_mono_flag )

#endif

    {

        v_shr( output[0], 1, output[0], output_frame ); /*0.5f*/

lib_dec/ivas_stereo_mdct_core_dec_fx.c

+7 −8
Original line number Diff line number Diff line
@@ -464,16 +464,15 @@ void stereo_mdct_core_dec_fx( 
    test();

    test();

    test();

    IF( hCPE->nchan_out == 1 && ( bfi == 0 || ( bfi != 0 && sts[0]->core != ACELP_CORE && sts[1]->core != ACELP_CORE ) ) )

    {



#ifdef FIX_FLOAT_1518

        IF ( !( EQ_16( st_ivas->ivas_format, SBA_ISM_FORMAT ) && EQ_16( st_ivas->ism_mode, ISM_MODE_NONE ) ) )

        {

    test();

    IF( hCPE->nchan_out == 1 && ( bfi == 0 || ( bfi != 0 && sts[0]->core != ACELP_CORE && sts[1]->core != ACELP_CORE ) ) && !( EQ_16( st_ivas->ivas_format, SBA_ISM_FORMAT ) && EQ_16( st_ivas->ism_mode, ISM_MODE_NONE ) ) )

#else

    IF( hCPE->nchan_out == 1 && ( bfi == 0 || ( bfi != 0 && sts[0]->core != ACELP_CORE && sts[1]->core != ACELP_CORE ) ) )

#endif

    {

        apply_dmx_weights_fx( hCPE, x_fx, sts[0]->transform_type, sts[1]->transform_type );

#ifdef FIX_FLOAT_1518

        }

#endif

    }



    Word16 s;