From patchwork Tue Jan 26 08:26:28 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Hirokazu Honda X-Patchwork-Id: 10995 Return-Path: X-Original-To: parsemail@patchwork.libcamera.org Delivered-To: parsemail@patchwork.libcamera.org Received: from lancelot.ideasonboard.com (lancelot.ideasonboard.com [92.243.16.209]) by patchwork.libcamera.org (Postfix) with ESMTPS id 6D305BD808 for ; Tue, 26 Jan 2021 08:26:38 +0000 (UTC) Received: from lancelot.ideasonboard.com (localhost [IPv6:::1]) by lancelot.ideasonboard.com (Postfix) with ESMTP id DC3AE682DF; Tue, 26 Jan 2021 09:26:37 +0100 (CET) Authentication-Results: lancelot.ideasonboard.com; dkim=fail reason="signature verification failed" (1024-bit key; unprotected) header.d=chromium.org header.i=@chromium.org header.b="L4wmEP5l"; dkim-atps=neutral Received: from mail-pl1-x631.google.com (mail-pl1-x631.google.com [IPv6:2607:f8b0:4864:20::631]) by lancelot.ideasonboard.com (Postfix) with ESMTPS id E38D96030D for ; Tue, 26 Jan 2021 09:26:35 +0100 (CET) Received: by mail-pl1-x631.google.com with SMTP id b17so2848938plz.6 for ; Tue, 26 Jan 2021 00:26:35 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; h=from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=LZHptJTRcTPsXUDLXpCekRFYMM8YodM2eFfN9sAyTco=; b=L4wmEP5lhkYZ3bqTWXnsiYtbRelWYbmVzB8hXhBMQ7u9UW+0y5fehjJFwA6avePhDf Ey6el4fk9SCBAi1N1nKSagmNl0jYvv8hEHFWa0sdRVrulwLVVmLCpBzdYXsvZpyVhX2c LE7N6uhGEyC3L8nH4YzxZSegtAC3gd3FojXD8= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=LZHptJTRcTPsXUDLXpCekRFYMM8YodM2eFfN9sAyTco=; b=rT+6RKaBVZCqdRW+f5LPFoNCsCBmnCxasFAEiKaCyR1P8Eor7n7h06+N+WA/4+DFnf vHN8EWeaTO/ADmAcmMf7Nr2k/cn69aYjiUE+GUdH2AMflpHyIaY0UjIbSXEMZJbsTHcj Ntxr9FmingX8ezzOphTuvZcsR8p2OuNrShxeDrXXFE66VeQL8thsV+3RryCbq7nbrMkW wTJP8jRIcMfZsNCd6h6QfXWuaGWTwo9avtvbOL0QeB73df+0IW6ypQrD0blr2kMn5F11 JJbeaGggyzXpAqf08ujd8RWb+LbDZr3X8gwxv6XUwX9r/vNZOEXVIEQd1bnpqER1mpOO oIBg== X-Gm-Message-State: AOAM532tSSKc8vh+MWnM7WI/dDy/rryuUqiZVRdxshlF++pIHTpkX1N4 rAaSXGZQIuuheIcT+bYsW7jdzOt+j72t1MWa X-Google-Smtp-Source: ABdhPJzloqsA+vRCAEzuDZCxwcqh+lqnmyf/OgNer5zhmrrmK5hoTjwmJOZGRQUPkkHnEXtl/TErXg== X-Received: by 2002:a17:90b:46cc:: with SMTP id jx12mr4760909pjb.97.1611649594074; Tue, 26 Jan 2021 00:26:34 -0800 (PST) Received: from hiroh.c.googlers.com.com (128.141.236.35.bc.googleusercontent.com. [35.236.141.128]) by smtp.gmail.com with ESMTPSA id a141sm18639430pfa.189.2021.01.26.00.26.32 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 26 Jan 2021 00:26:33 -0800 (PST) From: Hirokazu Honda To: libcamera-devel@lists.libcamera.org Date: Tue, 26 Jan 2021 08:26:28 +0000 Message-Id: <20210126082628.1902267-1-hiroh@chromium.org> X-Mailer: git-send-email 2.30.0.280.ga3ce27912f-goog MIME-Version: 1.0 Subject: [libcamera-devel] [PATCH v2] subprojects: Add libyuv and built if -Dandroid=enabled X-BeenThere: libcamera-devel@lists.libcamera.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: libcamera-devel-bounces@lists.libcamera.org Sender: "libcamera-devel" Android HAL adaptation layer may need image processing, for example, scaling and format conversion. Libyuv is a general image processing. This adds libyuv to subprojects, so that it is folked locally and can be used with Android HAL implementation code. Signed-off-by: Hirokazu Honda Reviewed-by: Laurent Pinchart --- README.rst | 2 +- meson.build | 2 +- src/android/meson.build | 18 ++++++++++++++++++ subprojects/.gitignore | 1 + subprojects/libyuv.wrap | 4 ++++ 5 files changed, 25 insertions(+), 2 deletions(-) create mode 100644 subprojects/.gitignore create mode 100644 subprojects/libyuv.wrap -- 2.30.0.280.ga3ce27912f-goog diff --git a/README.rst b/README.rst index 251291b7..08bfd5ad 100644 --- a/README.rst +++ b/README.rst @@ -47,7 +47,7 @@ A C++ toolchain: [required] Either {g++, clang} Meson Build system: [required] - meson (>= 0.51) ninja-build pkg-config + meson (>= 0.55) ninja-build pkg-config If your distribution doesn't provide a recent enough version of meson, you can install or upgrade it using pip3. diff --git a/meson.build b/meson.build index c47eb420..d9b63278 100644 --- a/meson.build +++ b/meson.build @@ -1,7 +1,7 @@ # SPDX-License-Identifier: CC0-1.0 project('libcamera', 'c', 'cpp', - meson_version : '>= 0.51', + meson_version : '>= 0.55', version : '0.0.0', default_options : [ 'werror=true', diff --git a/src/android/meson.build b/src/android/meson.build index 3d4d3be4..e1533d7c 100644 --- a/src/android/meson.build +++ b/src/android/meson.build @@ -14,6 +14,24 @@ foreach dep : android_deps endif endforeach +if android_enabled + cmake = import('cmake') + + libyuv_vars = cmake.subproject_options() + libyuv_vars.add_cmake_defines({'CMAKE_POSITION_INDEPENDENT_CODE': 'ON'}) + libyuv_vars.set_override_option('cpp_std', 'c++17') + libyuv_vars.append_compile_args('cpp', + '-Wno-sign-compare', + '-Wno-unused-variable', + '-Wno-unused-parameter') + libyuv_vars.append_link_args('-ljpeg') + libyuv = cmake.subproject('libyuv', options : libyuv_vars) + libyuv_dep = libyuv.dependency('yuv') + + android_deps += [ libyuv_dep, ] +endif + + android_hal_sources = files([ 'camera3_hal.cpp', 'camera_hal_manager.cpp', diff --git a/subprojects/.gitignore b/subprojects/.gitignore new file mode 100644 index 00000000..410b8bd6 --- /dev/null +++ b/subprojects/.gitignore @@ -0,0 +1 @@ +/libyuv \ No newline at end of file diff --git a/subprojects/libyuv.wrap b/subprojects/libyuv.wrap new file mode 100644 index 00000000..8ba51fa0 --- /dev/null +++ b/subprojects/libyuv.wrap @@ -0,0 +1,4 @@ +[wrap-git] +directory = libyuv +url = https://chromium.googlesource.com/libyuv/libyuv.git +revision = 93b1b332cd60b56ab90aea14182755e379c28a80