Merge pull request #32 from Digitelektro/develop

Develop

Author: Digitelektro

CMakeLists.txt

@@ -6,6 +6,7 @@ project(Meteordemod LANGUAGES CXX)
 
 set(CMAKE_CXX_STANDARD 14)
 set(CMAKE_CXX_STANDARD_REQUIRED ON)
+SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -pthread")
 
 if (NOT CMAKE_BUILD_TYPE OR CMAKE_BUILD_TYPE STREQUAL "")
     set(CMAKE_BUILD_TYPE "Release" CACHE STRING "" FORCE)
@@ -81,6 +82,8 @@ add_executable(meteordemod
     tools/databuffer.h
     tools/iniparser.cpp
     tools/iniparser.h
+    tools/threadpool.cpp
+    tools/threadpool.h
     GIS/shapereader.cpp
     GIS/shapereader.h
     GIS/shaperenderer.cpp
@@ -139,7 +142,7 @@ if(UNIX AND NOT APPLE)
     if (DEBIAN_FOUND)
         SET(CPACK_GENERATOR "DEB")
         SET(CPACK_PACKAGE_VERSION_MAJOR "2")
-        SET(CPACK_PACKAGE_VERSION_MINOR "1")
+        SET(CPACK_PACKAGE_VERSION_MINOR "2")
         SET(CPACK_PACKAGE_VERSION_PATCH "0")
         SET(CPACK_DEBIAN_PACKAGE_MAINTAINER "Digitelektro")
         SET(CPACK_DEBIAN_PACKAGE_HOMEPAGE "https://github.com/Digitelektro/MeteorDemod")

MeteorDemod.pro

@@ -31,6 +31,7 @@ SOURCES += \
     tools/databuffer.cpp \
     tools/iniparser.cpp \
     tools/pixelgeolocationcalculator.cpp \
+    tools/threadpool.cpp \
     tools/tlereader.cpp \
     tools/matrix.cpp \
     tools/vector.cpp \
@@ -67,6 +68,7 @@ HEADERS += \
     tools/iniparser.h \
     tools/pixelgeolocationcalculator.h \
     tools/matrix.h \
+    tools/threadpool.h \
     tools/tlereader.h \
     tools/vector.h \
     tools/databuffer.h \

common/version.h

@@ -2,7 +2,7 @@
 #define VERSION_H
 
 #define VERSION_MAJOR 2
-#define VERSION_MINOR 1
+#define VERSION_MINOR 2
 #define VERSION_FIX 0
 
 #endif // VERSION_H

main.cpp

@@ -18,6 +18,8 @@
 #include "tlereader.h"
 #include "settings.h"
 
+#include "threadpool.h"
+
 struct ImageForSpread {
     ImageForSpread(cv::Mat img, std::string fileNamebase)
         : image(img)
@@ -34,6 +36,7 @@ int mean(int cur, int prev);
 void differentialDecode(int8_t *data, int64_t len);
 int8_t clamp(float x);
 
+static std::mutex saveImageMutex;
 
 static uint16_t intSqrtTable[32768];
 
@@ -72,6 +75,7 @@ static Viterbi mViterbi;
 static PacketParser mPacketParser;
 static ReedSolomon mReedSolomon;
 static Settings &mSettings = Settings::getInstance();
+static ThreadPool mThreadPool(std::thread::hardware_concurrency());
 
 int main(int argc, char *argv[])
 {
@@ -84,6 +88,7 @@ int main(int argc, char *argv[])
     mSettings.parseArgs(argc, argv);
     mSettings.parseIni(mSettings.getResourcesPath() + "settings.ini");
 
+    mThreadPool.start();
     TleReader reader(mSettings.getTlePath());
     TleReader::TLE tle;
     reader.processFile();
@@ -291,11 +296,15 @@ int main(int argc, char *argv[])
         }
 
     } else if(mPacketParser.isChannel64Available() && mPacketParser.isChannel65Available() && mPacketParser.isChannel66Available()) {
-        cv::Mat threatedImage = mPacketParser.getRGBImage(PacketParser::APID_66, PacketParser::APID_65, PacketParser::APID_64, mSettings.fillBackLines());
+        cv::Mat threatedImage1 = mPacketParser.getRGBImage(PacketParser::APID_66, PacketParser::APID_65, PacketParser::APID_64, mSettings.fillBackLines());
+        cv::Mat threatedImage2 = mPacketParser.getRGBImage(PacketParser::APID_65, PacketParser::APID_65, PacketParser::APID_64, mSettings.fillBackLines());
 
-        if(!ThreatImage::isNightPass(threatedImage, mSettings.getNightPassTreshold())) {
-            imagesToSpread.push_back(ImageForSpread(threatedImage, "123_"));
-            saveImage(mSettings.getOutputPath() + fileNameDate + "_123.bmp", threatedImage);
+        if(!ThreatImage::isNightPass(threatedImage1, mSettings.getNightPassTreshold())) {
+            imagesToSpread.push_back(ImageForSpread(threatedImage1, "321_"));
+            saveImage(mSettings.getOutputPath() + fileNameDate + "_321.bmp", threatedImage1);
+
+            imagesToSpread.push_back(ImageForSpread(threatedImage2, "221_"));
+            saveImage(mSettings.getOutputPath() + fileNameDate + "_221.bmp", threatedImage2);
         } else {
             std::cout << "Night pass, RGB image skipped, threshold set to: " << mSettings.getNightPassTreshold() << std::endl;
         }
@@ -306,7 +315,7 @@ int main(int argc, char *argv[])
 
         cv::Mat ch64 = mPacketParser.getChannelImage(PacketParser::APID_64, mSettings.fillBackLines());
         cv::Mat ch65 = mPacketParser.getChannelImage(PacketParser::APID_65, mSettings.fillBackLines());
-        cv::Mat ch66 = mPacketParser.getChannelImage(PacketParser::APID_68, mSettings.fillBackLines());
+        cv::Mat ch66 = mPacketParser.getChannelImage(PacketParser::APID_66, mSettings.fillBackLines());
 
         saveImage(mSettings.getOutputPath() + fileNameDate + "_64.bmp", ch64);
         saveImage(mSettings.getOutputPath() + fileNameDate + "_65.bmp", ch65);
@@ -346,61 +355,68 @@ int main(int argc, char *argv[])
         return 0;
     }
 
-    SpreadImage spreadImage;
     std::ostringstream oss;
     oss << std::setfill('0') << std::setw(2) << passStart.Day() << "/" << std::setw(2) << passStart.Month() << "/" << passStart.Year() << " " << std::setw(2) << passStart.Hour() << ":" << std::setw(2) << passStart.Minute() << ":" << std::setw(2) << passStart.Second() << " UTC";
     std::string dateStr = oss.str();
 
     std::list<ImageForSpread>::const_iterator it;
-
-    int c = 1;
-    for(it = imagesToSpread.begin(); it != imagesToSpread.end(); ++it, c++) {
+    for(it = imagesToSpread.begin(); it != imagesToSpread.end(); ++it) {
         std::string fileName = (*it).fileNameBase + fileNameDate + "." + mSettings.getOutputFormat();
 
         if(mSettings.spreadImage()) {
-            cv::Mat strechedImg = spreadImage.stretch((*it).image);
-
-            if(!strechedImg.empty()) {
-                ThreatImage::drawWatermark(strechedImg, dateStr);
-                saveImage(mSettings.getOutputPath() + std::string("spread_") + fileName, strechedImg);
-            } else {
-                std::cout << "Failed to strech image" << std::endl;
-            }
+            mThreadPool.addJob([=]() {
+                SpreadImage spreadImage;
+                cv::Mat strechedImg = spreadImage.stretch((*it).image);
+
+                if(!strechedImg.empty()) {
+                    ThreatImage::drawWatermark(strechedImg, dateStr);
+                    saveImage(mSettings.getOutputPath() + std::string("spread_") + fileName, strechedImg);
+                } else {
+                    std::cout << "Failed to strech image" << std::endl;
+                }
+            });
         }
 
         if(mSettings.mercatorProjection()) {
-            cv::Mat mercator = spreadImage.mercatorProjection((*it).image, calc, [c, &imagesToSpread](float percent) {
-                std::cout << "Spreading mercator " << c << " of " << imagesToSpread.size() << " " << static_cast<int>(percent) << "%\t\t\r" << std::flush;
+            mThreadPool.addJob([=]() {
+                SpreadImage spreadImage;
+                cv::Mat mercator = spreadImage.mercatorProjection((*it).image, calc);
+
+                if(!mercator.empty()) {
+                    ThreatImage::drawWatermark(mercator, dateStr);
+                    saveImage(mSettings.getOutputPath() + std::string("mercator_") + fileName, mercator);
+                } else {
+                    std::cout << "Failed to create mercator projection" << std::endl;
+                }
             });
-            std::cout << std::endl;
-
-            if(!mercator.empty()) {
-                ThreatImage::drawWatermark(mercator, dateStr);
-                saveImage(mSettings.getOutputPath() + std::string("mercator_") + fileName, mercator);
-            } else {
-                std::cout << "Failed to create mercator projection" << std::endl;
-            }
         }
 
         if(mSettings.equadistantProjection()) {
-            cv::Mat equidistant = spreadImage.equidistantProjection((*it).image, calc, [c, &imagesToSpread](float percent) {
-                std::cout << "Spreading equidistant " << c << " of " << imagesToSpread.size() << " " << static_cast<int>(percent) << "%\t\t\r" << std::flush;
+            mThreadPool.addJob([=]() {
+                SpreadImage spreadImage;
+                cv::Mat equidistant = spreadImage.equidistantProjection((*it).image, calc);
+
+                if(!equidistant.empty()) {
+                    ThreatImage::drawWatermark(equidistant, dateStr);
+                    saveImage(mSettings.getOutputPath() + std::string("equidistant_") + fileName, equidistant);
+                } else {
+                    std::cout << "Failed to create equidistant projection" << std::endl;
+                }
             });
-            std::cout << std::endl;
-
-            if(!equidistant.empty()) {
-                ThreatImage::drawWatermark(equidistant, dateStr);
-                saveImage(mSettings.getOutputPath() + std::string("equidistant_") + fileName, equidistant);
-            } else {
-                std::cout << "Failed to create equidistant projection" << std::endl;
-            }
         }
     }
+
+    std::cout << "Generate images" << std::endl;
+    mThreadPool.stop();
+    std::cout << "Generate images done" << std::endl;
+
     return 0;
 }
 
 void saveImage(const std::string fileName, const cv::Mat &image)
 {
+    std::unique_lock<decltype(saveImageMutex)>lock(saveImageMutex);
+
     std::vector<int> compression_params;
     compression_params.push_back(cv::IMWRITE_JPEG_QUALITY);
     compression_params.push_back(mSettings.getJpegQuality());

readme.md

@@ -77,11 +77,8 @@ Other settings can be found in the settings.ini file.
 Master branch is for the latest stable version, beta branch for beta versions, development is ongoing on other branches.
 
 ## Future developments
- - More precise image overlays
- - Rain overlay
  - Composite output from multiple passes
  - Support dead Meteor M2 2 satellite (it may be required for future satellites)
- - Multithreading, faster image processing
 
 
 ## Example Outputs

tools/threadpool.cpp

@@ -0,0 +1,84 @@
+#include "threadpool.h"
+
+ThreadPool::ThreadPool(int numOfThreads)
+    : mNumberOfThreads(numOfThreads)
+    , mIsRuning(false)
+{
+
+}
+
+ThreadPool::~ThreadPool()
+{
+    if(mIsRuning) {
+        stop();
+    }
+}
+
+void ThreadPool::start()
+{
+    mIsRuning = true;
+
+    for (int i = 0; i < mNumberOfThreads; i++)
+    {
+        mThreads.push_back(std::thread(&ThreadPool::threadLoop, this));
+    }
+}
+
+void ThreadPool::stop()
+{
+    waitForAllJobsDone();
+
+    {
+        std::unique_lock<std::mutex> lock(mQueueMutex);
+        mIsRuning = false;
+    }
+
+    mConditionVariable.notify_all(); // wake up all threads.
+
+    for (std::thread &th : mThreads)
+    {
+        if(th.joinable())
+        {
+            th.join();
+        }
+    }
+
+    mThreads.clear();
+}
+
+void ThreadPool::addJob(JobFunction_t task)
+{
+    {
+        std::unique_lock<std::mutex> lock(mQueueMutex);
+        mJobCounter++;
+        mJobsQueue.push(task);
+    }
+
+    mConditionVariable.notify_one();
+}
+
+void ThreadPool::threadLoop()
+{
+    JobFunction_t job;
+
+    while (true)
+    {
+        {
+            std::unique_lock<std::mutex> lock(mQueueMutex);
+
+            mConditionVariable.wait(lock, [this](){
+                return !mJobsQueue.empty() || !mIsRuning;
+            });
+
+            if(!mIsRuning) {
+                break;
+            }
+
+            job = mJobsQueue.front();
+            mJobsQueue.pop();
+        }
+        job();
+
+        mJobCounter--;
+    }
+}