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

Commit 029d0c39 authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "mp3dec: Disable integer overflow errors in dct_6 and mdct_6" am: 75c2179c 

Original change: https://android-review.googlesource.com/c/platform/frameworks/av/+/1425609

Change-Id: Ic5b613fa2c3f8b0ede3abb56380199ea9ab9c8db
parents 4cbbdf65 75c2179c

media/libstagefright/codecs/mp3dec/src/pvmp3_dct_6.cpp

+1 −0
Original line number Diff line number Diff line
@@ -111,6 +111,7 @@ Returns 
; FUNCTION CODE

----------------------------------------------------------------------------*/



__attribute__((no_sanitize("integer")))

void pvmp3_dct_6(int32 vec[])

{

media/libstagefright/codecs/mp3dec/src/pvmp3_mdct_6.cpp

+1 −1
Original line number Diff line number Diff line
@@ -118,7 +118,7 @@ const int32 cosTerms_1_ov_cos_phi_N6[6] = 
; FUNCTION CODE

----------------------------------------------------------------------------*/





__attribute__((no_sanitize("integer")))

void pvmp3_mdct_6(int32 vec[], int32 *history)

{

    int32 i;

media/libstagefright/codecs/mp3dec/test/AndroidTest.xml

+1 −1
Original line number Diff line number Diff line
@@ -19,7 +19,7 @@ 
        <option name="cleanup" value="true" />

        <option name="push" value="Mp3DecoderTest->/data/local/tmp/Mp3DecoderTest" />

        <option name="push-file"

            key="https://storage.googleapis.com/android_media/frameworks/av/media/libstagefright/mp3dec/test/Mp3DecoderTest.zip?unzip=true"

            key="https://storage.googleapis.com/android_media/frameworks/av/media/libstagefright/mp3dec/test/Mp3DecoderTest-1.1.zip?unzip=true"

            value="/data/local/tmp/Mp3DecoderTestRes/" />

    </target_preparer>

media/libstagefright/codecs/mp3dec/test/Mp3DecoderTest.cpp

+1 −0
Original line number Diff line number Diff line
@@ -185,6 +185,7 @@ TEST_P(Mp3DecoderTest, ResetDecoderTest) { 
INSTANTIATE_TEST_SUITE_P(Mp3DecoderTestAll, Mp3DecoderTest,

                         ::testing::Values(("bbb_44100hz_2ch_128kbps_mp3_30sec.mp3"),

                                           ("bbb_44100hz_2ch_128kbps_mp3_5mins.mp3"),

                                           ("bug_136053885.mp3"),

                                           ("bbb_mp3_stereo_192kbps_48000hz.mp3")));



int main(int argc, char **argv) {