Revert "Revert "Revert "Extend EVS interfaces and data types"""
This reverts commit 47b45af32cdea1788a1fd3e316f97d89aeddac2b.
diff --git a/automotive/evs/1.1/IEvsCamera.hal b/automotive/evs/1.1/IEvsCamera.hal
index 975b6c6..21ca79e 100644
--- a/automotive/evs/1.1/IEvsCamera.hal
+++ b/automotive/evs/1.1/IEvsCamera.hal
@@ -26,14 +26,6 @@
*/
interface IEvsCamera extends @1.0::IEvsCamera {
/**
- * Returns the description of this camera.
- *
- * @return info The description of this camera. This must be the same value as
- * reported by EvsEnumerator::getCameraList_1_1().
- */
- getCameraInfo_1_1() generates (CameraDesc info);
-
- /**
* Requests to pause EVS camera stream events.
*
* Like stopVideoStream(), events may continue to arrive for some time
@@ -108,27 +100,7 @@
unsetMaster() generates (EvsResult result);
/**
- * Retrieves a list of parameters this camera supports.
- *
- * @return params A list of CameraParam that this camera supports.
- */
- getParameterList() generates (vec<CameraParam> params);
-
- /**
- * Requests a valid value range of a camera parameter
- *
- * @param id The identifier of camera parameter, CameraParam enum.
- *
- * @return min The lower bound of valid parameter value range.
- * @return max The upper bound of valid parameter value range.
- * @return step The resolution of values in valid range.
- */
- getIntParameterRange(CameraParam id)
- generates (int32_t min, int32_t max, int32_t step);
-
- /**
- * Requests to set a camera parameter. Only a request from the master
- * client will be processed successfully.
+ * Requests to set a camera parameter.
*
* @param id The identifier of camera parameter, CameraParam enum.
* value A desired parameter value.
@@ -142,7 +114,7 @@
* from what the client gives if, for example, the
* driver does not support a target parameter.
*/
- setIntParameter(CameraParam id, int32_t value)
+ setParameter(CameraParam id, int32_t value)
generates (EvsResult result, int32_t effectiveValue);
/**
@@ -154,5 +126,5 @@
* not supported.
* value A value of requested camera parameter.
*/
- getIntParameter(CameraParam id) generates(EvsResult result, int32_t value);
+ getParameter(CameraParam id) generates(EvsResult result, int32_t value);
};