Commit 2590e9bd authored by Arash Azizi's avatar Arash Azizi
Browse files

issue: 2479 Introducing the legacy flag variable instead of giving the function a vague integer

parent fdd370d8

lib_dec/jbm_pcmdsp_apa_fx.c

+10 −4
Original line number Diff line number Diff line
@@ -706,6 +706,9 @@ UWord8 apa_exec_fx( 
    Word32 dl_scaled, dl_copied, l_frm_out_target;

    Word32 expScaling, actScaling;

    UWord32 statsResetThreshold, statsResetShift;

#ifdef HARMONIZE_2481_EXTEND_SHRINK

    Word16 leg_flag = 1;

#endif // HARMONIZE_2481_EXTEND_SHRINK



    statsResetThreshold = 1637;

    move32();
@@ -804,7 +807,7 @@ UWord8 apa_exec_fx( 
#ifndef HARMONIZE_2481_EXTEND_SHRINK

            shrink_frm_fx( ps, frm_in, maxScaling, a_out, &l_frm_out );

#else

            shrink_frm_fx( ps, frm_in, maxScaling, a_out, 0, &l_frm_out, (Word16) 1 );

            shrink_frm_fx( ps, frm_in, maxScaling, a_out, 0, &l_frm_out, leg_flag );

#endif // !HARMONIZE_2481_EXTEND_SHRINK

        }

        /* extend */
@@ -813,7 +816,7 @@ UWord8 apa_exec_fx( 
#ifndef HARMONIZE_2481_EXTEND_SHRINK

            extend_frm_fx( ps, frm_in, a_out, &l_frm_out );

#else

            extend_frm_fx( ps, frm_in, a_out, 0, &l_frm_out, (Word16) 1 );

            extend_frm_fx( ps, frm_in, a_out, 0, &l_frm_out, leg_flag );

#endif // !HARMONIZE_2481_EXTEND_SHRINK

        }

        /* control the amount/frequency of scaling */
@@ -933,6 +936,9 @@ UWord8 apa_exec_ivas_fx( 
    UWord32 statsResetThreshold, statsResetShift;

    Word16 Q_a_out;

    Word16 Q_a_out_init_old;

#ifdef HARMONIZE_2481_EXTEND_SHRINK

    Word16 leg_flag = 0;

#endif // HARMONIZE_2481_EXTEND_SHRINK



    Q_a_out = add( getScaleFactor32_copy( a_in, l_in ), Q11 - Q16 - Q1 );

    Q_a_out_init_old = Q_a_out; /* store the possible scaling of a_in, to be re-used in the next frame */
@@ -1047,7 +1053,7 @@ UWord8 apa_exec_ivas_fx( 
#ifndef HARMONIZE_2481_EXTEND_SHRINK

                shrink_frm_ivas_fx( ps, frm_in, maxScaling, a_tmp, Q_a_out, &l_frm_out );

#else

                shrink_frm_fx( ps, frm_in, maxScaling, a_tmp, Q_a_out, &l_frm_out, (Word16) 0 );

                shrink_frm_fx( ps, frm_in, maxScaling, a_tmp, Q_a_out, &l_frm_out, leg_flag );

#endif // !HARMONIZE_2481_EXTEND_SHRINK

            }

            /* extend */
@@ -1056,7 +1062,7 @@ UWord8 apa_exec_ivas_fx( 
#ifndef HARMONIZE_2481_EXTEND_SHRINK

                extend_frm_ivas_fx( ps, frm_in, a_tmp, Q_a_out, &l_frm_out );

#else

                extend_frm_fx( ps, frm_in, a_tmp, Q_a_out, &l_frm_out, (Word16) 0 );

                extend_frm_fx( ps, frm_in, a_tmp, Q_a_out, &l_frm_out, leg_flag );

#endif // !HARMONIZE_2481_EXTEND_SHRINK

            }

            /* control the amount/frequency of scaling */