Merge pull request #56 from elsampsa/sampsa-dev

xcb warning, fixed github pipeline

.github/workflows/debian.yml

@@ -16,7 +16,7 @@ jobs:
         run: | 
           sudo apt-get update -y 
           sudo apt-get install -y python3 mesa-utils glew-utils python3-numpy v4l-utils python3-pip openssl 
-          sudo apt-get install -y build-essential yasm cmake pkg-config swig libglew-dev mesa-common-dev python3-dev python3-numpy libasound2-dev libssl-dev coreutils freeglut3-dev
+          sudo apt-get install -y build-essential yasm cmake pkg-config swig libglew-dev mesa-common-dev python3-dev python3-numpy libasound2-dev libssl-dev coreutils freeglut3-dev i965-va-driver libva-dev
 
       - name: Check out code
         uses: actions/checkout@v2
@@ -35,7 +35,7 @@ jobs:
         run: | 
           sudo apt-get update -y 
           sudo apt-get install -y python3 mesa-utils glew-utils python3-numpy v4l-utils python3-pip openssl 
-          sudo apt-get install -y build-essential yasm cmake pkg-config swig libglew-dev mesa-common-dev python3-dev python3-numpy libasound2-dev libssl-dev coreutils freeglut3-dev
+          sudo apt-get install -y build-essential yasm cmake pkg-config swig libglew-dev mesa-common-dev python3-dev python3-numpy libasound2-dev libssl-dev coreutils freeglut3-dev i965-va-driver libva-dev
 
       - name: Check out code
         uses: actions/checkout@v2

CMakeLists.txt

@@ -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 "0") 
+SET(PATCH_VERSION "1") 
 set(VERSION_STRING ${MAJOR_VERSION}.${MINOR_VERSION}.${PATCH_VERSION})
 
 # *** define build type: Debug or Release # now from the command line
@@ -359,7 +359,10 @@ SET(CPACK_PACKAGE_VERSION "${VERSION_STRING}")
 
 SET(CPACK_DEBIAN_PACKAGE_ARCHITECTURE ${MY_ARCH})
 
-# The dependencies: keep these consistent with debian/control
+# Dependencies for running (not building) libValkka: keep these consistent with:
+# - debian/control
+# - docker/Dockerfile(s)
+#
 # SET(CPACK_DEBIAN_PACKAGE_DEPENDS "libpython3.5(>= 3.5.2), libgcc1(>= 1:6.0.1), libc6(>= 2.23), libgl1-mesa-glx(>= 12.0.6), libx11-6(>= 2:1.6.3), libstdc++6(>= 5.4.0), libc6(>= 2.23), libglew1.13(>= 1.13.0), python3-numpy") # ubuntu 16
 # NEW: Avoid version numbers, use "utils" packages to imply a dependency, for example, to libglew (without hardcoding the version number into the package name)
 SET(CPACK_DEBIAN_PACKAGE_DEPENDS "python3, mesa-utils, glew-utils, python3-numpy, v4l-utils, python3-pip, openssl, i965-va-driver, intel-gpu-tools, vainfo")

README.md

@@ -65,12 +65,17 @@ Some key features of the Valkka library are:
 
 ## Versions and Features
 
-### Newest version is 1.5.0
+### Newest version is 1.5.1
 
-- Added VAAPI acceleration as practised in the ffmpeg/libav library infrastructure
+- Fixed github pipeline for autobuilds
+- A warning when trying to load libValkka with XDG_SESSION_TYPE != x11 (as Qt might not work)
 
 ### Older versions
 
+1.5.0
+
+- Added VAAPI acceleration as practised in the ffmpeg/libav library infrastructure
+
 1.4.0
 
 - Added a new (thread-safe) framefilter that counts and dumps the fps to terminal: nice for testing achieved fps for larger systems

Release.txt

@@ -1,3 +1,4 @@
-1.5.0
+1.5.1
 
-- Added VAAPI acceleration as practised in the ffmpeg/libav library infrastructure
+- Fixed github pipeline for autobuilds
+- A warning when trying to load libValkka with XDG_SESSION_TYPE != x11 (as Qt might not work)

docker/Dockerfile.x86_ubuntu_20

@@ -11,9 +11,14 @@ RUN ln -snf /usr/share/zoneinfo/$TZ /etc/localtime && echo $TZ > /etc/timezone
 
 RUN apt-get update -y && apt-get upgrade -y
 
