Skip to content
This repository was archived by the owner on Feb 6, 2025. It is now read-only.

Commit 91a9488

Browse files
johan-hultberg-workjohan-hultberg-work
authored
Merge pull request #151 from AxisCommunications/sync-20241125-1
Sync 20241125 1
2 parents 322f4b6 + 5e5fec2 commit 91a9488

File tree

91 files changed

+3065
-1324
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

91 files changed

+3065
-1324
lines changed

‎docs/api/src/api/axevent/html/axevent_8h.html‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -142,7 +142,8 @@ <h2><a class="anchor" id="ax_event_handler_source_and_data_keys"></a>
142142
<p>The source key can be omitted, for example if source information is of no use for the consumer. The data key can also be omitted, although most event will have data of some kind. See ax_event_handler_declare_event for a detailed description about how to declare an event.</p>
143143
<h2><a class="anchor" id="ax_event_handler_declaration_templates"></a>
144144
Event declaration templates</h2>
145-
<p>The recommended method to declare events is to use event declaration templates. An event declaration template is an XML representation of the declaration's key/value set. The template is then referenced when declaring a new event.</p>
145+
<p>N.b. from AXIS OS 12.0, templates for events are deprecated and are planned for removal.</p>
146+
<p>An event declaration template is an XML representation of the declaration's key/value set. The template is then referenced when declaring a new event.</p>
146147
<dl class="section user"><dt>Event declaration template schema</dt><dd><pre class="fragment">&lt;?xml version="1.0" encoding="UTF-8"?&gt;
147148

148149
&lt;xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema" elementFromDefault="qualified" attributeFormDefault="unqualified"&gt;

‎docs/api/src/api/axevent/html/axevent_8h_source.html‎

