summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRucha Katakwar <ruchamk@google.com>2022-08-02 17:28:05 +0000
committerAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>2022-08-02 17:28:05 +0000
commit54ef095c6487bc8aa777ed3cd036e35b8284a38b (patch)
treeaf0224a74fe11bcc8a89f7455a32b69a57682ded
parenta3ec96b674939051a705b321c40469a1afd05b74 (diff)
parentd7bec010b7f1f5618867ed81aa50a5c09f872e30 (diff)
downloadcts-54ef095c6487bc8aa777ed3cd036e35b8284a38b.tar.gz
Merge "CameraITS: Exclude 4:3 QCIF low resolution testing" into stage-aosp-tm-ts-dev am: d7bec010b7
Original change: https://googleplex-android-review.googlesource.com/c/platform/cts/+/19487452 Change-Id: I5df037907114b72320c760d3b4d9721f7a193c3d Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
-rw-r--r--apps/CameraITS/tests/sensor_fusion/test_preview_stabilization.py4
-rw-r--r--apps/CameraITS/utils/video_processing_utils.py6
2 files changed, 8 insertions, 2 deletions
diff --git a/apps/CameraITS/tests/sensor_fusion/test_preview_stabilization.py b/apps/CameraITS/tests/sensor_fusion/test_preview_stabilization.py
index c6b852c5378..e1909517dda 100644
--- a/apps/CameraITS/tests/sensor_fusion/test_preview_stabilization.py
+++ b/apps/CameraITS/tests/sensor_fusion/test_preview_stabilization.py
@@ -142,7 +142,9 @@ class PreviewStabilizationTest(its_base_test.ItsBaseTest):
# List of video resolutions to test
supported_preview_sizes = cam.get_supported_preview_sizes(self.camera_id)
- supported_preview_sizes.remove(video_processing_utils.QCIF_SIZE)
+ for size in video_processing_utils.LOW_RESOLUTION_SIZES:
+ if size in supported_preview_sizes:
+ supported_preview_sizes.remove(size)
logging.debug('Supported preview resolutions: %s',
supported_preview_sizes)
diff --git a/apps/CameraITS/utils/video_processing_utils.py b/apps/CameraITS/utils/video_processing_utils.py
index 98d930bc90b..5eab20c0742 100644
--- a/apps/CameraITS/utils/video_processing_utils.py
+++ b/apps/CameraITS/utils/video_processing_utils.py
@@ -33,7 +33,11 @@ ITS_SUPPORTED_QUALITIES = (
'LOW',
'VGA'
)
-QCIF_SIZE = '176x144'
+
+LOW_RESOLUTION_SIZES = (
+ '176x144',
+ '192x144',
+)
def extract_key_frames_from_video(log_path, video_file_name):