Merge pull request #15 from elsampsa/sampsa-dev

onvif & discovery separated
elsampsa · Sep 29, 2023 · 5b5f97a · 5b5f97a
2 parents 2edc4a8 + b1f3f9d
commit 5b5f97a
Show file tree

Hide file tree

Showing 56 changed files with 234 additions and 552 deletions.
diff --git a/api_level_1/cli/shmem_test_decoded.py b/api_level_1/cli/shmem_test_decoded.py
@@ -12,7 +12,7 @@
 @file    shmem_test_decoded.py
 @author  Sampsa Riikonen
 @date    2017
-@version 1.5.4 
+@version 1.6.1 
 @brief   Stream decoded (bitmap) frames from a single rtsp camera.  Share the bitmap between python processes.
 """
 

diff --git a/api_level_1/cli/shmem_test_encoded.py b/api_level_1/cli/shmem_test_encoded.py
@@ -12,7 +12,7 @@
 @file    shmem_test_encoded.py
 @author  Sampsa Riikonen
 @date    2017
-@version 1.5.4 
+@version 1.6.1 
 @brief   Stream encoded H264 frames from a single rtsp camera (no decoding).  Share H264 stream to another python process.
 """
 

diff --git a/api_level_1/qt/multiple_stream.py b/api_level_1/qt/multiple_stream.py
@@ -12,7 +12,7 @@
 @file    multiple_stream.py
 @author  Sampsa Riikonen
 @date    2017
-@version 1.5.4 
+@version 1.6.1 
 @brief   A demo program streaming from various rtsp cameras and other sources (defined per .sdp files)
 """
 

diff --git a/api_level_1/qt/single_stream_rtsp.py b/api_level_1/qt/single_stream_rtsp.py
@@ -12,7 +12,7 @@
 @file    single_stream_rtsp.py
 @author  Sampsa Riikonen
 @date    2017
-@version 1.5.4 
+@version 1.6.1 
 @brief   A demo program: streaming from a single rtsp camera
 """
 

diff --git a/api_level_1/qt/single_stream_rtsp_1.py b/api_level_1/qt/single_stream_rtsp_1.py
@@ -12,7 +12,7 @@
 @file    single_stream_rtsp_1.py
 @author  Sampsa Riikonen
 @date    2018
-@version 1.5.4 
+@version 1.6.1 
 @brief   A demo program: streaming from a single rtsp camera.  You can use an x window create by Valkka.
 """
 

diff --git a/api_level_2/cli/find_cams.py b/api_level_2/cli/find_cams.py
@@ -27,11 +27,14 @@ def process_cl_args():
     return parsed
 
 p = process_cl_args()
-ips = runWSDiscovery()
+ips = [item[0] for item in runWSDiscovery()] # list of (ip, port) 
+# -> pick up the ip addresses only
 # print(ips)
 ips2 = []
 if p.arp:
-    ips2 = runARPScan(exclude_list = ips)
+    ips2 = [item[0] for item in runARPScan(exclude_list = ips)]
+    # list of (ip, port) values, where port is the rtsp port
+    # pick up the ip only
 ips = ips + ips2
 
 """Let's produce the following format:

diff --git a/api_level_2/cli/single_stream_rtsp.py b/api_level_2/cli/single_stream_rtsp.py
@@ -12,7 +12,7 @@
 @file    single_stream_rtsp.py
 @author  Sampsa Riikonen
 @date    2017
-@version 1.5.4 
+@version 1.6.1 
 @brief   Send N copies of an rtsp stream to the screen, using level 2 api
 """
 

diff --git a/api_level_2/qt/basic.py b/api_level_2/qt/basic.py
@@ -25,7 +25,7 @@
 @file    basic.py
 @author  Sampsa Riikonen
 @date    2017
-@version 1.5.4 
+@version 1.6.1 
 
 @brief Some basic classes encapsulating filter chains
 """

diff --git a/api_level_2/qt/basic1.py b/api_level_2/qt/basic1.py
@@ -25,7 +25,7 @@
 @file    basic1.py
 @author  Sampsa Riikonen
 @date    2018
-@version 1.5.4 
+@version 1.6.1 
   
 @brief Some more custom filterchain classes for different use cases
 """

diff --git a/api_level_2/qt/basic2.py b/api_level_2/qt/basic2.py
@@ -25,7 +25,7 @@
 @file    basic.py
 @author  Sampsa Riikonen
 @date    2017
-@version 1.5.4 
+@version 1.6.1 
   
 @brief Some basic classes encapsulating filter chains.  User must define the endpoints of the filterchains
 """

diff --git a/api_level_2/qt/cast.py b/api_level_2/qt/cast.py
@@ -12,7 +12,7 @@
 @file    demo_filterchains.py
 @author  Sampsa Riikonen
 @date    2018
