diff options
| author | TreeHugger Robot <treehugger-gerrit@google.com> | 2021-07-13 19:00:52 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2021-07-13 19:00:52 +0000 |
| commit | d658e25ec210fbda9bbb3d52928f1e5db37207fe (patch) | |
| tree | 0558c1e32dc6479c4fe86ac359ee20f4c439e05f | |
| parent | c979dc7d6fbe00d082feb51e6d474c32d431cb07 (diff) | |
| parent | 45daae10aa0c5cde0aaa8ef4753cb39d91bf9663 (diff) | |
| download | cts-d658e25ec210fbda9bbb3d52928f1e5db37207fe.tar.gz | |
Merge "media: add new CamcorderProfiles" into sc-dev am: 45daae10aa
Original change: https://googleplex-android-review.googlesource.com/c/platform/cts/+/15265912
Change-Id: I8e4b3ed3b7fd452fa434f33ef3f539b8795e4d7e
| -rw-r--r-- | tests/tests/media/src/android/media/cts/CamcorderProfileTest.java | 25 |
1 files changed, 18 insertions, 7 deletions
diff --git a/tests/tests/media/src/android/media/cts/CamcorderProfileTest.java b/tests/tests/media/src/android/media/cts/CamcorderProfileTest.java index e712615f4c2..3eecb04f592 100644 --- a/tests/tests/media/src/android/media/cts/CamcorderProfileTest.java +++ b/tests/tests/media/src/android/media/cts/CamcorderProfileTest.java @@ -46,9 +46,13 @@ public class CamcorderProfileTest extends AndroidTestCase { CamcorderProfile.QUALITY_720P, CamcorderProfile.QUALITY_1080P, CamcorderProfile.QUALITY_QVGA, - CamcorderProfile.QUALITY_2K, - CamcorderProfile.QUALITY_QHD, CamcorderProfile.QUALITY_2160P, + CamcorderProfile.QUALITY_VGA, + CamcorderProfile.QUALITY_4KDCI, + CamcorderProfile.QUALITY_QHD, + CamcorderProfile.QUALITY_2K, + CamcorderProfile.QUALITY_8KUHD, + CamcorderProfile.QUALITY_TIME_LAPSE_LOW, CamcorderProfile.QUALITY_TIME_LAPSE_HIGH, CamcorderProfile.QUALITY_TIME_LAPSE_QCIF, @@ -57,18 +61,25 @@ public class CamcorderProfileTest extends AndroidTestCase { CamcorderProfile.QUALITY_TIME_LAPSE_720P, CamcorderProfile.QUALITY_TIME_LAPSE_1080P, CamcorderProfile.QUALITY_TIME_LAPSE_QVGA, - CamcorderProfile.QUALITY_TIME_LAPSE_2K, - CamcorderProfile.QUALITY_TIME_LAPSE_QHD, CamcorderProfile.QUALITY_TIME_LAPSE_2160P, + CamcorderProfile.QUALITY_TIME_LAPSE_VGA, + CamcorderProfile.QUALITY_TIME_LAPSE_4KDCI, + CamcorderProfile.QUALITY_TIME_LAPSE_QHD, + CamcorderProfile.QUALITY_TIME_LAPSE_2K, + CamcorderProfile.QUALITY_TIME_LAPSE_8KUHD, + CamcorderProfile.QUALITY_HIGH_SPEED_LOW, CamcorderProfile.QUALITY_HIGH_SPEED_HIGH, CamcorderProfile.QUALITY_HIGH_SPEED_480P, CamcorderProfile.QUALITY_HIGH_SPEED_720P, CamcorderProfile.QUALITY_HIGH_SPEED_1080P, - CamcorderProfile.QUALITY_HIGH_SPEED_2160P + CamcorderProfile.QUALITY_HIGH_SPEED_2160P, + CamcorderProfile.QUALITY_HIGH_SPEED_CIF, + CamcorderProfile.QUALITY_HIGH_SPEED_VGA, + CamcorderProfile.QUALITY_HIGH_SPEED_4KDCI, }; - private static final int LAST_QUALITY = CamcorderProfile.QUALITY_2K; - private static final int LAST_TIMELAPSE_QUALITY = CamcorderProfile.QUALITY_TIME_LAPSE_2K; + private static final int LAST_QUALITY = CamcorderProfile.QUALITY_8KUHD; + private static final int LAST_TIMELAPSE_QUALITY = CamcorderProfile.QUALITY_TIME_LAPSE_8KUHD; private static final int LAST_HIGH_SPEED_QUALITY = CamcorderProfile.QUALITY_HIGH_SPEED_4KDCI; private static final Integer[] UNKNOWN_QUALITIES = { LAST_QUALITY + 1, // Unknown normal profile quality |