Update CTS for 4K video recording support
Bug: 15287656
Change-Id: I31b43efa1ea881244a35916082a5889c79cf2b3d
diff --git a/apps/CtsVerifier/src/com/android/cts/verifier/camera/video/CameraVideoActivity.java b/apps/CtsVerifier/src/com/android/cts/verifier/camera/video/CameraVideoActivity.java
index b010f79..f93723c 100644
--- a/apps/CtsVerifier/src/com/android/cts/verifier/camera/video/CameraVideoActivity.java
+++ b/apps/CtsVerifier/src/com/android/cts/verifier/camera/video/CameraVideoActivity.java
@@ -449,7 +449,8 @@
CamcorderProfile.QUALITY_CIF,
CamcorderProfile.QUALITY_480P,
CamcorderProfile.QUALITY_720P,
- CamcorderProfile.QUALITY_1080P
+ CamcorderProfile.QUALITY_1080P,
+ CamcorderProfile.QUALITY_2160P
};
String[] nameArray = {
@@ -460,7 +461,8 @@
"CIF",
"480P",
"720P",
- "1080P"
+ "1080P",
+ "2160P"
};
ArrayList<VideoSizeNamePair> availableSizes =
@@ -499,7 +501,8 @@
CamcorderProfile.QUALITY_CIF,
CamcorderProfile.QUALITY_480P,
CamcorderProfile.QUALITY_720P,
- CamcorderProfile.QUALITY_1080P
+ CamcorderProfile.QUALITY_1080P,
+ CamcorderProfile.QUALITY_2160P
};
ArrayList<ResolutionQuality> qualityList = new ArrayList<ResolutionQuality>();
diff --git a/tests/tests/hardware/src/android/hardware/camera2/cts/RecordingTest.java b/tests/tests/hardware/src/android/hardware/camera2/cts/RecordingTest.java
index 00bf23c..0d1baed 100644
--- a/tests/tests/hardware/src/android/hardware/camera2/cts/RecordingTest.java
+++ b/tests/tests/hardware/src/android/hardware/camera2/cts/RecordingTest.java
@@ -61,6 +61,7 @@
private static final int VIDEO_FRAME_RATE = 30;
private final String VIDEO_FILE_PATH = Environment.getExternalStorageDirectory().getPath();
private static final int[] mCamcorderProfileList = {
+ CamcorderProfile.QUALITY_2160P,
CamcorderProfile.QUALITY_1080P,
CamcorderProfile.QUALITY_480P,
CamcorderProfile.QUALITY_720P,
diff --git a/tests/tests/hardware/src/android/hardware/cts/CameraTest.java b/tests/tests/hardware/src/android/hardware/cts/CameraTest.java
index 863325f..50a3573 100644
--- a/tests/tests/hardware/src/android/hardware/cts/CameraTest.java
+++ b/tests/tests/hardware/src/android/hardware/cts/CameraTest.java
@@ -2996,6 +2996,7 @@
}
private static final int[] mCamcorderProfileList = {
+ CamcorderProfile.QUALITY_2160P,
CamcorderProfile.QUALITY_1080P,
CamcorderProfile.QUALITY_480P,
CamcorderProfile.QUALITY_720P,
diff --git a/tests/tests/media/src/android/media/cts/CamcorderProfileTest.java b/tests/tests/media/src/android/media/cts/CamcorderProfileTest.java
index 1df5011..965deae 100644
--- a/tests/tests/media/src/android/media/cts/CamcorderProfileTest.java
+++ b/tests/tests/media/src/android/media/cts/CamcorderProfileTest.java
@@ -65,13 +65,15 @@
profile.quality == CamcorderProfile.QUALITY_480P ||
profile.quality == CamcorderProfile.QUALITY_720P ||
profile.quality == CamcorderProfile.QUALITY_1080P ||
+ profile.quality == CamcorderProfile.QUALITY_2160P ||
profile.quality == CamcorderProfile.QUALITY_TIME_LAPSE_LOW ||
profile.quality == CamcorderProfile.QUALITY_TIME_LAPSE_HIGH ||
profile.quality == CamcorderProfile.QUALITY_TIME_LAPSE_QCIF ||
profile.quality == CamcorderProfile.QUALITY_TIME_LAPSE_CIF ||
profile.quality == CamcorderProfile.QUALITY_TIME_LAPSE_480P ||
profile.quality == CamcorderProfile.QUALITY_TIME_LAPSE_720P ||
- profile.quality == CamcorderProfile.QUALITY_TIME_LAPSE_1080P);
+ profile.quality == CamcorderProfile.QUALITY_TIME_LAPSE_1080P ||
+ profile.quality == CamcorderProfile.QUALITY_TIME_LAPSE_2160P);
assertTrue(profile.videoBitRate > 0);
assertTrue(profile.videoFrameRate > 0);
assertTrue(profile.videoFrameWidth > 0);
@@ -137,6 +139,11 @@
assertTrue(1088 == profile.videoFrameHeight ||
1080 == profile.videoFrameHeight);
break;
+ case CamcorderProfile.QUALITY_2160P:
+ case CamcorderProfile.QUALITY_TIME_LAPSE_2160P:
+ assertEquals(3840, profile.videoFrameWidth);
+ assertEquals(2160, profile.videoFrameHeight);
+ break;
}
}
@@ -210,14 +217,16 @@
CamcorderProfile.QUALITY_CIF,
CamcorderProfile.QUALITY_480P,
CamcorderProfile.QUALITY_720P,
- CamcorderProfile.QUALITY_1080P};
+ CamcorderProfile.QUALITY_1080P,
+ CamcorderProfile.QUALITY_2160P};
int[] specificTimeLapseProfileQualities = {CamcorderProfile.QUALITY_TIME_LAPSE_QCIF,
CamcorderProfile.QUALITY_TIME_LAPSE_QVGA,
CamcorderProfile.QUALITY_TIME_LAPSE_CIF,
CamcorderProfile.QUALITY_TIME_LAPSE_480P,
CamcorderProfile.QUALITY_TIME_LAPSE_720P,
- CamcorderProfile.QUALITY_TIME_LAPSE_1080P};
+ CamcorderProfile.QUALITY_TIME_LAPSE_1080P,
+ CamcorderProfile.QUALITY_TIME_LAPSE_2160P};
checkSpecificProfiles(cameraId, lowProfile, highProfile,
specificProfileQualities, videoSizes);