Вынес в отдельный проект все что касается QCamera

MimusTriurus · Feb 4, 2018 · 2e2346a · 2e2346a
1 parent a4aebdd
commit 2e2346a
Show file tree

Hide file tree

Showing 35 changed files with 27 additions and 922 deletions.
diff --git a/README.md b/README.md
@@ -1,24 +1,21 @@
 # QtVideoStreamer
 Simple Qt video streamer
 ____________________________________________________________________________________________________________
-ImageSerialization  - static library of serialization/deserialization QImage
-
 MatSerialization    - static library of serialization/deserialization cv::Mat
 
 CvVideoCapture      - static library of image capture from camera by means of OpenCV
 
-QVideoCapture       - static library of image capture from camera by means of Qt (QCamera)
-
 VideoTransmitter    - static library of image transmitting from camera to application-receiver over network 
 
 VideoReceiver       - static library of image receiving over network from application-transmitter 
 
+FpsChecker			- static library of check fps
+
 CvTransmitterTest   - test application – image transmitter from camera by means of OpenCV
 
 CvReceiverTest      - test application – image receiver from camera by means of OpenCV
 
-QImgTransmitterTest - test application – image transmitter from camera by means of Qt (QCamera)
-QImgReceiverTest    - test application – image receiver from camera by means of Qt (QCamera)
+VideoCaptureTest	- test CvVideoCapture
 _____________________________________________________________________________________________________________
 
 System requirements:
@@ -38,7 +35,23 @@ Setup for Windows:
 Setup for Linux:
 ----------------------------------------------
 1. Clone the repository;
-2. Launch the console and run command “sudo apt-get install libopencv-dev” and “ sudo apt-get install qtmultimedia5-dev”;
+2. Launch the console and run command “sudo apt-get install libopencv-dev”;
 3. Build the project.
 
 Compiled applications are located in folder “bin”
+
+Remarks:
+----------------------------------------------
+OpenCV relies on the V4L2 (Video for Linux) module, so try adding the following line at the bottom of the file /etc/modules and rebooting your Raspberry Pi.
+
+bcm2835-v4l2
+
+Mine now looks like this in toto:
+
+# /etc/modules: kernel modules to load at boot time.
+#
+# This file contains the names of kernel modules that should be loaded
+# at boot time, one per line. Lines beginning with "#" are ignored.
+
+bcm2835-v4l2
+This ensures that the Broadcom Video For Linux 2 (v4l2) driver is loaded at all subsequent reboots.
diff --git a/README_RUS.md b/README_RUS.md
@@ -1,25 +1,21 @@
 # QtVideoStreamer
 Стриминг видео-потока с камеры по сети ( UDP ).
 ----------------------------------------------
-ImageSerialization - статическая библиотека сериализации и десереализации QImage
-
 MatSerialization    - статическая библиотека сериализации и десереализации cv::Mat
 
 CvVideoCapture      - статическая библиотека захвата изображения с камеры средствами OpenCV
 
-QVideoCapture       - статическая библиотека захвата изображения с камеры средствами Qt (QCamera)
-
 VideoTransmitter    - статическая библиотека передачи изображения с камеры приложению-приемнику по сети
 
 VideoReceiver       - статическая библиотека приема изображения по сети от приложения-передатчика
 
+FpsChecker			- статическая библиотека расчета fps
+
 CvTransmitterTest   - тестовое приложение-передатчик изображения с камеры средствами OpenCV
 
 CvReceiverTest      - тестовое приложение-приемник изображения с камеры средствами OpenCV
 
-QImgTransmitterTest - тестовое приложение-передатчик изображения с камеры средствами OpenCV
-
-QImgReceiverTest    - тестовое приложение-приемник изображения с камеры средствами OpenCV
+VideoCaptureTest	- тест CvVideoCapture
 
 Системные требования:
 1. ОС: Windows, Linux( Ubuntu 16.04, Raspbian );
@@ -36,7 +32,10 @@ QImgReceiverTest    - тестовое приложение-приемник и
 
 Сборка на Linux(Ubuntu 16.04, Raspbian)
 1. Склонировать репозиторий;
-2. Запустить терминал и выполнить команду sudo apt-get install libopencv-dev и sudo apt-get install qtmultimedia5-dev;
+2. Запустить терминал и выполнить команду sudo apt-get install libopencv-dev;
 3. Собрать проект.
 
 Скомпилированные приложения находятся в папке bin
+
+Примечание:
+Для использования raspicam необходимо добавить строку bcm2835-v4l2 в файл /etc/modules
diff --git a/lib/static/ImageSerialization/ImageSerialization.cpp b/lib/static/ImageSerialization/ImageSerialization.cpp
diff --git a/lib/static/ImageSerialization/ImageSerialization.h b/lib/static/ImageSerialization/ImageSerialization.h
diff --git a/lib/static/ImageSerialization/ImageSerialization.pro b/lib/static/ImageSerialization/ImageSerialization.pro
diff --git a/lib/static/QVideoCapture/CameraFrameGrabber.cpp b/lib/static/QVideoCapture/CameraFrameGrabber.cpp
diff --git a/lib/static/QVideoCapture/CameraFrameGrabber.h b/lib/static/QVideoCapture/CameraFrameGrabber.h
diff --git a/lib/static/QVideoCapture/QVideoCapture.cpp b/lib/static/QVideoCapture/QVideoCapture.cpp
diff --git a/lib/static/QVideoCapture/QVideoCapture.h b/lib/static/QVideoCapture/QVideoCapture.h
diff --git a/lib/static/QVideoCapture/QVideoCapture.pro b/lib/static/QVideoCapture/QVideoCapture.pro
diff --git a/lib/static/VideoReceiver/VideoReceiver.pro b/lib/static/VideoReceiver/VideoReceiver.pro
@@ -20,5 +20,3 @@ unix {
     target.path = /usr/lib
     INSTALLS += target
 }
-
-include(../../../config.pri)
diff --git a/lib/static/VideoTransmitter/VideoTransmitter.pro b/lib/static/VideoTransmitter/VideoTransmitter.pro
@@ -18,5 +18,3 @@ unix {
     target.path = /usr/lib
     INSTALLS += target
 }
-
-include(../../../config.pri)
diff --git a/lib/static/static.pro b/lib/static/static.pro
@@ -3,9 +3,7 @@ TEMPLATE = subdirs
 CONFIG += ordered
 
 SUBDIRS +=              \
-    ImageSerialization  \
     MatSerialization    \
-    QVideoCapture       \
     CvVideoCapture      \
     VideoTransmitter    \
     VideoReceiver \

diff --git a/test/QCameraTest/CameraFrameGrabber.cpp b/test/QCameraTest/CameraFrameGrabber.cpp