| commit | f05213023e43bc7c6b10a1079eb71c98dc163e9a | [log] [tgz] |
|---|---|---|
| author | Treehugger Robot <treehugger-gerrit@google.com> | Sun Oct 18 22:15:33 2020 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Sun Oct 18 22:15:33 2020 +0000 |
| tree | d538278f5d89f9d6b053f7279ee079d94cfb166b | |
| parent | 97c83ca96fee36775573979cd7377416f497c049 [diff] | |
| parent | be4ad525951bfb15b31dc2462ab7a5d46fac8108 [diff] |
Merge "mp3dec: Add test for mp3 file with error protection data" am: 80cd5274e9 am: 66e1d22ca8 am: 9374db2ec4 am: be4ad52595 Original change: https://android-review.googlesource.com/c/platform/frameworks/av/+/1463122 Change-Id: I9de09219c8b4cf17f6924d1e8fb786259cae04f3
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) {