Merge pull request #100 from AxisCommunications/sync-20230926-1

sync 20230926 1
AxisCommunications · Sep 26, 2023 · ef3dd35 · ef3dd35
2 parents d89b2fa + 362e320
commit ef3dd35
Show file tree

Hide file tree

Showing 112 changed files with 1,008 additions and 490 deletions.
diff --git a/docs/api/computer-vision-sdk-apis.md b/docs/api/computer-vision-sdk-apis.md
@@ -19,16 +19,17 @@ The table below shows ACAP Computer Vision SDK and firmware version compatibilit
 
 SDK version | Available from firmware version
 ----------- | -------------------------------
-1.0 | 10.7
-1.1 | 10.9
-1.2 | 10.10
-1.3 | 10.12
-1.4 | 11.0
-1.5 | 11.1
-1.6 | 11.2
-1.7 | 11.3
-1.8 | 11.4
-1.9 | 11.5
+1.0  | 10.7
+1.1  | 10.9
+1.2  | 10.10
+1.3  | 10.12
+1.4  | 11.0
+1.5  | 11.1
+1.6  | 11.2
+1.7  | 11.3
+1.8  | 11.4
+1.9  | 11.5
+1.10 | 11.6
 
 ## SDK index
 

diff --git a/docs/api/native-sdk-api.md b/docs/api/native-sdk-api.md
@@ -24,16 +24,17 @@ The table below shows ACAP Native SDK and firmware version compatibility.
 
 SDK version | Available from firmware version
 ----------- | -------------------------------
-1.0 | 10.7
-1.1 | 10.9
-1.2 | 10.10
-1.3 | 10.12
-1.4 | 11.0
-1.5 | 11.1
-1.6 | 11.2
-1.7 | 11.3
-1.8 | 11.4
-1.9 | 11.5
+1.0  | 10.7
+1.1  | 10.9
+1.2  | 10.10
+1.3  | 10.12
+1.4  | 11.0
+1.5  | 11.1
+1.6  | 11.2
+1.7  | 11.3
+1.8  | 11.4
+1.9  | 11.5
+1.10 | 11.6
 
 ## Video capture API (VDO)
 
@@ -89,6 +90,7 @@ AXIS OS version | VdoStream API version | New functions added
 11.3 | 9.32.0 | -
 11.4 | 9.41.16 | `vdo_channel_get_ex`
 11.5 | 9.59.0 | -
+11.6 | 9.78.12 | `vdo_stream_set_gop_length`, `vdo_error_is_resource_limitation`
 
 ### Known issues
 

diff --git a/docs/api/src/api/axoverlay/example/cairo_image/meson.build b/docs/api/src/api/axoverlay/example/cairo_image/meson.build
@@ -0,0 +1,10 @@
+sources = files('axoverlayexample_cairo.c')
+
+all_cppcheck_sources += sources
+
+install_data(sources, install_dir: axo1_example_source_install_dir)
+
+executable('axo1_cairo',
+    sources,
+    install: true,
+    dependencies: [axo1_dep, glib_dep, cairo_dep])
diff --git a/docs/api/src/api/axoverlay/example/meson.build b/docs/api/src/api/axoverlay/example/meson.build
@@ -0,0 +1,7 @@
+axo1_example_source_install_dir = doc_install_dir / 'example/v1'
+
+subdir('cairo_image')
+subdir('opengles_objectloader')
+subdir('opengles_skia')
+subdir('opengles_performance')
+subdir('palette')
diff --git a/...ay/example/opengles_objectloader/config.c → .../example/opengles_objectloader/config.cpp b/...ay/example/opengles_objectloader/config.c → .../example/opengles_objectloader/config.cpp
diff --git a/docs/api/src/api/axoverlay/example/opengles_objectloader/meson.build b/docs/api/src/api/axoverlay/example/opengles_objectloader/meson.build
@@ -0,0 +1,24 @@
+sources = files(
+    'config.cpp',
+    'gl_example_errors.c',
+    'loaders.cpp',
+    'mesh.cpp',
+    'opengles_objectloader.cpp',
+    'render.cpp',
+    'shaders.c',
+)
+
+# FIXME opengles_objectloader example is not clean in cppcheck
+#all_cppcheck_sources += sources
+
+install_data(sources, install_dir: axo1_example_source_install_dir)
+
+if get_option('opengl')
+    cxx.has_header('tiny_obj_loader.h', required: true)
+    cxx.has_header('stb_image.h', required: true)
+
+    executable('axo1_opengles_objectloader',
+        sources,
+        install: true,
+        dependencies: [axo1_dep, glib_dep, glesv2_dep, egl_dep])
+endif
diff --git a/...gles_objectloader/opengles_objectloader.c → ...es_objectloader/opengles_objectloader.cpp b/...gles_objectloader/opengles_objectloader.c → ...es_objectloader/opengles_objectloader.cpp
diff --git a/...ay/example/opengles_objectloader/render.c → .../example/opengles_objectloader/render.cpp b/...ay/example/opengles_objectloader/render.c → .../example/opengles_objectloader/render.cpp
diff --git a/docs/api/src/api/axoverlay/example/opengles_objectloader/shaders.c b/docs/api/src/api/axoverlay/example/opengles_objectloader/shaders.c
@@ -4,7 +4,7 @@
 
 #include "shaders.h"
 
