From patchwork Thu Nov 22 13:10:08 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kieran Bingham X-Patchwork-Id: 7 Return-Path: Received: from perceval.ideasonboard.com (perceval.ideasonboard.com [213.167.242.64]) by lancelot.ideasonboard.com (Postfix) with ESMTPS id CFF6C60B12 for ; Thu, 22 Nov 2018 14:10:15 +0100 (CET) Received: from localhost.localdomain (cpc89242-aztw30-2-0-cust488.18-1.cable.virginm.net [86.31.129.233]) by perceval.ideasonboard.com (Postfix) with ESMTPSA id 4B11E592; Thu, 22 Nov 2018 14:10:15 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com; s=mail; t=1542892215; bh=63YpMw8iiwGqDMFFEt+RrES01wcae0BXC2VHwZ5cBiM=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=bXFGAaXGcjjoAwszqt57s0knlIxyRFUR3VOw5IgV0zTNM1pYKZJnshOHgCaiJzpSd KGXZyYMoV9Yf2j0RNAE5bKNAI4luW8Ak3HMqMS70aguYMAOWx9DYouUOx02JgjZo5Q 7nG1c+mClOKRrEkXWul9q0AUZMukRe210CdB8AAw= From: Kieran Bingham To: LibCamera Devel Date: Thu, 22 Nov 2018 13:10:08 +0000 Message-Id: <20181122131010.22085-2-kieran.bingham@ideasonboard.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20181122131010.22085-1-kieran.bingham@ideasonboard.com> References: <20181122131010.22085-1-kieran.bingham@ideasonboard.com> Subject: [libcamera-devel] [PATCH 1/3] test: Register the initialisation test with meson X-BeenThere: libcamera-devel@lists.libcamera.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 22 Nov 2018 13:10:16 -0000 Register the test so that it can integrate with the meson test framework. To execute the test suite, use 'ninja test'. Signed-off-by: Kieran Bingham Reviewed-by: Laurent Pinchart --- test/meson.build | 2 ++ 1 file changed, 2 insertions(+) diff --git a/test/meson.build b/test/meson.build index faff4b2d4da4..4f5c7a82e4c4 100644 --- a/test/meson.build +++ b/test/meson.build @@ -1,3 +1,5 @@ test_init = executable('test_init', 'init.cpp', link_with : libcamera, include_directories : inc) + +test('Initialisation test', test_init) From patchwork Thu Nov 22 13:10:09 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kieran Bingham X-Patchwork-Id: 8 Return-Path: Received: from perceval.ideasonboard.com (perceval.ideasonboard.com [IPv6:2001:4b98:dc2:55:216:3eff:fef7:d647]) by lancelot.ideasonboard.com (Postfix) with ESMTPS id 0B57160B12 for ; Thu, 22 Nov 2018 14:10:16 +0100 (CET) Received: from localhost.localdomain (cpc89242-aztw30-2-0-cust488.18-1.cable.virginm.net [86.31.129.233]) by perceval.ideasonboard.com (Postfix) with ESMTPSA id 9AA55594; Thu, 22 Nov 2018 14:10:15 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com; s=mail; t=1542892215; bh=FIb0GJKsnQ8QF5E0PXkBR9zz5nUVwCqEMcV9whKz/LQ=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=pzhlPdK7vkgB/UzpXqR2Ivk+RUAIsVJjRqyzNqMZqdRSXaC8cgkZVyMOdY7/dCgKp bi2m6LjeJSaksyio13XcHY9w1X+H+a5GeWTNXFEMvc7rZZFwzfQaQoT1e39IQpHt1A MnntMgECTZ/+faHlnp1QQAp8S2/QN//RESdlqogE= From: Kieran Bingham To: LibCamera Devel Date: Thu, 22 Nov 2018 13:10:09 +0000 Message-Id: <20181122131010.22085-3-kieran.bingham@ideasonboard.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20181122131010.22085-1-kieran.bingham@ideasonboard.com> References: <20181122131010.22085-1-kieran.bingham@ideasonboard.com> Subject: [libcamera-devel] [PATCH 2/3] CI: Provide initial automated testing X-BeenThere: libcamera-devel@lists.libcamera.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 22 Nov 2018 13:10:16 -0000 Integrate compile testing and the ninja test framework. Any unit tests registered with the Meson Build system will automatically be run with 'ninja test'. Signed-off-by: Kieran Bingham --- .gitlab-ci.yml | 14 ++++++++++++++ 1 file changed, 14 insertions(+) create mode 100644 .gitlab-ci.yml diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml new file mode 100644 index 000000000000..8b4b4b12d368 --- /dev/null +++ b/.gitlab-ci.yml @@ -0,0 +1,14 @@ +image: gcc + +build: + stage: build + before_script: + - apt update && apt -y install meson + script: + - mkdir libcamera && cd libcamera && meson .. && ninja + - ninja test + artifacts: + paths: + - libcamera/lib/libcamera.so + - libcamera/test/test_init + - meson-logs/testlog.txt From patchwork Thu Nov 22 13:10:10 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kieran Bingham X-Patchwork-Id: 9 Return-Path: Received: from perceval.ideasonboard.com (perceval.ideasonboard.com [IPv6:2001:4b98:dc2:55:216:3eff:fef7:d647]) by lancelot.ideasonboard.com (Postfix) with ESMTPS id 5B46C60B12 for ; Thu, 22 Nov 2018 14:10:16 +0100 (CET) Received: from localhost.localdomain (cpc89242-aztw30-2-0-cust488.18-1.cable.virginm.net [86.31.129.233]) by perceval.ideasonboard.com (Postfix) with ESMTPSA id E3763595; Thu, 22 Nov 2018 14:10:15 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com; s=mail; t=1542892216; bh=dqIn31KRR0j5mqx637pG2yFssN7Lwrq/9hegI7z7ZTg=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=THXFn8HjrFemvyI3M6BY+qY67gxLdWBZZ5hKJECRt9nwWc0r2/PvcZ+Hj6FoM2ceO 0HwF2oDAcsV8zbn7DDelgGnbK8zRBWz6S1gaSeqEU2SJ4Oqyw1FfkyDQD58FgX+KPn OlKCc7Uz+06Sd8EIeCrF9bGAZOqiNnSS9Hd6p3Uw= From: Kieran Bingham To: LibCamera Devel Date: Thu, 22 Nov 2018 13:10:10 +0000 Message-Id: <20181122131010.22085-4-kieran.bingham@ideasonboard.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20181122131010.22085-1-kieran.bingham@ideasonboard.com> References: <20181122131010.22085-1-kieran.bingham@ideasonboard.com> Subject: [libcamera-devel] [PATCH 3/3] Documentation: Introduce sphinx documentation X-BeenThere: libcamera-devel@lists.libcamera.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 22 Nov 2018 13:10:16 -0000 Utilise sphinx-build to generate documentation in HTML form, and populate with some initial content. An initial conf.py is generated from sphinx-quickstart and answering initial questions. Signed-off-by: Kieran Bingham --- .gitlab-ci.yml | 2 +- Documentation/Makefile | 19 +++++ Documentation/conf.py | 173 ++++++++++++++++++++++++++++++++++++++ Documentation/hacking.rst | 42 +++++++++ Documentation/index.rst | 36 ++++++++ Documentation/meson.build | 20 +++++ meson.build | 6 ++ 7 files changed, 297 insertions(+), 1 deletion(-) create mode 100644 Documentation/Makefile create mode 100644 Documentation/conf.py create mode 100644 Documentation/hacking.rst create mode 100644 Documentation/index.rst create mode 100644 Documentation/meson.build diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 8b4b4b12d368..d7d41425dd8e 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -3,7 +3,7 @@ image: gcc build: stage: build before_script: - - apt update && apt -y install meson + - apt update && apt -y install meson python3-sphinx script: - mkdir libcamera && cd libcamera && meson .. && ninja - ninja test diff --git a/Documentation/Makefile b/Documentation/Makefile new file mode 100644 index 000000000000..298ea9e213e8 --- /dev/null +++ b/Documentation/Makefile @@ -0,0 +1,19 @@ +# Minimal makefile for Sphinx documentation +# + +# You can set these variables from the command line. +SPHINXOPTS = +SPHINXBUILD = sphinx-build +SOURCEDIR = . +BUILDDIR = _build + +# Put it first so that "make" without argument is like "make help". +help: + @$(SPHINXBUILD) -M help "$(SOURCEDIR)" "$(BUILDDIR)" $(SPHINXOPTS) $(O) + +.PHONY: help Makefile + +# Catch-all target: route all unknown targets to Sphinx using the new +# "make mode" option. $(O) is meant as a shortcut for $(SPHINXOPTS). +%: Makefile + @$(SPHINXBUILD) -M $@ "$(SOURCEDIR)" "$(BUILDDIR)" $(SPHINXOPTS) $(O) \ No newline at end of file diff --git a/Documentation/conf.py b/Documentation/conf.py new file mode 100644 index 000000000000..70d4e72c6902 --- /dev/null +++ b/Documentation/conf.py @@ -0,0 +1,173 @@ +# -*- coding: utf-8 -*- +# +# Configuration file for the Sphinx documentation builder. +# +# This file does only contain a selection of the most common options. For a +# full list see the documentation: +# http://www.sphinx-doc.org/en/master/config + +# -- Path setup -------------------------------------------------------------- + +# If extensions (or modules to document with autodoc) are in another directory, +# add these directories to sys.path here. If the directory is relative to the +# documentation root, use os.path.abspath to make it absolute, like shown here. +# +# import os +# import sys +# sys.path.insert(0, os.path.abspath('.')) + + +# -- Project information ----------------------------------------------------- + +project = 'LibCamera' +copyright = '2018, Kieran Bingham, Jacopo Mondi, Laurent Pinchart, Niklas Soderlund' +author = 'Kieran Bingham, Jacopo Mondi, Laurent Pinchart, Niklas Soderlund' + +# The short X.Y version +version = '' +# The full version, including alpha/beta/rc tags +release = '0.1' + + +# -- General configuration --------------------------------------------------- + +# If your documentation needs a minimal Sphinx version, state it here. +# +# needs_sphinx = '1.0' + +# Add any Sphinx extension module names here, as strings. They can be +# extensions coming with Sphinx (named 'sphinx.ext.*') or your custom +# ones. +extensions = [ +] + +# Add any paths that contain templates here, relative to this directory. +templates_path = ['_templates'] + +# The suffix(es) of source filenames. +# You can specify multiple suffix as a list of string: +# +# source_suffix = ['.rst', '.md'] +source_suffix = '.rst' + +# The master toctree document. +master_doc = 'index' + +# The language for content autogenerated by Sphinx. Refer to documentation +# for a list of supported languages. +# +# This is also used if you do content translation via gettext catalogs. +# Usually you set "language" from the command line for these cases. +language = None + +# List of patterns, relative to source directory, that match files and +# directories to ignore when looking for source files. +# This pattern also affects html_static_path and html_extra_path. +exclude_patterns = ['_build', 'Thumbs.db', '.DS_Store'] + +# The name of the Pygments (syntax highlighting) style to use. +pygments_style = None + + +# -- Options for HTML output ------------------------------------------------- + +# The theme to use for HTML and HTML Help pages. See the documentation for +# a list of builtin themes. +# +html_theme = 'alabaster' + +# Theme options are theme-specific and customize the look and feel of a theme +# further. For a list of options available for each theme, see the +# documentation. +# +# html_theme_options = {} + +# Add any paths that contain custom static files (such as style sheets) here, +# relative to this directory. They are copied after the builtin static files, +# so a file named "default.css" will overwrite the builtin "default.css". +html_static_path = ['_static'] + +# Custom sidebar templates, must be a dictionary that maps document names +# to template names. +# +# The default sidebars (for documents that don't match any pattern) are +# defined by theme itself. Builtin themes are using these templates by +# default: ``['localtoc.html', 'relations.html', 'sourcelink.html', +# 'searchbox.html']``. +# +# html_sidebars = {} + + +# -- Options for HTMLHelp output --------------------------------------------- + +# Output file base name for HTML help builder. +htmlhelp_basename = 'LibCameradoc' + + +# -- Options for LaTeX output ------------------------------------------------ + +latex_elements = { + # The paper size ('letterpaper' or 'a4paper'). + # + # 'papersize': 'letterpaper', + + # The font size ('10pt', '11pt' or '12pt'). + # + # 'pointsize': '10pt', + + # Additional stuff for the LaTeX preamble. + # + # 'preamble': '', + + # Latex figure (float) alignment + # + # 'figure_align': 'htbp', +} + +# Grouping the document tree into LaTeX files. List of tuples +# (source start file, target name, title, +# author, documentclass [howto, manual, or own class]). +latex_documents = [ + (master_doc, 'LibCamera.tex', 'LibCamera Documentation', + 'Kieran Bingham, Jacopo Mondi, Laurent Pinchart, Niklas Soderlund', 'manual'), +] + + +# -- Options for manual page output ------------------------------------------ + +# One entry per manual page. List of tuples +# (source start file, name, description, authors, manual section). +man_pages = [ + (master_doc, 'libcamera', 'LibCamera Documentation', + [author], 1) +] + + +# -- Options for Texinfo output ---------------------------------------------- + +# Grouping the document tree into Texinfo files. List of tuples +# (source start file, target name, title, author, +# dir menu entry, description, category) +texinfo_documents = [ + (master_doc, 'LibCamera', 'LibCamera Documentation', + author, 'LibCamera', 'One line description of project.', + 'Miscellaneous'), +] + + +# -- Options for Epub output ------------------------------------------------- + +# Bibliographic Dublin Core info. +epub_title = project + +# The unique identifier of the text. This can be a ISBN number +# or the project homepage. +# +# epub_identifier = '' + +# A unique identification for the text. +# +# epub_uid = '' + +# A list of files that should not be packed into the epub file. +epub_exclude_files = ['search.html'] \ No newline at end of file diff --git a/Documentation/hacking.rst b/Documentation/hacking.rst new file mode 100644 index 000000000000..f65381e8f290 --- /dev/null +++ b/Documentation/hacking.rst @@ -0,0 +1,42 @@ +Hacking and Development +======================= + +libcamera is developed as a free software project and welcomes contributors. +Whether you would like to help with coding, documentation, testing, proposing +new features, or just discussing the project with the community, you can join +our official public communication hannels, or simply check out the code. +Mailing List + +We use a public mailing list as our main mean of communication. You can find +subscription information and the messages archive on the libcamera-devel list +information page. + +IRC Channel +----------- + +For informal and real time discussions, our IRC channel on Freenode is open to +the public. Point your IRC client to #libcamera to say hello, or use the `WebChat`_. + +.. _WebChat: https://webchat.freenode.net/?channels=%23libcamera&uio=d4 + +Source Code +----------- + +libcamera is in early stages of development, no releases are available yet. The +source code is available from the project's git tree, hosted by LinuxTV. + + $ git clone git://linuxtv.org/libcamera.git + +Documentation +------------- + +Project documentation is created using `Sphinx`_. Source level documentation +is currently planned to utilise Doxygen integration. Please use this in your +development. + +Sphinx integration with Doxygen will be with either `Breathe`_ or `Exhale`_ +depending upon which system works best + +.. _Sphinx: http://www.sphinx-doc.org +.. _Breathe: https://breathe.readthedocs.io/en/latest/ +.. _Exhale: https://exhale.readthedocs.io/en/latest/ diff --git a/Documentation/index.rst b/Documentation/index.rst new file mode 100644 index 000000000000..36708af15c2c --- /dev/null +++ b/Documentation/index.rst @@ -0,0 +1,36 @@ +.. LibCamera documentation master file, created by + sphinx-quickstart on Mon Nov 19 22:09:29 2018. + You can adapt this file completely to your liking, but it should at least + contain the root `toctree` directive. + +LibCamera abstraction library +============================= + +Cameras are complex devices that need heavy hardware image processing +operations. Control of the processing is based on advanced algorithms that must +run on a programmable processor. This has traditionally been implemented in a +dedicated MCU in the camera, but in embedded devices algorithms have been moved +to the main CPU to save cost. Blurring the boundary between camera devices and +Linux often left the user with no other option than a vendor-specific +closed-source solution. + +To address this problem the Linux media community has very recently started +collaboration with the industry to develop a camera stack that will be +open-source-friendly while still protecting vendor core IP. libcamera was born +out of that collaboration and will offer modern camera support to Linux-based +systems, including traditional Linux distributions, ChromeOS and Android. + + +.. toctree:: + :maxdepth: 2 + :caption: Contents: + + hacking + + + +Indices and tables +================== + +* :ref:`genindex` +* :ref:`search` diff --git a/Documentation/meson.build b/Documentation/meson.build new file mode 100644 index 000000000000..5ab04479d3fb --- /dev/null +++ b/Documentation/meson.build @@ -0,0 +1,20 @@ +sphinx = find_program('sphinx-build-3', required: false) +if not sphinx.found() + sphinx = find_program('sphinx-build', required: false) +endif + +if sphinx.found() + docs_sources = [ + 'hacking.rst', + 'index.rst', + ] + + custom_target('en user documentation', + command: [sphinx, '-W', '-b', 'html', meson.current_source_dir(), '@OUTPUT@'], + input: docs_sources, + output: 'en', + build_by_default: true) + + install_subdir(meson.current_build_dir() + '/en', + install_dir: 'share/doc/libcamera-@0@/user'.format(api_version)) +endif diff --git a/meson.build b/meson.build index 4b3d528c8932..434aa557b8a1 100644 --- a/meson.build +++ b/meson.build @@ -2,8 +2,14 @@ project('libcamera - supporting complex camera pipelines', 'c', 'cpp', version : '0.1', license : 'LGPL 2.1+') +# TODO: Extract this from project.version. +# Ideally the version at Documentation/conf.py should be +# generated from this too. +api_version = '0.1' + inc = include_directories('include') +subdir('Documentation') subdir('lib') subdir('test') subdir('utils')