Lines changed: 18 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -66,24 +66,24 @@
6666
<div class="contents">
6767
<a href="axevent_8h.html">Go to the documentation of this file.</a><div class="fragment"><div class="line"><a name="l00001"></a><span class="lineno"> 1</span>&#160;<span class="preprocessor">#ifndef _AX_EVENTS_H_</span></div>
6868
<div class="line"><a name="l00002"></a><span class="lineno"> 2</span>&#160;<span class="preprocessor">#define _AX_EVENTS_H_</span></div>
69-
<div class="line"><a name="l00373"></a><span class="lineno"> 373</span>&#160;<span class="preprocessor">#include &lt;glib.h&gt;</span></div>
70-
<div class="line"><a name="l00374"></a><span class="lineno"> 374</span>&#160; </div>
71-
<div class="line"><a name="l00375"></a><span class="lineno"> 375</span>&#160;<span class="preprocessor">#ifdef __cplusplus</span></div>
72-
<div class="line"><a name="l00376"></a><span class="lineno"> 376</span>&#160;<span class="keyword">extern</span> <span class="stringliteral">&quot;C&quot;</span> {</div>
73-
<div class="line"><a name="l00377"></a><span class="lineno"> 377</span>&#160;<span class="preprocessor">#endif</span></div>
74-
<div class="line"><a name="l00378"></a><span class="lineno"> 378</span>&#160; </div>
75-
<div class="line"><a name="l00379"></a><span class="lineno"> 379</span>&#160;<span class="preprocessor">#include &lt;axsdk/axevent/ax_event_types.h&gt;</span></div>
76-
<div class="line"><a name="l00380"></a><span class="lineno"> 380</span>&#160;<span class="preprocessor">#include &lt;axsdk/axevent/ax_event_element_item.h&gt;</span></div>
77-
<div class="line"><a name="l00381"></a><span class="lineno"> 381</span>&#160;<span class="preprocessor">#include &lt;axsdk/axevent/ax_event_error.h&gt;</span></div>
78-
<div class="line"><a name="l00382"></a><span class="lineno"> 382</span>&#160;<span class="preprocessor">#include &lt;axsdk/axevent/ax_event_key_value_set.h&gt;</span></div>
79-
<div class="line"><a name="l00383"></a><span class="lineno"> 383</span>&#160;<span class="preprocessor">#include &lt;axsdk/axevent/ax_event.h&gt;</span></div>
80-
<div class="line"><a name="l00384"></a><span class="lineno"> 384</span>&#160;<span class="preprocessor">#include &lt;axsdk/axevent/ax_event_handler.h&gt;</span></div>
81-
<div class="line"><a name="l00385"></a><span class="lineno"> 385</span>&#160; </div>
82-
<div class="line"><a name="l00386"></a><span class="lineno"> 386</span>&#160;<span class="preprocessor">#ifdef __cplusplus</span></div>
83-
<div class="line"><a name="l00387"></a><span class="lineno"> 387</span>&#160;}</div>
84-
<div class="line"><a name="l00388"></a><span class="lineno"> 388</span>&#160;<span class="preprocessor">#endif</span></div>
85-
<div class="line"><a name="l00389"></a><span class="lineno"> 389</span>&#160; </div>
86-
<div class="line"><a name="l00390"></a><span class="lineno"> 390</span>&#160;<span class="preprocessor">#endif </span><span class="comment">/* _AX_EVENTS_H_ */</span><span class="preprocessor"></span></div>
69+
<div class="line"><a name="l00374"></a><span class="lineno"> 374</span>&#160;<span class="preprocessor">#include &lt;glib.h&gt;</span></div>
70+
<div class="line"><a name="l00375"></a><span class="lineno"> 375</span>&#160; </div>
71+
<div class="line"><a name="l00376"></a><span class="lineno"> 376</span>&#160;<span class="preprocessor">#ifdef __cplusplus</span></div>
72+
<div class="line"><a name="l00377"></a><span class="lineno"> 377</span>&#160;<span class="keyword">extern</span> <span class="stringliteral">&quot;C&quot;</span> {</div>
73+
<div class="line"><a name="l00378"></a><span class="lineno"> 378</span>&#160;<span class="preprocessor">#endif</span></div>
74+
<div class="line"><a name="l00379"></a><span class="lineno"> 379</span>&#160; </div>
75+
<div class="line"><a name="l00380"></a><span class="lineno"> 380</span>&#160;<span class="preprocessor">#include &lt;axsdk/axevent/ax_event_types.h&gt;</span></div>
76+
<div class="line"><a name="l00381"></a><span class="lineno"> 381</span>&#160;<span class="preprocessor">#include &lt;axsdk/axevent/ax_event_element_item.h&gt;</span></div>
77+
<div class="line"><a name="l00382"></a><span class="lineno"> 382</span>&#160;<span class="preprocessor">#include &lt;axsdk/axevent/ax_event_error.h&gt;</span></div>
78+
<div class="line"><a name="l00383"></a><span class="lineno"> 383</span>&#160;<span class="preprocessor">#include &lt;axsdk/axevent/ax_event_key_value_set.h&gt;</span></div>
79+
<div class="line"><a name="l00384"></a><span class="lineno"> 384</span>&#160;<span class="preprocessor">#include &lt;axsdk/axevent/ax_event.h&gt;</span></div>
80+
<div class="line"><a name="l00385"></a><span class="lineno"> 385</span>&#160;<span class="preprocessor">#include &lt;axsdk/axevent/ax_event_handler.h&gt;</span></div>
81+
<div class="line"><a name="l00386"></a><span class="lineno"> 386</span>&#160; </div>
82+
<div class="line"><a name="l00387"></a><span class="lineno"> 387</span>&#160;<span class="preprocessor">#ifdef __cplusplus</span></div>
83+
<div class="line"><a name="l00388"></a><span class="lineno"> 388</span>&#160;}</div>
84+
<div class="line"><a name="l00389"></a><span class="lineno"> 389</span>&#160;<span class="preprocessor">#endif</span></div>
85+
<div class="line"><a name="l00390"></a><span class="lineno"> 390</span>&#160; </div>
86+
<div class="line"><a name="l00391"></a><span class="lineno"> 391</span>&#160;<span class="preprocessor">#endif </span><span class="comment">/* _AX_EVENTS_H_ */</span><span class="preprocessor"></span></div>
8787
</div><!-- fragment --></div><!-- contents -->
8888
</div><!-- doc-content -->
8989
<!-- HTML footer for doxygen 1.8.13-->