-# REQUIRED TO INSTALL VALKKA # keep consistent with CMakeLists.txt : SET(CPACK_DEBIAN_PACKAGE_DEPENDS "...")
+# REQUIRED TO INSTALL VALKKA 
+# keep consistent with CMakeLists.txt : SET(CPACK_DEBIAN_PACKAGE_DEPENDS "...")
 RUN apt-get install -y python3 mesa-utils glew-utils python3-numpy v4l-utils python3-pip openssl i965-va-driver intel-gpu-tools vainfo
-## REQUIRED TO BUILD VALKKA # keep consistent with debian/control & valkka-core main readme
+## REQUIRED TO BUILD VALKKA 
+# keep consistent with:
+# - debian/control 
+# - valkka-core main readme
+# - .github/workflows/debian.yml
 RUN apt-get install -y build-essential yasm cmake pkg-config swig libglew-dev mesa-common-dev python3-dev python3-numpy libasound2-dev libssl-dev coreutils freeglut3-dev i965-va-driver libva-dev
 # needed to add freeglut3-dev --> see: https://github.com/elsampsa/valkka-core/issues/35
 

docker/Dockerfile.x86_ubuntu_22

@@ -13,7 +13,11 @@ RUN apt-get update -y && apt-get upgrade -y
 
 # REQUIRED TO INSTALL VALKKA # keep consistent with CMakeLists.txt : SET(CPACK_DEBIAN_PACKAGE_DEPENDS "...")
 RUN apt-get install -y python3 mesa-utils glew-utils python3-numpy v4l-utils python3-pip openssl i965-va-driver intel-gpu-tools vainfo
-## REQUIRED TO BUILD VALKKA # keep consistent with debian/control & valkka-core main readme
+## REQUIRED TO BUILD VALKKA 
+# keep consistent with:
+# - debian/control 
+# - valkka-core main readme
+# - .github/workflows/debian.yml
 RUN apt-get install -y build-essential yasm cmake pkg-config swig libglew-dev mesa-common-dev python3-dev python3-numpy libasound2-dev libssl-dev coreutils freeglut3-dev i965-va-driver libva-dev
 # needed to add freeglut3-dev --> see: https://github.com/elsampsa/valkka-core/issues/35
 

docs/config

@@ -34,11 +34,11 @@ DOXYFILE_ENCODING      = UTF-8
 
 PROJECT_NAME           = "Valkka"
 
-# The PROJECT_NUMBER = "1.5.0"
+# The PROJECT_NUMBER = "1.5.1"
 # could be handy for archiving the generated documentation or if some version
 # control system is used.
 
-PROJECT_NUMBER = "1.5.0"
+PROJECT_NUMBER = "1.5.1"
 
 # 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

docs/html/annotated.html

@@ -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.0</span>
+   &#160;<span id="projectnumber">1.5.1</span>
    </div>
    <div id="projectbrief">OpenSource Video Management</div>
   </td>

docs/html/avdep_8cpp.html

@@ -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.0</span>
+   &#160;<span id="projectnumber">1.5.1</span>
    </div>
    <div id="projectbrief">OpenSource Video Management</div>
   </td>
@@ -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.0</dd></dl>
+<dl class="section version"><dt>Version</dt><dd>1.5.1</dd></dl>
 <h1><a class="anchor" id="DESCRIPTION"></a>
 DESCRIPTION</h1>
 </div></div><!-- contents -->

docs/html/avdep_8h.html

@@ -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.0</span>
+   &#160;<span id="projectnumber">1.5.1</span>
    </div>
    <div id="projectbrief">OpenSource Video Management</div>
   </td>
@@ -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.0 </dd></dl>
+<dl class="section version"><dt>Version</dt><dd>1.5.1 </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>

docs/html/avdep_8h_source.html

@@ -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.0</span>
+   &#160;<span id="projectnumber">1.5.1</span>
    </div>
    <div id="projectbrief">OpenSource Video Management</div>
   </td>

docs/html/avfilethread_8cpp.html

@@ -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.0</span>
+   &#160;<span id="projectnumber">1.5.1</span>
    </div>
    <div id="projectbrief">OpenSource Video Management</div>
   </td>
@@ -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.0 </dd></dl>
+<dl class="section version"><dt>Version</dt><dd>1.5.1 </dd></dl>
 </div></div><!-- contents -->
 <!-- start footer part -->
 <hr class="footer"/><address class="footer"><small>

docs/html/avfilethread_8h.html

@@ -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.0</span>
+   &#160;<span id="projectnumber">1.5.1</span>
    </div>
    <div id="projectbrief">OpenSource Video Management</div>
   </td>
@@ -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.0 </dd></dl>
+<dl class="section version"><dt>Version</dt><dd>1.5.1 </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>

docs/html/avfilethread_8h_source.html

@@ -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.0</span>
+   &#160;<span id="projectnumber">1.5.1</span>
    </div>
    <div id="projectbrief">OpenSource Video Management</div>
   </td>

