am 7756cbee: Merge change 27073 into eclair
Merge commit '7756cbeef475127ed56bfeabecb3c291366a952f' into eclair-plus-aosp * commit '7756cbeef475127ed56bfeabecb3c291366a952f': Removed the device type checking
This commit is contained in:
@ -58,6 +58,7 @@ public class MediaProfileReader {
|
|||||||
public static void createVideoProfileTable() {
|
public static void createVideoProfileTable() {
|
||||||
// push all the property into one big table
|
// push all the property into one big table
|
||||||
String encoderType = getVideoCodecProperty();
|
String encoderType = getVideoCodecProperty();
|
||||||
|
if (encoderType.length() != 0) {
|
||||||
String encoder[] = encoderType.split(",");
|
String encoder[] = encoderType.split(",");
|
||||||
for (int i = 0; i < encoder.length; i++) {
|
for (int i = 0; i < encoder.length; i++) {
|
||||||
for (int j = 0; j < VIDEO_ENCODER_PROPERTY.length; j++) {
|
for (int j = 0; j < VIDEO_ENCODER_PROPERTY.length; j++) {
|
||||||
@ -73,11 +74,13 @@ public class MediaProfileReader {
|
|||||||
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
}
|
||||||
|
|
||||||
public static void createAudioProfileTable() {
|
public static void createAudioProfileTable() {
|
||||||
// push all the property into one big table
|
// push all the property into one big table
|
||||||
String audioType = getAudioCodecProperty();
|
String audioType = getAudioCodecProperty();
|
||||||
String encoder[] = audioType.split(",");
|
String encoder[] = audioType.split(",");
|
||||||
|
if (audioType.length() != 0) {
|
||||||
for (int i = 0; i < encoder.length; i++) {
|
for (int i = 0; i < encoder.length; i++) {
|
||||||
for (int j = 0; j < AUDIO_ENCODER_PROPERTY.length; j++) {
|
for (int j = 0; j < AUDIO_ENCODER_PROPERTY.length; j++) {
|
||||||
String propertyName = MEDIA_AUD_VID + encoder[i] + AUDIO_ENCODER_PROPERTY[j];
|
String propertyName = MEDIA_AUD_VID + encoder[i] + AUDIO_ENCODER_PROPERTY[j];
|
||||||
@ -89,7 +92,7 @@ public class MediaProfileReader {
|
|||||||
OUTPUT_FORMAT_TABLE.put((encoder[i] + AUDIO_ENCODER_PROPERTY[j] + "_high"),
|
OUTPUT_FORMAT_TABLE.put((encoder[i] + AUDIO_ENCODER_PROPERTY[j] + "_high"),
|
||||||
Integer.parseInt(propRange[1]));
|
Integer.parseInt(propRange[1]));
|
||||||
}
|
}
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -434,15 +434,15 @@ public class MediaRecorderTest extends ActivityInstrumentationTestCase<MediaFram
|
|||||||
boolean recordSuccess = false;
|
boolean recordSuccess = false;
|
||||||
String deviceType = MediaProfileReader.getDeviceType();
|
String deviceType = MediaProfileReader.getDeviceType();
|
||||||
Log.v(TAG, "deviceType = " + deviceType);
|
Log.v(TAG, "deviceType = " + deviceType);
|
||||||
if (deviceType.compareTo("voles") == 0) {
|
|
||||||
// Test cases are device specified
|
// Test cases are device specified
|
||||||
MediaProfileReader.createVideoProfileTable();
|
MediaProfileReader.createVideoProfileTable();
|
||||||
MediaProfileReader.createAudioProfileTable();
|
MediaProfileReader.createAudioProfileTable();
|
||||||
MediaProfileReader.createEncoderTable();
|
MediaProfileReader.createEncoderTable();
|
||||||
String encoderType = MediaProfileReader.getVideoCodecProperty();
|
String encoderType = MediaProfileReader.getVideoCodecProperty();
|
||||||
String encoder[] = encoderType.split(",");
|
|
||||||
String audioType = MediaProfileReader.getAudioCodecProperty();
|
String audioType = MediaProfileReader.getAudioCodecProperty();
|
||||||
|
if ((encoderType.length() != 0) || (audioType.length() != 0)) {
|
||||||
String audio[] = audioType.split(",");
|
String audio[] = audioType.split(",");
|
||||||
|
String encoder[] = encoderType.split(",");
|
||||||
for (int k = 0; k < 2; k++) {
|
for (int k = 0; k < 2; k++) {
|
||||||
for (int i = 0; i < encoder.length; i++) {
|
for (int i = 0; i < encoder.length; i++) {
|
||||||
for (int j = 0; j < audio.length; j++) {
|
for (int j = 0; j < audio.length; j++) {
|
||||||
@ -460,9 +460,9 @@ public class MediaRecorderTest extends ActivityInstrumentationTestCase<MediaFram
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
|
||||||
if (noOfFailure != 0) {
|
if (noOfFailure != 0) {
|
||||||
assertTrue("testDeviceSpecificCodec", false);
|
assertTrue("testDeviceSpecificCodec", false);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
}
|
||||||
|
Reference in New Issue
Block a user