<div dir="ltr"><div dir="auto">Hi Jacopo,<br><br><br><div class="gmail_quote" dir="auto"><div dir="ltr" class="gmail_attr">вт, 28 дек. 2021 г., 13:04 Jacopo Mondi <<a href="mailto:jacopo@jmondi.org" target="_blank">jacopo@jmondi.org</a>>:<br></div><blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex">Hi Roman,<br>
<br>
cc Hanlin Chen from ChromiumOS as he's planning to extend<br>
configuration file support for the ChromeOS Android HAL.</blockquote></div><div class="gmail_quote" dir="auto"><blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex">
<br>
Before looking into the patch: is there any hope libyaml might become<br>
part of the standard AOSP distribution (or a process in place to request<br>
that)<br></blockquote></div><div dir="auto"><br></div><div dir="auto">I am not aware of that, and I haven't initiated such a process. It will be a very slow and bumpy road. </div><div dir="auto"><br></div><div dir="auto">Not sure what is planned for these properties in future, but now it is not necessary to have it in libcamera to have fully functional hal. Also having no configuration file available will encourage developers to add corresponding records to dts, which is also a great thing to align with linux world.</div><div dir="auto"><br></div><div class="gmail_quote" dir="auto"><blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex">
<br>
Thanks<br>
j<br>
<br>
On Tue, Dec 28, 2021 at 11:51:53AM +0200, Roman Stratiienko wrote:<br>
> Mainline Android has no libyaml in-tree. Moreover camera_hal_config.cpp<br>
> uses std::filesystem class that is not permitted for AOSP VNDK vendor<br>
> libraries.<br>
><br>
> External configuration file is no longer mandatory and DTS overlays can<br>
> be used to specify camera location and rotation.<br>
><br>
> Do not require external configuration file for cases where meson.build<br>
> can't find libyaml. Assume that cameras without location specified<br>
> by V4L2 properties are always external.<br>
><br>
> Signed-off-by: Roman Stratiienko <<a href="mailto:roman.o.stratiienko@globallogic.com" rel="noreferrer" target="_blank">roman.o.stratiienko@globallogic.com</a>><br>
> ---<br>
> src/android/camera_hal_manager.cpp | 13 +++++++++++++<br>
> src/android/camera_hal_manager.h | 2 ++<br>
> src/android/meson.build | 10 ++++++++--<br>
> 3 files changed, 23 insertions(+), 2 deletions(-)<br>
><br>
> diff --git a/src/android/camera_hal_manager.cpp b/src/android/camera_hal_manager.cpp<br>
> index 5f7bfe265c71b..9e575bfa5204a 100644<br>
> --- a/src/android/camera_hal_manager.cpp<br>
> +++ b/src/android/camera_hal_manager.cpp<br>
> @@ -48,6 +48,7 @@ int CameraHalManager::init()<br>
> {<br>
> cameraManager_ = std::make_unique<CameraManager>();<br>
><br>
> +#ifdef HAVE_LIBYAML<br>
> /*<br>
> * If the configuration file is not available the HAL only supports<br>
> * external cameras. If it exists but it's not valid then error out.<br>
> @@ -56,6 +57,7 @@ int CameraHalManager::init()<br>
> LOG(HAL, Error) << "HAL configuration file is not valid";<br>
> return -EINVAL;<br>
> }<br>
> +#endif<br>
><br>
> /* Support camera hotplug. */<br>
> cameraManager_->cameraAdded.connect(this, &CameraHalManager::cameraAdded);<br>
> @@ -133,6 +135,7 @@ void CameraHalManager::cameraAdded(std::shared_ptr<Camera> cam)<br>
> }<br>
> }<br>
><br>
> +#ifdef HAVE_LIBYAML<br>
> /*<br>
> * The configuration file must be valid, and contain a corresponding<br>
> * entry for internal cameras. External cameras can be initialized<br>
> @@ -145,6 +148,16 @@ void CameraHalManager::cameraAdded(std::shared_ptr<Camera> cam)<br>
> }<br>
><br>
> const CameraConfigData *cameraConfigData = halConfig_.cameraConfigData(cam->id());<br>
> +#else<br>
> + /*<br>
> + * Assume that cameras without properties::Location specified are external.<br>
> + */<br>
> + const CameraConfigData *cameraConfigData = nullptr;<br>
> + if (!isCameraExternal && cameraLocation(cam.get()) < 0) {<br>
> + isCameraExternal = true;<br>
> + id = nextExternalCameraId_;<br>
> + }<br>
> +#endif<br>
><br>
> /*<br>
> * Some cameras whose location is reported by libcamera as external may<br>
> diff --git a/src/android/camera_hal_manager.h b/src/android/camera_hal_manager.h<br>
> index a5f8b933a7902..056abbb0d4e54 100644<br>
> --- a/src/android/camera_hal_manager.h<br>
> +++ b/src/android/camera_hal_manager.h<br>
> @@ -56,7 +56,9 @@ private:<br>
> CameraDevice *cameraDeviceFromHalId(unsigned int id) LIBCAMERA_TSA_REQUIRES(mutex_);<br>
><br>
> std::unique_ptr<libcamera::CameraManager> cameraManager_;<br>
> +#ifdef HAVE_LIBYAML<br>
> CameraHalConfig halConfig_;<br>
> +#endif<br>
><br>
> const camera_module_callbacks_t *callbacks_;<br>
> std::vector<std::unique_ptr<CameraDevice>> cameras_ LIBCAMERA_TSA_GUARDED_BY(mutex_);<br>
> diff --git a/src/android/meson.build b/src/android/meson.build<br>
> index 75b4bf2070851..1e471c291a1e4 100644<br>
> --- a/src/android/meson.build<br>
> +++ b/src/android/meson.build<br>
> @@ -3,7 +3,6 @@<br>
> android_deps = [<br>
> dependency('libexif', required : get_option('android')),<br>
> dependency('libjpeg', required : get_option('android')),<br>
> - dependency('yaml-0.1', required : get_option('android')),<br>
> libcamera_private,<br>
> ]<br>
><br>
> @@ -41,7 +40,6 @@ android_hal_sources = files([<br>
> 'camera3_hal.cpp',<br>
> 'camera_capabilities.cpp',<br>
> 'camera_device.cpp',<br>
> - 'camera_hal_config.cpp',<br>
> 'camera_hal_manager.cpp',<br>
> 'camera_metadata.cpp',<br>
> 'camera_ops.cpp',<br>
> @@ -56,6 +54,14 @@ android_hal_sources = files([<br>
><br>
> android_cpp_args = []<br>
><br>
> +libyaml_dep = dependency('yaml-0.1', required : false)<br>
> +if libyaml_dep.found()<br>
> + config_h.set('HAVE_LIBYAML', 1)<br>
> + android_hal_sources += files([<br>
> + 'camera_hal_config.cpp',<br>
> + ])<br>
> +endif<br>
> +<br>
> subdir('cros')<br>
> subdir('mm')<br>
><br>
> --<br>
> 2.30.2<br>
><br></blockquote><div><br></div><div>Regards,</div><div>Roman. </div></div></div>
</div>