-#include "error_handler.h"
+#include "../../src/error_handler.h"
 
 #include <stdlib.h>
 #include <stdio.h>

diff --git a/docs/api/src/api/axoverlay/example/opengles_performance/meson.build b/docs/api/src/api/axoverlay/example/opengles_performance/meson.build
@@ -0,0 +1,12 @@
+sources = files('opengles_performance.c')
+
+all_cppcheck_sources += sources
+
+install_data(sources, install_dir: axo1_example_source_install_dir)
+
+if get_option('opengl')
+    executable('axo1_opengles_performance',
+        sources,
+        install: true,
+        dependencies: [axo1_dep, glib_dep, cairo_dep, glesv2_dep])
+endif
diff --git a/docs/api/src/api/axoverlay/example/opengles_performance/opengles_performance.c b/docs/api/src/api/axoverlay/example/opengles_performance/opengles_performance.c
@@ -51,7 +51,7 @@ struct program_struct {
   GLuint fragmentShader;
 };
 
-static program_struct* the_program = NULL;
+static struct program_struct* the_program = NULL;
 
 gboolean render_trigger_redraw(gpointer data)
 {
@@ -292,7 +292,7 @@ main(int argc, char **argv)
     return 1;
   }
 
-  the_program = (program_struct*)g_malloc0(sizeof(program_struct));
+  the_program = (struct program_struct*)g_malloc0(sizeof(*the_program));
 
   init_shaders();
 

diff --git a/docs/api/src/api/axoverlay/example/opengles_skia/meson.build b/docs/api/src/api/axoverlay/example/opengles_skia/meson.build
@@ -0,0 +1,17 @@
+sources = files('opengles_skia.cpp')
+
+all_cppcheck_sources += sources
+
+install_data(sources, install_dir: axo1_example_source_install_dir)
+
+if get_option('opengl')
+    skia_dep = dependency('skia', required: false)
+    freetype_dep = dependency('freetype2', required: false)
+    raqm_dep = dependency('raqm', required: false)
+    harfbuzz_dep = dependency('harfbuzz', required: false)
+
+    executable('axo1_opengles_skia',
+        sources,
+        install: true,
+        dependencies: [axo1_dep, glib_dep, freetype_dep, skia_dep, raqm_dep, harfbuzz_dep, glesv2_dep])
+endif
diff --git a/docs/api/src/api/axoverlay/example/palette/meson.build b/docs/api/src/api/axoverlay/example/palette/meson.build
@@ -0,0 +1,10 @@
+sources = files('axoverlayexample_palette.c')
+
+all_cppcheck_sources += sources
+
+install_data(sources, install_dir: axo1_example_source_install_dir)
+
+executable('axo1_palette',
+    sources,
+    install: true,
+    dependencies: [axo1_dep, glib_dep, cairo_dep])
diff --git a/docs/api/src/api/axoverlay/html/axoverlay_8h.html b/docs/api/src/api/axoverlay/html/axoverlay_8h.html
diff --git a/docs/api/src/api/axoverlay/html/axoverlay_8h.js b/docs/api/src/api/axoverlay/html/axoverlay_8h.js
@@ -13,6 +13,7 @@ var axoverlay_8h =
     [ "axoverlay_adjustment_function", "axoverlay_8h.html#acd597540ddc493c361cf49d425527c9b", null ],
     [ "axoverlay_render_function", "axoverlay_8h.html#af8cda33355d9b1345b4bc97836324a6e", null ],
     [ "axoverlay_stream_select_function", "axoverlay_8h.html#a69680654ad920dd63825debf80db1835", null ],
