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

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

Merge "mp3dec: Add test for mp3 file with error protection data" am:... 

Merge "mp3dec: Add test for mp3 file with error protection data" am: 80cd5274 am: 66e1d22c am: 9374db2e am: be4ad525

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

Change-Id: I9de09219c8b4cf17f6924d1e8fb786259cae04f3
parents 97c83ca9 be4ad525

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-1.1.zip?unzip=true"

            key="https://storage.googleapis.com/android_media/frameworks/av/media/libstagefright/mp3dec/test/Mp3DecoderTest-1.2.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
@@ -186,6 +186,7 @@ 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_2ch_44kHz_lame_crc.mp3"),

                                           ("bbb_mp3_stereo_192kbps_48000hz.mp3")));



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