‎docs/api/src/api/bbox/html/bbox_8h.html‎

Lines changed: 62 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -113,6 +113,12 @@
113113
<tr class="memdesc:a3c355605ed60f45f49369fb2959d8ac6"><td class="mdescLeft">&#160;</td><td class="mdescRight">Destroy the bbox object. <a href="bbox_8h.html#a3c355605ed60f45f49369fb2959d8ac6">More...</a><br /></td></tr>
114114
<tr class="separator:a3c355605ed60f45f49369fb2959d8ac6"><td class="memSeparator" colspan="2">&#160;</td></tr>
115115
<tr><td colspan="2"><div class="groupHeader">Functions</div></td></tr>
116+
<tr class="memitem:aa5f4fc125238cbaf365d3c17a0b54a4c"><td class="memItemLeft" align="right" valign="top">bool&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="bbox_8h.html#aa5f4fc125238cbaf365d3c17a0b54a4c">bbox_coordinates_scene_normalized</a> (bbox_t *self)</td></tr>
117+
<tr class="memdesc:aa5f4fc125238cbaf365d3c17a0b54a4c"><td class="mdescLeft">&#160;</td><td class="mdescRight">Switch to scene normalized coordinate space [Default]. <a href="bbox_8h.html#aa5f4fc125238cbaf365d3c17a0b54a4c">More...</a><br /></td></tr>
118+
<tr class="separator:aa5f4fc125238cbaf365d3c17a0b54a4c"><td class="memSeparator" colspan="2">&#160;</td></tr>
119+
<tr class="memitem:a33f78b623bcd946a078378d57fbec61f"><td class="memItemLeft" align="right" valign="top">bool&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="bbox_8h.html#a33f78b623bcd946a078378d57fbec61f">bbox_coordinates_frame_normalized</a> (bbox_t *self)</td></tr>
120+
<tr class="memdesc:a33f78b623bcd946a078378d57fbec61f"><td class="mdescLeft">&#160;</td><td class="mdescRight">Switch to frame normalized coordinate space. <a href="bbox_8h.html#a33f78b623bcd946a078378d57fbec61f">More...</a><br /></td></tr>
121+
<tr class="separator:a33f78b623bcd946a078378d57fbec61f"><td class="memSeparator" colspan="2">&#160;</td></tr>
116122
<tr class="memitem:ae90970820d6e036471c9bca9a130164a"><td class="memItemLeft" align="right" valign="top">bool&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="bbox_8h.html#ae90970820d6e036471c9bca9a130164a">bbox_video_output</a> (bbox_t *self, bool enabled)</td></tr>
117123
<tr class="memdesc:ae90970820d6e036471c9bca9a130164a"><td class="mdescLeft">&#160;</td><td class="mdescRight">Control drawing on video-output. <a href="bbox_8h.html#ae90970820d6e036471c9bca9a130164a">More...</a><br /></td></tr>
118124
<tr class="separator:ae90970820d6e036471c9bca9a130164a"><td class="memSeparator" colspan="2">&#160;</td></tr>
@@ -367,6 +373,62 @@ <h2 class="memtitle"><span class="permalink"><a href="#a4ad40a618cba025fd62083b6
367373
</dl>
368374
<dl class="section return"><dt>Returns</dt><dd>Success, check <code>errno</code> on error. </dd></dl>
369375

