commit ee7e16c57d4fdb7e049855be99fcf9942c20f872
author Ricky Liang <jcliang@chromium.org> Thu Jun 15 05:59:35 2017
committer chrome-bot <chrome-bot@chromium.org> Sat Jun 17 08:12:44 2017
tree 4ff996bdbccd52b3acb8b050b74c10bd75603ca2
parent 9e1aa3f0e44fdd407fb55a602a5e478860c883ca

hal_adpater: remove vendor tag support in arc_camera3.mojom

We don't support vendor tags in ARC++ camera HAL v3 so we don't need to
support vendor tags in the Mojo inferface.

BUG=b:32690003
TEST=None

Change-Id: I404334e3f764bc5a5ed0260264697a6c1b1264cc
Reviewed-on: https://chromium-review.googlesource.com/536556
Commit-Ready: Ricky Liang <jcliang@chromium.org>
Tested-by: Ricky Liang <jcliang@chromium.org>
Reviewed-by: Heng-ruey Hsu <henryhsu@google.com>

hal_adapter/mojo/arc_camera3.mojom

diff --git a/hal_adapter/mojo/arc_camera3.mojom b/hal_adapter/mojo/arc_camera3.mojom
index 41e201f..e256469 100644
--- a/hal_adapter/mojo/arc_camera3.mojom
+++ b/hal_adapter/mojo/arc_camera3.mojom
@@ -42,14 +42,11 @@
   CAMERA3_STREAM_ROTATION_270 = 3,
 };
 
-[Extensible]
 enum Camera3StreamConfigurationMode {
   CAMERA3_STREAM_CONFIGURATION_NORMAL_MODE = 0,
   CAMERA3_STREAM_CONFIGURATION_CONSTRAINED_HIGH_SPEED_MODE =1,
-  CAMERA3_VENDOR_STREAM_CONFIGURATION_MODE_START = 0x8000,
 };
 
-[Extensible]
 enum Camera3RequestTemplate {
   CAMERA3_TEMPLATE_PREVIEW = 1,
   CAMERA3_TEMPLATE_STILL_CAPTURE = 2,
@@ -58,7 +55,6 @@
   CAMERA3_TEMPLATE_ZERO_SHUTTER_LAG = 5,
   CAMERA3_TEMPLATE_MANUAL = 6,
   CAMERA3_TEMPLATE_COUNT,
-  CAMERA3_VENDOR_TEMPLATE_START = 0x40000000,
 };
 
 enum Camera3BufferStatus {

hal_adapter/mojo/arc_camera3_mojo_verifier.cc

diff --git a/hal_adapter/mojo/arc_camera3_mojo_verifier.cc b/hal_adapter/mojo/arc_camera3_mojo_verifier.cc
index ef272df..3987e57 100644
--- a/hal_adapter/mojo/arc_camera3_mojo_verifier.cc
+++ b/hal_adapter/mojo/arc_camera3_mojo_verifier.cc
@@ -61,8 +61,6 @@
     CAMERA3_STREAM_CONFIGURATION_NORMAL_MODE);
 CHECK_STREAM_CONFIGURATION_MODE_DEFINITION(
     CAMERA3_STREAM_CONFIGURATION_CONSTRAINED_HIGH_SPEED_MODE);
-CHECK_STREAM_CONFIGURATION_MODE_DEFINITION(
-    CAMERA3_VENDOR_STREAM_CONFIGURATION_MODE_START);
 
 #define CHECK_REQUEST_TEMPLATE_DEFINITION(temp) \
   CHECK_MOJOM_DEFINITION(temp, Camera3RequestTemplate)
@@ -74,7 +72,6 @@
 CHECK_REQUEST_TEMPLATE_DEFINITION(CAMERA3_TEMPLATE_ZERO_SHUTTER_LAG);
 CHECK_REQUEST_TEMPLATE_DEFINITION(CAMERA3_TEMPLATE_MANUAL);
 CHECK_REQUEST_TEMPLATE_DEFINITION(CAMERA3_TEMPLATE_COUNT);
-CHECK_REQUEST_TEMPLATE_DEFINITION(CAMERA3_VENDOR_TEMPLATE_START);
 
 #define CHECK_BUFFER_STATUS_DEFINITION(status) \
   CHECK_MOJOM_DEFINITION(status, Camera3BufferStatus)