Commit 66621ab9 authored by Sandesh Venkatesh's avatar Sandesh Venkatesh
Browse files

Merge branch 'complexity_crash_fix' into 'main' 

Fix for complexity measure crash -...

See merge request !1441
parents d119249b 86a16ee1

lib_enc/ivas_masa_enc_fx.c

+8 −2
Original line number Diff line number Diff line
@@ -2302,7 +2302,7 @@ static void reduce_metadata_further_fx( 
    Word16 bandEnergy_exp, shift;

    UWord8 mergeOverFreqBands;

    Word32 meanRatio;

    Word16 tmp, tmp2;

    Word16 tmp, tmp2, q_totalEnergySum;



    numCodingBands = hMasa->config.numCodingBands;

    test();
@@ -2373,6 +2373,7 @@ static void reduce_metadata_further_fx( 
    tmp2 = s_min( 32, tmp2 );

    totalEnergySum = W_extract_h( W_shl( W_tmp, tmp2 ) );

    tmp2 = sub( tmp2, 32 );

    q_totalEnergySum = add( hMasa->data.q_energy, tmp2 );



    /* Determine onsets */

    hMasa->data.onset_detector_1_fx = Mpy_32_32( hMasa->data.onset_detector_1_fx, LOWBITRATE_ONSET_ALPHA_Q31 );
@@ -2380,12 +2381,17 @@ static void reduce_metadata_further_fx( 


    tmp = hMasa->data.q_onset_detector;

    move16();

    IF( BASOP_Util_Cmp_Mant32Exp( hMasa->data.onset_detector_1_fx, sub( 31, hMasa->data.q_onset_detector ), totalEnergySum, sub( 31, hMasa->data.q_energy ) ) < 0 )

    IF( BASOP_Util_Cmp_Mant32Exp( hMasa->data.onset_detector_1_fx, sub( 31, hMasa->data.q_onset_detector ), totalEnergySum, sub( 31, q_totalEnergySum ) ) < 0 )

    {

        hMasa->data.onset_detector_1_fx = totalEnergySum; // hMasa->data.q_energy

        hMasa->data.q_onset_detector = add( hMasa->data.q_energy, tmp2 );

        move32();

        move16();



        shift = norm_l( hMasa->data.onset_detector_2_fx );

        hMasa->data.onset_detector_2_fx = L_shl( hMasa->data.onset_detector_2_fx, shift );

        move32();

        tmp = add( tmp, shift );

    }

    IF( LT_16( tmp, hMasa->data.q_onset_detector ) )

    {