Skip to content

Commit

Permalink
Merge pull request #81 from AxisCommunications/sync-20221114-1
Browse files Browse the repository at this point in the history
Sync 20221114 1
  • Loading branch information
pataxis authored Nov 14, 2022
2 parents 321b6f6 + 103c81b commit 7d0877f
Show file tree
Hide file tree
Showing 38 changed files with 178 additions and 40 deletions.
3 changes: 1 addition & 2 deletions docs/api/beta-api.md
Original file line number Diff line number Diff line change
Expand Up @@ -24,5 +24,4 @@ or in the Beta API example if there is one available.
### ACAP Runtime and Parameter API

Feedback on the service and API can be given in the [ACAP Computer Vision SDK
examples](https://github.com/AxisCommunications/acap-computer-vision-sdk-examples/issues)
issue tracker.
examples](https://github.com/AxisCommunications/acap-computer-vision-sdk-examples/issues) issue tracker.
2 changes: 2 additions & 0 deletions docs/api/computer-vision-sdk-apis.md
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,7 @@ SDK version | Available from firmware version
1.2 | 10.10
1.3 | 10.12
1.4 | 11.0
1.5 | 11.1

## SDK index

Expand Down Expand Up @@ -162,6 +163,7 @@ The ACAP Runtime service is an installable ACAP application that provides:

- Inference API - Tensorflow Serving for inference service
- Parameter API - Axis parameter service
- Video capture API - Enables capture of images from a camera

The ACAP Runtime uses [gRPC](https://grpc.io) and a [Unix Socket Domain (UDS)](https://grpc.github.io/grpc/cpp/md_doc_naming.html) socket for access. The access is restricted to applications in the device that belongs to the `sdk` user group. Installable versions for devices equipped with ARTPEC-7 and ARTPEC-8 chips are available [here](https://hub.docker.com/r/axisecp/acap-runtime).

Expand Down
4 changes: 3 additions & 1 deletion docs/api/native-sdk-api.md
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,7 @@ SDK version | Available from firmware version
1.2 | 10.10
1.3 | 10.12
1.4 | 11.0
1.5 | 11.1

## Video capture API

Expand Down Expand Up @@ -78,6 +79,7 @@ Axis OS version | VdoStream API version | New functions added
10.11 | 7.19.2 | -
10.12 | 8.0.15 | `vdo_map_get_pair32i`, `vdo_map_get_pair32u`, `vdo_map_set_pair32i`, `vdo_map_set_pair32u`
11.0 | 9.0.4 | -
11.1 | 9.8.16 | -

### Known issues

Expand Down Expand Up @@ -269,7 +271,7 @@ The API supports products with the following chips:

### Version history

This API was introduced in API version 1.0
This API was introduced in Native SDK 1.0.

### Code Examples

Expand Down
2 changes: 1 addition & 1 deletion docs/api/src/api/larod/html/annotated.html
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@
<td id="projectlogo"><img alt="Logo" src="axis-logo.png"/></td>
<td id="projectalign" style="padding-left: 0.5em;">
<div id="projectname">liblarod
&#160;<span id="projectnumber">3.1.107</span>
&#160;<span id="projectnumber">3.1.125-1-g8add087c</span>
</div>
</td>
</tr>
Expand Down
2 changes: 1 addition & 1 deletion docs/api/src/api/larod/html/classes.html
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@
<td id="projectlogo"><img alt="Logo" src="axis-logo.png"/></td>
<td id="projectalign" style="padding-left: 0.5em;">
<div id="projectname">liblarod
&#160;<span id="projectnumber">3.1.107</span>
&#160;<span id="projectnumber">3.1.125-1-g8add087c</span>
</div>
</td>
</tr>
Expand Down
2 changes: 1 addition & 1 deletion docs/api/src/api/larod/html/deprecated.html
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@
<td id="projectlogo"><img alt="Logo" src="axis-logo.png"/></td>
<td id="projectalign" style="padding-left: 0.5em;">
<div id="projectname">liblarod
&#160;<span id="projectnumber">3.1.107</span>
&#160;<span id="projectnumber">3.1.125-1-g8add087c</span>
</div>
</td>
</tr>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@
<td id="projectlogo"><img alt="Logo" src="axis-logo.png"/></td>
<td id="projectalign" style="padding-left: 0.5em;">
<div id="projectname">liblarod
&#160;<span id="projectnumber">3.1.107</span>
&#160;<span id="projectnumber">3.1.125-1-g8add087c</span>
</div>
</td>
</tr>
Expand Down
2 changes: 1 addition & 1 deletion docs/api/src/api/larod/html/files.html
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@
<td id="projectlogo"><img alt="Logo" src="axis-logo.png"/></td>
<td id="projectalign" style="padding-left: 0.5em;">
<div id="projectname">liblarod
&#160;<span id="projectnumber">3.1.107</span>
&#160;<span id="projectnumber">3.1.125-1-g8add087c</span>
</div>
</td>
</tr>
Expand Down
2 changes: 1 addition & 1 deletion docs/api/src/api/larod/html/functions.html
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@
<td id="projectlogo"><img alt="Logo" src="axis-logo.png"/></td>
<td id="projectalign" style="padding-left: 0.5em;">
<div id="projectname">liblarod
&#160;<span id="projectnumber">3.1.107</span>
&#160;<span id="projectnumber">3.1.125-1-g8add087c</span>
</div>
</td>
</tr>
Expand Down
2 changes: 1 addition & 1 deletion docs/api/src/api/larod/html/functions_vars.html
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@
<td id="projectlogo"><img alt="Logo" src="axis-logo.png"/></td>
<td id="projectalign" style="padding-left: 0.5em;">
<div id="projectname">liblarod
&#160;<span id="projectnumber">3.1.107</span>
&#160;<span id="projectnumber">3.1.125-1-g8add087c</span>
</div>
</td>
</tr>
Expand Down
2 changes: 1 addition & 1 deletion docs/api/src/api/larod/html/globals.html
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@
<td id="projectlogo"><img alt="Logo" src="axis-logo.png"/></td>
<td id="projectalign" style="padding-left: 0.5em;">
<div id="projectname">liblarod
&#160;<span id="projectnumber">3.1.107</span>
&#160;<span id="projectnumber">3.1.125-1-g8add087c</span>
</div>
</td>
</tr>
Expand Down
2 changes: 1 addition & 1 deletion docs/api/src/api/larod/html/globals_defs.html
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@
<td id="projectlogo"><img alt="Logo" src="axis-logo.png"/></td>
<td id="projectalign" style="padding-left: 0.5em;">
<div id="projectname">liblarod
&#160;<span id="projectnumber">3.1.107</span>
&#160;<span id="projectnumber">3.1.125-1-g8add087c</span>
</div>
</td>
</tr>
Expand Down
2 changes: 1 addition & 1 deletion docs/api/src/api/larod/html/globals_enum.html
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@
<td id="projectlogo"><img alt="Logo" src="axis-logo.png"/></td>
<td id="projectalign" style="padding-left: 0.5em;">
<div id="projectname">liblarod
&#160;<span id="projectnumber">3.1.107</span>
&#160;<span id="projectnumber">3.1.125-1-g8add087c</span>
</div>
</td>
</tr>
Expand Down
2 changes: 1 addition & 1 deletion docs/api/src/api/larod/html/globals_eval.html
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@
<td id="projectlogo"><img alt="Logo" src="axis-logo.png"/></td>
<td id="projectalign" style="padding-left: 0.5em;">
<div id="projectname">liblarod
&#160;<span id="projectnumber">3.1.107</span>
&#160;<span id="projectnumber">3.1.125-1-g8add087c</span>
</div>
</td>
</tr>
Expand Down
2 changes: 1 addition & 1 deletion docs/api/src/api/larod/html/globals_func.html
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@
<td id="projectlogo"><img alt="Logo" src="axis-logo.png"/></td>
<td id="projectalign" style="padding-left: 0.5em;">
<div id="projectname">liblarod
&#160;<span id="projectnumber">3.1.107</span>
&#160;<span id="projectnumber">3.1.125-1-g8add087c</span>
</div>
</td>
</tr>
Expand Down
2 changes: 1 addition & 1 deletion docs/api/src/api/larod/html/globals_type.html
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@
<td id="projectlogo"><img alt="Logo" src="axis-logo.png"/></td>
<td id="projectalign" style="padding-left: 0.5em;">
<div id="projectname">liblarod
&#160;<span id="projectnumber">3.1.107</span>
&#160;<span id="projectnumber">3.1.125-1-g8add087c</span>
</div>
</td>
</tr>
Expand Down
2 changes: 1 addition & 1 deletion docs/api/src/api/larod/html/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@
<td id="projectlogo"><img alt="Logo" src="axis-logo.png"/></td>
<td id="projectalign" style="padding-left: 0.5em;">
<div id="projectname">liblarod
&#160;<span id="projectnumber">3.1.107</span>
&#160;<span id="projectnumber">3.1.125-1-g8add087c</span>
</div>
</td>
</tr>
Expand Down
6 changes: 3 additions & 3 deletions docs/api/src/api/larod/html/larod_8h.html
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@
<td id="projectlogo"><img alt="Logo" src="axis-logo.png"/></td>
<td id="projectalign" style="padding-left: 0.5em;">
<div id="projectname">liblarod
&#160;<span id="projectnumber">3.1.107</span>
&#160;<span id="projectnumber">3.1.125-1-g8add087c</span>
</div>
</td>
</tr>
Expand Down Expand Up @@ -984,7 +984,7 @@ <h2 class="memtitle"><span class="permalink"><a href="#ad8be991c1295938b95df0c2d
<p>Create input tensors according to what <code>model</code> requires. The tensors will be initialized with metadata such as data type, dims, layout etcetera based on information from the model.</p>
<p>The service will also allocate a buffer for each created tensor. These buffers are represented by the file descriptors set on the tensors and as such will be used to store the tensors' contents.</p>
<p>Furthermore, the buffers are guaranteed to meet the requirements specified in <code>fdPropFlags</code> (if non-zero) and the fd properties of each tensor will be set accordingly. If <code>fdPropFlags</code> is not set (i.e. zero), the service will decide for itself (based on <code>model</code>) which operations should be supported on the newly allocated tensors and thus set the fd properties accordingly (c.f. <a class="el" href="larod_8h.html#a33a0af9702614ee94936e6cc757c3fad" title="Set the properties for a file descriptor of a tensor. ">larodSetTensorFdProps()</a>). In addition the service will automatically track each tensor, i.e. as if <a class="el" href="larod_8h.html#a4c84b8df7f3efc94276ba8cdaf940f85" title="Start tracking a tensor in the service. ">larodTrackTensor()</a> would have been called on the newly created and allocated tensors (this increments the total number of tracked tensors for <code>conn</code>, see <a class="el" href="larod_8h.html#a4c84b8df7f3efc94276ba8cdaf940f85" title="Start tracking a tensor in the service. ">larodTrackTensor()</a> for more details).</p>
<p>The buffers will be deallocated when <code>conn</code> closes, typically via a call to <code><a class="el" href="larod_8h.html#ab8f97b4b4d15798384ca25f32ca77bba" title="Disconnect from larod. ">larodDisconnect()</a></code>. The array of tensors needs to be released when it is no longer needed using <code><a class="el" href="larod_8h.html#afac99dfef68ffe3d513008aaac354ae0" title="Destroy a list of larodTensor. ">larodDestroyTensors()</a></code>. Note that the call to <a class="el" href="larod_8h.html#afac99dfef68ffe3d513008aaac354ae0" title="Destroy a list of larodTensor. ">larodDestroyTensors()</a> will not deallocate the allocated buffers.</p>
<p>The buffers will be deallocated when <code>conn</code> closes, typically via a call to <code><a class="el" href="larod_8h.html#ab8f97b4b4d15798384ca25f32ca77bba" title="Disconnect from larod. ">larodDisconnect()</a></code>. The array of tensors needs to be released when it is no longer needed using <code><a class="el" href="larod_8h.html#afac99dfef68ffe3d513008aaac354ae0" title="Destroy a list of larodTensor. ">larodDestroyTensors()</a></code>.</p>
<dl class="params"><dt>Parameters</dt><dd>
<table class="params">
<tr><td class="paramname">conn</td><td>An initialized connection handle. </td></tr>
Expand Down Expand Up @@ -1054,7 +1054,7 @@ <h2 class="memtitle"><span class="permalink"><a href="#a39c2cd5fb8f2395f976cc492
<p>Create output tensors according to what <code>model</code> requires. The tensors will be initialized with metadata such as data type, dims, layout etcetera based on information from the model.</p>
<p>The service will also allocate a buffer for each created tensor. These buffers are represented by the file descriptors set on the tensors and as such will be used to store the tensors' contents.</p>
<p>Furthermore, the buffers are guaranteed to meet the requirements specified in <code>fdPropFlags</code> (if non-zero) and the fd properties of each tensor will be set accordingly. If <code>fdPropFlags</code> is not set (i.e. zero), the service will decide for itself (based on <code>model</code>) which operations should be supported on the newly allocated tensors and thus set the fd properties accordingly (c.f. <a class="el" href="larod_8h.html#a33a0af9702614ee94936e6cc757c3fad" title="Set the properties for a file descriptor of a tensor. ">larodSetTensorFdProps()</a>). In addition the service will automatically track each tensor, i.e. as if <a class="el" href="larod_8h.html#a4c84b8df7f3efc94276ba8cdaf940f85" title="Start tracking a tensor in the service. ">larodTrackTensor()</a> would have been called on the newly created and allocated tensors (this increments the total number of tracked tensors for <code>conn</code>, see <a class="el" href="larod_8h.html#a4c84b8df7f3efc94276ba8cdaf940f85" title="Start tracking a tensor in the service. ">larodTrackTensor()</a> for more details).</p>
<p>The buffers will be deallocated when <code>conn</code> closes, typically via a call to <code><a class="el" href="larod_8h.html#ab8f97b4b4d15798384ca25f32ca77bba" title="Disconnect from larod. ">larodDisconnect()</a></code>. The array of tensors needs to be released when it is no longer needed using <code><a class="el" href="larod_8h.html#afac99dfef68ffe3d513008aaac354ae0" title="Destroy a list of larodTensor. ">larodDestroyTensors()</a></code>. Note that the call to <a class="el" href="larod_8h.html#afac99dfef68ffe3d513008aaac354ae0" title="Destroy a list of larodTensor. ">larodDestroyTensors()</a> will not deallocate the allocated buffers.</p>
<p>The buffers will be deallocated when <code>conn</code> closes, typically via a call to <code><a class="el" href="larod_8h.html#ab8f97b4b4d15798384ca25f32ca77bba" title="Disconnect from larod. ">larodDisconnect()</a></code>. The array of tensors needs to be released when it is no longer needed using <code><a class="el" href="larod_8h.html#afac99dfef68ffe3d513008aaac354ae0" title="Destroy a list of larodTensor. ">larodDestroyTensors()</a></code>.</p>
<dl class="params"><dt>Parameters</dt><dd>
<table class="params">
<tr><td class="paramname">conn</td><td>An initialized connection handle. </td></tr>
Expand Down
4 changes: 2 additions & 2 deletions docs/api/src/api/larod/html/larod_8h_source.html

Large diffs are not rendered by default.

Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@
<td id="projectlogo"><img alt="Logo" src="axis-logo.png"/></td>
<td id="projectalign" style="padding-left: 0.5em;">
<div id="projectname">liblarod
&#160;<span id="projectnumber">3.1.107</span>
&#160;<span id="projectnumber">3.1.125-1-g8add087c</span>
</div>
</td>
</tr>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@
<td id="projectlogo"><img alt="Logo" src="axis-logo.png"/></td>
<td id="projectalign" style="padding-left: 0.5em;">
<div id="projectname">liblarod
&#160;<span id="projectnumber">3.1.107</span>
&#160;<span id="projectnumber">3.1.125-1-g8add087c</span>
</div>
</td>
</tr>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@
<td id="projectlogo"><img alt="Logo" src="axis-logo.png"/></td>
<td id="projectalign" style="padding-left: 0.5em;">
<div id="projectname">liblarod
&#160;<span id="projectnumber">3.1.107</span>
&#160;<span id="projectnumber">3.1.125-1-g8add087c</span>
</div>
</td>
</tr>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@
<td id="projectlogo"><img alt="Logo" src="axis-logo.png"/></td>
<td id="projectalign" style="padding-left: 0.5em;">
<div id="projectname">liblarod
&#160;<span id="projectnumber">3.1.107</span>
&#160;<span id="projectnumber">3.1.125-1-g8add087c</span>
</div>
</td>
</tr>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@
<td id="projectlogo"><img alt="Logo" src="axis-logo.png"/></td>
<td id="projectalign" style="padding-left: 0.5em;">
<div id="projectname">liblarod
&#160;<span id="projectnumber">3.1.107</span>
&#160;<span id="projectnumber">3.1.125-1-g8add087c</span>
</div>
</td>
</tr>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@
<td id="projectlogo"><img alt="Logo" src="axis-logo.png"/></td>
<td id="projectalign" style="padding-left: 0.5em;">
<div id="projectname">liblarod
&#160;<span id="projectnumber">3.1.107</span>
&#160;<span id="projectnumber">3.1.125-1-g8add087c</span>
</div>
</td>
</tr>
Expand Down
Loading

0 comments on commit 7d0877f

Please sign in to comment.