| commit | be4ad525951bfb15b31dc2462ab7a5d46fac8108 | [log] [tgz] |
|---|---|---|
| author | Treehugger Robot <treehugger-gerrit@google.com> | Sun Oct 18 21:55:51 2020 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Sun Oct 18 21:55:51 2020 +0000 |
| tree | e3ad3e6e2b18b17391c358a453003f85ba42987e | |
| parent | 49b490ffc23a1b236c720520d2aabdf781fbf7a6 [diff] | |
| parent | 9374db2ec483b0668ff5954328c97f96edd3e1a6 [diff] |
Merge "mp3dec: Add test for mp3 file with error protection data" am: 80cd5274e9 am: 66e1d22ca8 am: 9374db2ec4 Original change: https://android-review.googlesource.com/c/platform/frameworks/av/+/1463122 Change-Id: Id681f88f3c6fa8b2efd4e47ce25b58eb163a6a1a
diff --git a/media/libstagefright/codecs/mp3dec/test/AndroidTest.xml b/media/libstagefright/codecs/mp3dec/test/AndroidTest.xml index 233f9bb..29952eb 100644 --- a/media/libstagefright/codecs/mp3dec/test/AndroidTest.xml +++ b/media/libstagefright/codecs/mp3dec/test/AndroidTest.xml
@@ -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>
diff --git a/media/libstagefright/codecs/mp3dec/test/Mp3DecoderTest.cpp b/media/libstagefright/codecs/mp3dec/test/Mp3DecoderTest.cpp index 0784c0c..91326a8 100644 --- a/media/libstagefright/codecs/mp3dec/test/Mp3DecoderTest.cpp +++ b/media/libstagefright/codecs/mp3dec/test/Mp3DecoderTest.cpp
@@ -186,6 +186,7 @@ ::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) {