376+
</div>
377+
</div>
378+
<a id="a33f78b623bcd946a078378d57fbec61f"></a>
379+
<h2 class="memtitle"><span class="permalink"><a href="#a33f78b623bcd946a078378d57fbec61f">&#9670;&nbsp;</a></span>bbox_coordinates_frame_normalized()</h2>
380+
381+
<div class="memitem">
382+
<div class="memproto">
383+
<table class="memname">
384+
<tr>
385+
<td class="memname">bool bbox_coordinates_frame_normalized </td>
386+
<td>(</td>
387+
<td class="paramtype">bbox_t *&#160;</td>
388+
<td class="paramname"><em>self</em></td><td>)</td>
389+
<td></td>
390+
</tr>
391+
</table>
392+
</div><div class="memdoc">
393+
394+
<p>Switch to frame normalized coordinate space. </p>
395+
<p>This coordinate system is normalized and aligned with the camera frame, i.e. top-left is [0,0] and bottom-right is [1,1].</p>
396+
<dl class="params"><dt>Parameters</dt><dd>
397+
<table class="params">
398+
<tr><td class="paramname">self</td><td>The bbox object</td></tr>
399+
</table>
400+
</dd>
401+
</dl>
402+
<dl class="section return"><dt>Returns</dt><dd>Success, check <code>errno</code> on error. </dd></dl>
403+
404+
</div>
405+
</div>
406+
<a id="aa5f4fc125238cbaf365d3c17a0b54a4c"></a>
407+
<h2 class="memtitle"><span class="permalink"><a href="#aa5f4fc125238cbaf365d3c17a0b54a4c">&#9670;&nbsp;</a></span>bbox_coordinates_scene_normalized()</h2>
408+
409+
<div class="memitem">
410+
<div class="memproto">
411+
<table class="memname">
412+
<tr>
413+
<td class="memname">bool bbox_coordinates_scene_normalized </td>
414+
<td>(</td>
415+
<td class="paramtype">bbox_t *&#160;</td>
416+
<td class="paramname"><em>self</em></td><td>)</td>
417+
<td></td>
418+
</tr>
419+
</table>
420+
</div><div class="memdoc">
421+
422+
<p>Switch to scene normalized coordinate space [Default]. </p>
423+
<p>This coordinate system is normalized to [0,0]-[1,1] and follows the filmed scene, i.e. static objects in the world have the same coordinates regardless of global rotation.</p>
424+
<dl class="params"><dt>Parameters</dt><dd>
425+
<table class="params">
426+
<tr><td class="paramname">self</td><td>The bbox object</td></tr>
427+
</table>
428+
</dd>
429+
</dl>
430+
<dl class="section return"><dt>Returns</dt><dd>Success, check <code>errno</code> on error. </dd></dl>
431+
370432
</div>
371433
</div>
372434
<a id="a3c355605ed60f45f49369fb2959d8ac6"></a>

‎docs/api/src/api/bbox/html/bbox_8h.js‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,8 @@ var bbox_8h =
55
[ "bbox_color_from_rgb", "bbox_8h.html#a754959ec9753db997867f92749fb9ae0", null ],
66
[ "bbox_color_from_rgba", "bbox_8h.html#abb400e8a2a0849e43c42252642e563db", null ],
77
[ "bbox_commit", "bbox_8h.html#a4ad40a618cba025fd62083b69b95f9ec", null ],
8+
[ "bbox_coordinates_frame_normalized", "bbox_8h.html#a33f78b623bcd946a078378d57fbec61f", null ],
9+
[ "bbox_coordinates_scene_normalized", "bbox_8h.html#aa5f4fc125238cbaf365d3c17a0b54a4c", null ],
810
[ "bbox_destroy", "bbox_8h.html#a3c355605ed60f45f49369fb2959d8ac6", null ],
911
[ "bbox_draw_path", "bbox_8h.html#af614c4a1f8a2a0e7a44943cacb7954f2", null ],
1012
[ "bbox_line", "bbox_8h.html#aa398d040f56c60b4189709f71ee72230", null ],

0 commit comments

Comments
 (0)