Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge change I4b03c2cd into eclair

Browse Source 
* changes:
  Add windows media support check in MediaMetadataTest.java and MediaPlayerApiTest.java
This commit is contained in:
Android (Google) Code Review
2009-11-05 19:15:56 -05:00
parent d94ed3794c b1c85ec47a
commit 1e495da19f
2 changed files with 12 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -23,6 +23,7 @@ import android.test.suitebuilder.annotation.Suppress;
import android.util.Log;
import com.android.mediaframeworktest.MediaNames;
import com.android.mediaframeworktest.MediaProfileReader;
/**
* This metadata test suite test the basic functionality of the
* MediaMetadataRetriever
@@ -31,7 +32,7 @@ import com.android.mediaframeworktest.MediaNames;
public class MediaMetadataTest extends AndroidTestCase {
private static final String TAG = "MediaMetadataTest";
public static enum METADATA_EXPECTEDRESULT{
FILE_PATH,CD_TRACK, ALBUM,
ARTIST, AUTHOR, COMPOSER,
@@ -193,12 +194,17 @@ public class MediaMetadataTest extends AndroidTestCase {
}
private static void validateMetatData(int fileIndex, String meta_data_file[][]) {
Log.v(TAG, "filePath = "+ meta_data_file[fileIndex][0]);
if ((meta_data_file[fileIndex][0].endsWith("wma") && !MediaProfileReader.getWMAEnable()) ||
(meta_data_file[fileIndex][0].endsWith("wmv") && !MediaProfileReader.getWMVEnable())) {
Log.v(TAG, "Skip test since windows media is not supported");
return;
}
String value = null;
MediaMetadataRetriever retriever = new MediaMetadataRetriever();
retriever.setMode(MediaMetadataRetriever.MODE_GET_METADATA_ONLY);
try {
retriever.setDataSource(meta_data_file[fileIndex][0]);
Log.v(TAG, "filePath = "+ meta_data_file[fileIndex][0]);
} catch(Exception e) {
Log.v(TAG, "Failed: "+meta_data_file[fileIndex][0] + " " + e.toString());
//Set the test case failure whenever it failed to setDataSource

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

@@ -242,8 +242,10 @@ public class MediaPlayerApiTest extends ActivityInstrumentationTestCase<MediaFra
@LargeTest
public void testWMA9SetLooping() throws Exception {
boolean isLoop = CodecTest.setLooping(MediaNames.WMA9);
assertTrue("WMA9 setLooping", isLoop);
if (isWMAEnable) {
boolean isLoop = CodecTest.setLooping(MediaNames.WMA9);
assertTrue("WMA9 setLooping", isLoop);
}
}
@LargeTest