[{"id":16690,"web_url":"https://patchwork.libcamera.org/comment/16690/","msgid":"<87b59bba-b868-1299-c7f4-295e0d5ea34a@ideasonboard.com>","date":"2021-04-29T12:51:57","subject":"Re: [libcamera-devel] [PATCH v2] src: android: Rectify internal\n\theader's #include path","submitter":{"id":4,"url":"https://patchwork.libcamera.org/api/people/4/","name":"Kieran Bingham","email":"kieran.bingham@ideasonboard.com"},"content":"Hi Umang,\n\nOn 29/04/2021 13:22, Umang Jain wrote:\n> libcamera internal headers are not installed system-wide. Hence, any\n> inclusion of internal headers should be follow the #include directive\n> form:\n> \t#include \"libcamera/internal/header.h\"\n> \n> This was not the case for a few of the class in android HAL. Fix them\n> \n\nGood spot.\n\n> Signed-off-by: Umang Jain \n\nFor this,\n\nReviewed-by: Kieran Bingham \n\nThere is one more occurrence though in test/bayer-format.cpp as shown by:\n git grep \" ---\n> Changes in v2:\n> - Also include other classes namely, generic_camera_buffer,\n> post_processor as spotted by Niklas.\n> ---\n> src/android/camera_stream.h | 2 +-\n> src/android/mm/generic_camera_buffer.cpp | 2 +-\n> src/android/post_processor.h | 2 +-\n> 3 files changed, 3 insertions(+), 3 deletions(-)\n> \n> diff --git a/src/android/camera_stream.h b/src/android/camera_stream.h\n> index f68fdd3a..34016722 100644\n> --- a/src/android/camera_stream.h\n> +++ b/src/android/camera_stream.h\n> @@ -19,7 +19,7 @@\n> #include \n> #include \n> \n> -#include \n> +#include \"libcamera/internal/buffer.h\"\n> \n> class CameraDevice;\n> class CameraMetadata;\n> diff --git a/src/android/mm/generic_camera_buffer.cpp b/src/android/mm/generic_camera_buffer.cpp\n> index 929e078a..334498c1 100644\n> --- a/src/android/mm/generic_camera_buffer.cpp\n> +++ b/src/android/mm/generic_camera_buffer.cpp\n> @@ -7,7 +7,7 @@\n> \n> #include \"../camera_buffer.h\"\n> \n> -#include \n> +#include \"libcamera/internal/buffer.h\"\n> #include \"libcamera/internal/log.h\"\n> \n> using namespace libcamera;\n> diff --git a/src/android/post_processor.h b/src/android/post_processor.h\n> index 4944078b..547fda37 100644\n> --- a/src/android/post_processor.h\n> +++ b/src/android/post_processor.h\n> @@ -10,7 +10,7 @@\n> #include \n> #include \n> \n> -#include \n> +#include \"libcamera/internal/buffer.h\"\n> \n> #include \"camera_buffer.h\"\n> \n>","headers":{"Return-Path":"","X-Original-To":"parsemail@patchwork.libcamera.org","Delivered-To":"parsemail@patchwork.libcamera.org","Received":["from lancelot.ideasonboard.com (lancelot.ideasonboard.com\n\t[92.243.16.209])\n\tby patchwork.libcamera.org (Postfix) with ESMTPS id BA69EBDE45\n\tfor ;\n\tThu, 29 Apr 2021 12:52:02 +0000 (UTC)","from lancelot.ideasonboard.com (localhost [IPv6:::1])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTP id 0172C6890D;\n\tThu, 29 Apr 2021 14:52:01 +0200 (CEST)","from perceval.ideasonboard.com (perceval.ideasonboard.com\n\t[213.167.242.64])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTPS id DA19660511\n\tfor ;\n\tThu, 29 Apr 2021 14:51:59 +0200 (CEST)","from [192.168.0.20]\n\t(cpc89244-aztw30-2-0-cust3082.18-1.cable.virginm.net [86.31.172.11])\n\tby perceval.ideasonboard.com (Postfix) with ESMTPSA id 5C516BC0;\n\tThu, 29 Apr 2021 14:51:59 +0200 (CEST)"],"Authentication-Results":"lancelot.ideasonboard.com;\n\tdkim=fail reason=\"signature verification failed\" (1024-bit key;\n\tunprotected) header.d=ideasonboard.com header.i=@ideasonboard.com\n\theader.b=\"czF8u+cI\"; dkim-atps=neutral","DKIM-Signature":"v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com;\n\ts=mail; t=1619700719;\n\tbh=GnVdYm5SySZP1aGX1DTkpFvWUOap/x5sF76UUScPibo=;\n\th=Reply-To:Subject:To:References:From:Date:In-Reply-To:From;\n\tb=czF8u+cI6bJT3PFtf3Zw5m+bZVR4ZaNgYpfQIHQbs7apnDTwYAHC4yx/E8Qv2wqSH\n\t0pemE2n9ZrY74SByvWwp6ga0jaTV8h1H4GXJSsQ04RW4Z2E79CHtq/zEjoXclmB/tE\n\tQmGPhHuahXVnEApYj4deaa8mkHZvfd6YnWVXMQ0Q=","To":"Umang Jain ,\n\tlibcamera-devel@lists.libcamera.org","References":"<20210429122258.68814-1-umang.jain@ideasonboard.com>","From":"Kieran Bingham ","Organization":"Ideas on Board","Message-ID":"<87b59bba-b868-1299-c7f4-295e0d5ea34a@ideasonboard.com>","Date":"Thu, 29 Apr 2021 13:51:57 +0100","User-Agent":"Mozilla/5.0 (X11; Linux x86_64; rv:78.0) Gecko/20100101\n\tThunderbird/78.7.1","MIME-Version":"1.0","In-Reply-To":"<20210429122258.68814-1-umang.jain@ideasonboard.com>","Content-Language":"en-GB","Subject":"Re: [libcamera-devel] [PATCH v2] src: android: Rectify internal\n\theader's #include path","X-BeenThere":"libcamera-devel@lists.libcamera.org","X-Mailman-Version":"2.1.29","Precedence":"list","List-Id":"","List-Unsubscribe":",\n\t","List-Archive":"","List-Post":"","List-Help":"","List-Subscribe":",\n\t","Reply-To":"kieran.bingham@ideasonboard.com","Content-Type":"text/plain; charset=\"us-ascii\"","Content-Transfer-Encoding":"7bit","Errors-To":"libcamera-devel-bounces@lists.libcamera.org","Sender":"\"libcamera-devel\" "}},{"id":16694,"web_url":"https://patchwork.libcamera.org/comment/16694/","msgid":"","date":"2021-04-30T04:09:13","subject":"Re: [libcamera-devel] [PATCH v2] src: android: Rectify internal\n\theader's #include path","submitter":{"id":63,"url":"https://patchwork.libcamera.org/api/people/63/","name":"Hirokazu Honda","email":"hiroh@chromium.org"},"content":"Hi Umang,\n\nOn Thu, Apr 29, 2021 at 9:52 PM Kieran Bingham <\nkieran.bingham@ideasonboard.com> wrote:\n\n> Hi Umang,\n>\n> On 29/04/2021 13:22, Umang Jain wrote:\n> > libcamera internal headers are not installed system-wide. Hence, any\n> > inclusion of internal headers should be follow the #include directive\n> > form:\n> > #include \"libcamera/internal/header.h\"\n> >\n> > This was not the case for a few of the class in android HAL. Fix them\n> >\n>\n> Good spot.\n>\n> > Signed-off-by: Umang Jain \n>\n> For this,\n>\n> Reviewed-by: Kieran Bingham \n>\n> There is one more occurrence though in test/bayer-format.cpp as shown by:\n> git grep \"\n> Do you think this should be fixed in this patch (in which case, the\n> title needs a small update, purely to remove the 'android:' or as a\n> separate patch?\n>\n> Either way is fine with me.\n>\n>\n\nI am sorry I missed this patch and sent the comment to v1.\n\nWith the Kieran's comment,\nReviewed-by: Hirokazu Honda \n\n-Hiro\n\n>\n> > ---\n> > Changes in v2:\n> > - Also include other classes namely, generic_camera_buffer,\n> > post_processor as spotted by Niklas.\n> > ---\n> > src/android/camera_stream.h | 2 +-\n> > src/android/mm/generic_camera_buffer.cpp | 2 +-\n> > src/android/post_processor.h | 2 +-\n> > 3 files changed, 3 insertions(+), 3 deletions(-)\n> >\n> > diff --git a/src/android/camera_stream.h b/src/android/camera_stream.h\n> > index f68fdd3a..34016722 100644\n> > --- a/src/android/camera_stream.h\n> > +++ b/src/android/camera_stream.h\n> > @@ -19,7 +19,7 @@\n> > #include \n> > #include \n> >\n> > -#include \n> > +#include \"libcamera/internal/buffer.h\"\n> >\n> > class CameraDevice;\n> > class CameraMetadata;\n> > diff --git a/src/android/mm/generic_camera_buffer.cpp\n> b/src/android/mm/generic_camera_buffer.cpp\n> > index 929e078a..334498c1 100644\n> > --- a/src/android/mm/generic_camera_buffer.cpp\n> > +++ b/src/android/mm/generic_camera_buffer.cpp\n> > @@ -7,7 +7,7 @@\n> >\n> > #include \"../camera_buffer.h\"\n> >\n> > -#include \n> > +#include \"libcamera/internal/buffer.h\"\n> > #include \"libcamera/internal/log.h\"\n> >\n> > using namespace libcamera;\n> > diff --git a/src/android/post_processor.h b/src/android/post_processor.h\n> > index 4944078b..547fda37 100644\n> > --- a/src/android/post_processor.h\n> > +++ b/src/android/post_processor.h\n> > @@ -10,7 +10,7 @@\n> > #include \n> > #include \n> >\n> > -#include \n> > +#include \"libcamera/internal/buffer.h\"\n> >\n> > #include \"camera_buffer.h\"\n> >\n> >\n>\n> --\n> Regards\n> --\n> Kieran\n> _______________________________________________\n> libcamera-devel mailing list\n> libcamera-devel@lists.libcamera.org\n> https://lists.libcamera.org/listinfo/libcamera-devel\n>","headers":{"Return-Path":"","X-Original-To":"parsemail@patchwork.libcamera.org","Delivered-To":"parsemail@patchwork.libcamera.org","Received":["from lancelot.ideasonboard.com (lancelot.ideasonboard.com\n\t[92.243.16.209])\n\tby patchwork.libcamera.org (Postfix) with ESMTPS id E5887BDE45\n\tfor ;\n\tFri, 30 Apr 2021 04:09:25 +0000 (UTC)","from lancelot.ideasonboard.com (localhost [IPv6:::1])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTP id 47C2468901;\n\tFri, 30 Apr 2021 06:09:25 +0200 (CEST)","from mail-ed1-x530.google.com (mail-ed1-x530.google.com\n\t[IPv6:2a00:1450:4864:20::530])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTPS id AE2F6602C0\n\tfor ;\n\tFri, 30 Apr 2021 06:09:23 +0200 (CEST)","by mail-ed1-x530.google.com with SMTP id n25so8946546edr.5\n\tfor ;\n\tThu, 29 Apr 2021 21:09:23 -0700 (PDT)"],"Authentication-Results":"lancelot.ideasonboard.com;\n\tdkim=fail reason=\"signature verification failed\" (1024-bit key;\n\tunprotected) header.d=chromium.org header.i=@chromium.org\n\theader.b=\"StSJ6Q/6\"; dkim-atps=neutral","DKIM-Signature":"v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org;\n\ts=google; \n\th=mime-version:references:in-reply-to:from:date:message-id:subject:to\n\t:cc; bh=8qt2BsnY2A9iCkkl0cMyBM03Og8e0KrUHTEj3TZIOVw=;\n\tb=StSJ6Q/6GtpgRdN7fka5ED/IUST+kiNIKF7+35VYK0gOaiaMvURb52uWudCBLx4Pr/\n\tDmb/BLwPjRyJU6y1VI7821s0cU5NbH3oJ5jT1ta8ZFpuUzVK8DZd7EuU7hRTh32zsuAe\n\tcwzGvmBOB90hx1fmEXQ5lElnvwquFz9XTSDoc=","X-Google-DKIM-Signature":"v=1; a=rsa-sha256; c=relaxed/relaxed;\n\td=1e100.net; s=20161025;\n\th=x-gm-message-state:mime-version:references:in-reply-to:from:date\n\t:message-id:subject:to:cc;\n\tbh=8qt2BsnY2A9iCkkl0cMyBM03Og8e0KrUHTEj3TZIOVw=;\n\tb=e09EaIWwj7fzsyvon3+5/4uAeJlOhjqooPTIUC4uu2dV5D+etk8A4jnY2d9Fa5SI7M\n\tTaMlSyMWDzmZ35A0faF92jFRh3pSSipARJlufA/OBkuXP/ob1ahRU2lcotUUMCG/Y7ZN\n\tehDbMDi4Mz4NG169CUSmmCwpFJo7nojMy0mb5wUEXkGo/LToE3oS58aS77LlDNvWSbLn\n\t4/9KtDZvmnhnc3op/JakSpJZDPpdxR+IC6JBjd5if0cmnWD1B5vd6uaQpKW7zq1+zOzg\n\t4TibuucpRJnkabB35XmIsslRO5v0sM5GS7u934tFJB+xHuIxOZY/M/VTjqqlnlDtE4iT\n\t6D4Q==","X-Gm-Message-State":"AOAM5308kXyNGmsk9LqHjF3AuNkJ/h9GM+Po8vSMH0z0sXt9ZSZNIlyb\n\tX0mF1Sd1szBYWRqA7/HlCG+KRVBd9p/KmUSC/a1Efnkrg9E=","X-Google-Smtp-Source":"ABdhPJy5SSePKcGrsC+GpF5xKggxVWQg19kepZfuEVaRBWX+JmsGWJGGHndP/9dHj8ndge1VhWY2CI6tydHGQYXMa1g=","X-Received":"by 2002:a05:6402:51cd:: with SMTP id\n\tr13mr3320027edd.116.1619755763264; \n\tThu, 29 Apr 2021 21:09:23 -0700 (PDT)","MIME-Version":"1.0","References":"<20210429122258.68814-1-umang.jain@ideasonboard.com>\n\t<87b59bba-b868-1299-c7f4-295e0d5ea34a@ideasonboard.com>","In-Reply-To":"<87b59bba-b868-1299-c7f4-295e0d5ea34a@ideasonboard.com>","From":"Hirokazu Honda ","Date":"Fri, 30 Apr 2021 13:09:13 +0900","Message-ID":"","To":"Kieran Bingham ","Subject":"Re: [libcamera-devel] [PATCH v2] src: android: Rectify internal\n\theader's #include path","X-BeenThere":"libcamera-devel@lists.libcamera.org","X-Mailman-Version":"2.1.29","Precedence":"list","List-Id":"","List-Unsubscribe":",\n\t","List-Archive":"","List-Post":"","List-Help":"","List-Subscribe":",\n\t","Cc":"libcamera devel ","Content-Type":"multipart/mixed;\n\tboundary=\"===============9045695753673377670==\"","Errors-To":"libcamera-devel-bounces@lists.libcamera.org","Sender":"\"libcamera-devel\" "}}]