Skip to content

Commit

Permalink
Merge pull request #59 from elsampsa/sampsa-dev
Browse files Browse the repository at this point in the history
Sampsa dev
  • Loading branch information
elsampsa authored Aug 28, 2023
2 parents 9c709cd + d7db055 commit 21a06de
Show file tree
Hide file tree
Showing 719 changed files with 860 additions and 808 deletions.
2 changes: 1 addition & 1 deletion CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -121,7 +121,7 @@ endif (cachestream_verbose)
# WARNING: the following three lines are modified by the "setver.bash" script
SET(MAJOR_VERSION "1")
SET(MINOR_VERSION "5")
SET(PATCH_VERSION "2")
SET(PATCH_VERSION "3")
set(VERSION_STRING ${MAJOR_VERSION}.${MINOR_VERSION}.${PATCH_VERSION})

# *** define build type: Debug or Release # now from the command line
Expand Down
9 changes: 7 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -65,12 +65,17 @@ Some key features of the Valkka library are:

## Versions and Features

### Newest version is 1.5.2
### Newest version is 1.5.3

- Eliminated some small & annoying bugs in the python part valkka.multiprocess

### Older versions

1.5.2

- Better arp-scan discovery
- Only one decoding thread per decoder when using vaapi

### Older versions

1.5.1

Expand Down
5 changes: 2 additions & 3 deletions Release.txt
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
1.5.2
1.5.3

- Better arp-scan discovery
- Only one decoding thread per decoder when using vaapi
- Eliminated some small & annoying bugs in the python part valkka.multiprocess
12 changes: 12 additions & 0 deletions debian/changelog
Original file line number Diff line number Diff line change
@@ -1,3 +1,15 @@
valkka (1.5.3-0ubuntu1-jammyppa1) jammy; urgency=low

* valkka.multiprocess bugs eliminated

-- Sampsa Riikonen <[email protected]> Mon, 28 Aug 2023 21:36:18 +0300

valkka (1.5.3-0ubuntu1-focalppa1) focal; urgency=low

* valkka.multiprocess bugs eliminated

-- Sampsa Riikonen <[email protected]> Mon, 28 Aug 2023 21:35:05 +0300

valkka (1.5.2-0ubuntu1-jammyppa1) jammy; urgency=low

* better arp-scan and vaapi
Expand Down
2 changes: 1 addition & 1 deletion debian/files
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
valkka_0.5.0_amd64.deb devel optional
valkka_1.5.2-0ubuntu1-jammyppa1_source.buildinfo libs optional
valkka_1.5.3-0ubuntu1-jammyppa1_source.buildinfo libs optional
4 changes: 2 additions & 2 deletions docs/config
Original file line number Diff line number Diff line change
Expand Up @@ -34,11 +34,11 @@ DOXYFILE_ENCODING = UTF-8

PROJECT_NAME = "Valkka"

# The PROJECT_NUMBER = "1.5.2"
# The PROJECT_NUMBER = "1.5.3"
# could be handy for archiving the generated documentation or if some version
# control system is used.

PROJECT_NUMBER = "1.5.2"
PROJECT_NUMBER = "1.5.3"

