From 2edc4a826525d4ad3485fcc7570b49b8e7b0e05d Mon Sep 17 00:00:00 2001 From: Sampsa Riikonen Date: Sat, 9 Sep 2023 01:24:36 +0300 Subject: [PATCH] etc --- api_level_1/cli/shmem_test_decoded.py | 2 +- api_level_1/cli/shmem_test_encoded.py | 2 +- api_level_1/qt/multiple_stream.py | 2 +- api_level_1/qt/single_stream_rtsp.py | 2 +- api_level_1/qt/single_stream_rtsp_1.py | 2 +- api_level_2/cli/single_stream_rtsp.py | 2 +- api_level_2/qt/basic.py | 2 +- api_level_2/qt/basic1.py | 2 +- api_level_2/qt/basic2.py | 2 +- api_level_2/qt/cast.py | 2 +- api_level_2/qt/chains.py | 2 +- api_level_2/qt/cpp_thread_demo.py | 2 +- api_level_2/qt/demo_analyzer.py | 2 +- api_level_2/qt/demo_base.py | 2 +- api_level_2/qt/manager.py | 2 +- api_level_2/qt/multiprocessing_demo.py | 2 +- api_level_2/qt/playback.py | 2 +- api_level_2/qt/playwidget.py | 2 +- api_level_2/qt/port.py | 2 +- api_level_2/qt/test_studio_1.py | 2 +- api_level_2/qt/test_studio_2.py | 2 +- api_level_2/qt/test_studio_3.py | 2 +- api_level_2/qt/test_studio_4.py | 2 +- api_level_2/qt/test_studio_5.py | 2 +- api_level_2/qt/test_studio_6.py | 2 +- api_level_2/qt/test_studio_detector.py | 2 +- api_level_2/qt/test_studio_detector_2.py | 2 +- api_level_2/qt/test_studio_file.py | 2 +- api_level_2/qt/test_studio_multicast.py | 2 +- api_level_2/qt/test_studio_rtsp_server.py | 2 +- api_level_2/qt/tools.py | 2 +- api_level_2/qt/valkkafs.py | 2 +- api_level_2/qt/valkkafs2.py | 2 +- api_level_2/qt/valkkafs3.py | 2 +- api_level_2/qt/xscreen_test.py | 2 +- aux/template.py | 2 +- aux/template_qt.py | 2 +- docs/_build/html/objects.inv | Bin 1275 -> 1275 bytes docs/conf.py | 4 ++-- quicktest.py | 2 +- 40 files changed, 40 insertions(+), 40 deletions(-) diff --git a/api_level_1/cli/shmem_test_decoded.py b/api_level_1/cli/shmem_test_decoded.py index b4e0c6e..5e30ebe 100644 --- 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.3 +@version 1.5.4 @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 index d8012f4..41ef108 100644 --- 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.3 +@version 1.5.4 @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 index 9e70695..fd1f819 100644 --- 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.3 +@version 1.5.4 @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 index 9906484..5275db9 100644 --- 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.3 +@version 1.5.4 @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 index 8059972..ba4d10f 100644 --- 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.3 +@version 1.5.4 @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/single_stream_rtsp.py b/api_level_2/cli/single_stream_rtsp.py index c41b090..aa6263b 100644 --- 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.3 +@version 1.5.4 @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 index 0313834..909b1c0 100644 --- 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.3 +@version 1.5.4 @brief Some basic classes encapsulating filter chains """ diff --git a/api_level_2/qt/basic1.py b/api_level_2/qt/basic1.py index 133bc09..2f4e207 100644 --- 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.3 +@version 1.5.4 @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 index 295eabf..d63a124 100644 --- 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.3 +@version 1.5.4 @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 index 1ce5452..d4f98a5 100644 --- 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.3 +@version 1.5.4 @brief """ import sys diff --git a/api_level_2/qt/chains.py b/api_level_2/qt/chains.py index ceacb72..06bc646 100644 --- 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.3 +@version 1.5.4 @brief """ diff --git a/api_level_2/qt/cpp_thread_demo.py b/api_level_2/qt/cpp_thread_demo.py index 7cabd02..789610b 100644 --- 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.3 +@version 1.5.4 @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 index 3e653bf..612c09c 100644 --- 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.3 +@version 1.5.4 @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 index e6c0fa1..af480f2 100644 --- 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.3 +@version 1.5.4 @brief """ diff --git a/api_level_2/qt/manager.py b/api_level_2/qt/manager.py index 1cc51ef..1578da4 100644 --- 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.3 +@version 1.5.4 @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 index 4f4d8e0..7962de0 100644 --- 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.3 +@version 1.5.4 @brief Use Qt with python multiprocesses """ diff --git a/api_level_2/qt/playback.py b/api_level_2/qt/playback.py index e436af1..3d07045 100644 --- 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.3 +@version 1.5.4 @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 index 1228bfa..fe52297 100644 --- 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.3 +@version 1.5.4 @brief """ diff --git a/api_level_2/qt/port.py b/api_level_2/qt/port.py index 020dffe..a557dd3 100644 --- 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.3 +@version 1.5.4 @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 index 801a05a..b5c66ea 100644 --- 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.3 +@version 1.5.4 @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 index 9ee96fb..cee93a8 100644 --- 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.3 +@version 1.5.4 @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 index ffbe833..39eb0f3 100644 --- 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.3 +@version 1.5.4 @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 index 79ca41c..90f42ca 100644 --- 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.3 +@version 1.5.4 @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 index 0537637..991acb9 100644 --- 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.3 +@version 1.5.4 @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 index ac56a90..b25bf55 100644 --- 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.3 +@version 1.5.4 @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 index c25c0af..1040237 100644 --- 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.3 +@version 1.5.4 @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 index 82c8a2d..7882e53 100644 --- 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.3 +@version 1.5.4 @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 index b19e1f4..ae10c8b 100644 --- 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.3 +@version 1.5.4 @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 index 6362cdd..5834e64 100644 --- 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.3 +@version 1.5.4 @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 index 47f11bb..b893be7 100644 --- 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.3 +@version 1.5.4 @brief Test live streaming with Qt diff --git a/api_level_2/qt/tools.py b/api_level_2/qt/tools.py index 3224c1c..9822507 100644 --- 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.3 +@version 1.5.4 @brief helper functions """ diff --git a/api_level_2/qt/valkkafs.py b/api_level_2/qt/valkkafs.py index 81e7d63..8913640 100644 --- 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.3 +@version 1.5.4 @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 index ca2f9d3..0b8f7bc 100644 --- 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.3 +@version 1.5.4 @brief """ diff --git a/api_level_2/qt/valkkafs3.py b/api_level_2/qt/valkkafs3.py index 29f295f..89fc46a 100644 --- 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.3 +@version 1.5.4 @brief """ diff --git a/api_level_2/qt/xscreen_test.py b/api_level_2/qt/xscreen_test.py index ddd4d8d..e227f80 100644 --- 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.3 +@version 1.5.4 @brief """ diff --git a/aux/template.py b/aux/template.py index 6e43159..dbda3bb 100644 --- a/aux/template.py +++ b/aux/template.py @@ -12,7 +12,7 @@ @file NAME.py @author Sampsa Riikonen @date 2017 -@version 1.5.3 +@version 1.5.4 @brief """ diff --git a/aux/template_qt.py b/aux/template_qt.py index 529c426..2877f15 100644 --- 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.3 +@version 1.5.4 @brief """ diff --git a/docs/_build/html/objects.inv b/docs/_build/html/objects.inv index 1493bde95839dbc24d79ba3dd66689d4ea3d34e4..ed2d79b803524ca90dc17609031474cd1c2a14fd 100644 GIT binary patch delta 12 Tcmey(`I~b>5~In+5~K0P