Commit e7cbc0ea authored by sagnowski's avatar sagnowski
Browse files

Improve naming consistency (shr_r_o -> shr_ro)

parent 22063f41

basic_op/basop32.c

+2 −2
Original line number Diff line number Diff line
@@ -1882,7 +1882,7 @@ Word32 L_shr (Word32 L_var1, Word16 var2) { 
 |___________________________________________________________________________|

*/

#ifdef BASOP_NOGLOB

Word16 shr_r_o (Word16 var1, Word16 var2, Flag* Overflow) {

Word16 shr_ro (Word16 var1, Word16 var2, Flag* Overflow) {

#else

Word16 shr_r (Word16 var1, Word16 var2) {

#endif
@@ -1914,7 +1914,7 @@ Word16 shr_r (Word16 var1, Word16 var2) { 
}

#ifdef BASOP_NOGLOB

Word16 shr_r(Word16 var1, Word16 var2) {

    return shr_r_o(var1, var2, NULL);

    return shr_ro(var1, var2, NULL);

}

#endif /* BASOP_NOGLOB */

basic_op/basop32.h

+1 −1
Original line number Diff line number Diff line
@@ -149,7 +149,7 @@ Word16 add_o (Word16 var1, Word16 var2, Flag * Overflow); 
Word16 sub_o (Word16 var1, Word16 var2, Flag * Overflow);

Word16 shl_o (Word16 var1, Word16 var2, Flag * Overflow);

Word16 shr_o (Word16 var1, Word16 var2, Flag * Overflow);

Word16 shr_r_o(Word16 var1, Word16 var2, Flag* Overflow);

Word16 shr_ro(Word16 var1, Word16 var2, Flag* Overflow);

Word16 mult_o (Word16 var1, Word16 var2, Flag * Overflow);

Word32 L_mult_o (Word16 var1, Word16 var2, Flag * Overflow);

Word16 round_fx_o (Word32 L_var1, Flag * Overflow);

lib_enc/find_uv.c

+1 −1
Original line number Diff line number Diff line
@@ -75,7 +75,7 @@ static Word16 find_ener_decrease_fx( /* o : maximum energy ratio Q10 
    wtmp1 = extract_h(L_shl(maxEnr, exp1));

    wtmp1 = div_s(wtmp1,wtmp0);

#ifdef BASOP_NOGLOB

    dE2 = shr_r_o(wtmp1, add(sub(exp1, exp0),15-10), &Overflow);  /*Q10*/

    dE2 = shr_ro(wtmp1, add(sub(exp1, exp0),15-10), &Overflow);  /*Q10*/

#else

    dE2 = shr_r(wtmp1, add(sub(exp1, exp0),15-10));  /*Q10*/

#endif