+    [ "axoverlay_synced_render_function", "axoverlay_8h.html#a837c18c9e89496b8e59c23c9320439aa", null ],
     [ "axoverlay_anchor_point", "axoverlay_8h.html#aa9f8d7e0652223e43d0d80b35fb1b017", [
       [ "AXOVERLAY_ANCHOR_TOP_LEFT", "axoverlay_8h.html#aa9f8d7e0652223e43d0d80b35fb1b017a8d67dcee72751fc14aa2d1bce7600efe", null ],
       [ "AXOVERLAY_ANCHOR_CENTER", "axoverlay_8h.html#aa9f8d7e0652223e43d0d80b35fb1b017a364bf6dd30ca9c71e5e3cb711befd6fc", null ]
@@ -56,6 +57,7 @@ var axoverlay_8h =
     [ "axoverlay_cleanup", "axoverlay_8h.html#a3510c0ea4e04846864603505b3994cf5", null ],
     [ "axoverlay_create_overlay", "axoverlay_8h.html#a95a791a9f63d0c5bad2d403b0d8c7ba3", null ],
     [ "axoverlay_destroy_overlay", "axoverlay_8h.html#aef2581df55e0b9adef9fcb795336c902", null ],
+    [ "axoverlay_enable_cpu_mem_sync", "axoverlay_8h.html#a4f313b61885df524cefe3242527ef1cd", null ],
     [ "axoverlay_get_max_resolution_height", "axoverlay_8h.html#aba18305ff424cfe2dd8c88974da6c700", null ],
     [ "axoverlay_get_max_resolution_width", "axoverlay_8h.html#a2081f1e63d1ccefe40e36b7328d07b05", null ],
     [ "axoverlay_get_number_of_palette_colors", "axoverlay_8h.html#a9039e46539a8ed3e23754e9261b0e793", null ],
@@ -66,7 +68,12 @@ var axoverlay_8h =
     [ "axoverlay_is_backend_supported", "axoverlay_8h.html#ad150141c6187fb915ea263c9824e2114", null ],
     [ "axoverlay_redraw", "axoverlay_8h.html#ac73bea732951f6bdcead8ee248b35b0a", null ],
     [ "axoverlay_reload_streams", "axoverlay_8h.html#a05e917b3d92ca3b5e38dd074aeb7d80c", null ],
+    [ "axoverlay_set_adjustment_callback", "axoverlay_8h.html#af78f0b190338d56da5c6491dfff596d3", null ],
+    [ "axoverlay_set_backend", "axoverlay_8h.html#af9c9390f00f72ac40793d35f0e4392fd", null ],
     [ "axoverlay_set_overlay_position", "axoverlay_8h.html#ade3ed3d327deba171eb679416a28af6e", null ],
     [ "axoverlay_set_overlay_size", "axoverlay_8h.html#aadef178b4a74eb601c095fcb9a0875b3", null ],
-    [ "axoverlay_set_palette_color", "axoverlay_8h.html#ac95c0f4c11509dfae12707aff79eedb8", null ]
+    [ "axoverlay_set_palette_color", "axoverlay_8h.html#ac95c0f4c11509dfae12707aff79eedb8", null ],
+    [ "axoverlay_set_render_callback", "axoverlay_8h.html#a41f1b95d6f4a76bda3795196bee97a2c", null ],
+    [ "axoverlay_set_stream_select_callback", "axoverlay_8h.html#a14986c555fe904ad27e9cee09c5793b1", null ],
+    [ "axoverlay_set_synced_render_callback", "axoverlay_8h.html#aa8ef90e6f67e0523c50f70e195b923e9", null ]
 ];
diff --git a/docs/api/src/api/axoverlay/html/axoverlay_8h__incl.dot b/docs/api/src/api/axoverlay/html/axoverlay_8h__incl.dot
@@ -1,8 +1,10 @@
-digraph "src/axoverlay.h"
+digraph "axoverlay.h"
 {
   edge [fontname="Helvetica",fontsize="10",labelfontname="Helvetica",labelfontsize="10"];
   node [fontname="Helvetica",fontsize="10",shape=record];
-  Node0 [label="src/axoverlay.h",height=0.2,width=0.4,color="black", fillcolor="grey75", style="filled", fontcolor="black"];
+  Node0 [label="axoverlay.h",height=0.2,width=0.4,color="black", fillcolor="grey75", style="filled", fontcolor="black"];
   Node0 -> Node1 [color="midnightblue",fontsize="10",style="solid",fontname="Helvetica"];
   Node1 [label="glib.h",height=0.2,width=0.4,color="grey75", fillcolor="white", style="filled"];
+  Node0 -> Node2 [color="midnightblue",fontsize="10",style="solid",fontname="Helvetica"];
+  Node2 [label="sys/time.h",height=0.2,width=0.4,color="grey75", fillcolor="white", style="filled"];
 }
diff --git a/docs/api/src/api/axoverlay/html/axoverlay_8h__incl.md5 b/docs/api/src/api/axoverlay/html/axoverlay_8h__incl.md5
@@ -1 +1 @@
-0c919c87ea3a0b3eb2b9909d8b26b08b
+779c49708e38945656824c4bc274fc40
diff --git a/docs/api/src/api/axoverlay/html/axoverlay_8h_source.html b/docs/api/src/api/axoverlay/html/axoverlay_8h_source.html
diff --git a/docs/api/src/api/axoverlay/html/axoverlaypage.html b/docs/api/src/api/axoverlay/html/axoverlaypage.html
@@ -5,7 +5,7 @@
 <meta http-equiv="X-UA-Compatible" content="IE=9"/>
 <meta name="generator" content="Doxygen 1.8.13"/>
 <meta name="viewport" content="width=device-width, initial-scale=1"/>
-<title>Axoverlay Library: Axoverlay C API</title>
+<title>Axoverlay Library: Axoverlay C API version 1.0</title>
 <link href="tabs.css" rel="stylesheet" type="text/css"/>
 <script type="text/javascript" src="jquery.js"></script>
 <script type="text/javascript" src="dynsections.js"></script>
@@ -82,10 +82,10 @@
 
 <div class="header">
   <div class="headertitle">
-<div class="title">Axoverlay C API </div>  </div>
+<div class="title">Axoverlay C API version 1.0 </div>  </div>
 </div><!--header-->
 <div class="contents">
-<div class="textblock"><p>This manual documents the Axoverlay C API.</p>
+<div class="textblock"><p>This manual documents the legacy Axoverlay C API.</p>
 <p>The purpose of this library is to make it easier to create and render custom overlays. </p>
 </div></div><!-- contents -->
 </div><!-- doc-content -->

diff --git a/...dir_68267d1309a1af8e8297ef4c3efbcdba.html → ...dir_5f95f37867742e27eef5ba25b7140943.html b/...dir_68267d1309a1af8e8297ef4c3efbcdba.html → ...dir_5f95f37867742e27eef5ba25b7140943.html
@@ -5,7 +5,7 @@
 <meta http-equiv="X-UA-Compatible" content="IE=9"/>
 <meta name="generator" content="Doxygen 1.8.13"/>
 <meta name="viewport" content="width=device-width, initial-scale=1"/>
-<title>Axoverlay Library: src Directory Reference</title>
+<title>Axoverlay Library: include Directory Reference</title>
 <link href="tabs.css" rel="stylesheet" type="text/css"/>
 <script type="text/javascript" src="jquery.js"></script>
 <script type="text/javascript" src="dynsections.js"></script>
@@ -63,7 +63,7 @@
   </div>
 </div>
 <script type="text/javascript">
-$(document).ready(function(){initNavTree('dir_68267d1309a1af8e8297ef4c3efbcdba.html','');});
+$(document).ready(function(){initNavTree('dir_5f95f37867742e27eef5ba25b7140943.html','');});
 </script>
 <div id="doc-content">
 <!-- window showing the filter options -->
@@ -82,7 +82,7 @@
 
 <div class="header">
   <div class="headertitle">
-<div class="title">src Directory Reference</div>  </div>
+<div class="title">include Directory Reference</div>  </div>
 </div><!--header-->
 <div class="contents">
 <table class="memberdecls">
@@ -98,7 +98,7 @@
 <!-- start footer part -->
 <div id="nav-path" class="navpath"><!-- id is needed for treeview function! -->
   <ul>
-    <li class="navelem"><a class="el" href="dir_68267d1309a1af8e8297ef4c3efbcdba.html">src</a></li>
+    <li class="navelem"><a class="el" href="dir_a6e26b83e1cc01163d742a8b70e154d1.html">v1</a></li><li class="navelem"><a class="el" href="dir_5f95f37867742e27eef5ba25b7140943.html">include</a></li>
     <li class="footer">Copyright &copy; 2009-2023 Axis Communications AB. All rights reserved.</li>
   </ul>
 </div>

diff --git a/docs/api/src/api/axoverlay/html/dir_68267d1309a1af8e8297ef4c3efbcdba.js b/docs/api/src/api/axoverlay/html/dir_68267d1309a1af8e8297ef4c3efbcdba.js
diff --git a/docs/api/src/api/axoverlay/html/dir_a6e26b83e1cc01163d742a8b70e154d1.html b/docs/api/src/api/axoverlay/html/dir_a6e26b83e1cc01163d742a8b70e154d1.html
@@ -0,0 +1,103 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head>
+<meta http-equiv="Content-Type" content="text/xhtml;charset=UTF-8"/>
+<meta http-equiv="X-UA-Compatible" content="IE=9"/>
+<meta name="generator" content="Doxygen 1.8.13"/>
+<meta name="viewport" content="width=device-width, initial-scale=1"/>
+<title>Axoverlay Library: v1 Directory Reference</title>
+<link href="tabs.css" rel="stylesheet" type="text/css"/>
+<script type="text/javascript" src="jquery.js"></script>
+<script type="text/javascript" src="dynsections.js"></script>
+<link href="navtree.css" rel="stylesheet" type="text/css"/>
+<script type="text/javascript" src="resize.js"></script>
+<script type="text/javascript" src="navtreedata.js"></script>
+<script type="text/javascript" src="navtree.js"></script>
+<script type="text/javascript">
+  $(document).ready(initResizable);
+</script>
+<link href="search/search.css" rel="stylesheet" type="text/css"/>
+<script type="text/javascript" src="search/searchdata.js"></script>
+<script type="text/javascript" src="search/search.js"></script>
+<link href="doxygen.css" rel="stylesheet" type="text/css" />
+<link href="customdoxygen.css" rel="stylesheet" type="text/css"/>
+</head>
+<body>
+<div id="top"><!-- do not remove this div, it is closed by doxygen! -->
+<div id="titlearea">
+<table cellspacing="0" cellpadding="0">
+ <tbody>
+ <tr style="height: 56px;">
+  <td id="projectlogo"><img alt="Logo" src="axis-logo.png"/></td>
+  <td id="projectalign" style="padding-left: 0.5em;">
+   <div id="projectname">Axoverlay Library
+   </div>
+  </td>
+ </tr>
+ </tbody>
+</table>
+</div>
+<!-- end header part -->
+<!-- Generated by Doxygen 1.8.13 -->
+<script type="text/javascript">
+var searchBox = new SearchBox("searchBox", "search",false,'Search');
+</script>
+<script type="text/javascript" src="menudata.js"></script>
+<script type="text/javascript" src="menu.js"></script>
+<script type="text/javascript">
+$(function() {
+  initMenu('',true,false,'search.php','Search');
+  $(document).ready(function() { init_search(); });
+});
+</script>
+<div id="main-nav"></div>
+</div><!-- top -->
+<div id="side-nav" class="ui-resizable side-nav-resizable">
+  <div id="nav-tree">
+    <div id="nav-tree-contents">
+      <div id="nav-sync" class="sync"></div>
+    </div>
+  </div>
+  <div id="splitbar" style="-moz-user-select:none;" 
+       class="ui-resizable-handle">
+  </div>
+</div>
+<script type="text/javascript">
+$(document).ready(function(){initNavTree('dir_a6e26b83e1cc01163d742a8b70e154d1.html','');});
+</script>
+<div id="doc-content">
+<!-- window showing the filter options -->
+<div id="MSearchSelectWindow"
+     onmouseover="return searchBox.OnSearchSelectShow()"
+     onmouseout="return searchBox.OnSearchSelectHide()"
+     onkeydown="return searchBox.OnSearchSelectKey(event)">
+</div>
+
+<!-- iframe showing the search results (closed by default) -->
+<div id="MSearchResultsWindow">
+<iframe src="javascript:void(0)" frameborder="0" 
+        name="MSearchResults" id="MSearchResults">
+</iframe>
+</div>
+
+<div class="header">
+  <div class="headertitle">
+<div class="title">v1 Directory Reference</div>  </div>
+</div><!--header-->
+<div class="contents">
+<table class="memberdecls">
+<tr class="heading"><td colspan="2"><h2 class="groupheader"><a name="subdirs"></a>
+Directories</h2></td></tr>
+</table>
+</div><!-- contents -->
+</div><!-- doc-content -->
+<!-- HTML footer for doxygen 1.8.13-->
+<!-- start footer part -->
+<div id="nav-path" class="navpath"><!-- id is needed for treeview function! -->
+  <ul>
+    <li class="navelem"><a class="el" href="dir_a6e26b83e1cc01163d742a8b70e154d1.html">v1</a></li>
+    <li class="footer">Copyright &copy; 2009-2023 Axis Communications AB. All rights reserved.</li>
+  </ul>
+</div>
+</body>
+</html>