diff options
author | Yu Shan Emily Lau <yslau@google.com> | 2009-09-25 11:18:40 -0700 |
---|---|---|
committer | Yu Shan Emily Lau <yslau@google.com> | 2009-09-25 16:01:20 -0700 |
commit | 34831c9330d4f2993ac1d698a7e176c4b8848b48 (patch) | |
tree | 81b6aab7e05a1d89f0ee2d69819dfc042568bb5e /media/tests/MediaFrameworkTest | |
parent | a56e653130f2253edb97fe3a5feb18789c29ec9e (diff) | |
download | frameworks_base-34831c9330d4f2993ac1d698a7e176c4b8848b48.zip frameworks_base-34831c9330d4f2993ac1d698a7e176c4b8848b48.tar.gz frameworks_base-34831c9330d4f2993ac1d698a7e176c4b8848b48.tar.bz2 |
Removed the device type checking
Diffstat (limited to 'media/tests/MediaFrameworkTest')
2 files changed, 39 insertions, 36 deletions
diff --git a/media/tests/MediaFrameworkTest/src/com/android/mediaframeworktest/MediaProfileReader.java b/media/tests/MediaFrameworkTest/src/com/android/mediaframeworktest/MediaProfileReader.java index 53afb1d..717f7ba 100644 --- a/media/tests/MediaFrameworkTest/src/com/android/mediaframeworktest/MediaProfileReader.java +++ b/media/tests/MediaFrameworkTest/src/com/android/mediaframeworktest/MediaProfileReader.java @@ -58,19 +58,21 @@ public class MediaProfileReader { public static void createVideoProfileTable() { // push all the property into one big table String encoderType = getVideoCodecProperty(); - String encoder[] = encoderType.split(","); - for (int i = 0; i < encoder.length; i++) { - for (int j = 0; j < VIDEO_ENCODER_PROPERTY.length; j++) { - String propertyName = MEDIA_ENC_VID + encoder[i] + VIDEO_ENCODER_PROPERTY[j]; - String prop = SystemProperties.get(propertyName); - //push to the table - String propRange[] = prop.split(","); - OUTPUT_FORMAT_TABLE.put((encoder[i] + VIDEO_ENCODER_PROPERTY[j] + "_low"), - Integer.parseInt(propRange[0])); - OUTPUT_FORMAT_TABLE.put((encoder[i] + VIDEO_ENCODER_PROPERTY[j] + "_high"), - Integer.parseInt(propRange[1])); - } + if (encoderType.length() != 0) { + String encoder[] = encoderType.split(","); + for (int i = 0; i < encoder.length; i++) { + for (int j = 0; j < VIDEO_ENCODER_PROPERTY.length; j++) { + String propertyName = MEDIA_ENC_VID + encoder[i] + VIDEO_ENCODER_PROPERTY[j]; + String prop = SystemProperties.get(propertyName); + // push to the table + String propRange[] = prop.split(","); + OUTPUT_FORMAT_TABLE.put((encoder[i] + VIDEO_ENCODER_PROPERTY[j] + "_low"), + Integer.parseInt(propRange[0])); + OUTPUT_FORMAT_TABLE.put((encoder[i] + VIDEO_ENCODER_PROPERTY[j] + "_high"), + Integer.parseInt(propRange[1])); + } + } } } @@ -78,18 +80,19 @@ public class MediaProfileReader { // push all the property into one big table String audioType = getAudioCodecProperty(); String encoder[] = audioType.split(","); - for (int i = 0; i < encoder.length; i++) { - for (int j = 0; j < AUDIO_ENCODER_PROPERTY.length; j++) { - String propertyName = MEDIA_AUD_VID + encoder[i] + AUDIO_ENCODER_PROPERTY[j]; - String prop = SystemProperties.get(propertyName); - //push to the table - String propRange[] = prop.split(","); - OUTPUT_FORMAT_TABLE.put((encoder[i] + AUDIO_ENCODER_PROPERTY[j] + "_low"), - Integer.parseInt(propRange[0])); - OUTPUT_FORMAT_TABLE.put((encoder[i] + AUDIO_ENCODER_PROPERTY[j] + "_high"), - Integer.parseInt(propRange[1])); + if (audioType.length() != 0) { + for (int i = 0; i < encoder.length; i++) { + for (int j = 0; j < AUDIO_ENCODER_PROPERTY.length; j++) { + String propertyName = MEDIA_AUD_VID + encoder[i] + AUDIO_ENCODER_PROPERTY[j]; + String prop = SystemProperties.get(propertyName); + // push to the table + String propRange[] = prop.split(","); + OUTPUT_FORMAT_TABLE.put((encoder[i] + AUDIO_ENCODER_PROPERTY[j] + "_low"), + Integer.parseInt(propRange[0])); + OUTPUT_FORMAT_TABLE.put((encoder[i] + AUDIO_ENCODER_PROPERTY[j] + "_high"), + Integer.parseInt(propRange[1])); + } } - } } diff --git a/media/tests/MediaFrameworkTest/src/com/android/mediaframeworktest/functional/MediaRecorderTest.java b/media/tests/MediaFrameworkTest/src/com/android/mediaframeworktest/functional/MediaRecorderTest.java index 690eff6..fdc5970 100644 --- a/media/tests/MediaFrameworkTest/src/com/android/mediaframeworktest/functional/MediaRecorderTest.java +++ b/media/tests/MediaFrameworkTest/src/com/android/mediaframeworktest/functional/MediaRecorderTest.java @@ -434,15 +434,15 @@ public class MediaRecorderTest extends ActivityInstrumentationTestCase<MediaFram boolean recordSuccess = false; String deviceType = MediaProfileReader.getDeviceType(); Log.v(TAG, "deviceType = " + deviceType); - if (deviceType.compareTo("voles") == 0) { - // Test cases are device specified - MediaProfileReader.createVideoProfileTable(); - MediaProfileReader.createAudioProfileTable(); - MediaProfileReader.createEncoderTable(); - String encoderType = MediaProfileReader.getVideoCodecProperty(); - String encoder[] = encoderType.split(","); - String audioType = MediaProfileReader.getAudioCodecProperty(); + // Test cases are device specified + MediaProfileReader.createVideoProfileTable(); + MediaProfileReader.createAudioProfileTable(); + MediaProfileReader.createEncoderTable(); + String encoderType = MediaProfileReader.getVideoCodecProperty(); + String audioType = MediaProfileReader.getAudioCodecProperty(); + if ((encoderType.length() != 0) || (audioType.length() != 0)) { String audio[] = audioType.split(","); + String encoder[] = encoderType.split(","); for (int k = 0; k < 2; k++) { for (int i = 0; i < encoder.length; i++) { for (int j = 0; j < audio.length; j++) { @@ -451,18 +451,18 @@ public class MediaRecorderTest extends ActivityInstrumentationTestCase<MediaFram } else { recordSuccess = recordVideoWithPara(encoder[i], audio[j], "low"); } - if (!recordSuccess){ + if (!recordSuccess) { Log.v(TAG, "testDeviceSpecificCodec failed"); Log.v(TAG, "Encoder = " + encoder[i] + "Audio Encoder = " + audio[j]); noOfFailure++; } - //assertTrue((encoder[i] + audio[j]), recordSuccess); + // assertTrue((encoder[i] + audio[j]), recordSuccess); } } } - } - if (noOfFailure != 0){ - assertTrue("testDeviceSpecificCodec", false); + if (noOfFailure != 0) { + assertTrue("testDeviceSpecificCodec", false); + } } } } |