diff options
| author | Andreas Huber <andih@google.com> | 2011-06-27 11:14:05 -0700 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2011-06-27 11:14:05 -0700 |
| commit | bab4b56c93a3fc26767687bffd5d10c5250b35ea (patch) | |
| tree | a8432dec7a7ff35fbbe74ec3ecda1a1f467081a4 | |
| parent | b1af69b8f91cf71bef79f56faf981f9a77e507b6 (diff) | |
| parent | 078f12ed36b71a5fa7654b774369090b98cc684c (diff) | |
| download | frameworks_av-bab4b56c93a3fc26767687bffd5d10c5250b35ea.zip frameworks_av-bab4b56c93a3fc26767687bffd5d10c5250b35ea.tar.gz frameworks_av-bab4b56c93a3fc26767687bffd5d10c5250b35ea.tar.bz2 | |
Merge "Update paths to test content used to run the omx_tests."
| -rw-r--r-- | media/libstagefright/omx/tests/OMXHarness.cpp | 18 |
1 files changed, 7 insertions, 11 deletions
diff --git a/media/libstagefright/omx/tests/OMXHarness.cpp b/media/libstagefright/omx/tests/OMXHarness.cpp index a404f1f..d4354db 100644 --- a/media/libstagefright/omx/tests/OMXHarness.cpp +++ b/media/libstagefright/omx/tests/OMXHarness.cpp @@ -485,24 +485,20 @@ static const char *GetURLForMime(const char *mime) { }; static const MimeToURL kMimeToURL[] = { { "video/avc", - "file:///sdcard/media_api/video/H264_AAC.3gp" }, - { "video/mp4v-es", "file:///sdcard/media_api/video/gingerkids.MP4" }, + "file:///sdcard/media_api/video/H264_500_AAC_128.3gp" }, + { "video/mp4v-es", "file:///sdcard/media_api/video/MPEG4_320_AAC_64.mp4" }, { "video/3gpp", "file:///sdcard/media_api/video/H263_500_AMRNB_12.3gp" }, { "audio/3gpp", "file:///sdcard/media_api/video/H263_500_AMRNB_12.3gp" }, - { "audio/amr-wb", - "file:///sdcard/media_api/music/" - "AI_AMR-WB_12.65kbps(13kbps)_16khz_mono_NMC.awb" }, + { "audio/amr-wb", NULL }, { "audio/mp4a-latm", - "file:///sdcard/media_api/video/H264_AAC.3gp" }, + "file:///sdcard/media_api/video/H263_56_AAC_24.3gp" }, { "audio/mpeg", - "file:///sdcard/media_api/music/MP3CBR.mp3" }, - { "audio/vorbis", - "file:///sdcard/media_api/metaDataTestMedias/OGG/" - "When You Say Nothing At All.ogg" }, + "file:///sdcard/media_api/music/MP3_48KHz_128kbps_s_1_17_CBR.mp3" }, + { "audio/vorbis", NULL }, { "video/x-vnd.on2.vp8", - "file:///sdcard/media_api/webm/big-buck-bunny_trailer.webm" }, + "file:///sdcard/media_api/video/big-buck-bunny_trailer.webm" }, { MEDIA_MIMETYPE_AUDIO_G711_ALAW, "file:///sdcard/M1F1-Alaw-AFsp.wav" }, { MEDIA_MIMETYPE_AUDIO_G711_MLAW, "file:///sdcard/M1F1-mulaw-AFsp.wav" }, |