docs/html/avthread_8cpp.html

@@ -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.0</span>
+   &#160;<span id="projectnumber">1.5.1</span>
    </div>
    <div id="projectbrief">OpenSource Video Management</div>
   </td>
@@ -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.0 </dd></dl>
+<dl class="section version"><dt>Version</dt><dd>1.5.1 </dd></dl>
 </div></div><!-- contents -->
 <!-- start footer part -->
 <hr class="footer"/><address class="footer"><small>

docs/html/avthread_8h.html

@@ -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.0</span>
+   &#160;<span id="projectnumber">1.5.1</span>
    </div>
    <div id="projectbrief">OpenSource Video Management</div>
   </td>
@@ -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.0 </dd></dl>
+<dl class="section version"><dt>Version</dt><dd>1.5.1 </dd></dl>
 </div></div><!-- contents -->
 <!-- start footer part -->
 <hr class="footer"/><address class="footer"><small>

docs/html/avthread_8h_source.html

@@ -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.0</span>
+   &#160;<span id="projectnumber">1.5.1</span>
    </div>
    <div id="projectbrief">OpenSource Video Management</div>
   </td>

docs/html/cachestream_8cpp.html

@@ -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.0</span>
+   &#160;<span id="projectnumber">1.5.1</span>
    </div>
    <div id="projectbrief">OpenSource Video Management</div>
   </td>
@@ -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.0 </dd></dl>
+<dl class="section version"><dt>Version</dt><dd>1.5.1 </dd></dl>
 </div></div><!-- contents -->
 <!-- start footer part -->
 <hr class="footer"/><address class="footer"><small>

docs/html/cachestream_8h.html

@@ -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.0</span>
+   &#160;<span id="projectnumber">1.5.1</span>
    </div>
    <div id="projectbrief">OpenSource Video Management</div>
   </td>
@@ -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.0 </dd></dl>
+<dl class="section version"><dt>Version</dt><dd>1.5.1 </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>

docs/html/cachestream_8h_source.html

@@ -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.0</span>
+   &#160;<span id="projectnumber">1.5.1</span>
    </div>
    <div id="projectbrief">OpenSource Video Management</div>
   </td>

docs/html/classAVBitmapFrame-members.html

@@ -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.0</span>
+   &#160;<span id="projectnumber">1.5.1</span>
    </div>
    <div id="projectbrief">OpenSource Video Management</div>
   </td>

docs/html/classAVBitmapFrame.html

@@ -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.0</span>
+   &#160;<span id="projectnumber">1.5.1</span>
    </div>
    <div id="projectbrief">OpenSource Video Management</div>
   </td>

docs/html/classAVDecoder-members.html

@@ -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.0</span>
+   &#160;<span id="projectnumber">1.5.1</span>
    </div>
    <div id="projectbrief">OpenSource Video Management</div>
   </td>

docs/html/classAVDecoder.html

@@ -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.0</span>
+   &#160;<span id="projectnumber">1.5.1</span>
    </div>
    <div id="projectbrief">OpenSource Video Management</div>
   </td>

docs/html/classAVHwDecoder-members.html

@@ -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.0</span>
+   &#160;<span id="projectnumber">1.5.1</span>
    </div>
    <div id="projectbrief">OpenSource Video Management</div>
   </td>

docs/html/classAVHwDecoder.html

@@ -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.0</span>
+   &#160;<span id="projectnumber">1.5.1</span>
    </div>
    <div id="projectbrief">OpenSource Video Management</div>
   </td>

docs/html/classAVMediaFrame-members.html

@@ -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.0</span>
+   &#160;<span id="projectnumber">1.5.1</span>
    </div>
    <div id="projectbrief">OpenSource Video Management</div>
   </td>

docs/html/classAVMediaFrame.html

@@ -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.0</span>
+   &#160;<span id="projectnumber">1.5.1</span>
    </div>
    <div id="projectbrief">OpenSource Video Management</div>
   </td>

docs/html/classAVRGBFrame-members.html

@@ -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.0</span>
+   &#160;<span id="projectnumber">1.5.1</span>
    </div>
    <div id="projectbrief">OpenSource Video Management</div>
   </td>

docs/html/classAVRGBFrame.html

@@ -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.0</span>
+   &#160;<span id="projectnumber">1.5.1</span>
    </div>
    <div id="projectbrief">OpenSource Video Management</div>
   </td>

docs/html/classAVThread-members.html

@@ -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.0</span>
+   &#160;<span id="projectnumber">1.5.1</span>
    </div>
    <div id="projectbrief">OpenSource Video Management</div>
   </td>