-@version 1.5.4 
+@version 1.6.1 
 @brief   
 """
 import sys

diff --git a/api_level_2/qt/chains.py b/api_level_2/qt/chains.py
@@ -12,7 +12,7 @@
 @file    chains.py
 @author  Sampsa Riikonen
 @date    2019
-@version 1.5.4 
+@version 1.6.1 
 @brief   
 """
 

diff --git a/api_level_2/qt/cpp_thread_demo.py b/api_level_2/qt/cpp_thread_demo.py
@@ -12,7 +12,7 @@
 @file    cpp_thread_demo.py
 @author  Sampsa Riikonen
 @date    2017
-@version 1.5.4 
+@version 1.6.1 
 @brief   Launch a cpp thread in python.  That thread uses a callback to send a signal to PyQt's signal/slot system
 """
 

diff --git a/api_level_2/qt/demo_analyzer.py b/api_level_2/qt/demo_analyzer.py
@@ -12,7 +12,7 @@
 @file    analyzer.py
 @author  Sampsa Riikonen
 @date    2018
-@version 1.5.4 
+@version 1.6.1 
 @brief   A base class for analyzing image streams using OpenCV and an example movement detector.
 """
 

diff --git a/api_level_2/qt/demo_base.py b/api_level_2/qt/demo_base.py
@@ -12,7 +12,7 @@
 @file    demo_base.py
 @author  Sampsa Riikonen
 @date    2018
-@version 1.5.4 
+@version 1.6.1 
 @brief   
 """
 

diff --git a/api_level_2/qt/manager.py b/api_level_2/qt/manager.py
@@ -25,7 +25,7 @@
 @file    manage.py
 @author  Sampsa Riikonen
 @date    2018
-@version 1.5.4 
+@version 1.6.1 
 
 @brief   Managed filterchain classes.  Resources are managed hierarchically, decoding is turned off if its not required
 """

diff --git a/api_level_2/qt/multiprocessing_demo.py b/api_level_2/qt/multiprocessing_demo.py
@@ -12,7 +12,7 @@
 @file    multiprocessing_demo.py
 @author  Sampsa Riikonen
 @date    2018
-@version 1.5.4 
+@version 1.6.1 
 @brief   Use Qt with python multiprocesses
 """
 

diff --git a/api_level_2/qt/playback.py b/api_level_2/qt/playback.py
@@ -13,7 +13,7 @@
 @author  Petri Eränkö
 @author  Sampsa Riikonen
 @date    2019
-@version 1.5.4 
+@version 1.6.1 
 @brief   A controller that brings together TimeLineWidget, CalendarWidget and the ValkkaFSManager
 """
 

diff --git a/api_level_2/qt/playwidget.py b/api_level_2/qt/playwidget.py
@@ -13,7 +13,7 @@
 @author  Petri Eränkö
 @author  Sampsa Riikonen
 @date    2017
-@version 1.5.4 
+@version 1.6.1 
 @brief
 """
 

diff --git a/api_level_2/qt/port.py b/api_level_2/qt/port.py
@@ -25,7 +25,7 @@
 @file    manage.py
 @author  Sampsa Riikonen
 @date    2018
-@version 1.5.4 
+@version 1.6.1 
   
 @brief   Port classes for managed filterchains (see "managed.py").  "Ports" are terminals of the filterchains that require resources (say, decoding or connection to a certain x screen)
 """

diff --git a/api_level_2/qt/test_studio_1.py b/api_level_2/qt/test_studio_1.py
@@ -14,7 +14,7 @@
 @file    test_studio_1.py
 @author  Sampsa Riikonen
 @date    2018
-@version 1.5.4 
+@version 1.6.1 
 @brief   Test live streaming with Qt
 
 

diff --git a/api_level_2/qt/test_studio_2.py b/api_level_2/qt/test_studio_2.py
@@ -14,7 +14,7 @@
 @file    test_studio_2.py
 @author  Sampsa Riikonen
 @date    2018
-@version 1.5.4 
+@version 1.6.1 
 @brief   Test live streaming with Qt with floating instead of grouped widgets
 
 

diff --git a/api_level_2/qt/test_studio_3.py b/api_level_2/qt/test_studio_3.py
@@ -12,7 +12,7 @@
 @file    test_studio_2.py
 @author  Sampsa Riikonen
 @date    2018
-@version 1.5.4 
+@version 1.6.1 
 @brief   Jump video from one x-screen (and gpu) to another
 
 

diff --git a/api_level_2/qt/test_studio_4.py b/api_level_2/qt/test_studio_4.py
@@ -12,7 +12,7 @@
 @file    test_studio_2.py
 @author  Sampsa Riikonen
 @date    2018
-@version 1.5.4 
+@version 1.6.1 
 @brief   Test live streaming with Qt
 
 

diff --git a/api_level_2/qt/test_studio_5.py b/api_level_2/qt/test_studio_5.py
@@ -12,7 +12,7 @@
 @file    test_studio_5.py
 @author  Sampsa Riikonen
 @date    2019
