Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 7c8053cf authored by Marco Nelissen's avatar Marco Nelissen Committed by android-build-merger
Browse files

Merge "Revert "Disable integer sanitization for amrwbenc"" 

am: d86e4cb4

* commit 'd86e4cb4':
  Revert "Disable integer sanitization for amrwbenc"
parents eb31ad3a d86e4cb4

media/libstagefright/codecs/amrwbenc/Android.mk

+2 −2
Original line number Diff line number Diff line
@@ -102,7 +102,7 @@ LOCAL_C_INCLUDES := \ 


LOCAL_CFLAGS += -Werror

LOCAL_CLANG := true

#LOCAL_SANITIZE := signed-integer-overflow

LOCAL_SANITIZE := signed-integer-overflow



include $(BUILD_STATIC_LIBRARY)
@@ -120,7 +120,7 @@ LOCAL_C_INCLUDES := \ 


LOCAL_CFLAGS += -Werror

LOCAL_CLANG := true

#LOCAL_SANITIZE := signed-integer-overflow

LOCAL_SANITIZE := signed-integer-overflow



LOCAL_STATIC_LIBRARIES := \

        libstagefright_amrwbenc

media/libstagefright/codecs/amrwbenc/src/c4t64fx.c

+2 −2
Original line number Diff line number Diff line
@@ -1014,8 +1014,8 @@ void search_ixiy( 
            {

                ps2 = add1(ps1, dn[y]);



                alp2 = alp1 + ((*p1++)<<13);

                alp2 = alp2 + ((*p2++)<<14);

                alp2 = L_add(alp1, ((*p1++)<<13));

                alp2 = L_add(alp2, ((*p2++)<<14));

                alp_16 = extract_h(alp2);

                sq = vo_mult(ps2, ps2);

                s = vo_L_mult(alpk, sq) - ((sqk * alp_16)<<1);