summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAustin Borger <borgera@google.com>2023-03-17 18:23:57 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2023-03-17 18:23:57 +0000
commit406784084f89496d6ff65bfa4da6bc6897f01974 (patch)
tree8fa2e28c6a4b45c158d7e5ebf6d7e1424084845c
parent3733295dcdf84d211d726e14d3caa9732ce15922 (diff)
parent7f3a4c5373f64765d6c3d9386cc20b91d84baa89 (diff)
downloadcamera-406784084f89496d6ff65bfa4da6bc6897f01974.tar.gz
Merge "Modify emulated camera configs to contain supported color spaces only." into udc-dev
-rw-r--r--devices/EmulatedCamera/hwl/configs/emu_camera_back.json13
-rw-r--r--devices/EmulatedCamera/hwl/configs/emu_camera_front.json13
2 files changed, 4 insertions, 22 deletions
diff --git a/devices/EmulatedCamera/hwl/configs/emu_camera_back.json b/devices/EmulatedCamera/hwl/configs/emu_camera_back.json
index 3be9dfe..f35e4c5 100644
--- a/devices/EmulatedCamera/hwl/configs/emu_camera_back.json
+++ b/devices/EmulatedCamera/hwl/configs/emu_camera_back.json
@@ -212,10 +212,7 @@
"0",
"35",
"1",
- "6",
- "35",
- "1",
- "5",
+ "16",
"54",
"2",
"7",
@@ -224,10 +221,7 @@
"0",
"34",
"1",
- "6",
- "34",
- "1",
- "5",
+ "16",
"34",
"2",
"7",
@@ -236,9 +230,6 @@
"0",
"256",
"1",
- "6",
- "256",
- "1",
"7",
"256",
"1"
diff --git a/devices/EmulatedCamera/hwl/configs/emu_camera_front.json b/devices/EmulatedCamera/hwl/configs/emu_camera_front.json
index 43ecf52..5c4b617 100644
--- a/devices/EmulatedCamera/hwl/configs/emu_camera_front.json
+++ b/devices/EmulatedCamera/hwl/configs/emu_camera_front.json
@@ -323,10 +323,7 @@
"0",
"35",
"1",
- "6",
- "35",
- "1",
- "5",
+ "16",
"54",
"2",
"7",
@@ -335,10 +332,7 @@
"0",
"34",
"1",
- "6",
- "34",
- "1",
- "5",
+ "16",
"34",
"2",
"7",
@@ -347,9 +341,6 @@
"0",
"256",
"1",
- "6",
- "256",
- "1",
"7",
"256",
"1"