# Using the PROJECT_BRIEF tag one can provide an optional one line description
# for a project that appears at the top of each page and should give viewer a
Expand Down
2 changes: 1 addition & 1 deletion docs/html/annotated.html
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
<tr style="height: 56px;">
<td id="projectalign" style="padding-left: 0.5em;">
<div id="projectname">Valkka
&#160;<span id="projectnumber">1.5.2</span>
&#160;<span id="projectnumber">1.5.3</span>
</div>
<div id="projectbrief">OpenSource Video Management</div>
</td>
Expand Down
4 changes: 2 additions & 2 deletions docs/html/avdep_8cpp.html
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
<tr style="height: 56px;">
<td id="projectalign" style="padding-left: 0.5em;">
<div id="projectname">Valkka
&#160;<span id="projectnumber">1.5.2</span>
&#160;<span id="projectnumber">1.5.3</span>
</div>
<div id="projectbrief">OpenSource Video Management</div>
</td>
Expand Down Expand Up @@ -101,7 +101,7 @@
<a name="details" id="details"></a><h2 class="groupheader">Detailed Description</h2>
<div class="textblock"><dl class="section author"><dt>Author</dt><dd>Sampsa Riikonen </dd></dl>
<dl class="section date"><dt>Date</dt><dd>2017 </dd></dl>
<dl class="section version"><dt>Version</dt><dd>1.5.2</dd></dl>
<dl class="section version"><dt>Version</dt><dd>1.5.3</dd></dl>
<h1><a class="anchor" id="DESCRIPTION"></a>
DESCRIPTION</h1>
</div></div><!-- contents -->
Expand Down
4 changes: 2 additions & 2 deletions docs/html/avdep_8h.html
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
<tr style="height: 56px;">
<td id="projectalign" style="padding-left: 0.5em;">
<div id="projectname">Valkka
&#160;<span id="projectnumber">1.5.2</span>
&#160;<span id="projectnumber">1.5.3</span>
</div>
<div id="projectbrief">OpenSource Video Management</div>
</td>
Expand Down Expand Up @@ -167,7 +167,7 @@
<div class="textblock"><p>List of common ffmpeg/libav header files. Definition of some functions to call FFmpeg API directly from Valkka. </p>
<dl class="section author"><dt>Author</dt><dd>Sampsa Riikonen </dd></dl>
<dl class="section date"><dt>Date</dt><dd>2017 </dd></dl>
<dl class="section version"><dt>Version</dt><dd>1.5.2 </dd></dl>
<dl class="section version"><dt>Version</dt><dd>1.5.3 </dd></dl>
</div></div><!-- contents -->
<div class="ttc" id="aclassFDWrite_html_a1f4cf1da3829eef916930b052b61c097"><div class="ttname"><a href="classFDWrite.html#a1f4cf1da3829eef916930b052b61c097">FDWrite::FDWrite</a></div><div class="ttdeci">FDWrite(FrameFifo &amp;fifo, const FDWriteContext &amp;ctx)</div><div class="ttdoc">Default constructor.</div><div class="ttdef"><b>Definition:</b> fdwritethread.cpp:39</div></div>
<div class="ttc" id="aclassTestThread_html_aa8b97705464849de965b265ce216d45e"><div class="ttname"><a href="classTestThread.html#aa8b97705464849de965b265ce216d45e">TestThread::run</a></div><div class="ttdeci">void run()</div><div class="ttdoc">Main execution loop is defined here.</div><div class="ttdef"><b>Definition:</b> testthread.cpp:110</div></div>
Expand Down
2 changes: 1 addition & 1 deletion docs/html/avdep_8h_source.html
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
<tr style="height: 56px;">
<td id="projectalign" style="padding-left: 0.5em;">
<div id="projectname">Valkka
&#160;<span id="projectnumber">1.5.2</span>
&#160;<span id="projectnumber">1.5.3</span>
</div>
<div id="projectbrief">OpenSource Video Management</div>
</td>
Expand Down
4 changes: 2 additions & 2 deletions docs/html/avfilethread_8cpp.html
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
<tr style="height: 56px;">
<td id="projectalign" style="padding-left: 0.5em;">
<div id="projectname">Valkka
&#160;<span id="projectnumber">1.5.2</span>
&#160;<span id="projectnumber">1.5.3</span>
</div>
<div id="projectbrief">OpenSource Video Management</div>
</td>
Expand Down Expand Up @@ -136,7 +136,7 @@
<div class="textblock"><p>A thread sending frames from files. </p>
<dl class="section author"><dt>Author</dt><dd>Sampsa Riikonen </dd></dl>
<dl class="section date"><dt>Date</dt><dd>2017 </dd></dl>
<dl class="section version"><dt>Version</dt><dd>1.5.2 </dd></dl>
<dl class="section version"><dt>Version</dt><dd>1.5.3 </dd></dl>
</div></div><!-- contents -->
<!-- start footer part -->
<hr class="footer"/><address class="footer"><small>
Expand Down
4 changes: 2 additions & 2 deletions docs/html/avfilethread_8h.html
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
<tr style="height: 56px;">
<td id="projectalign" style="padding-left: 0.5em;">
<div id="projectname">Valkka
&#160;<span id="projectnumber">1.5.2</span>
&#160;<span id="projectnumber">1.5.3</span>
</div>
<div id="projectbrief">OpenSource Video Management</div>
</td>
Expand Down Expand Up @@ -200,7 +200,7 @@
<div class="textblock"><p>A <a class="el" href="classThread.html" title="A class for multithreading with a signaling system.">Thread</a> handling files and sending frames to fifo. </p>
<dl class="section author"><dt>Author</dt><dd>Sampsa Riikonen </dd></dl>
<dl class="section date"><dt>Date</dt><dd>2018 </dd></dl>
<dl class="section version"><dt>Version</dt><dd>1.5.2 </dd></dl>
<dl class="section version"><dt>Version</dt><dd>1.5.3 </dd></dl>
</div><h2 class="groupheader">Enumeration Type Documentation</h2>
<a id="a48ba78962b5250e11b9caca78113ecd1"></a>
<h2 class="memtitle"><span class="permalink"><a href="#a48ba78962b5250e11b9caca78113ecd1">&#9670;&nbsp;</a></span>FileSignal</h2>
Expand Down
2 changes: 1 addition & 1 deletion docs/html/avfilethread_8h_source.html
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
<tr style="height: 56px;">
<td id="projectalign" style="padding-left: 0.5em;">
<div id="projectname">Valkka
&#160;<span id="projectnumber">1.5.2</span>
&#160;<span id="projectnumber">1.5.3</span>
</div>
<div id="projectbrief">OpenSource Video Management</div>
</td>
Expand Down
4 changes: 2 additions & 2 deletions docs/html/avthread_8cpp.html
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
<tr style="height: 56px;">
<td id="projectalign" style="padding-left: 0.5em;">
<div id="projectname">Valkka
&#160;<span id="projectnumber">1.5.2</span>
&#160;<span id="projectnumber">1.5.3</span>
</div>
<div id="projectbrief">OpenSource Video Management</div>
</td>
Expand Down Expand Up @@ -137,7 +137,7 @@
<div class="textblock"><p>FFmpeg decoding thread. </p>
<dl class="section author"><dt>Author</dt><dd>Sampsa Riikonen </dd></dl>
<dl class="section date"><dt>Date</dt><dd>2017 </dd></dl>
<dl class="section version"><dt>Version</dt><dd>1.5.2 </dd></dl>
<dl class="section version"><dt>Version</dt><dd>1.5.3 </dd></dl>
</div></div><!-- contents -->
<!-- start footer part -->
<hr class="footer"/><address class="footer"><small>
Expand Down
4 changes: 2 additions & 2 deletions docs/html/avthread_8h.html
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
<tr style="height: 56px;">
<td id="projectalign" style="padding-left: 0.5em;">
<div id="projectname">Valkka
&#160;<span id="projectnumber">1.5.2</span>
&#160;<span id="projectnumber">1.5.3</span>
</div>
<div id="projectbrief">OpenSource Video Management</div>
</td>
Expand Down Expand Up @@ -156,7 +156,7 @@
<div class="textblock"><p>FFmpeg decoding thread. </p>
<dl class="section author"><dt>Author</dt><dd>Sampsa Riikonen </dd></dl>
<dl class="section date"><dt>Date</dt><dd>2017 </dd></dl>
<dl class="section version"><dt>Version</dt><dd>1.5.2 </dd></dl>
<dl class="section version"><dt>Version</dt><dd>1.5.3 </dd></dl>
</div></div><!-- contents -->
<!-- start footer part -->
<hr class="footer"/><address class="footer"><small>
Expand Down
2 changes: 1 addition & 1 deletion docs/html/avthread_8h_source.html
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
<tr style="height: 56px;">
<td id="projectalign" style="padding-left: 0.5em;">
<div id="projectname">Valkka
&#160;<span id="projectnumber">1.5.2</span>
&#160;<span id="projectnumber">1.5.3</span>
</div>
<div id="projectbrief">OpenSource Video Management</div>
</td>
Expand Down
4 changes: 2 additions & 2 deletions docs/html/cachestream_8cpp.html
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
<tr style="height: 56px;">
<td id="projectalign" style="padding-left: 0.5em;">
<div id="projectname">Valkka
&#160;<span id="projectnumber">1.5.2</span>
&#160;<span id="projectnumber">1.5.3</span>
</div>
<div id="projectbrief">OpenSource Video Management</div>
</td>
Expand Down Expand Up @@ -132,7 +132,7 @@
</div><a name="details" id="details"></a><h2 class="groupheader">Detailed Description</h2>
<div class="textblock"><dl class="section author"><dt>Author</dt><dd>Sampsa Riikonen </dd></dl>
<dl class="section date"><dt>Date</dt><dd>2017 </dd></dl>
<dl class="section version"><dt>Version</dt><dd>1.5.2 </dd></dl>
<dl class="section version"><dt>Version</dt><dd>1.5.3 </dd></dl>
</div></div><!-- contents -->
<!-- start footer part -->
<hr class="footer"/><address class="footer"><small>
Expand Down
4 changes: 2 additions & 2 deletions docs/html/cachestream_8h.html
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
<tr style="height: 56px;">
<td id="projectalign" style="padding-left: 0.5em;">
<div id="projectname">Valkka
&#160;<span id="projectnumber">1.5.2</span>
&#160;<span id="projectnumber">1.5.3</span>
</div>
<div id="projectbrief">OpenSource Video Management</div>
</td>
Expand Down Expand Up @@ -191,7 +191,7 @@
<a name="details" id="details"></a><h2 class="groupheader">Detailed Description</h2>
<div class="textblock"><dl class="section author"><dt>Author</dt><dd>Sampsa Riikonen </dd></dl>
<dl class="section date"><dt>Date</dt><dd>2017 </dd></dl>
<dl class="section version"><dt>Version</dt><dd>1.5.2 </dd></dl>
<dl class="section version"><dt>Version</dt><dd>1.5.3 </dd></dl>
</div><h2 class="groupheader">Enumeration Type Documentation</h2>
<a id="ada9b6bfa4ba1d83563a501d8c4df2d2f"></a>
<h2 class="memtitle"><span class="permalink"><a href="#ada9b6bfa4ba1d83563a501d8c4df2d2f">&#9670;&nbsp;</a></span>FileCacheSignal</h2>
Expand Down
2 changes: 1 addition & 1 deletion docs/html/cachestream_8h_source.html
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
<tr style="height: 56px;">
<td id="projectalign" style="padding-left: 0.5em;">
<div id="projectname">Valkka
&#160;<span id="projectnumber">1.5.2</span>
&#160;<span id="projectnumber">1.5.3</span>
</div>
<div id="projectbrief">OpenSource Video Management</div>
</td>
Expand Down
2 changes: 1 addition & 1 deletion docs/html/classAVBitmapFrame-members.html
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
<tr style="height: 56px;">
<td id="projectalign" style="padding-left: 0.5em;">
<div id="projectname">Valkka
&#160;<span id="projectnumber">1.5.2</span>
&#160;<span id="projectnumber">1.5.3</span>
</div>
<div id="projectbrief">OpenSource Video Management</div>
</td>
Expand Down
2 changes: 1 addition & 1 deletion docs/html/classAVBitmapFrame.html
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
<tr style="height: 56px;">
<td id="projectalign" style="padding-left: 0.5em;">
<div id="projectname">Valkka
&#160;<span id="projectnumber">1.5.2</span>
&#160;<span id="projectnumber">1.5.3</span>
</div>
<div id="projectbrief">OpenSource Video Management</div>
</td>
Expand Down
2 changes: 1 addition & 1 deletion docs/html/classAVDecoder-members.html
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
<tr style="height: 56px;">
<td id="projectalign" style="padding-left: 0.5em;">
<div id="projectname">Valkka
&#160;<span id="projectnumber">1.5.2</span>
&#160;<span id="projectnumber">1.5.3</span>
</div>
<div id="projectbrief">OpenSource Video Management</div>
</td>
Expand Down
2 changes: 1 addition & 1 deletion docs/html/classAVDecoder.html
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
<tr style="height: 56px;">
<td id="projectalign" style="padding-left: 0.5em;">
<div id="projectname">Valkka
&#160;<span id="projectnumber">1.5.2</span>
&#160;<span id="projectnumber">1.5.3</span>
</div>
<div id="projectbrief">OpenSource Video Management</div>
</td>
Expand Down
2 changes: 1 addition & 1 deletion docs/html/classAVHwDecoder-members.html
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
<tr style="height: 56px;">
<td id="projectalign" style="padding-left: 0.5em;">
<div id="projectname">Valkka
&#160;<span id="projectnumber">1.5.2</span>
&#160;<span id="projectnumber">1.5.3</span>
</div>
<div id="projectbrief">OpenSource Video Management</div>
</td>
Expand Down
2 changes: 1 addition & 1 deletion docs/html/classAVHwDecoder.html
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
<tr style="height: 56px;">
<td id="projectalign" style="padding-left: 0.5em;">
<div id="projectname">Valkka
&#160;<span id="projectnumber">1.5.2</span>
&#160;<span id="projectnumber">1.5.3</span>
</div>
<div id="projectbrief">OpenSource Video Management</div>
</td>
Expand Down
2 changes: 1 addition & 1 deletion docs/html/classAVMediaFrame-members.html
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
<tr style="height: 56px;">
<td id="projectalign" style="padding-left: 0.5em;">
<div id="projectname">Valkka
&#160;<span id="projectnumber">1.5.2</span>
&#160;<span id="projectnumber">1.5.3</span>
</div>
<div id="projectbrief">OpenSource Video Management</div>
</td>
Expand Down
2 changes: 1 addition & 1 deletion docs/html/classAVMediaFrame.html
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
<tr style="height: 56px;">
<td id="projectalign" style="padding-left: 0.5em;">
<div id="projectname">Valkka
&#160;<span id="projectnumber">1.5.2</span>
&#160;<span id="projectnumber">1.5.3</span>
</div>
<div id="projectbrief">OpenSource Video Management</div>
</td>
Expand Down
2 changes: 1 addition & 1 deletion docs/html/classAVRGBFrame-members.html
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
<tr style="height: 56px;">
<td id="projectalign" style="padding-left: 0.5em;">
<div id="projectname">Valkka
&#160;<span id="projectnumber">1.5.2</span>
&#160;<span id="projectnumber">1.5.3</span>
</div>
<div id="projectbrief">OpenSource Video Management</div>
</td>
Expand Down
2 changes: 1 addition & 1 deletion docs/html/classAVRGBFrame.html
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
<tr style="height: 56px;">
<td id="projectalign" style="padding-left: 0.5em;">
<div id="projectname">Valkka
&#160;<span id="projectnumber">1.5.2</span>
&#160;<span id="projectnumber">1.5.3</span>
</div>
<div id="projectbrief">OpenSource Video Management</div>
</td>
Expand Down
2 changes: 1 addition & 1 deletion docs/html/classAVThread-members.html
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
<tr style="height: 56px;">
<td id="projectalign" style="padding-left: 0.5em;">
<div id="projectname">Valkka
&#160;<span id="projectnumber">1.5.2</span>
&#160;<span id="projectnumber">1.5.3</span>
</div>
<div id="projectbrief">OpenSource Video Management</div>
</td>
Expand Down
2 changes: 1 addition & 1 deletion docs/html/classAVThread.html
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
<tr style="height: 56px;">
<td id="projectalign" style="padding-left: 0.5em;">
<div id="projectname">Valkka
&#160;<span id="projectnumber">1.5.2</span>
&#160;<span id="projectnumber">1.5.3</span>
</div>
<div id="projectbrief">OpenSource Video Management</div>
</td>
Expand Down
2 changes: 1 addition & 1 deletion docs/html/classAbstractFileStream-members.html
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
<tr style="height: 56px;">
<td id="projectalign" style="padding-left: 0.5em;">
<div id="projectname">Valkka
&#160;<span id="projectnumber">1.5.2</span>
&#160;<span id="projectnumber">1.5.3</span>
</div>
<div id="projectbrief">OpenSource Video Management</div>
</td>
Expand Down
2 changes: 1 addition & 1 deletion docs/html/classAbstractFileStream.html
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
<tr style="height: 56px;">
<td id="projectalign" style="padding-left: 0.5em;">
<div id="projectname">Valkka
&#160;<span id="projectnumber">1.5.2</span>
&#160;<span id="projectnumber">1.5.3</span>
</div>
<div id="projectbrief">OpenSource Video Management</div>
</td>
Expand Down
2 changes: 1 addition & 1 deletion docs/html/classAbstractFileThread-members.html
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
<tr style="height: 56px;">
<td id="projectalign" style="padding-left: 0.5em;">
<div id="projectname">Valkka
&#160;<span id="projectnumber">1.5.2</span>
&#160;<span id="projectnumber">1.5.3</span>
</div>
<div id="projectbrief">OpenSource Video Management</div>
</td>
Expand Down
Loading

0 comments on commit 21a06de

Please sign in to comment.