Merge "Cleaned up the old test cases and test media files." (fd65e00d) · Commits · e / os / android_frameworks_base

media/tests/MediaFrameworkTest/src/com/android/mediaframeworktest/MediaFrameworkTest.java

+0 −57

Original line number	Diff line number	Diff line
		@@ -124,63 +124,6 @@ public class MediaFrameworkTest extends Activity implements SurfaceHolder.Callba
		startActivity(intent);
		}

		@Override public boolean onKeyDown(int keyCode, KeyEvent event) {
		switch (keyCode) {
		case KeyEvent.KEYCODE_0:
		MediaPlayer mp = new MediaPlayer();
		try{
		mp.setDataSource(MediaNames.VIDEO_RTSP3GP);
		Log.v("emily","awb " + testfilepath);
		mp.setDisplay(mSurfaceView.getHolder());
		mp.prepare();
		mp.start();
		}catch (Exception e){}
		break;

		//start the music player intent with the test URL from PV
		case KeyEvent.KEYCODE_1:
		startPlayback(MediaNames.STREAM_MP3_1);
		break;

		case KeyEvent.KEYCODE_2:
		startPlayback(MediaNames.STREAM_MP3_2);
		break;

		case KeyEvent.KEYCODE_3:
		startPlayback(MediaNames.STREAM_MP3_3);
		break;

		case KeyEvent.KEYCODE_4:
		startPlayback(MediaNames.STREAM_MP3_4);
		break;

		case KeyEvent.KEYCODE_5:
		startPlayback(MediaNames.STREAM_MP3_5);
		break;

		case KeyEvent.KEYCODE_6:
		startPlayback(MediaNames.STREAM_MP3_6);
		break;

		case KeyEvent.KEYCODE_7:
		startPlayback(MediaNames.STREAM_MP3_7);
		break;

		case KeyEvent.KEYCODE_8:
		startPlayback(MediaNames.STREAM_MP3_8);
		break;

		case KeyEvent.KEYCODE_9:
		startPlayback(MediaNames.STREAM_MP3_9);
		break;



		}
		return super.onKeyDown(keyCode, event);

		}

		public static boolean checkStreamingServer() throws Exception {
		InetAddress address = InetAddress.getByAddress(MediaNames.STREAM_SERVER);
		return address.isReachable(10000);

media/tests/MediaFrameworkTest/src/com/android/mediaframeworktest/MediaNames.java

+5 −272

Original line number	Diff line number	Diff line
		@@ -51,18 +51,8 @@ public class MediaNames {
		public static final long WAIT_TIME = 2000;
		public static final long WAIT_SNAPSHOT_TIME = 5000;

		//Streaming Video
		public static final String VIDEO_HTTP3GP = "http://pvs.pv.com/jj/lipsync0.3gp";
		public static final String VIDEO_RTSP3GP = "rtsp://63.241.31.203/public/jj/md.3gp";
		public static final String VIDEO_RTSP3GP2 = "rtsp://pvs.pv.com/public/live_dvd1.3gp";
		public static final String VIDEO_RTSP3GP3 =
		"rtsp://ehug.rtsp-youtube.l.google.com/" +
		"Ci4LENy73wIaJQmeRVCJq4HuQBMYDSANFEIJbXYtZ29vZ2xlSARSB2RldGFpbHMM/0/0/0/video.3gp";
		//public static final String VIDEO_RTSP3GP = "rtsp://193.159.241.21/sp/alizee05.3gp";

		//local video
		public static final String VIDEO_MP4 = "/sdcard/media_api/video/MPEG4_320_AAC_64.mp4";
		public static final String VIDEO_LONG_3GP = "/sdcard/media_api/video/radiohead.3gp";
		public static final String VIDEO_SHORT_3GP = "/sdcard/media_api/video/short.3gp";
		public static final String VIDEO_LARGE_SIZE_3GP = "/sdcard/media_api/video/border_large.3gp";
		public static final String VIDEO_H263_AAC = "/sdcard/media_api/video/H263_56_AAC_24.3gp";
		@@ -73,202 +63,6 @@ public class MediaNames {
		public static final String VIDEO_HIGHRES_H263 = "/sdcard/media_api/video/H263_500_AMRNB_12.3gp";
		public static final String VIDEO_HIGHRES_MP4 = "/sdcard/media_api/video/H264_500_AAC_128.3gp";

		//ringtone
		public static final String ringtone = "/sdcard/media_api/ringtones/F1_NewVoicemail.mp3";

		//streaming mp3
		public static final String STREAM_MP3_1 =
		"http://wms.pv.com:7070/MediaDownloadContent/mp3/chadthi_jawani_128kbps.mp3";
		public static final String STREAM_MP3_2 =
		"http://wms.pv.com:7070/MediaDownloadContent/mp3/dualStereo.mp3";
		public static final String STREAM_MP3_3 =
		"http://wms.pv.com:7070/mediadownloadcontent/UserUploads/15%20Keep%20Holding%20On.mp3";
		public static final String STREAM_MP3_4 =
		"http://wms.pv.com:7070/mediadownloadcontent/UserUploads/1%20-%20Apologize.mp3";
		public static final String STREAM_MP3_5 =
		"http://wms.pv.com:7070/mediadownloadcontent/UserUploads/" +
		"03%20You're%20Gonna%20Miss%20This.mp3";
		public static final String STREAM_MP3_6 =
		"http://wms.pv.com:7070/mediadownloadcontent/UserUploads" +
		"/02%20Looney%20Tunes%20%C3%82%C2%B7%20Light%20Cavalry%20Overture%20(LP%20Version).mp3";
		public static final String STREAM_MP3_7 =
		"http://wms.pv.com:7070/mediadownloadcontent/UserUploads" +
		"/01%20Love%20Song%20(Album%20Version).mp3";
		public static final String STREAM_MP3_8 =
		"http://wms.pv.com:7070/MediaDownloadContent/UserUploads/1%20-%20Apologize.mp3";
		public static final String STREAM_MP3_9 =
		"http://wms.pv.com:7070/MediaDownloadContent/UserUploads" +
		"/1%20-%20Smile%20(Explicit%20Version).mp3";
		public static final String STREAM_MP3_10 =
		"http://wms.pv.com:7070/MediaDownloadContent/UserUploads/beefcake.mp3";

		//Sonivox
		public static String MIDIFILES[] = {
		"/sdcard/media_api/music/Leadsol.mxmf",
		"/sdcard/media_api/music/abba.imy", "/sdcard/media_api/music/ants.mid",
		"/sdcard/media_api/music/greensleeves.rtttl", "/sdcard/media_api/music/test.ota"};

		//Performance measurement
		public static String[] WAVFILES = {
		"/sdcard/media_api/music_perf/WAV/M1F1-AlawWE-AFsp.wav",
		"/sdcard/media_api/music_perf/WAV/M1F1-float64-AFsp.wav",
		"/sdcard/media_api/music_perf/WAV/song.wav",
		"/sdcard/media_api/music_perf/WAV/WAVEtest.wav",
		"/sdcard/media_api/music_perf/WAV/WAVEtest_out.wav",
		"/sdcard/media_api/music_perf/WAV/test_out.wav"};

		public static String[] AMRNBFILES = {
		"/sdcard/media_api/music_perf/AMR/AI_AMR-NB_5.9kbps_6.24kbps_8khz_mono_NMC.amr",
		"/sdcard/media_api/music_perf/AMR/AI_AMR-NB_5.15kbps_5.46kbps_8khz_mono_NMC.amr",
		"/sdcard/media_api/music_perf/AMR/AI_AMR-NB_7.4kbps_7.80kbps_8khz_mono_NMC.amr",
		"/sdcard/media_api/music_perf/AMR/AI_AMR-NB_7.95kbps_9.6kbps_8khz_mono_NMC.amr",
		"/sdcard/media_api/music_perf/AMR/AI_AMR-NB_10.2kbps_10.48kbps_8khz_mono_NMC.amr"};

		public static String[] AMRWBFILES = {
		"/sdcard/media_api/music_perf/AMRWB/NIN_AMR-WB_15.85kbps_16kbps.amr",
		"/sdcard/media_api/music_perf/AMRWB/NIN_AMR-WB_18.25kbps_18kbps.amr",
		"/sdcard/media_api/music_perf/AMRWB/NIN_AMR-WB_19.85kbps_20kbps.amr",
		"/sdcard/media_api/music_perf/AMRWB/NIN_AMR-WB_23.05kbps_23kbps.amr",
		"/sdcard/media_api/music_perf/AMRWB/NIN_AMR-WB_23.85kbps_24kbps.amr",
		"/sdcard/media_api/music_perf/AMRWB/PD_AMR-WB_19.85kbps_20kbps.amr",
		"/sdcard/media_api/music_perf/AMRWB/PD_AMR-WB_23.05kbps_23kbps.amr",
		"/sdcard/media_api/music_perf/AMRWB/PD_AMR-WB_23.85kbps_24kbps.amr",
		"/sdcard/media_api/music_perf/AMRWB/WC_AMR-WB_23.05kbps_23kbps.amr",
		"/sdcard/media_api/music_perf/AMRWB/WC_AMR-WB_23.85kbps_24kbps.amr", };

		public static String[] MP3FILES = {
		"/sdcard/media_api/music_perf/MP3/NIN_56kbps_32khz_stereo_VBR_MCA.MP3",
		"/sdcard/media_api/music_perf/MP3/NIN_80kbps_32khz_stereo_VBR_MCA.mp3",
		"/sdcard/media_api/music_perf/MP3/NIN_80kbps_44.1khz_stereo_VBR_MCA.mp3",
		"/sdcard/media_api/music_perf/MP3/NIN_80kbps_48khz_stereo_VBR_MCA.mp3",
		"/sdcard/media_api/music_perf/MP3/NIN_112kbps_32khz_stereo_VBR_MCA.mp3",
		"/sdcard/media_api/music_perf/MP3/NIN_112kbps_44.1khz_stereo_VBR_MCA.mp3",
		"/sdcard/media_api/music_perf/MP3/NIN_112kbps_48khz_stereo_VBR_MCA.mp3",
		"/sdcard/media_api/music_perf/MP3/NIN_192kbps_32khz_mono_CBR_MCA.mp3",
		"/sdcard/media_api/music_perf/MP3/NIN_192kbps_44.1khz_mono_CBR_MCA.mp3",
		"/sdcard/media_api/music_perf/MP3/NIN_192kbps_48khz_mono_CBR_MCA.mp3",
		"/sdcard/media_api/music_perf/MP3/NIN_256kbps_44.1khz_mono_CBR_MCA.mp3",
		"/sdcard/media_api/music_perf/MP3/NIN_256kbps_48khz_mono_CBR_MCA.mp3",
		"/sdcard/media_api/music_perf/MP3/PD_112kbps_32khz_stereo_VBR_MCA.mp3",
		"/sdcard/media_api/music_perf/MP3/PD_112kbps_44.1khz_stereo_VBR_MCA.mp3",
		"/sdcard/media_api/music_perf/MP3/PD_112kbps_48khz_stereo_VBR_MCA.mp3",
		"/sdcard/media_api/music_perf/MP3/PD_192kbps_32khz_mono_CBR_DPA.mp3",
		"/sdcard/media_api/music_perf/MP3/PD_256kbps_44.1khz_mono_CBR_DPA.mp3",
		"/sdcard/media_api/music_perf/MP3/PD_256kbps_48khz_mono_CBR_MCA.mp3",
		"/sdcard/media_api/music_perf/MP3/WC_256kbps_44.1khz_mono_CBR_DPA.mp3",
		"/sdcard/media_api/music_perf/MP3/WC_256kbps_48khz_mono_CBR_DPA.mp3",
		"/sdcard/media_api/music_perf/regular_album_photo/Apologize.mp3",
		"/sdcard/media_api/music_perf/regular_album_photo/Because_Of_You.mp3",
		"/sdcard/media_api/music_perf/regular_album_photo/Complicated.mp3",
		"/sdcard/media_api/music_perf/regular_album_photo/Glamorous.mp3",
		"/sdcard/media_api/music_perf/regular_album_photo/Im_With_You.mp3",
		"/sdcard/media_api/music_perf/regular_album_photo/Smile.mp3",
		"/sdcard/media_api/music_perf/regular_album_photo/Suddenly_I_See.mp3",
		"/sdcard/media_api/music_perf/regular_album_photo/When You Say Nothing At All.mp3",
		"/sdcard/media_api/music_perf/regular_album_photo/my_happy_ending.mp3"};

		public static String[] AACFILES = {
		"/sdcard/media_api/music_perf/AAC/AI_AAC_24kbps_12khz_Mono_1pCBR_SSE.mp4",
		"/sdcard/media_api/music_perf/AAC/AI_AAC_56kbps_22.05khz_Stereo_1pCBR_SSE.mp4",
		"/sdcard/media_api/music_perf/AAC/AI_AAC_56kbps_32khz_Stereo_CBR_SSE.mp4",
		"/sdcard/media_api/music_perf/AAC/AI_AAC_56kbps_44.1khz_Stereo_1pCBR_SSE.mp4",
		"/sdcard/media_api/music_perf/AAC/AI_AAC_80kbps_32khz_Stereo_1pCBR_SSE.mp4",
		"/sdcard/media_api/music_perf/AAC/AI_AAC_80kbps_32khz_Stereo_CBR_SSE.mp4",
		"/sdcard/media_api/music_perf/AAC/NIN_AAC_56kbps_22.05khz_Stereo_1pCBR_SSE.mp4",
		"/sdcard/media_api/music_perf/AAC/NIN_AAC_56kbps_32khz_Stereo_CBR_SSE.mp4",
		"/sdcard/media_api/music_perf/AAC/NIN_AAC_56kbps_44.1khz_Stereo_1pCBR_SSE.mp4",
		"/sdcard/media_api/music_perf/AAC/NIN_AAC_80kbps_32khz_Stereo_1pCBR_SSE.mp4",
		"/sdcard/media_api/music_perf/AAC/NIN_AAC_80kbps_32khz_Stereo_CBR_SSE.mp4",
		"/sdcard/media_api/music_perf/AAC/PD_AAC_56kbps_22.05khz_Stereo_1pCBR_SSE.mp4",
		"/sdcard/media_api/music_perf/AAC/PD_AAC_56kbps_32khz_Stereo_CBR_SSE.mp4",
		"/sdcard/media_api/music_perf/AAC/PD_AAC_56kbps_44.1khz_Stereo_1pCBR_SSE.mp4",
		"/sdcard/media_api/music_perf/AAC/PD_AAC_80kbps_32khz_Stereo_1pCBR_SSE.mp4",
		"/sdcard/media_api/music_perf/AAC/PD_AAC_80kbps_32khz_Stereo_CBR_SSE.mp4",
		"/sdcard/media_api/music_perf/AAC/PV_AAC_56kbps_22.05khz_Stereo_1pCBR_SSE.mp4",
		"/sdcard/media_api/music_perf/AAC/PV_AAC_56kbps_32khz_Stereo_CBR_SSE.mp4",
		"/sdcard/media_api/music_perf/AAC/PV_AAC_56kbps_44.1khz_Stereo_1pCBR_SSE.mp4",
		"/sdcard/media_api/music_perf/AAC/PV_AAC_80kbps_32khz_Stereo_1pCBR_SSE.mp4",
		"/sdcard/media_api/music_perf/AAC/PV_AAC_80kbps_32khz_Stereo_CBR_SSE.mp4",
		"/sdcard/media_api/music_perf/AAC/WC_AAC_56kbps_22.05khz_Stereo_1pCBR_SSE.mp4",
		"/sdcard/media_api/music_perf/AAC/WC_AAC_56kbps_32khz_Stereo_CBR_SSE.mp4",
		"/sdcard/media_api/music_perf/AAC/WC_AAC_56kbps_44.1khz_Stereo_1pCBR_SSE.mp4",
		"/sdcard/media_api/music_perf/AAC/WC_AAC_80kbps_32khz_Stereo_1pCBR_SSE.mp4",
		"/sdcard/media_api/music_perf/AAC/WC_AAC_80kbps_32khz_Stereo_CBR_SSE.mp4",
		};

		public static String[] VIDEOFILES = { "/sdcard/media_api/video_perf/AI_CTO_Mpeg4_32kbps_10fps_SQCIF_128x96+AAC_8kbps_8khz_mono_QTE.mp4",
		"/sdcard/media_api/video_perf/AI_CTO_Mpeg4_32kbps_12fps_SQCIF_128x96+AAC_8kbps_8khz_mono_QTE.mp4",
		"/sdcard/media_api/video_perf/AI_CTO_Mpeg4_32kbps_15fps_SQCIF_128x96+AAC_8kbps_8khz_mono_QTE.mp4",
		"/sdcard/media_api/video_perf/AI_CTO_Mpeg4_32kbps_5fps_SQCIF_128x96+AAC_8kbps_8khz_mono_QTE.mp4",
		"/sdcard/media_api/video_perf/AI_CTO_Mpeg4_32kbps_5fps_SQCIF_128x96+AAC_8kbps_8khz_mono_SSE.mp4",
		"/sdcard/media_api/video_perf/AI_CTO_Mpeg4_32kbps_7.5fps_SQCIF_128x96+AAC_8kbps_8khz_mono_QTE.mp4",
		"/sdcard/media_api/video_perf/AI_WMV_1024kbps_20fps_QCIF_176x144_noaudio_SSE.wmv",
		"/sdcard/media_api/video_perf/AI_WMV_1024kbps_25fps_QCIF_176x144_noaudio_SSE.wmv",
		"/sdcard/media_api/video_perf/Chicken.wmv",
		"/sdcard/media_api/video_perf/MP_qcif_15fps_100kbps_48kHz_192kbps_30secs.wmv",
		"/sdcard/media_api/video_perf/NIN_CTO_H264_123kbps_5fps_QCIF_176x144+AMR_12.2kbps_8khz_mono_QTE.3gp",
		"/sdcard/media_api/video_perf/NIN_CTO_H264_96kbps_10.2fps_QCIF_176x144+AMR_12.2kbps_8khz_mono_QTE.3gp",
		"/sdcard/media_api/video_perf/NIN_CTO_H264_96kbps_12fps_QCIF_176x144+AMR_12.2kbps_8khz_mono_QTE.3gp",
		"/sdcard/media_api/video_perf/NIN_CTO_H264_96kbps_15fps_QCIF_176x144+AMR_12.2kbps_8khz_mono_QTE.3gp",
		"/sdcard/media_api/video_perf/NIN_CTO_Mpeg4_123kbps_15fps_QCIF_176x144+AAC_32kbps_22khz_mono_SSE.3gp",
		"/sdcard/media_api/video_perf/NIN_CTO_Mpeg4_123kbps_7.5fps_QCIF_176x144+AAC_32kbps_22khz_stereo_SSE.3gp",
		"/sdcard/media_api/video_perf/NIN_CTO_Mpeg4_128kbps_10fps_QCIF_176x144+AAC+_32kbps_48khz_stereo_SSE.3gp",
		"/sdcard/media_api/video_perf/NIN_CTO_Mpeg4_128kbps_12fps_QCIF_176x144+AAC+_32kbps_48khz_stereo_SSE.3gp",
		"/sdcard/media_api/video_perf/NIN_CTO_Mpeg4_128kbps_15fps_QCIF_176x144+AAC+_32kbps_48khz_stereo_SSE.3gp",
		"/sdcard/media_api/video_perf/NIN_CTO_Mpeg4_128kbps_5fps_QCIF_176x144+AAC+_32kbps_48khz_stereo_SSE.3gp",
		"/sdcard/media_api/video_perf/NIN_CTO_Mpeg4_128kbps_7.5fps_QCIF_176x144+AAC+_32kbps_48khz_stereo_SSE.3gp",
		"/sdcard/media_api/video_perf/NIN_H263_128kbps_10fps_QCIF_174x144_noaudio_SSE.mp4",
		"/sdcard/media_api/video_perf/NIN_H263_128kbps_15fps_QCIF_174x144_noaudio_SSE.mp4",
		"/sdcard/media_api/video_perf/NIN_H263_48kbps_10fps_QCIF_174x144_noaudio_SSE.3gp",
		"/sdcard/media_api/video_perf/NIN_H263_48kbps_12fps_QCIF_174x144_noaudio_SSE.3gp",
		"/sdcard/media_api/video_perf/NIN_H264_123kbps_15fps_QCIF_176x144+AAC_32kbps_22khz_stereo_SSE.3gp",
		"/sdcard/media_api/video_perf/NIN_H264_123kbps_7.5fps_QCIF_176x144+AAC_32kbps_22khz_stereo_SSE.3gp",
		"/sdcard/media_api/video_perf/PV_H264_2000kbps_20fps_CIF_352x288+AAC_96kbps_48khz_stereo_SSE.mp4",
		"/sdcard/media_api/video_perf/PV_H264_2000kbps_25fps_CIF_352x288+AAC_96kbps_48khz_stereo_SSE.mp4",
		"/sdcard/media_api/video_perf/PV_H264_2000kbps_30fps_CIF_352x288+AAC_128kbps_48khz_stereo_SSE.mp4",
		"/sdcard/media_api/video_perf/Stevie-1.wmv",
		"/sdcard/media_api/video_perf/WC_H264_1600kbps_20fps_QCIF_176x144+AAC_96kbps_48khz_mono_SSE.mp4",
		"/sdcard/media_api/video_perf/WC_H264_1600kbps_25fps_QCIF_176x144+AAC_96kbps_48khz_mono_SSE.mp4",
		"/sdcard/media_api/video_perf/WC_H264_1600kbps_30fps_QCIF_176x144+AAC_96kbps_48khz_mono_SSE.mp4",
		"/sdcard/media_api/video_perf/bugs.wmv",
		"/sdcard/media_api/video_perf/niceday.wmv",
		"/sdcard/media_api/video_perf/eaglesatopnflpe.wmv",

		};

		//wma - only support up to wma 9
		public static String[] WMASUPPORTED = {
		"/sdcard/media_api/music_perf/WMASUPPORTED/AI_WMA9.2_32kbps_44.1khz_mono_CBR_DPA.wma",
		"/sdcard/media_api/music_perf/WMASUPPORTED/AI_WMA9.2_48kbps_44.1khz_mono_CBR_DPA.wma",
		"/sdcard/media_api/music_perf/WMASUPPORTED/NIN_WMA9.2_32kbps_44.1khz_mono_CBR_DPA.wma",
		"/sdcard/media_api/music_perf/WMASUPPORTED/NIN_WMA9.2_48kbps_44.1khz_mono_CBR_DPA.wma",
		"/sdcard/media_api/music_perf/WMASUPPORTED/PD_WMA9.2_32kbps_44.1khz_mono_CBR_DPA.wma",
		"/sdcard/media_api/music_perf/WMASUPPORTED/PD_WMA9.2_48kbps_44.1khz_mono_CBR_DPA.wma",
		"/sdcard/media_api/music_perf/WMASUPPORTED/PV_WMA9.2_32kbps_44.1khz_mono_CBR_DPA.wma",
		"/sdcard/media_api/music_perf/WMASUPPORTED/PV_WMA9.2_48kbps_44.1khz_mono_CBR_DPA.wma",
		"/sdcard/media_api/music_perf/WMASUPPORTED/WC_WMA9.2_32kbps_44.1khz_mono_CBR_DPA.wma",
		"/sdcard/media_api/music_perf/WMASUPPORTED/WC_WMA9.2_48kbps_44.1khz_mono_CBR_DPA.wma"

		};

		public static String[] WMAUNSUPPORTED = {
		"/sdcard/media_api/music_perf/WMAUNSUPPORTED/AI_WMA10_127kbps_48khz_stereo_CBR_DPA.wma",
		"/sdcard/media_api/music_perf/WMAUNSUPPORTED/AI_WMA10_128kbps_44.1khz_stereo_2pVBR_DPA.wma",
		"/sdcard/media_api/music_perf/WMAUNSUPPORTED/AI_WMA10_128kbps_48khz_stereo_2pVBR_DPA.wma",
		"/sdcard/media_api/music_perf/WMAUNSUPPORTED/AI_WMA10_128kbps_88khz_stereo_CBR_DPA.wma",
		"/sdcard/media_api/music_perf/WMAUNSUPPORTED/AI_WMA10_128kbps_96khz_stereo_CBR_DPA.wma",
		"/sdcard/media_api/music_perf/WMAUNSUPPORTED/AI_WMA10_192kbps_44.1khz_stereo_2pVBR_DPA.wma",
		"/sdcard/media_api/music_perf/WMAUNSUPPORTED/AI_WMA10_192kbps_88khz_stereo_CBR_DPA.wma",
		"/sdcard/media_api/music_perf/WMAUNSUPPORTED/AI_WMA10_192kbps_96khz_stereo_CBR_DPA.wma",
		"/sdcard/media_api/music_perf/WMAUNSUPPORTED/AI_WMA10_256kbps_44khz_stereo_CBR_DPA.wma",
		"/sdcard/media_api/music_perf/WMAUNSUPPORTED/AI_WMA10_256kbps_48khz_stereo_CBR_DPA.wma",
		"/sdcard/media_api/music_perf/WMAUNSUPPORTED/AI_WMA10_256kbps_88khz_stereo_CBR_DPA.wma",
		"/sdcard/media_api/music_perf/WMAUNSUPPORTED/AI_WMA10_256kbps_96khz_stereo_CBR_DPA.wma",
		"/sdcard/media_api/music_perf/WMAUNSUPPORTED/AI_WMA10_384kbps_44khz_stereo_CBR_DPA.wma",
		"/sdcard/media_api/music_perf/WMAUNSUPPORTED/AI_WMA10_384kbps_48khz_stereo_CBR_DPA.wma",
		"/sdcard/media_api/music_perf/WMAUNSUPPORTED/AI_WMA10_384kbps_88khz_stereo_CBR_DPA.wma"
		};

		//Media Recorder
		public static final String RECORDER_OUTPUT = "/sdcard/media_api/recorderOutput.amr";

		@@ -405,52 +199,6 @@ public class MediaNames {
		null, null, null, null, null, null, "295", "1", null}
		};

		public static final String META_DATA_OTHERS [][] = {
		{"/sdcard/media_api/metaDataTestMedias/3GP/cat.3gp", null, null, null,
		null, null, "20080309T002415.000Z", null,
		null, null, "63916", "2", null},
		{"/sdcard/media_api/metaDataTestMedias/AMR/AMR_NB.amr", null, null, null,
		null, null, null, null,
		null, null, "126540", "1", null},
		{"/sdcard/media_api/metaDataTestMedias/AMRWB/AMR_WB.amr", null, null, null,
		null, null, null, null,
		null, null, "231180", "1", null},
		{"/sdcard/media_api/metaDataTestMedias/M4A/Jaws Of Life_ver1.m4a", "1/8", "Suspended Animation",
		"John Petrucci", null, null, "20070510T125223.000Z",
		"12", "Jaws Of Life", "2005", "449329", "1", "m4a composer"},
		{"/sdcard/media_api/metaDataTestMedias/M4V/sample_iPod.m4v", null, null,
		null, null, null, "20051220T202015.000Z",
		null, null, null, "85500", "2", null},
		{"/sdcard/media_api/metaDataTestMedias/MIDI/MIDI.mid", null, "Suspended Animation",
		"John Petrucci", null, null, "20070510T125223.000Z",
		null, null, "2005", "231180", "1", null},
		{"/sdcard/media_api/metaDataTestMedias/MP4/kung_fu_panda_h264.mp4", "2/0", "mp4 album Kung Fu Panda",
		"mp4 artist Kung Fu Panda", null, null, "20080517T091451.000Z",
		"40", "Kung Fu Panda", "2008", "128521", "2", "mp4 composer"},
		{"/sdcard/media_api/metaDataTestMedias/OGG/Ring_Classic_02.ogg", null, "Suspended Animation",
		"John Petrucci", null, null, "20070510T125223.000Z",
		null, null, "2005", "231180", "1", null},
		{"/sdcard/media_api/metaDataTestMedias/OGG/When You Say Nothing At All.ogg",
		null, "Suspended Animation", "John Petrucci",
		null, null, "20070510T125223.000Z", null, null, "2005", "231180", "1", null},
		{"/sdcard/media_api/metaDataTestMedias/WAV/Im With You.wav", null, null,
		null, null, null, null,
		null, null, null, "224000", "1", null},
		{"/sdcard/media_api/metaDataTestMedias/WMA/WMA9.wma", "6", "Ten Songs in the Key of Betrayal",
		"Alien Crime Syndicate", "Alien Crime Syndicate",
		"wma 9 Composer", "20040521T175729.483Z",
		"Rock", "Run for the Money", "2004", "134479", "1", null},
		{"/sdcard/media_api/metaDataTestMedias/WMA/WMA10.wma", "09", "wma 10 Album",
		"wma 10 Album Artist", "wma 10 Artist", "wma 10 Composer", "20070705T063625.097Z",
		"Acid Jazz", "wma 10 Title", "2010", "126574", "1", null},
		{"/sdcard/media_api/metaDataTestMedias/WMV/bugs.wmv", "8", "wmv 9 Album",
		null, "wmv 9 Artist ", null, "20051122T155247.540Z",
		null, "Looney Tunes - Hare-Breadth Hurry", "2005", "193482", "2", null},
		{"/sdcard/media_api/metaDataTestMedias/WMV/clips_ver7.wmv", "50", "wmv 7 Album",
		null, "Hallau Shoots & Company", null, "20020226T170045.891Z",
		null, "CODEC Shootout", "1986", "43709", "2", null}
		};

		//output recorded video

		public static final String RECORDED_HVGA_H263 = "/sdcard/HVGA_H263.3gp";
		@@ -475,21 +223,6 @@ public class MediaNames {
		public static final long RECORDED_TIME = 5000;
		public static final long VALID_VIDEO_DURATION = 2000;

		//Videos for the mediaplayer stress test
		public static String[] H263_STRESS = {
		"/sdcard/media_api/video_stress/h263/H263_CIF.3gp",
		"/sdcard/media_api/video_stress/h263/H263_QCIF.3gp",
		"/sdcard/media_api/video_stress/h263/H263_QVGA.3gp",
		"/sdcard/media_api/video_stress/h263/H263_SQVGA.3gp"
		};

		public static String[] MPEG4_STRESS = {
		"/sdcard/media_api/video_stress/h263/mpeg4_CIF.mp4",
		"/sdcard/media_api/video_stress/h263/mpeg4_QCIF.3gp",
		"/sdcard/media_api/video_stress/h263/mpeg4_QVGA.3gp",
		"/sdcard/media_api/video_stress/h263/mpeg4_SQVGA.mp4"
		};

		//Streaming test files
		public static final byte [] STREAM_SERVER = new byte[] {(byte)75,(byte)17,(byte)48,(byte)204};
		public static final String STREAM_H264_480_360_1411k =

media/tests/MediaFrameworkTest/src/com/android/mediaframeworktest/functional/MediaMetadataTest.java

+0 −83

File changed.

Preview size limit exceeded, changes collapsed.

media/tests/MediaFrameworkTest/src/com/android/mediaframeworktest/functional/MediaPlayerApiTest.java

+1 −7

Original line number	Diff line number	Diff line
		@@ -370,12 +370,6 @@ public class MediaPlayerApiTest extends ActivityInstrumentationTestCase<MediaFra
		assertTrue("Local MP4 SeekTo", isSeek);
		}

		@LargeTest
		public void testVideoLong3gpSeekTo() throws Exception {
		boolean isSeek = CodecTest.videoSeekTo(MediaNames.VIDEO_LONG_3GP);
		assertTrue("Local 3gp SeekTo", isSeek);
		}

		@LargeTest
		public void testVideoH263AACSeekTo() throws Exception {
		boolean isSeek = CodecTest.videoSeekTo(MediaNames.VIDEO_H263_AAC);

media/tests/MediaFrameworkTest/src/com/android/mediaframeworktest/performance/MediaPlayerPerformance.java

+0 −110

File changed.

Preview size limit exceeded, changes collapsed.