summaryrefslogtreecommitdiffstats
path: root/media/libstagefright/omx
diff options
context:
space:
mode:
authorAndreas Huber <andih@google.com>2011-06-24 13:14:32 -0700
committerAndreas Huber <andih@google.com>2011-06-27 09:26:09 -0700
commit078f12ed36b71a5fa7654b774369090b98cc684c (patch)
tree6511315c11e89bb617f23f712a96fc4260e6a828 /media/libstagefright/omx
parent4ca2c7c913f8bd4ada13aca56d36045d42d1e00f (diff)
downloadframeworks_av-078f12ed36b71a5fa7654b774369090b98cc684c.zip
frameworks_av-078f12ed36b71a5fa7654b774369090b98cc684c.tar.gz
frameworks_av-078f12ed36b71a5fa7654b774369090b98cc684c.tar.bz2
Update paths to test content used to run the omx_tests.
Change-Id: I23201ac1541df032426cb05b9dc872b28882f992
Diffstat (limited to 'media/libstagefright/omx')
-rw-r--r--media/libstagefright/omx/tests/OMXHarness.cpp18
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" },