-@version 1.5.4 
+@version 1.6.1 
 @brief   Test live streaming, recording and playback in Qt
 
 

diff --git a/api_level_2/qt/test_studio_6.py b/api_level_2/qt/test_studio_6.py
@@ -12,7 +12,7 @@
 @file    test_studio_5.py
 @author  Sampsa Riikonen
 @date    2019
-@version 1.5.4 
+@version 1.6.1 
 @brief   Test live streaming, recording and playback in Qt
 
 

diff --git a/api_level_2/qt/test_studio_detector.py b/api_level_2/qt/test_studio_detector.py
@@ -12,7 +12,7 @@
 @file    test_studio_detector.py
 @author  Sampsa Riikonen
 @date    2018
-@version 1.5.4 
+@version 1.6.1 
 @brief   Test live streaming with Qt.  Send copies of streams to OpenCV movement detector processes.  There is one OpenCV detector & multiprocess for each stream.
 
 In the main text field, write live video sources, one to each line, e.g.

diff --git a/api_level_2/qt/test_studio_detector_2.py b/api_level_2/qt/test_studio_detector_2.py
@@ -12,7 +12,7 @@
 @file    test_studio_detector_2.py
 @author  Sampsa Riikonen
 @date    2018
-@version 1.5.4 
+@version 1.6.1 
 @brief   Test live streaming with Qt.  Send copies of the streams to OpenCV movement detector processes.
 
 

diff --git a/api_level_2/qt/test_studio_file.py b/api_level_2/qt/test_studio_file.py
@@ -13,7 +13,7 @@
 @file    test_studio_file.py
 @author  Sampsa Riikonen
 @date    2018
-@version 1.5.4 
+@version 1.6.1 
 @brief   An example GUI for reading matroska (mkv) files, playing and sending them to an analyzer
 """
 

diff --git a/api_level_2/qt/test_studio_multicast.py b/api_level_2/qt/test_studio_multicast.py
@@ -12,7 +12,7 @@
 @file    test_studio_multcast.py
 @author  Sampsa Riikonen
 @date    2018
-@version 1.5.4 
+@version 1.6.1 
 @brief   Test live streaming with Qt
 
 

diff --git a/api_level_2/qt/test_studio_rtsp_server.py b/api_level_2/qt/test_studio_rtsp_server.py
@@ -12,7 +12,7 @@
 @file    test_studio_multcast.py
 @author  Sampsa Riikonen
 @date    2018
-@version 1.5.4 
+@version 1.6.1 
 @brief   Test live streaming with Qt
 
 

diff --git a/api_level_2/qt/tools.py b/api_level_2/qt/tools.py
@@ -25,7 +25,7 @@
 @file    tools.py
 @author  Sampsa Riikonen
 @date    2017
-@version 1.5.4 
+@version 1.6.1 
 
 @brief helper functions
 """

diff --git a/api_level_2/qt/valkkafs.py b/api_level_2/qt/valkkafs.py
@@ -25,7 +25,7 @@
 @file    valkkafs.py
 @author  Sampsa Riikonen
 @date    2017
-@version 1.5.4 
+@version 1.6.1 
 
 @brief Framefilter chains for simultaneous decoding, presenting and reading / writing frames to ValkkaFS
 """

diff --git a/api_level_2/qt/valkkafs2.py b/api_level_2/qt/valkkafs2.py
@@ -13,7 +13,7 @@
 @author  Sampsa Riikonen
 @author  Petri Eränkö
 @date    2019
-@version 1.5.4 
+@version 1.6.1 
 @brief   
 """
 

diff --git a/api_level_2/qt/valkkafs3.py b/api_level_2/qt/valkkafs3.py
@@ -13,7 +13,7 @@
 @author  Sampsa Riikonen
 @author  Petri Eränkö
 @date    2019
-@version 1.5.4 
+@version 1.6.1 
 @brief   
 """
 

diff --git a/api_level_2/qt/xscreen_test.py b/api_level_2/qt/xscreen_test.py
@@ -12,7 +12,7 @@
 @file    NAME.py
 @author  Sampsa Riikonen
 @date    2017
-@version 1.5.4 
+@version 1.6.1 
 @brief   
 """
 

diff --git a/aux/template.py b/aux/template.py
@@ -12,7 +12,7 @@
 @file    NAME.py
 @author  Sampsa Riikonen
 @date    2017
-@version 1.5.4 
+@version 1.6.1 
 @brief   
 """
 

diff --git a/aux/template_qt.py b/aux/template_qt.py
@@ -12,7 +12,7 @@
 @file    NAME.py
 @author  Sampsa Riikonen
 @date    2017
-@version 1.5.4 
+@version 1.6.1 
 @brief   
 """
 

diff --git a/docker/Dockerfile.cv.armv8 b/docker/Dockerfile.cv.armv8