frodovdr/hyperion.ng
1
0
Fork 0
mirror of https://github.com/hyperion-project/hyperion.ng.git synced 2025-03-01 10:33:28 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix Memory leaks (#1678)

Browse Source 
* Refactor to fix #1671

* Add GUI/NonGUI mode to info page

* Do not show lock config, if in non-UI mode

* Updae Changelog

* Correct includes

* Ensure key member initialization - RGB Channels

* Ensure key member initialization - WebServer

* Update RGBChannels

* Fix initialization order

* Fix key when inserting new logger in LoggerMap,
Prepare logBuffer-JSON snapshot view in LoggerManager,
Increase buffered loglines to 500

* Fix Memory leak in GrabberWrapper

* Fix Memory leak in BlackBorderProcessor

* Fix Memory leak in BlackBorderProcessor

* use ninja generator under macos

* Fix BGEffectHandler destruction

* Fix Mdns code

* Clear list after applying qDeleteAll

* Fix deletion of CecHandler

* Fix memory leak caused by wrong buffer allocation

* Remove extra pixel consistently

* Change mDNS to Qt SmartPointers

* Correct removal

* Fix usage of _width/_height (they are the output resolution, not the screen resolution)
That avoids unnecessary resizing of the output image with every transferFrame call

* Move main non Thread Objects to Smart Pointers

* Revert "Move main non Thread Objects to Smart Pointers"

This reverts commit 26102ca963982e2fbc4ffb8d4db6139f0128a3cc.

* Add missing deletes

* Revert MdnsBrowser chnage

* Revert MdnsBrowser change

* Fix memory leaks related standalone grabber

* Address CodeQL finding

* delete pointer OsxFrameGrabber

---------

Co-authored-by: Paulchen-Panther <16664240+Paulchen-Panther@users.noreply.github.com>
This commit is contained in:
LordGrey 2024-01-13 17:04:45 +01:00 committed by GitHub
parent 8907d7370e
commit 05d24b99c4
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
46 changed files with 439 additions and 341 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
CHANGELOG.md
View File

@ -53,6 +53,7 @@ Note: The wizard will configure an APIv2 capable bridge always with Entertainmen
- MDNSBrower - Fixed, if timeout while resolving host occurs - MDNSBrower - Fixed, if timeout while resolving host occurs
- Non image updates ignored blacklisted LEDs (#1634) - Non image updates ignored blacklisted LEDs (#1634)
- Fixed that Windows OsEvents failed in non-GUI mode (#1671) - Fixed that Windows OsEvents failed in non-GUI mode (#1671)
- Addressed serious (#1425) and some smaller memory leaks
##### LED-Devices ##### LED-Devices

11
include/blackborder/BlackBorderProcessor.h
View File

@ -1,4 +1,7 @@
#pragma once #ifndef BLACK_BORDER_PROCESSOR_H
#define BLACK_BORDER_PROCESSOR_H
#include <memory>
// QT includes // QT includes
#include <QJsonObject> #include <QJsonObject>
@ -24,7 +27,7 @@ namespace hyperion
Q_OBJECT Q_OBJECT
public: public:
BlackBorderProcessor(Hyperion* hyperion, QObject* parent); BlackBorderProcessor(Hyperion* hyperion, QObject* parent);
~BlackBorderProcessor() override;
/// ///
/// Return the current (detected) border /// Return the current (detected) border
/// @return The current border /// @return The current border
@ -141,7 +144,7 @@ namespace hyperion
QString _detectionMode; QString _detectionMode;
/// The black-border detector /// The black-border detector
BlackBorderDetector* _detector; std::unique_ptr<BlackBorderDetector> _detector;
/// The current detected border /// The current detected border
BlackBorder _currentBorder; BlackBorder _currentBorder;
@ -162,3 +165,5 @@ namespace hyperion
}; };
} // end namespace hyperion } // end namespace hyperion
#endif // BLACK_BORDER_PROCESSOR_H

5
include/commandline/ValidatorOption.h
View File

@ -36,6 +36,11 @@ public:
: Option(other), validator(validator) : Option(other), validator(validator)
{} {}
~ValidatorOption()
{
delete validator;
}
virtual const QValidator *getValidator() const; virtual const QValidator *getValidator() const;
virtual bool validate(Parser & parser, QString &value) override; virtual bool validate(Parser & parser, QString &value) override;
}; };

4
include/grabber/qt/QtGrabber.h
View File

@ -113,8 +113,8 @@ private:
int _display; int _display;
int _numberOfSDisplays; int _numberOfSDisplays;
int _calculatedWidth; int _screenWidth;
int _calculatedHeight; int _screenHeight;
int _src_x; int _src_x;
int _src_y; int _src_y;
int _src_x_max; int _src_x_max;

20
include/grabber/x11/X11Grabber.h
View File

@ -57,7 +57,7 @@ public:
/// ///
/// @brief Apply new width/height values, overwrite Grabber.h implementation as X11 doesn't use width/height, just pixelDecimation to calc dimensions /// @brief Apply new width/height values, overwrite Grabber.h implementation as X11 doesn't use width/height, just pixelDecimation to calc dimensions
/// ///
bool setWidthHeight(int width, int height) override { return true; } bool setWidthHeight(int /*width*/, int /*height*/) override { return true; }
/// ///
/// @brief Apply new pixelDecimation /// @brief Apply new pixelDecimation
@ -109,19 +109,19 @@ private:
Picture _srcPicture; Picture _srcPicture;
Picture _dstPicture; Picture _dstPicture;
int _XRandREventBase; int _xRandREventBase;
XTransform _transform; XTransform _transform;
unsigned _calculatedWidth; int _screenWidth;
unsigned _calculatedHeight; int _screenHeight;
unsigned _src_x; int _src_x;
unsigned _src_y; int _src_y;
bool _XShmAvailable; bool _xShmAvailable;
bool _XShmPixmapAvailable; bool _xShmPixmapAvailable;
bool _XRenderAvailable; bool _xRenderAvailable;
bool _XRandRAvailable; bool _xRandRAvailable;
bool _isWayland; bool _isWayland;
Logger * _logger; Logger * _logger;

10
include/hyperion/BGEffectHandler.h
View File

@ -43,6 +43,16 @@ public:
handleSettingsUpdate(settings::BGEFFECT, _hyperion->getSetting(settings::BGEFFECT)); handleSettingsUpdate(settings::BGEFFECT, _hyperion->getSetting(settings::BGEFFECT));
} }
///
/// @brief Disconnect from connected signals
/// Disconnect should be done before other priorities invoke methods during shutdown
///
void disconnect()
{
QObject::disconnect(_prioMuxer, &PriorityMuxer::prioritiesChanged, nullptr, nullptr);
QObject::disconnect(_hyperion, nullptr, nullptr, nullptr);
}
/// ///
/// @brief Check, if background effect processing is enabled. /// @brief Check, if background effect processing is enabled.
/// @return True, background effect processing is enabled. /// @return True, background effect processing is enabled.

16
include/hyperion/ColorAdjustment.h
View File

@ -16,21 +16,21 @@ public:
QString _id; QString _id;
/// The BLACK (RGB-Channel) adjustment /// The BLACK (RGB-Channel) adjustment
RgbChannelAdjustment _rgbBlackAdjustment; RgbChannelAdjustment _rgbBlackAdjustment {0, 0, 0, "black"};
/// The WHITE (RGB-Channel) adjustment /// The WHITE (RGB-Channel) adjustment
RgbChannelAdjustment _rgbWhiteAdjustment; RgbChannelAdjustment _rgbWhiteAdjustment{255, 255, 255, "white"};
/// The RED (RGB-Channel) adjustment /// The RED (RGB-Channel) adjustment
RgbChannelAdjustment _rgbRedAdjustment; RgbChannelAdjustment _rgbRedAdjustment {255, 0, 0 , "red"};
/// The GREEN (RGB-Channel) adjustment /// The GREEN (RGB-Channel) adjustment
RgbChannelAdjustment _rgbGreenAdjustment; RgbChannelAdjustment _rgbGreenAdjustment {0, 255, 0, "green"};
/// The BLUE (RGB-Channel) adjustment /// The BLUE (RGB-Channel) adjustment
RgbChannelAdjustment _rgbBlueAdjustment; RgbChannelAdjustment _rgbBlueAdjustment {0, 0, 255, "blue"};
/// The CYAN (RGB-Channel) adjustment /// The CYAN (RGB-Channel) adjustment
RgbChannelAdjustment _rgbCyanAdjustment; RgbChannelAdjustment _rgbCyanAdjustment {0, 255, 255, "cyan"};
/// The MAGENTA (RGB-Channel) adjustment /// The MAGENTA (RGB-Channel) adjustment
RgbChannelAdjustment _rgbMagentaAdjustment; RgbChannelAdjustment _rgbMagentaAdjustment {255, 0, 255, "magenta"};
/// The YELLOW (RGB-Channel) adjustment /// The YELLOW (RGB-Channel) adjustment
RgbChannelAdjustment _rgbYellowAdjustment; RgbChannelAdjustment _rgbYellowAdjustment {255, 255, 0, "yellow"};
RgbTransform _rgbTransform; RgbTransform _rgbTransform;
OkhsvTransform _okhsvTransform; OkhsvTransform _okhsvTransform;

7
include/hyperion/GrabberWrapper.h
View File

@ -6,6 +6,7 @@
#include <QString> #include <QString>
#include <QStringList> #include <QStringList>
#include <QMultiMap> #include <QMultiMap>
#include <QScopedPointer>
#include <utils/Logger.h> #include <utils/Logger.h>
#include <utils/Components.h> #include <utils/Components.h>
@ -91,8 +92,8 @@ public:
template <typename Grabber_T> template <typename Grabber_T>
bool transferFrame(Grabber_T &grabber) bool transferFrame(Grabber_T &grabber)
{ {
unsigned w = grabber.getImageWidth(); int w = grabber.getImageWidth();
unsigned h = grabber.getImageHeight(); int h = grabber.getImageHeight();
if ( _image.width() != w || _image.height() != h) if ( _image.width() != w || _image.height() != h)
{ {
_image.resize(w, h); _image.resize(w, h);
@ -185,7 +186,7 @@ protected:
Logger * _log; Logger * _log;
/// The timer for generating events with the specified update rate /// The timer for generating events with the specified update rate
QTimer* _timer; QScopedPointer<QTimer> _timer;
/// The calculated update rate [ms] /// The calculated update rate [ms]
int _updateInterval_ms; int _updateInterval_ms;

13
include/mdns/MdnsBrowser.h
View File

@ -2,7 +2,6 @@
#define MDNS_BROWSER_H #define MDNS_BROWSER_H
#include <chrono> #include <chrono>
#include <type_traits>
#include <qmdnsengine/server.h> #include <qmdnsengine/server.h>
#include <qmdnsengine/service.h> #include <qmdnsengine/service.h>
@ -16,6 +15,9 @@
// Qt includes // Qt includes
#include <QObject> #include <QObject>
#include <QByteArray> #include <QByteArray>
#include <QMap>
#include <QJsonArray>
#include <QSharedPointer>
// Utility includes // Utility includes
#include <utils/Logger.h> #include <utils/Logger.h>
@ -24,15 +26,12 @@
namespace { namespace {
constexpr std::chrono::milliseconds DEFAULT_DISCOVER_TIMEOUT{ 500 }; constexpr std::chrono::milliseconds DEFAULT_DISCOVER_TIMEOUT{ 500 };
constexpr std::chrono::milliseconds DEFAULT_ADDRESS_RESOLVE_TIMEOUT{ 1000 }; constexpr std::chrono::milliseconds DEFAULT_ADDRESS_RESOLVE_TIMEOUT{ 1000 };
} // End of constants
} //End of constants
class MdnsBrowser : public QObject class MdnsBrowser : public QObject
{ {
Q_OBJECT Q_OBJECT
// Run MdnsBrowser as singleton
private: private:
/// ///
/// @brief Browse for hyperion services in bonjour, constructed from HyperionDaemon /// @brief Browse for hyperion services in bonjour, constructed from HyperionDaemon
@ -58,7 +57,6 @@ public:
QMdnsEngine::Service getFirstService(const QByteArray& serviceType, const QString& filter = ".*", const std::chrono::milliseconds waitTime = DEFAULT_DISCOVER_TIMEOUT) const; QMdnsEngine::Service getFirstService(const QByteArray& serviceType, const QString& filter = ".*", const std::chrono::milliseconds waitTime = DEFAULT_DISCOVER_TIMEOUT) const;
QJsonArray getServicesDiscoveredJson(const QByteArray& serviceType, const QString& filter = ".*", const std::chrono::milliseconds waitTime = std::chrono::milliseconds{ 0 }) const; QJsonArray getServicesDiscoveredJson(const QByteArray& serviceType, const QString& filter = ".*", const std::chrono::milliseconds waitTime = std::chrono::milliseconds{ 0 }) const;
void printCache(const QByteArray& name = QByteArray(), quint16 type = QMdnsEngine::ANY) const; void printCache(const QByteArray& name = QByteArray(), quint16 type = QMdnsEngine::ANY) const;
public slots: public slots:
@ -109,8 +107,9 @@ private:
QMdnsEngine::Server _server; QMdnsEngine::Server _server;
QMdnsEngine::Cache _cache; QMdnsEngine::Cache _cache;
QSharedPointer<QMdnsEngine::Resolver> _resolver;
QMap<QByteArray, QMdnsEngine::Browser*> _browsedServiceTypes; QMap<QByteArray, QSharedPointer<QMdnsEngine::Browser>> _browsedServiceTypes;
}; };
#endif // MDNSBROWSER_H #endif // MDNSBROWSER_H

7
include/mdns/MdnsProvider.h
View File

@ -9,6 +9,7 @@
// Qt includes // Qt includes
#include <QObject> #include <QObject>
#include <QByteArray> #include <QByteArray>
#include <QScopedPointer>
// Utility includes // Utility includes
#include <utils/Logger.h> #include <utils/Logger.h>
@ -41,11 +42,11 @@ private:
/// The logger instance for mDNS-Service /// The logger instance for mDNS-Service
Logger* _log; Logger* _log;
QMdnsEngine::Server* _server; QScopedPointer<QMdnsEngine::Server> _server;
QMdnsEngine::Hostname* _hostname; QScopedPointer<QMdnsEngine::Hostname> _hostname;
/// map of services provided /// map of services provided
QMap<QByteArray, QMdnsEngine::Provider*> _providedServiceTypes; QMap<QByteArray, QSharedPointer<QMdnsEngine::Provider>> _providedServiceTypes;
}; };
#endif // MDNSPROVIDER_H #endif // MDNSPROVIDER_H

20
include/utils/Image.h
View File

@ -15,9 +15,8 @@ public:
{ {
} }
Image(unsigned width, unsigned height) : Image(int width, int height) :
Image(width, height, Pixel_T()) Image(width, height, Pixel_T())
{ {
} }
@ -28,7 +27,7 @@ public:
/// @param height The height of the image /// @param height The height of the image
/// @param background The color of the image /// @param background The color of the image
/// ///
Image(unsigned width, unsigned height, const Pixel_T background) : Image(int width, int height, const Pixel_T background) :
_d_ptr(new ImageData<Pixel_T>(width, height, background)) _d_ptr(new ImageData<Pixel_T>(width, height, background))
{ {
} }
@ -78,7 +77,7 @@ public:
/// ///
/// @return The width of the image /// @return The width of the image
/// ///
inline unsigned width() const inline int width() const
{ {
return _d_ptr->width(); return _d_ptr->width();
} }
@ -88,7 +87,7 @@ public:
/// ///
/// @return The height of the image /// @return The height of the image
/// ///
inline unsigned height() const inline int height() const
{ {
return _d_ptr->height(); return _d_ptr->height();
} }
@ -111,7 +110,7 @@ public:
/// ///
/// @return const reference to specified pixel /// @return const reference to specified pixel
/// ///
uint8_t blue(unsigned pixel) const uint8_t blue(int pixel) const
{ {
return _d_ptr->blue(pixel); return _d_ptr->blue(pixel);
} }
@ -121,7 +120,7 @@ public:
/// ///
/// @param x The x index /// @param x The x index
/// @param y The y index /// @param y The y index
const Pixel_T& operator()(unsigned x, unsigned y) const const Pixel_T& operator()(int x, int y) const
{ {
return _d_ptr->operator()(x, y); return _d_ptr->operator()(x, y);
} }
@ -129,7 +128,7 @@ public:
/// ///
/// @return reference to specified pixel /// @return reference to specified pixel
/// ///
Pixel_T& operator()(unsigned x, unsigned y) Pixel_T& operator()(int x, int y)
{ {
return _d_ptr->operator()(x, y); return _d_ptr->operator()(x, y);
} }
@ -137,7 +136,7 @@ public:
/// Resize the image /// Resize the image
/// @param width The width of the image /// @param width The width of the image
/// @param height The height of the image /// @param height The height of the image
void resize(unsigned width, unsigned height) void resize(int width, int height)
{ {
_d_ptr->resize(width, height); _d_ptr->resize(width, height);
} }
@ -198,12 +197,11 @@ private:
/// ///
/// @return The index into the underlying data-vector /// @return The index into the underlying data-vector
/// ///
inline unsigned toIndex(unsigned x, unsigned y) const inline int toIndex(int x, int y) const
{ {
return _d_ptr->toIndex(x, y); return _d_ptr->toIndex(x, y);
} }
private:
QSharedDataPointer<ImageData<Pixel_T>> _d_ptr; QSharedDataPointer<ImageData<Pixel_T>> _d_ptr;
}; };

64
include/utils/ImageData.h
View File

@ -1,12 +1,9 @@
#pragma once #pragma once
// STL includes // STL includes
#include <vector>
#include <cstdint> #include <cstdint>
#include <cstring> #include <cstring>
#include <algorithm> #include <algorithm>
#include <cassert>
#include <type_traits>
#include <utils/ColorRgb.h> #include <utils/ColorRgb.h>
// QT includes // QT includes
@ -24,10 +21,10 @@ class ImageData : public QSharedData
public: public:
typedef Pixel_T pixel_type; typedef Pixel_T pixel_type;
ImageData(unsigned width, unsigned height, const Pixel_T background) : ImageData(int width, int height, const Pixel_T background) :
_width(width), _width(width),
_height(height), _height(height),
_pixels(new Pixel_T[width * height + 1]) _pixels(new Pixel_T[static_cast<size_t>(width) * static_cast<size_t>(height)])
{ {
std::fill(_pixels, _pixels + width * height, background); std::fill(_pixels, _pixels + width * height, background);
} }
@ -36,9 +33,9 @@ public:
QSharedData(other), QSharedData(other),
_width(other._width), _width(other._width),
_height(other._height), _height(other._height),
_pixels(new Pixel_T[other._width * other._height + 1]) _pixels(new Pixel_T[static_cast<size_t>(other._width) * static_cast<size_t>(other._height)])
{ {
memcpy(_pixels, other._pixels, static_cast<ulong>(other._width) * static_cast<ulong>(other._height) * sizeof(Pixel_T)); memcpy(_pixels, other._pixels, static_cast<size_t>(other._width) * static_cast<size_t>(other._height) * sizeof(Pixel_T));
} }
ImageData& operator=(ImageData rhs) ImageData& operator=(ImageData rhs)
@ -74,52 +71,57 @@ public:
delete[] _pixels; delete[] _pixels;
} }
inline unsigned width() const inline int width() const
{ {
return _width; return _width;
} }
inline unsigned height() const inline int height() const
{ {
return _height; return _height;
} }
uint8_t red(unsigned pixel) const uint8_t red(int pixel) const
{ {
return (_pixels + pixel)->red; return (_pixels + pixel)->red;
} }
uint8_t green(unsigned pixel) const uint8_t green(int pixel) const
{ {
return (_pixels + pixel)->green; return (_pixels + pixel)->green;
} }
uint8_t blue(unsigned pixel) const uint8_t blue(int pixel) const
{ {
return (_pixels + pixel)->blue; return (_pixels + pixel)->blue;
} }
const Pixel_T& operator()(unsigned x, unsigned y) const const Pixel_T& operator()(int x, int y) const
{ {
return _pixels[toIndex(x,y)]; return _pixels[toIndex(x,y)];
} }
Pixel_T& operator()(unsigned x, unsigned y) Pixel_T& operator()(int x, int y)
{ {
return _pixels[toIndex(x,y)]; return _pixels[toIndex(x,y)];
} }
void resize(unsigned width, unsigned height) void resize(int width, int height)
{ {
if (width == _width && height == _height) if (width == _width && height == _height)
return;
if ((width * height) > unsigned((_width * _height)))
{ {
delete[] _pixels; return;
_pixels = new Pixel_T[width*height + 1];
} }
// Allocate a new buffer without initializing the content
Pixel_T* newPixels = new Pixel_T[static_cast<size_t>(width) * static_cast<size_t>(height)];
// Release the old buffer without copying data
delete[] _pixels;
// Update the pointer to the new buffer
_pixels = newPixels;
_width = width; _width = width;
_height = height; _height = height;
} }
@ -137,11 +139,13 @@ public:
void toRgb(ImageData<ColorRgb>& image) const void toRgb(ImageData<ColorRgb>& image) const
{ {
if (image.width() != _width || image.height() != _height) if (image.width() != _width || image.height() != _height)
{
image.resize(_width, _height); image.resize(_width, _height);
}
const unsigned imageSize = _width * _height; const int imageSize = _width * _height;
for (unsigned idx = 0; idx < imageSize; idx++) for (int idx = 0; idx < imageSize; idx++)
{ {
const Pixel_T & color = _pixels[idx]; const Pixel_T & color = _pixels[idx];
image.memptr()[idx] = ColorRgb{color.red, color.green, color.blue}; image.memptr()[idx] = ColorRgb{color.red, color.green, color.blue};
@ -157,26 +161,22 @@ public:
{ {
if (_width != 1 || _height != 1) if (_width != 1 || _height != 1)
{ {
_width = 1; resize(1,1);
_height = 1;
delete[] _pixels;
_pixels = new Pixel_T[2];
} }
// Set the single pixel to the default background
memset(_pixels, 0, static_cast<unsigned long>(_width) * static_cast<unsigned long>(_height) * sizeof(Pixel_T)); _pixels[0] = Pixel_T();
} }
private: private:
inline unsigned toIndex(unsigned x, unsigned y) const inline int toIndex(int x, int y) const
{ {
return y * _width + x; return y * _width + x;
} }
private:
/// The width of the image /// The width of the image
unsigned _width; int _width;
/// The height of the image /// The height of the image
unsigned _height; int _height;
/// The pixels of the image /// The pixels of the image
Pixel_T* _pixels; Pixel_T* _pixels;
}; };

13
include/utils/Logger.h
View File

@ -6,6 +6,7 @@
#include <QMap> #include <QMap>
#include <QAtomicInteger> #include <QAtomicInteger>
#include <QList> #include <QList>
#include <QJsonArray>
#if (QT_VERSION >= QT_VERSION_CHECK(5, 14, 0)) #if (QT_VERSION >= QT_VERSION_CHECK(5, 14, 0))
#include <QRecursiveMutex> #include <QRecursiveMutex>
@ -14,8 +15,6 @@
#endif #endif
// stl includes // stl includes
#include <stdio.h>
#include <stdarg.h>
#ifdef _WIN32 #ifdef _WIN32
#include <stdexcept> #include <stdexcept>
#endif #endif
@ -59,7 +58,7 @@ public:
QString function; QString function;
unsigned int line; unsigned int line;
QString fileName; QString fileName;
uint64_t utime; qint64 utime;
QString message; QString message;
LogLevel level; LogLevel level;
QString levelString; QString levelString;
@ -74,7 +73,7 @@ public:
void setMinLevel(LogLevel level) { _minLevel = static_cast<int>(level); } void setMinLevel(LogLevel level) { _minLevel = static_cast<int>(level); }
LogLevel getMinLevel() const { return static_cast<LogLevel>(int(_minLevel)); } LogLevel getMinLevel() const { return static_cast<LogLevel>(int(_minLevel)); }
QString getName() const { return _name; } QString getName() const { return _name; }
QString getSubName() const { return _subname; } QString getSubName() const { return _subName; }
signals: signals:
void newLogMessage(Logger::T_LOG_MESSAGE); void newLogMessage(Logger::T_LOG_MESSAGE);
@ -95,7 +94,7 @@ private:
static QAtomicInteger<int> GLOBAL_MIN_LOG_LEVEL; static QAtomicInteger<int> GLOBAL_MIN_LOG_LEVEL;
const QString _name; const QString _name;
const QString _subname; const QString _subName;
const bool _syslogEnabled; const bool _syslogEnabled;
const unsigned _loggerId; const unsigned _loggerId;
@ -109,15 +108,15 @@ class LoggerManager : public QObject
public: public:
static LoggerManager* getInstance(); static LoggerManager* getInstance();
const QList<Logger::T_LOG_MESSAGE>* getLogMessageBuffer() const { return &_logMessageBuffer; }
public slots: public slots:
void handleNewLogMessage(const Logger::T_LOG_MESSAGE&); void handleNewLogMessage(const Logger::T_LOG_MESSAGE&);
QJsonArray getLogMessageBuffer(Logger::LogLevel filter=Logger::UNSET) const;
signals: signals:
void newLogMessage(const Logger::T_LOG_MESSAGE&); void newLogMessage(const Logger::T_LOG_MESSAGE&);
protected: private:
LoggerManager(); LoggerManager();
QList<Logger::T_LOG_MESSAGE> _logMessageBuffer; QList<Logger::T_LOG_MESSAGE> _logMessageBuffer;

2
include/utils/hyperion.h
View File

@ -96,7 +96,7 @@ namespace hyperion {
static_cast<uint8_t>(channelConfig[0].toInt(defaultR)), static_cast<uint8_t>(channelConfig[0].toInt(defaultR)),
static_cast<uint8_t>(channelConfig[1].toInt(defaultG)), static_cast<uint8_t>(channelConfig[1].toInt(defaultG)),
static_cast<uint8_t>(channelConfig[2].toInt(defaultB)), static_cast<uint8_t>(channelConfig[2].toInt(defaultB)),
"ChannelAdjust_" + channelName.toUpper() channelName
); );
} }

5
include/webserver/WebServer.h
View File

@ -92,11 +92,6 @@ private:
StaticFileServing* _staticFileServing; StaticFileServing* _staticFileServing;
QtHttpServer* _server; QtHttpServer* _server;
bool _inited = false; bool _inited = false;
const QString WEBSERVER_DEFAULT_PATH = ":/webconfig";
const QString WEBSERVER_DEFAULT_CRT_PATH = ":/hyperion.crt";
const QString WEBSERVER_DEFAULT_KEY_PATH = ":/hyperion.key";
quint16 WEBSERVER_DEFAULT_PORT = 8090;
}; };
#endif // WEBSERVER_H #endif // WEBSERVER_H

22
libsrc/api/JsonAPI.cpp
View File

@ -1983,24 +1983,10 @@ void JsonAPI::incommingLogMessage(const Logger::T_LOG_MESSAGE &msg)
if (!_streaming_logging_activated) if (!_streaming_logging_activated)
{ {
_streaming_logging_activated = true; _streaming_logging_activated = true;
const QList<Logger::T_LOG_MESSAGE> *logBuffer = LoggerManager::getInstance()->getLogMessageBuffer(); QMetaObject::invokeMethod(LoggerManager::getInstance(), "getLogMessageBuffer",
for (int i = 0; i < logBuffer->length(); i++) Qt::DirectConnection,
{ Q_RETURN_ARG(QJsonArray, messageArray),
//Only present records of the current log-level Q_ARG(Logger::LogLevel, _log->getLogLevel()));
if ( logBuffer->at(i).level >= _log->getLogLevel())
{
message["loggerName"] = logBuffer->at(i).loggerName;
message["loggerSubName"] = logBuffer->at(i).loggerSubName;
message["function"] = logBuffer->at(i).function;
message["line"] = QString::number(logBuffer->at(i).line);
message["fileName"] = logBuffer->at(i).fileName;
message["message"] = logBuffer->at(i).message;
message["levelString"] = logBuffer->at(i).levelString;
message["utime"] = QString::number(logBuffer->at(i).utime);
messageArray.append(message);
}
}
} }
else else
{ {

12
libsrc/blackborder/BlackBorderProcessor.cpp
View File

@ -35,12 +35,7 @@ BlackBorderProcessor::BlackBorderProcessor(Hyperion* hyperion, QObject* parent)
// listen for component state changes // listen for component state changes
connect(_hyperion, &Hyperion::compStateChangeRequest, this, &BlackBorderProcessor::handleCompStateChangeRequest); connect(_hyperion, &Hyperion::compStateChangeRequest, this, &BlackBorderProcessor::handleCompStateChangeRequest);
_detector = new BlackBorderDetector(_oldThreshold); _detector = std::make_unique<BlackBorderDetector>(_oldThreshold);
}
BlackBorderProcessor::~BlackBorderProcessor()
{
delete _detector;
} }
void BlackBorderProcessor::handleSettingsUpdate(settings::type type, const QJsonDocument& config) void BlackBorderProcessor::handleSettingsUpdate(settings::type type, const QJsonDocument& config)
@ -66,10 +61,7 @@ void BlackBorderProcessor::handleSettingsUpdate(settings::type type, const QJson
if (fabs(_oldThreshold - newThreshold) > std::numeric_limits<double>::epsilon()) if (fabs(_oldThreshold - newThreshold) > std::numeric_limits<double>::epsilon())
{ {
_oldThreshold = newThreshold; _oldThreshold = newThreshold;
_detector = std::make_unique<BlackBorderDetector>(_oldThreshold);
delete _detector;
_detector = new BlackBorderDetector(newThreshold);
} }
Debug(Logger::getInstance("BLACKBORDER", "I"+QString::number(_hyperion->getInstanceIndex())), "Set mode to: %s", QSTRING_CSTR(_detectionMode)); Debug(Logger::getInstance("BLACKBORDER", "I"+QString::number(_hyperion->getInstanceIndex())), "Set mode to: %s", QSTRING_CSTR(_detectionMode));

1
libsrc/boblightserver/BoblightServer.cpp
View File

@ -63,6 +63,7 @@ void BoblightServer::stop()
return; return;
qDeleteAll(_openConnections); qDeleteAll(_openConnections);
_openConnections.clear();
_server->close(); _server->close();

1
libsrc/commandline/Parser.cpp
View File

@ -5,6 +5,7 @@ using namespace commandline;
Parser::~Parser() Parser::~Parser()
{ {
qDeleteAll(_options); qDeleteAll(_options);
_options.clear();
} }
bool Parser::parse(const QStringList &arguments) bool Parser::parse(const QStringList &arguments)

2
libsrc/grabber/audio/AudioGrabber.cpp
View File

@ -178,7 +178,7 @@ void AudioGrabber::processAudioFrame(int16_t* buffer, int length)
} }
// Convert to Image<ColorRGB> // Convert to Image<ColorRGB>
Image<ColorRgb> finalImage (static_cast<unsigned>(image.width()), static_cast<unsigned>(image.height())); Image<ColorRgb> finalImage (image.width(),image.height());
for (int y = 0; y < image.height(); y++) for (int y = 0; y < image.height(); y++)
{ {
memcpy((unsigned char*)finalImage.memptr() + y * image.width() * 3, static_cast<unsigned char*>(image.scanLine(y)), image.width() * 3); memcpy((unsigned char*)finalImage.memptr() + y * image.width() * 3, static_cast<unsigned char*>(image.scanLine(y)), image.width() * 3);

1
libsrc/grabber/audio/AudioWrapper.cpp
View File

@ -5,7 +5,6 @@
AudioWrapper::AudioWrapper() AudioWrapper::AudioWrapper()
: GrabberWrapper("AudioGrabber", &_grabber) : GrabberWrapper("AudioGrabber", &_grabber)
, _grabber()
{ {
// register the image type // register the image type
qRegisterMetaType<Image<ColorRgb>>("Image<ColorRgb>"); qRegisterMetaType<Image<ColorRgb>>("Image<ColorRgb>");

3
libsrc/grabber/osx/OsxFrameGrabber.cpp
View File

@ -124,6 +124,7 @@ bool OsxFrameGrabber::setDisplayIndex(int index)
CGImageRelease(image); CGImageRelease(image);
} }
} }
delete[] activeDspys;
} }
else else
{ {
@ -201,7 +202,7 @@ QJsonObject OsxFrameGrabber::discover(const QJsonObject& params)
defaults["video_input"] = video_inputs_default; defaults["video_input"] = video_inputs_default;
inputsDiscovered["default"] = defaults; inputsDiscovered["default"] = defaults;
} }
delete [] activeDspys; delete[] activeDspys;
} }
if (inputsDiscovered.isEmpty()) if (inputsDiscovered.isEmpty())

72
libsrc/grabber/qt/QtGrabber.cpp
View File

@ -22,8 +22,8 @@ const bool verbose = false;
QtGrabber::QtGrabber(int display, int cropLeft, int cropRight, int cropTop, int cropBottom) QtGrabber::QtGrabber(int display, int cropLeft, int cropRight, int cropTop, int cropBottom)
: Grabber("QTGRABBER", cropLeft, cropRight, cropTop, cropBottom) : Grabber("QTGRABBER", cropLeft, cropRight, cropTop, cropBottom)
, _display(display) , _display(display)
, _calculatedWidth(0) , _screenWidth(0)
, _calculatedHeight(0) , _screenHeight(0)
, _src_x(0) , _src_x(0)
, _src_y(0) , _src_y(0)
, _src_x_max(0) , _src_x_max(0)
@ -233,8 +233,8 @@ int QtGrabber::grabFrame(Image<ColorRgb>& image)
} }
else else
{ {
QImage imageFrame = originalPixmap.toImage().scaled(_calculatedWidth, _calculatedHeight).convertToFormat(QImage::Format_RGB888); QImage imageFrame = originalPixmap.toImage().scaled(_width, _height).convertToFormat(QImage::Format_RGB888);
image.resize(static_cast<uint>(_calculatedWidth), static_cast<uint>(_calculatedHeight)); image.resize(_width, _height);
for (int y = 0; y < imageFrame.height(); y++) for (int y = 0; y < imageFrame.height(); y++)
{ {
@ -263,27 +263,27 @@ int QtGrabber::updateScreenDimensions(bool force)
{ {
geo = _screen->geometry(); geo = _screen->geometry();
} }
if (!force && _width == geo.width() && _height == geo.height()) if (!force && _screenWidth == geo.width() && _height == geo.height())
{ {
// No update required // No update required
return 0; return 0;
} }
Info(_log, "Update of screen resolution: [%dx%d] to [%dx%d]", _width, _height, geo.width(), geo.height()); Info(_log, "Update of screen resolution: [%dx%d] to [%dx%d]", _screenWidth, _screenHeight, geo.width(), geo.height());
_width = geo.width(); _screenWidth = geo.width();
_height = geo.height(); _screenHeight = geo.height();
int width = 0; int width = 0;
int height = 0; int height = 0;
// Image scaling is performed by Qt // Image scaling is performed by Qt
width = (_width > (_cropLeft + _cropRight)) width = (_screenWidth > (_cropLeft + _cropRight))
? ((_width - _cropLeft - _cropRight) / _pixelDecimation) ? ((_screenWidth - _cropLeft - _cropRight) / _pixelDecimation)
: (_width / _pixelDecimation); : (_screenWidth / _pixelDecimation);
height = (_height > (_cropTop + _cropBottom)) height = (_screenHeight > (_cropTop + _cropBottom))
? ((_height - _cropTop - _cropBottom) / _pixelDecimation) ? ((_screenHeight - _cropTop - _cropBottom) / _pixelDecimation)
: (_height / _pixelDecimation); : (_screenHeight / _pixelDecimation);
// calculate final image dimensions and adjust top/left cropping in 3D modes // calculate final image dimensions and adjust top/left cropping in 3D modes
if (_isVirtual) if (_isVirtual)
@ -300,33 +300,33 @@ int QtGrabber::updateScreenDimensions(bool force)
switch (_videoMode) switch (_videoMode)
{ {
case VideoMode::VIDEO_3DSBS: case VideoMode::VIDEO_3DSBS:
_calculatedWidth = width / 2; _width = width / 2;
_calculatedHeight = height; _height = height;
_src_x = _src_x + (_cropLeft / 2); _src_x = _src_x + (_cropLeft / 2);
_src_y = _src_y + _cropTop; _src_y = _src_y + _cropTop;
_src_x_max = (_width / 2) - _cropRight - _cropLeft; _src_x_max = (_screenWidth / 2) - _cropRight - _cropLeft;
_src_y_max = _height - _cropBottom - _cropTop; _src_y_max = _screenHeight - _cropBottom - _cropTop;
break; break;
case VideoMode::VIDEO_3DTAB: case VideoMode::VIDEO_3DTAB:
_calculatedWidth = width; _width = width;
_calculatedHeight = height / 2; _height = height / 2;
_src_x = _src_x + _cropLeft; _src_x = _src_x + _cropLeft;
_src_y = _src_y + (_cropTop / 2); _src_y = _src_y + (_cropTop / 2);
_src_x_max = _width - _cropRight - _cropLeft; _src_x_max = _screenWidth - _cropRight - _cropLeft;
_src_y_max = (_height / 2) - _cropBottom - _cropTop; _src_y_max = (_screenHeight / 2) - _cropBottom - _cropTop;
break; break;
case VideoMode::VIDEO_2D: case VideoMode::VIDEO_2D:
default: default:
_calculatedWidth = width; _width = width;
_calculatedHeight = height; _height = height;
_src_x = _src_x + _cropLeft; _src_x = _src_x + _cropLeft;
_src_y = _src_y + _cropTop; _src_y = _src_y + _cropTop;
_src_x_max = _width - _cropRight - _cropLeft; _src_x_max = _screenWidth - _cropRight - _cropLeft;
_src_y_max = _height - _cropBottom - _cropTop; _src_y_max = _screenHeight - _cropBottom - _cropTop;
break; break;
} }
Info(_log, "Update output image resolution to [%dx%d]", _calculatedWidth, _calculatedHeight); Info(_log, "Update output image resolution to [%dx%d]", _width, _height);
Debug(_log, "Grab screen area: %d,%d,%d,%d", _src_x, _src_y, _src_x_max, _src_y_max); Debug(_log, "Grab screen area: %d,%d,%d,%d", _src_x, _src_y, _src_x_max, _src_y_max);
return 1; return 1;
@ -433,10 +433,10 @@ QJsonObject QtGrabber::discover(const QJsonObject& params)
if (screens.at(0)->size() != screens.at(0)->virtualSize()) if (screens.at(0)->size() != screens.at(0)->virtualSize())
{ {
QJsonObject in; QJsonObject input;
in["name"] = "All Displays"; input["name"] = "All Displays";
in["inputIdx"] = screens.size(); input["inputIdx"] = screens.size();
in["virtual"] = true; input["virtual"] = true;
QJsonArray formats; QJsonArray formats;
QJsonObject format; QJsonObject format;
@ -454,15 +454,19 @@ QJsonObject QtGrabber::discover(const QJsonObject& params)
format["resolutions"] = resolutionArray; format["resolutions"] = resolutionArray;
formats.append(format); formats.append(format);
in["formats"] = formats; input["formats"] = formats;
video_inputs.append(in); video_inputs.append(input);
} }
inputsDiscovered["video_inputs"] = video_inputs; inputsDiscovered["video_inputs"] = video_inputs;
QJsonObject defaults, video_inputs_default, resolution_default; QJsonObject resolution_default;
resolution_default["fps"] = _fps; resolution_default["fps"] = _fps;
QJsonObject video_inputs_default;
video_inputs_default["resolution"] = resolution_default; video_inputs_default["resolution"] = resolution_default;
video_inputs_default["inputIdx"] = 0; video_inputs_default["inputIdx"] = 0;
QJsonObject defaults;
defaults["video_input"] = video_inputs_default; defaults["video_input"] = video_inputs_default;
inputsDiscovered["default"] = defaults; inputsDiscovered["default"] = defaults;
} }

2
libsrc/grabber/video/EncoderThread.cpp
View File

@ -318,7 +318,7 @@ void EncoderThread::processImageMjpeg()
} }
} }
Image<ColorRgb> srcImage(static_cast<unsigned>(_width), static_cast<unsigned>(_height)); Image<ColorRgb> srcImage(_width, _height);
if (tjDecompress2(_tjInstance, _localData , _size, if (tjDecompress2(_tjInstance, _localData , _size,
reinterpret_cast<unsigned char*>(srcImage.memptr()), _width, 0, _height, reinterpret_cast<unsigned char*>(srcImage.memptr()), _width, 0, _height,

153
libsrc/grabber/x11/X11Grabber.cpp
View File

@ -18,16 +18,15 @@ X11Grabber::X11Grabber(int cropLeft, int cropRight, int cropTop, int cropBottom)
, _dstFormat(nullptr) , _dstFormat(nullptr)
, _srcPicture(None) , _srcPicture(None)
, _dstPicture(None) , _dstPicture(None)
, _calculatedWidth(0) , _screenWidth(0)
, _calculatedHeight(0) , _screenHeight(0)
, _src_x(cropLeft) , _src_x(cropLeft)
, _src_y(cropTop) , _src_y(cropTop)
, _XShmAvailable(false) , _xShmAvailable(false)
, _XRenderAvailable(false) , _xRenderAvailable(false)
, _XRandRAvailable(false) , _xRandRAvailable(false)
, _isWayland (false) , _isWayland (false)
, _logger{} , _logger{}
, _image(0,0)
{ {
_logger = Logger::getInstance("X11"); _logger = Logger::getInstance("X11");
@ -53,17 +52,17 @@ void X11Grabber::freeResources()
{ {
XDestroyImage(_xImage); XDestroyImage(_xImage);
} }
if (_XRandRAvailable) if (_xRandRAvailable)
{ {
qApp->removeNativeEventFilter(this); qApp->removeNativeEventFilter(this);
} }
if(_XShmAvailable) if(_xShmAvailable)
{ {
XShmDetach(_x11Display, &_shminfo); XShmDetach(_x11Display, &_shminfo);
shmdt(_shminfo.shmaddr); shmdt(_shminfo.shmaddr);
shmctl(_shminfo.shmid, IPC_RMID, 0); shmctl(_shminfo.shmid, IPC_RMID, nullptr);
} }
if (_XRenderAvailable) if (_xRenderAvailable)
{ {
XRenderFreePicture(_x11Display, _srcPicture); XRenderFreePicture(_x11Display, _srcPicture);
XRenderFreePicture(_x11Display, _dstPicture); XRenderFreePicture(_x11Display, _dstPicture);
@ -73,41 +72,41 @@ void X11Grabber::freeResources()
void X11Grabber::setupResources() void X11Grabber::setupResources()
{ {
if (_XRandRAvailable) if (_xRandRAvailable)
{ {
qApp->installNativeEventFilter(this); qApp->installNativeEventFilter(this);
} }
if(_XShmAvailable) if(_xShmAvailable)
{ {
_xImage = XShmCreateImage(_x11Display, _windowAttr.visual, _windowAttr.depth, ZPixmap, NULL, &_shminfo, _calculatedWidth, _calculatedHeight); _xImage = XShmCreateImage(_x11Display, _windowAttr.visual, _windowAttr.depth, ZPixmap, nullptr, &_shminfo, _width, _height);
_shminfo.shmid = shmget(IPC_PRIVATE, (size_t) _xImage->bytes_per_line * _xImage->height, IPC_CREAT|0777); _shminfo.shmid = shmget(IPC_PRIVATE, (size_t) _xImage->bytes_per_line * _xImage->height, IPC_CREAT|0777);
_xImage->data = (char*)shmat(_shminfo.shmid,0,0); _xImage->data = (char*)shmat(_shminfo.shmid,nullptr,0);
_shminfo.shmaddr = _xImage->data; _shminfo.shmaddr = _xImage->data;
_shminfo.readOnly = False; _shminfo.readOnly = False;
XShmAttach(_x11Display, &_shminfo); XShmAttach(_x11Display, &_shminfo);
} }
if (_XRenderAvailable) if (_xRenderAvailable)
{ {
_useImageResampler = false; _useImageResampler = false;
_imageResampler.setHorizontalPixelDecimation(1); _imageResampler.setHorizontalPixelDecimation(1);
_imageResampler.setVerticalPixelDecimation(1); _imageResampler.setVerticalPixelDecimation(1);
if(_XShmPixmapAvailable) if(_xShmPixmapAvailable)
{ {
_pixmap = XShmCreatePixmap(_x11Display, _window, _xImage->data, &_shminfo, _calculatedWidth, _calculatedHeight, _windowAttr.depth); _pixmap = XShmCreatePixmap(_x11Display, _window, _xImage->data, &_shminfo, _width, _height, _windowAttr.depth);
} }
else else
{ {
_pixmap = XCreatePixmap(_x11Display, _window, _calculatedWidth, _calculatedHeight, _windowAttr.depth); _pixmap = XCreatePixmap(_x11Display, _window, _width, _height, _windowAttr.depth);
} }
_srcFormat = XRenderFindVisualFormat(_x11Display, _windowAttr.visual); _srcFormat = XRenderFindVisualFormat(_x11Display, _windowAttr.visual);
_dstFormat = XRenderFindVisualFormat(_x11Display, _windowAttr.visual); _dstFormat = XRenderFindVisualFormat(_x11Display, _windowAttr.visual);
_srcPicture = XRenderCreatePicture(_x11Display, _window, _srcFormat, CPRepeat, &_pictAttr); _srcPicture = XRenderCreatePicture(_x11Display, _window, _srcFormat, CPRepeat, &_pictAttr);
_dstPicture = XRenderCreatePicture(_x11Display, _pixmap, _dstFormat, CPRepeat, &_pictAttr); _dstPicture = XRenderCreatePicture(_x11Display, _pixmap, _dstFormat, CPRepeat, &_pictAttr);
XRenderSetPictureFilter(_x11Display, _srcPicture, FilterBilinear, NULL, 0); XRenderSetPictureFilter(_x11Display, _srcPicture, FilterBilinear, nullptr, 0);
} }
else else
{ {
@ -162,19 +161,20 @@ bool X11Grabber::setupDisplay()
{ {
_window = DefaultRootWindow(_x11Display); _window = DefaultRootWindow(_x11Display);
int dummy, pixmaps_supported; int dummy;
int pixmaps_supported;
_XRandRAvailable = XRRQueryExtension(_x11Display, &_XRandREventBase, &dummy); _xRandRAvailable = (XRRQueryExtension(_x11Display, &_xRandREventBase, &dummy) != 0);
_XRenderAvailable = XRenderQueryExtension(_x11Display, &dummy, &dummy); _xRenderAvailable = (XRenderQueryExtension(_x11Display, &dummy, &dummy) != 0);
_XShmAvailable = XShmQueryExtension(_x11Display); _xShmAvailable = (XShmQueryExtension(_x11Display) != 0);
XShmQueryVersion(_x11Display, &dummy, &dummy, &pixmaps_supported); XShmQueryVersion(_x11Display, &dummy, &dummy, &pixmaps_supported);
_XShmPixmapAvailable = pixmaps_supported && XShmPixmapFormat(_x11Display) == ZPixmap; _xShmPixmapAvailable = (pixmaps_supported != 0) && XShmPixmapFormat(_x11Display) == ZPixmap;
Info(_log, "%s", QSTRING_CSTR(QString("XRandR=[%1] XRender=[%2] XShm=[%3] XPixmap=[%4]") Info(_log, "%s", QSTRING_CSTR(QString("XRandR=[%1] XRender=[%2] XShm=[%3] XPixmap=[%4]")
.arg(_XRandRAvailable ? "available" : "unavailable", .arg(_xRandRAvailable ? "available" : "unavailable",
_XRenderAvailable ? "available" : "unavailable", _xRenderAvailable ? "available" : "unavailable",
_XShmAvailable ? "available" : "unavailable", _xShmAvailable ? "available" : "unavailable",
_XShmPixmapAvailable ? "available" : "unavailable")) _xShmPixmapAvailable ? "available" : "unavailable"))
); );
result = (updateScreenDimensions(true) >=0); result = (updateScreenDimensions(true) >=0);
@ -186,12 +186,17 @@ bool X11Grabber::setupDisplay()
int X11Grabber::grabFrame(Image<ColorRgb> & image, bool forceUpdate) int X11Grabber::grabFrame(Image<ColorRgb> & image, bool forceUpdate)
{ {
if (!_isEnabled) return 0; if (!_isEnabled)
{
return 0;
}
if (forceUpdate) if (forceUpdate)
{
updateScreenDimensions(forceUpdate); updateScreenDimensions(forceUpdate);
}
if (_XRenderAvailable) if (_xRenderAvailable)
{ {
double scale_x = static_cast<double>(_windowAttr.width / _pixelDecimation) / static_cast<double>(_windowAttr.width); double scale_x = static_cast<double>(_windowAttr.width / _pixelDecimation) / static_cast<double>(_windowAttr.width);
double scale_y = static_cast<double>(_windowAttr.height / _pixelDecimation) / static_cast<double>(_windowAttr.height); double scale_y = static_cast<double>(_windowAttr.height / _pixelDecimation) / static_cast<double>(_windowAttr.height);
@ -224,20 +229,20 @@ int X11Grabber::grabFrame(Image<ColorRgb> & image, bool forceUpdate)
// src_y = cropTop, mask_x, mask_y, dest_x, dest_y, width, height // src_y = cropTop, mask_x, mask_y, dest_x, dest_y, width, height
XRenderComposite( XRenderComposite(
_x11Display, PictOpSrc, _srcPicture, None, _dstPicture, ( _src_x/_pixelDecimation), _x11Display, PictOpSrc, _srcPicture, None, _dstPicture, ( _src_x/_pixelDecimation),
(_src_y/_pixelDecimation), 0, 0, 0, 0, _calculatedWidth, _calculatedHeight); (_src_y/_pixelDecimation), 0, 0, 0, 0, _width, _height);
XSync(_x11Display, False); XSync(_x11Display, False);
if (_XShmAvailable) if (_xShmAvailable)
{ {
XShmGetImage(_x11Display, _pixmap, _xImage, 0, 0, AllPlanes); XShmGetImage(_x11Display, _pixmap, _xImage, 0, 0, AllPlanes);
} }
else else
{ {
_xImage = XGetImage(_x11Display, _pixmap, 0, 0, _calculatedWidth, _calculatedHeight, AllPlanes, ZPixmap); _xImage = XGetImage(_x11Display, _pixmap, 0, 0, _width, _height, AllPlanes, ZPixmap);
} }
} }
else if (_XShmAvailable) else if (_xShmAvailable)
{ {
// use xshm // use xshm
XShmGetImage(_x11Display, _window, _xImage, _src_x, _src_y, AllPlanes); XShmGetImage(_x11Display, _window, _xImage, _src_x, _src_y, AllPlanes);
@ -245,7 +250,7 @@ int X11Grabber::grabFrame(Image<ColorRgb> & image, bool forceUpdate)
else else
{ {
// all things done by xgetimage // all things done by xgetimage
_xImage = XGetImage(_x11Display, _window, _src_x, _src_y, _calculatedWidth, _calculatedHeight, AllPlanes, ZPixmap); _xImage = XGetImage(_x11Display, _window, _src_x, _src_y, _width, _height, AllPlanes, ZPixmap);
} }
if (_xImage == nullptr) if (_xImage == nullptr)
@ -268,46 +273,46 @@ int X11Grabber::updateScreenDimensions(bool force)
return -1; return -1;
} }
if (!force && _width == _windowAttr.width && _height == _windowAttr.height) if (!force && _screenWidth == _windowAttr.width && _screenHeight == _windowAttr.height)
{ {
// No update required // No update required
return 0; return 0;
} }
if (_width || _height) if ((_screenWidth != 0) || _screenHeight != 0)
{ {
freeResources(); freeResources();
} }
Info(_log, "Update of screen resolution: [%dx%d] to [%dx%d]", _width, _height, _windowAttr.width, _windowAttr.height); Info(_log, "Update of screen resolution: [%dx%d] to [%dx%d]", _screenWidth, _screenHeight, _windowAttr.width, _windowAttr.height);
_width = _windowAttr.width; _screenWidth = _windowAttr.width;
_height = _windowAttr.height; _screenHeight = _windowAttr.height;
int width=0; int width=0;
int height=0; int height=0;
// Image scaling is performed by XRender when available, otherwise by ImageResampler // Image scaling is performed by XRender when available, otherwise by ImageResampler
if (_XRenderAvailable) if (_xRenderAvailable)
{ {
width = (_width > (_cropLeft + _cropRight)) width = (_screenWidth > (_cropLeft + _cropRight))
? ((_width - _cropLeft - _cropRight) / _pixelDecimation) ? ((_screenWidth - _cropLeft - _cropRight) / _pixelDecimation)
: _width / _pixelDecimation; : _screenWidth / _pixelDecimation;
height = (_height > (_cropTop + _cropBottom)) height = (_screenHeight > (_cropTop + _cropBottom))
? ((_height - _cropTop - _cropBottom) / _pixelDecimation) ? ((_screenHeight - _cropTop - _cropBottom) / _pixelDecimation)
: _height / _pixelDecimation; : _screenHeight / _pixelDecimation;
Info(_log, "Using XRender for grabbing"); Info(_log, "Using XRender for grabbing");
} }
else else
{ {
width = (_width > (_cropLeft + _cropRight)) width = (_screenWidth > (_cropLeft + _cropRight))
? (_width - _cropLeft - _cropRight) ? (_screenWidth - _cropLeft - _cropRight)
: _width; : _screenWidth;
height = (_height > (_cropTop + _cropBottom)) height = (_screenHeight > (_cropTop + _cropBottom))
? (_height - _cropTop - _cropBottom) ? (_screenHeight - _cropTop - _cropBottom)
: _height; : _screenHeight;
Info(_log, "Using XGetImage for grabbing"); Info(_log, "Using XGetImage for grabbing");
} }
@ -316,29 +321,28 @@ int X11Grabber::updateScreenDimensions(bool force)
switch (_videoMode) switch (_videoMode)
{ {
case VideoMode::VIDEO_3DSBS: case VideoMode::VIDEO_3DSBS:
_calculatedWidth = width /2; _width = width /2;
_calculatedHeight = height; _height = height;
_src_x = _cropLeft / 2; _src_x = _cropLeft / 2;
_src_y = _cropTop; _src_y = _cropTop;
break; break;
case VideoMode::VIDEO_3DTAB: case VideoMode::VIDEO_3DTAB:
_calculatedWidth = width; _width = width;
_calculatedHeight = height / 2; _height = height / 2;
_src_x = _cropLeft; _src_x = _cropLeft;
_src_y = _cropTop / 2; _src_y = _cropTop / 2;
break; break;
case VideoMode::VIDEO_2D: case VideoMode::VIDEO_2D:
default: default:
_calculatedWidth = width; _width = width;
_calculatedHeight = height; _height = height;
_src_x = _cropLeft; _src_x = _cropLeft;
_src_y = _cropTop; _src_y = _cropTop;
break; break;
} }
Info(_log, "Update output image resolution: [%dx%d] to [%dx%d]", _image.width(), _image.height(), _calculatedWidth, _calculatedHeight); Info(_log, "Update output image resolution to [%dx%d]", _width, _height);
_image.resize(_width, _height);
_image.resize(_calculatedWidth, _calculatedHeight);
setupResources(); setupResources();
return 1; return 1;
@ -384,14 +388,14 @@ bool X11Grabber::nativeEventFilter(const QByteArray & eventType, void * message,
bool X11Grabber::nativeEventFilter(const QByteArray & eventType, void * message, long int * /*result*/) bool X11Grabber::nativeEventFilter(const QByteArray & eventType, void * message, long int * /*result*/)
#endif #endif
{ {
if (!_XRandRAvailable || eventType != "xcb_generic_event_t") { if (!_xRandRAvailable || eventType != "xcb_generic_event_t") {
return false; return false;
} }
xcb_generic_event_t *e = static_cast<xcb_generic_event_t*>(message); xcb_generic_event_t *event = static_cast<xcb_generic_event_t*>(message);
const uint8_t xEventType = XCB_EVENT_RESPONSE_TYPE(e); const uint8_t xEventType = XCB_EVENT_RESPONSE_TYPE(event);
if (xEventType == _XRandREventBase + XCB_RANDR_SCREEN_CHANGE_NOTIFY) if (xEventType == _xRandREventBase + XCB_RANDR_SCREEN_CHANGE_NOTIFY)
{ {
updateScreenDimensions(true); updateScreenDimensions(true);
} }
@ -428,7 +432,7 @@ QJsonObject X11Grabber::discover(const QJsonObject& params)
} }
else else
{ {
QJsonObject in; QJsonObject input;
QString displayName; QString displayName;
char* name; char* name;
@ -440,8 +444,8 @@ QJsonObject X11Grabber::discover(const QJsonObject& params)
displayName = QString("Display:%1").arg(i); displayName = QString("Display:%1").arg(i);
} }
in["name"] = displayName; input["name"] = displayName;
in["inputIdx"] = i; input["inputIdx"] = i;
QJsonArray formats; QJsonArray formats;
QJsonArray resolutionArray; QJsonArray resolutionArray;
@ -457,19 +461,22 @@ QJsonObject X11Grabber::discover(const QJsonObject& params)
format["resolutions"] = resolutionArray; format["resolutions"] = resolutionArray;
formats.append(format); formats.append(format);
in["formats"] = formats; input["formats"] = formats;
video_inputs.append(in); video_inputs.append(input);
} }
} }
if ( !video_inputs.isEmpty() ) if ( !video_inputs.isEmpty() )
{ {
inputsDiscovered["video_inputs"] = video_inputs; inputsDiscovered["video_inputs"] = video_inputs;
QJsonObject resolution_default;
QJsonObject defaults, video_inputs_default, resolution_default;
resolution_default["fps"] = _fps; resolution_default["fps"] = _fps;
QJsonObject video_inputs_default;
video_inputs_default["resolution"] = resolution_default; video_inputs_default["resolution"] = resolution_default;
video_inputs_default["inputIdx"] = 0; video_inputs_default["inputIdx"] = 0;
QJsonObject defaults;
defaults["video_input"] = video_inputs_default; defaults["video_input"] = video_inputs_default;
inputsDiscovered["default"] = defaults; inputsDiscovered["default"] = defaults;
} }

46
libsrc/hyperion/GrabberWrapper.cpp
View File

@ -27,26 +27,33 @@ bool GrabberWrapper::GLOBAL_GRABBER_AUDIO_ENABLE = false;
GrabberWrapper::GrabberWrapper(const QString& grabberName, Grabber * ggrabber, int updateRate_Hz) GrabberWrapper::GrabberWrapper(const QString& grabberName, Grabber * ggrabber, int updateRate_Hz)
: _grabberName(grabberName) : _grabberName(grabberName)
, _log(Logger::getInstance(grabberName.toUpper())) , _log(Logger::getInstance(grabberName.toUpper()))
, _timer(new QTimer(this)) , _timer(nullptr)
, _updateInterval_ms(1000/updateRate_Hz) , _updateInterval_ms(1000/updateRate_Hz)
, _ggrabber(ggrabber) , _ggrabber(ggrabber)
, _image(0,0)
{ {
GrabberWrapper::instance = this; GrabberWrapper::instance = this;
_timer.reset(new QTimer(this));
// Configure the timer to generate events every n milliseconds // Configure the timer to generate events every n milliseconds
_timer->setTimerType(Qt::PreciseTimer); _timer->setTimerType(Qt::PreciseTimer);
_timer->setInterval(_updateInterval_ms); _timer->setInterval(_updateInterval_ms);
connect(_timer, &QTimer::timeout, this, &GrabberWrapper::action); connect(_timer.get(), &QTimer::timeout, this, &GrabberWrapper::action);
// connect the image forwarding // connect the image forwarding
if (_grabberName.startsWith("V4L")) if (_grabberName.startsWith("V4L"))
{
connect(this, &GrabberWrapper::systemImage, GlobalSignals::getInstance(), &GlobalSignals::setV4lImage); connect(this, &GrabberWrapper::systemImage, GlobalSignals::getInstance(), &GlobalSignals::setV4lImage);
}
else if (_grabberName.startsWith("Audio")) else if (_grabberName.startsWith("Audio"))
{
connect(this, &GrabberWrapper::systemImage, GlobalSignals::getInstance(), &GlobalSignals::setAudioImage); connect(this, &GrabberWrapper::systemImage, GlobalSignals::getInstance(), &GlobalSignals::setAudioImage);
}
else else
{
connect(this, &GrabberWrapper::systemImage, GlobalSignals::getInstance(), &GlobalSignals::setSystemImage); connect(this, &GrabberWrapper::systemImage, GlobalSignals::getInstance(), &GlobalSignals::setSystemImage);
}
// listen for source requests // listen for source requests
connect(GlobalSignals::getInstance(), &GlobalSignals::requestSource, this, &GrabberWrapper::handleSourceRequest); connect(GlobalSignals::getInstance(), &GlobalSignals::requestSource, this, &GrabberWrapper::handleSourceRequest);
@ -56,6 +63,7 @@ GrabberWrapper::GrabberWrapper(const QString& grabberName, Grabber * ggrabber, i
GrabberWrapper::~GrabberWrapper() GrabberWrapper::~GrabberWrapper()
{ {
_timer->stop();
GrabberWrapper::instance = nullptr; GrabberWrapper::instance = nullptr;
} }
@ -103,19 +111,25 @@ QStringList GrabberWrapper::getActive(int inst, GrabberTypeFilter type) const
if (type == GrabberTypeFilter::SCREEN || type == GrabberTypeFilter::ALL) if (type == GrabberTypeFilter::SCREEN || type == GrabberTypeFilter::ALL)
{ {
if (GRABBER_SYS_CLIENTS.contains(inst)) if (GRABBER_SYS_CLIENTS.contains(inst))
{
result << GRABBER_SYS_CLIENTS.value(inst); result << GRABBER_SYS_CLIENTS.value(inst);
}
} }
if (type == GrabberTypeFilter::VIDEO || type == GrabberTypeFilter::ALL) if (type == GrabberTypeFilter::VIDEO || type == GrabberTypeFilter::ALL)
{ {
if (GRABBER_V4L_CLIENTS.contains(inst)) if (GRABBER_V4L_CLIENTS.contains(inst))
{
result << GRABBER_V4L_CLIENTS.value(inst); result << GRABBER_V4L_CLIENTS.value(inst);
}
} }
if (type == GrabberTypeFilter::AUDIO || type == GrabberTypeFilter::ALL) if (type == GrabberTypeFilter::AUDIO || type == GrabberTypeFilter::ALL)
{ {
if (GRABBER_AUDIO_CLIENTS.contains(inst)) if (GRABBER_AUDIO_CLIENTS.contains(inst))
{
result << GRABBER_AUDIO_CLIENTS.value(inst); result << GRABBER_AUDIO_CLIENTS.value(inst);
}
} }
return result; return result;
@ -207,7 +221,9 @@ void GrabberWrapper::updateTimer(int interval)
_timer->setInterval(_updateInterval_ms); _timer->setInterval(_updateInterval_ms);
if(timerWasActive) if(timerWasActive)
{
_timer->start(); _timer->start();
}
} }
} }
@ -268,40 +284,64 @@ void GrabberWrapper::handleSourceRequest(hyperion::Components component, int hyp
!_grabberName.startsWith("Audio")) !_grabberName.startsWith("Audio"))
{ {
if (listen) if (listen)
{
GRABBER_SYS_CLIENTS.insert(hyperionInd, _grabberName); GRABBER_SYS_CLIENTS.insert(hyperionInd, _grabberName);
}
else else
{
GRABBER_SYS_CLIENTS.remove(hyperionInd); GRABBER_SYS_CLIENTS.remove(hyperionInd);
}
if (GRABBER_SYS_CLIENTS.empty() || !getSysGrabberState()) if (GRABBER_SYS_CLIENTS.empty() || !getSysGrabberState())
{
stop(); stop();
}
else else
{
start(); start();
}
} }
else if (component == hyperion::Components::COMP_V4L && else if (component == hyperion::Components::COMP_V4L &&
_grabberName.startsWith("V4L")) _grabberName.startsWith("V4L"))
{ {
if (listen) if (listen)
{
GRABBER_V4L_CLIENTS.insert(hyperionInd, _grabberName); GRABBER_V4L_CLIENTS.insert(hyperionInd, _grabberName);
}
else else
{
GRABBER_V4L_CLIENTS.remove(hyperionInd); GRABBER_V4L_CLIENTS.remove(hyperionInd);
}
if (GRABBER_V4L_CLIENTS.empty() || !getV4lGrabberState()) if (GRABBER_V4L_CLIENTS.empty() || !getV4lGrabberState())
{
stop(); stop();
}
else else
{
start(); start();
}
} }
else if (component == hyperion::Components::COMP_AUDIO && else if (component == hyperion::Components::COMP_AUDIO &&
_grabberName.startsWith("Audio")) _grabberName.startsWith("Audio"))
{ {
if (listen) if (listen)
{
GRABBER_AUDIO_CLIENTS.insert(hyperionInd, _grabberName); GRABBER_AUDIO_CLIENTS.insert(hyperionInd, _grabberName);
}
else else
{
GRABBER_AUDIO_CLIENTS.remove(hyperionInd); GRABBER_AUDIO_CLIENTS.remove(hyperionInd);
}
if (GRABBER_AUDIO_CLIENTS.empty() || !getAudioGrabberState()) if (GRABBER_AUDIO_CLIENTS.empty() || !getAudioGrabberState())
{
stop(); stop();
}
else else
{
start(); start();
}
} }
} }

7
libsrc/hyperion/Hyperion.cpp
View File

@ -200,13 +200,16 @@ void Hyperion::stop()
void Hyperion::freeObjects() void Hyperion::freeObjects()
{ {
//delete Background effect first that it does not kick in when other priorities are stopped //Disconnect Background effect first that it does not kick in when other priorities are stopped
delete _BGEffectHandler; _BGEffectHandler->disconnect();
//Remove all priorities to switch off all leds //Remove all priorities to switch off all leds
clear(-1,true); clear(-1,true);
// delete components on exit of hyperion core // delete components on exit of hyperion core
delete _BGEffectHandler;
#if defined(ENABLE_BOBLIGHT_SERVER) #if defined(ENABLE_BOBLIGHT_SERVER)
delete _boblightServer; delete _boblightServer;
#endif #endif

1
libsrc/jsonserver/JsonServer.cpp
View File

@ -35,6 +35,7 @@ JsonServer::JsonServer(const QJsonDocument& config)
JsonServer::~JsonServer() JsonServer::~JsonServer()
{ {
qDeleteAll(_openConnections); qDeleteAll(_openConnections);
_openConnections.clear();
} }
void JsonServer::initServer() void JsonServer::initServer()

48
libsrc/mdns/MdnsBrowser.cpp
View File

@ -2,9 +2,8 @@
#include <qmdnsengine/message.h> #include <qmdnsengine/message.h>
#include <qmdnsengine/service.h> #include <qmdnsengine/service.h>
//Qt includes // Qt includes
#include <QThread> #include <QThread>
#include <QJsonObject> #include <QJsonObject>
#include <QJsonArray> #include <QJsonArray>
#include <QJsonDocument> #include <QJsonDocument>
@ -19,7 +18,8 @@
namespace { namespace {
const bool verboseBrowser = false; const bool verboseBrowser = false;
} //End of constants const int SERVICE_LOOKUP_RETRIES = 5;
} // End of constants
MdnsBrowser::MdnsBrowser(QObject* parent) MdnsBrowser::MdnsBrowser(QObject* parent)
: QObject(parent) : QObject(parent)
@ -30,7 +30,7 @@ MdnsBrowser::MdnsBrowser(QObject* parent)
MdnsBrowser::~MdnsBrowser() MdnsBrowser::~MdnsBrowser()
{ {
qDeleteAll(_browsedServiceTypes); _browsedServiceTypes.clear();
} }
void MdnsBrowser::browseForServiceType(const QByteArray& serviceType) void MdnsBrowser::browseForServiceType(const QByteArray& serviceType)
@ -38,11 +38,11 @@ void MdnsBrowser::browseForServiceType(const QByteArray& serviceType)
if (!_browsedServiceTypes.contains(serviceType)) if (!_browsedServiceTypes.contains(serviceType))
{ {
DebugIf(verboseBrowser, _log, "Start new mDNS browser for serviceType [%s], Thread: %s", serviceType.constData(), QSTRING_CSTR(QThread::currentThread()->objectName())); DebugIf(verboseBrowser, _log, "Start new mDNS browser for serviceType [%s], Thread: %s", serviceType.constData(), QSTRING_CSTR(QThread::currentThread()->objectName()));
QMdnsEngine::Browser* newBrowser = new QMdnsEngine::Browser(&_server, serviceType, &_cache); QSharedPointer<QMdnsEngine::Browser> newBrowser = QSharedPointer<QMdnsEngine::Browser>::create(&_server, serviceType, &_cache);
QObject::connect(newBrowser, &QMdnsEngine::Browser::serviceAdded, this, &MdnsBrowser::onServiceAdded); QObject::connect(newBrowser.get(), &QMdnsEngine::Browser::serviceAdded, this, &MdnsBrowser::onServiceAdded);
QObject::connect(newBrowser, &QMdnsEngine::Browser::serviceUpdated, this, &MdnsBrowser::onServiceUpdated); QObject::connect(newBrowser.get(), &QMdnsEngine::Browser::serviceUpdated, this, &MdnsBrowser::onServiceUpdated);
QObject::connect(newBrowser, &QMdnsEngine::Browser::serviceRemoved, this, &MdnsBrowser::onServiceRemoved); QObject::connect(newBrowser.get(), &QMdnsEngine::Browser::serviceRemoved, this, &MdnsBrowser::onServiceRemoved);
_browsedServiceTypes.insert(serviceType, newBrowser); _browsedServiceTypes.insert(serviceType, newBrowser);
} }
@ -124,8 +124,8 @@ QHostAddress MdnsBrowser::getHostFirstAddress(const QByteArray& hostname)
{ {
DebugIf(verboseBrowser, _log, "IP-address for hostname [%s] not yet in cache, start resolver.", toBeResolvedHostName.constData()); DebugIf(verboseBrowser, _log, "IP-address for hostname [%s] not yet in cache, start resolver.", toBeResolvedHostName.constData());
qRegisterMetaType<QMdnsEngine::Message>("Message"); qRegisterMetaType<QMdnsEngine::Message>("Message");
auto* resolver = new QMdnsEngine::Resolver(&_server, toBeResolvedHostName, &_cache); _resolver.reset(new QMdnsEngine::Resolver(&_server, toBeResolvedHostName, &_cache));
connect(resolver, &QMdnsEngine::Resolver::resolved, this, &MdnsBrowser::onHostNameResolved); connect(_resolver.get(), &QMdnsEngine::Resolver::resolved, this, &MdnsBrowser::onHostNameResolved);
} }
} }
} }
@ -149,7 +149,7 @@ void MdnsBrowser::onHostNameResolved(const QHostAddress& address)
bool MdnsBrowser::resolveAddress(Logger* log, const QString& hostname, QHostAddress& hostAddress, std::chrono::milliseconds timeout) bool MdnsBrowser::resolveAddress(Logger* log, const QString& hostname, QHostAddress& hostAddress, std::chrono::milliseconds timeout)
{ {
DebugIf(verboseBrowser, _log, "Get address for hostname [%s], Thread: %s", QSTRING_CSTR(hostname), QSTRING_CSTR(QThread::currentThread()->objectName())); DebugIf(verboseBrowser, log, "Get address for hostname [%s], Thread: %s", QSTRING_CSTR(hostname), QSTRING_CSTR(QThread::currentThread()->objectName()));
bool isHostAddressOK{ false }; bool isHostAddressOK{ false };
if (hostname.endsWith(".local") || hostname.endsWith(".local.")) if (hostname.endsWith(".local") || hostname.endsWith(".local."))
@ -158,20 +158,20 @@ bool MdnsBrowser::resolveAddress(Logger* log, const QString& hostname, QHostAddr
if (hostAddress.isNull()) if (hostAddress.isNull())
{ {
DebugIf(verboseBrowser, _log, "Wait for resolver on hostname [%s]", QSTRING_CSTR(hostname)); DebugIf(verboseBrowser, log, "Wait for resolver on hostname [%s]", QSTRING_CSTR(hostname));
QEventLoop loop; QEventLoop loop;
QTimer t; QTimer timer;
QObject::connect(&MdnsBrowser::getInstance(), &MdnsBrowser::addressResolved, &loop, &QEventLoop::quit);
QObject::connect(&MdnsBrowser::getInstance(), &MdnsBrowser::addressResolved, &loop, &QEventLoop::quit);
weakConnect(&MdnsBrowser::getInstance(), &MdnsBrowser::addressResolved, weakConnect(&MdnsBrowser::getInstance(), &MdnsBrowser::addressResolved,
[&hostAddress, hostname](const QHostAddress& resolvedAddress) { [&hostAddress, hostname, log](const QHostAddress& resolvedAddress) {
DebugIf(verboseBrowser, Logger::getInstance("MDNS"), "Resolver resolved hostname [%s] to address [%s], Thread: %s", QSTRING_CSTR(hostname), QSTRING_CSTR(resolvedAddress.toString()), QSTRING_CSTR(QThread::currentThread()->objectName())); DebugIf(verboseBrowser, log, "Resolver resolved hostname [%s] to address [%s], Thread: %s", QSTRING_CSTR(hostname), QSTRING_CSTR(resolvedAddress.toString()), QSTRING_CSTR(QThread::currentThread()->objectName()));
hostAddress = resolvedAddress; hostAddress = resolvedAddress;
}); });
QTimer::connect(&t, &QTimer::timeout, &loop, &QEventLoop::quit); QTimer::connect(&timer, &QTimer::timeout, &loop, &QEventLoop::quit);
t.start(static_cast<int>(timeout.count())); timer.start(static_cast<int>(timeout.count()));
loop.exec(); loop.exec();
} }
@ -206,8 +206,8 @@ QMdnsEngine::Record MdnsBrowser::getServiceInstanceRecord(const QByteArray& serv
} }
QMdnsEngine::Record srvRecord; QMdnsEngine::Record srvRecord;
bool found{ false }; bool found { false };
int retries = 5; int retries { SERVICE_LOOKUP_RETRIES };
do do
{ {
if (_cache.lookupRecord(service, QMdnsEngine::SRV, srvRecord)) if (_cache.lookupRecord(service, QMdnsEngine::SRV, srvRecord))
@ -393,10 +393,10 @@ QJsonArray MdnsBrowser::getServicesDiscoveredJson(const QByteArray& serviceType,
QMap<QByteArray, QByteArray> txtAttributes = txtRecord.attributes(); QMap<QByteArray, QByteArray> txtAttributes = txtRecord.attributes();
QVariantMap txtMap; QVariantMap txtMap;
QMapIterator<QByteArray, QByteArray> i(txtAttributes); QMapIterator<QByteArray, QByteArray> iterator(txtAttributes);
while (i.hasNext()) { while (iterator.hasNext()) {
i.next(); iterator.next();
txtMap.insert(i.key(), i.value()); txtMap.insert(iterator.key(), iterator.value());
} }
obj.insert("txt", QJsonObject::fromVariantMap(txtMap)); obj.insert("txt", QJsonObject::fromVariantMap(txtMap));
} }

67
libsrc/mdns/MdnsProvider.cpp
View File

@ -1,7 +1,7 @@
#include <mdns/MdnsProvider.h> #include <mdns/MdnsProvider.h>
#include <mdns/MdnsServiceRegister.h> #include <mdns/MdnsServiceRegister.h>
//Qt includes // Qt includes
#include <QHostInfo> #include <QHostInfo>
#include <QThread> #include <QThread>
@ -12,7 +12,7 @@
namespace { namespace {
const bool verboseProvider = false; const bool verboseProvider = false;
} //End of constants } // End of constants
MdnsProvider::MdnsProvider(QObject* parent) MdnsProvider::MdnsProvider(QObject* parent)
: QObject(parent) : QObject(parent)
@ -24,58 +24,59 @@ MdnsProvider::MdnsProvider(QObject* parent)
void MdnsProvider::init() void MdnsProvider::init()
{ {
_server = new QMdnsEngine::Server(); _server.reset(new QMdnsEngine::Server());
_hostname = new QMdnsEngine::Hostname(_server); _hostname.reset(new QMdnsEngine::Hostname(_server.data()));
connect(_hostname, &QMdnsEngine::Hostname::hostnameChanged, this, &MdnsProvider::onHostnameChanged); connect(_hostname.data(), &QMdnsEngine::Hostname::hostnameChanged, this, &MdnsProvider::onHostnameChanged);
DebugIf(verboseProvider, _log, "Hostname [%s], isRegistered [%d]", _hostname->hostname().constData(), _hostname->isRegistered()); DebugIf(verboseProvider, _log, "Hostname [%s], isRegistered [%d]", _hostname->hostname().constData(), _hostname->isRegistered());
} }
MdnsProvider::~MdnsProvider() MdnsProvider::~MdnsProvider()
{ {
qDeleteAll(_providedServiceTypes); _providedServiceTypes.clear();
_hostname->deleteLater();
_server->deleteLater();
} }
void MdnsProvider::publishService(const QString& serviceType, quint16 servicePort, const QByteArray& serviceName) void MdnsProvider::publishService(const QString& serviceType, quint16 servicePort, const QByteArray& serviceName)
{ {
QMdnsEngine::Provider* provider(nullptr);
QByteArray type = MdnsServiceRegister::getServiceType(serviceType); QByteArray type = MdnsServiceRegister::getServiceType(serviceType);
if (!type.isEmpty()) if (!type.isEmpty())
{ {
DebugIf(verboseProvider, _log, "Publish new mDNS serviceType [%s], Thread: %s", type.constData(), QSTRING_CSTR(QThread::currentThread()->objectName())); DebugIf(verboseProvider, _log, "Publish new mDNS serviceType [%s], Thread: %s", type.constData(), QSTRING_CSTR(QThread::currentThread()->objectName()));
if (!_providedServiceTypes.contains(type)) if (!_providedServiceTypes.contains(type))
{ {
provider = new QMdnsEngine::Provider(_server, _hostname); QSharedPointer<QMdnsEngine::Provider> newProvider = QSharedPointer<QMdnsEngine::Provider>::create(_server.data(), _hostname.data());
_providedServiceTypes.insert(type, provider); _providedServiceTypes.insert(type, newProvider);
}
QSharedPointer<QMdnsEngine::Provider> provider = _providedServiceTypes.value(type);
if (!provider.isNull())
{
QMdnsEngine::Service service;
service.setType(type);
service.setPort(servicePort);
QByteArray name(QHostInfo::localHostName().toUtf8());
if (!serviceName.isEmpty())
{
name.prepend(serviceName + "@");
}
service.setName(name);
QByteArray uuid = AuthManager::getInstance()->getID().toUtf8();
const QMap<QByteArray, QByteArray> attributes = {{"id", uuid}, {"version", HYPERION_VERSION}};
service.setAttributes(attributes);
DebugIf(verboseProvider, _log, "[%s], Name: [%s], Port: [%u] ", service.type().constData(), service.name().constData(), service.port());
provider->update(service);
} }
else else
{ {
provider = _providedServiceTypes[type]; Error(_log, "Not able to get hold of mDNS serviceType [%s]", type.constData());
} }
QMdnsEngine::Service service;
service.setType(type);
service.setPort(servicePort);
QByteArray name(QHostInfo::localHostName().toUtf8());
if (!serviceName.isEmpty())
{
name.prepend(serviceName + "@");
}
service.setName(name);
QByteArray id = AuthManager::getInstance()->getID().toUtf8();
const QMap<QByteArray, QByteArray> attributes = { {"id", id}, {"version", HYPERION_VERSION} };
service.setAttributes(attributes);
DebugIf(verboseProvider, _log, "[%s], Name: [%s], Port: [%u] ", service.type().constData(), service.name().constData(), service.port());
provider->update(service);
} }
} }

2
libsrc/utils/ImageResampler.cpp
View File

@ -159,10 +159,8 @@ void ImageResampler::processImage(const uint8_t * data, int width, int height, i
break; break;
} }
break; break;
#ifdef HAVE_TURBO_JPEG
case PixelFormat::MJPEG: case PixelFormat::MJPEG:
break; break;
#endif
case PixelFormat::NO_CHANGE: case PixelFormat::NO_CHANGE:
Error(Logger::getInstance("ImageResampler"), "Invalid pixel format given"); Error(Logger::getInstance("ImageResampler"), "Invalid pixel format given");
break; break;

43
libsrc/utils/Logger.cpp
View File

@ -2,7 +2,6 @@
#include <utils/FileUtils.h> #include <utils/FileUtils.h>
#include <iostream> #include <iostream>
#include <algorithm>
#ifndef _WIN32 #ifndef _WIN32
#include <syslog.h> #include <syslog.h>
@ -15,7 +14,8 @@
#include <QFileInfo> #include <QFileInfo>
#include <QMutexLocker> #include <QMutexLocker>
#include <QThreadStorage> #include <QThreadStorage>
#include <time.h> #include <QJsonObject>
#if (QT_VERSION >= QT_VERSION_CHECK(5, 14, 0)) #if (QT_VERSION >= QT_VERSION_CHECK(5, 14, 0))
QRecursiveMutex Logger::MapLock; QRecursiveMutex Logger::MapLock;
@ -38,6 +38,7 @@ const size_t MAX_IDENTIFICATION_LENGTH = 22;
QAtomicInteger<unsigned int> LoggerCount = 0; QAtomicInteger<unsigned int> LoggerCount = 0;
QAtomicInteger<unsigned int> LoggerId = 0; QAtomicInteger<unsigned int> LoggerId = 0;
const int MAX_LOG_MSG_BUFFERED = 500;
const int MaxRepeatCountSize = 200; const int MaxRepeatCountSize = 200;
QThreadStorage<int> RepeatCount; QThreadStorage<int> RepeatCount;
QThreadStorage<Logger::T_LOG_MESSAGE> RepeatMessage; QThreadStorage<Logger::T_LOG_MESSAGE> RepeatMessage;
@ -51,8 +52,7 @@ Logger* Logger::getInstance(const QString & name, const QString & subName, Logge
if (log == nullptr) if (log == nullptr)
{ {
log = new Logger(name, subName, minLevel); log = new Logger(name, subName, minLevel);
LoggerMap.insert(name, log); // compat version, replace it with following line if we have 100% c++11 LoggerMap.insert(name + subName, log);
//LoggerMap.emplace(name, log); // not compat with older linux distro's e.g. wheezy
connect(log, &Logger::newLogMessage, LoggerManager::getInstance(), &LoggerManager::handleNewLogMessage); connect(log, &Logger::newLogMessage, LoggerManager::getInstance(), &LoggerManager::handleNewLogMessage);
} }
@ -105,7 +105,7 @@ Logger::LogLevel Logger::getLogLevel(const QString & name, const QString & subNa
Logger::Logger (const QString & name, const QString & subName, LogLevel minLevel) Logger::Logger (const QString & name, const QString & subName, LogLevel minLevel)
: QObject() : QObject()
, _name(name) , _name(name)
, _subname(subName) , _subName(subName)
, _syslogEnabled(true) , _syslogEnabled(true)
, _loggerId(LoggerId++) , _loggerId(LoggerId++)
, _minLevel(static_cast<int>(minLevel)) , _minLevel(static_cast<int>(minLevel))
@ -161,7 +161,7 @@ void Logger::write(const Logger::T_LOG_MESSAGE & message)
.toStdString() .toStdString()
<< std::endl; << std::endl;
newLogMessage(message); emit newLogMessage(message);
} }
void Logger::Message(LogLevel level, const char* sourceFile, const char* func, unsigned int line, const char* fmt, ...) void Logger::Message(LogLevel level, const char* sourceFile, const char* func, unsigned int line, const char* fmt, ...)
@ -195,7 +195,7 @@ void Logger::Message(LogLevel level, const char* sourceFile, const char* func, u
}; };
if (RepeatMessage.localData().loggerName == _name && if (RepeatMessage.localData().loggerName == _name &&
RepeatMessage.localData().loggerSubName == _subname && RepeatMessage.localData().loggerSubName == _subName &&
RepeatMessage.localData().function == func && RepeatMessage.localData().function == func &&
RepeatMessage.localData().message == msg && RepeatMessage.localData().message == msg &&
RepeatMessage.localData().line == line) RepeatMessage.localData().line == line)
@ -213,7 +213,7 @@ void Logger::Message(LogLevel level, const char* sourceFile, const char* func, u
Logger::T_LOG_MESSAGE logMsg; Logger::T_LOG_MESSAGE logMsg;
logMsg.loggerName = _name; logMsg.loggerName = _name;
logMsg.loggerSubName = _subname; logMsg.loggerSubName = _subName;
logMsg.function = QString(func); logMsg.function = QString(func);
logMsg.line = line; logMsg.line = line;
logMsg.fileName = FileUtils::getBaseName(sourceFile); logMsg.fileName = FileUtils::getBaseName(sourceFile);
@ -233,11 +233,36 @@ void Logger::Message(LogLevel level, const char* sourceFile, const char* func, u
LoggerManager::LoggerManager() LoggerManager::LoggerManager()
: QObject() : QObject()
, _loggerMaxMsgBufferSize(200) , _loggerMaxMsgBufferSize(MAX_LOG_MSG_BUFFERED)
{ {
_logMessageBuffer.reserve(_loggerMaxMsgBufferSize); _logMessageBuffer.reserve(_loggerMaxMsgBufferSize);
} }
QJsonArray LoggerManager::getLogMessageBuffer(Logger::LogLevel filter) const
{
QJsonArray messageArray;
{
for (const auto &logLine : std::as_const(_logMessageBuffer))
{
if (logLine.level >= filter)
{
QJsonObject message;
message["loggerName"] = logLine.loggerName;
message["loggerSubName"] = logLine.loggerSubName;
message["function"] = logLine.function;
message["line"] = QString::number(logLine.line);
message["fileName"] = logLine.fileName;
message["message"] = logLine.message;
message["levelString"] = logLine.levelString;
message["utime"] = QString::number(logLine.utime);
messageArray.append(message);
}
}
}
return messageArray;
}
void LoggerManager::handleNewLogMessage(const Logger::T_LOG_MESSAGE & msg) void LoggerManager::handleNewLogMessage(const Logger::T_LOG_MESSAGE & msg)
{ {
_logMessageBuffer.push_back(msg); _logMessageBuffer.push_back(msg);

10
libsrc/utils/RgbChannelAdjustment.cpp
View File

@ -1,16 +1,14 @@
#include <utils/RgbChannelAdjustment.h> #include <utils/RgbChannelAdjustment.h>
RgbChannelAdjustment::RgbChannelAdjustment(QString channelName) RgbChannelAdjustment::RgbChannelAdjustment(QString channelName)
: _channelName(channelName) : RgbChannelAdjustment(0, 0, 0, channelName)
, _log(Logger::getInstance(channelName))
, _brightness(0)
{ {
resetInitialized();
} }
RgbChannelAdjustment::RgbChannelAdjustment(uint8_t adjustR, uint8_t adjustG, uint8_t adjustB, QString channelName) RgbChannelAdjustment::RgbChannelAdjustment(uint8_t adjustR, uint8_t adjustG, uint8_t adjustB, QString channelName )
: _channelName(channelName) : _channelName(channelName)
, _log(Logger::getInstance(channelName)) , _log(Logger::getInstance("CHANNEL_" + channelName.toUpper()))
, _brightness(0)
{ {
setAdjustment(adjustR, adjustG, adjustB); setAdjustment(adjustR, adjustG, adjustB);
} }

6
libsrc/utils/RgbTransform.cpp
View File

@ -2,13 +2,15 @@
#include <utils/RgbTransform.h> #include <utils/RgbTransform.h>
RgbTransform::RgbTransform() RgbTransform::RgbTransform()
: RgbTransform::RgbTransform(1.0, 1.0, 1.0, 0.0, false, 100, 100)
{ {
init(1.0, 1.0, 1.0, 0.0, false, 100, 100);
} }
RgbTransform::RgbTransform(double gammaR, double gammaG, double gammaB, double backlightThreshold, bool backlightColored, uint8_t brightness, uint8_t brightnessCompensation) RgbTransform::RgbTransform(double gammaR, double gammaG, double gammaB, double backlightThreshold, bool backlightColored, uint8_t brightness, uint8_t brightnessCompensation)
: _brightness(brightness)
, _brightnessCompensation(brightnessCompensation)
{ {
init(gammaR, gammaG, gammaB, backlightThreshold, backlightColored, brightness, brightnessCompensation); init(gammaR, gammaG, gammaB, backlightThreshold, backlightColored, _brightness, _brightnessCompensation);
} }
void RgbTransform::init(double gammaR, double gammaG, double gammaB, double backlightThreshold, bool backlightColored, uint8_t brightness, uint8_t brightnessCompensation) void RgbTransform::init(double gammaR, double gammaG, double gammaB, double backlightThreshold, bool backlightColored, uint8_t brightness, uint8_t brightnessCompensation)

11
libsrc/webserver/WebServer.cpp
View File

@ -16,6 +16,13 @@ namespace {
const char HTTPS_SERVICE_TYPE[] = "https"; const char HTTPS_SERVICE_TYPE[] = "https";
const char HYPERION_SERVICENAME[] = "Hyperion"; const char HYPERION_SERVICENAME[] = "Hyperion";
const char WEBSERVER_DEFAULT_PATH[] = ":/webconfig";
const char WEBSERVER_DEFAULT_CRT_PATH[] = ":/hyperion.crt";
const char WEBSERVER_DEFAULT_KEY_PATH[] = ":/hyperion.key";
quint16 WEBSERVER_DEFAULT_PORT = 8090;
quint16 WBSERVERR_DEFAULT_SSL_PORT = 8092;
} //End of constants } //End of constants
WebServer::WebServer(const QJsonDocument& config, bool useSsl, QObject* parent) WebServer::WebServer(const QJsonDocument& config, bool useSsl, QObject* parent)
@ -23,6 +30,7 @@ WebServer::WebServer(const QJsonDocument& config, bool useSsl, QObject* parent)
, _config(config) , _config(config)
, _useSsl(useSsl) , _useSsl(useSsl)
, _log(Logger::getInstance("WEBSERVER")) , _log(Logger::getInstance("WEBSERVER"))
, _port(WEBSERVER_DEFAULT_PORT)
, _server() , _server()
{ {
} }
@ -41,7 +49,6 @@ void WebServer::initServer()
if (_useSsl) if (_useSsl)
{ {
_server->setUseSecure(); _server->setUseSecure();
WEBSERVER_DEFAULT_PORT = 8092;
} }
connect(_server, &QtHttpServer::started, this, &WebServer::onServerStarted); connect(_server, &QtHttpServer::started, this, &WebServer::onServerStarted);
@ -111,7 +118,7 @@ void WebServer::handleSettingsUpdate(settings::type type, const QJsonDocument& c
_staticFileServing->setBaseUrl(_baseUrl); _staticFileServing->setBaseUrl(_baseUrl);
// ssl different port // ssl different port
quint16 newPort = _useSsl ? obj["sslPort"].toInt(WEBSERVER_DEFAULT_PORT) : obj["port"].toInt(WEBSERVER_DEFAULT_PORT); quint16 newPort = _useSsl ? obj["sslPort"].toInt(WBSERVERR_DEFAULT_SSL_PORT) : obj["port"].toInt(WEBSERVER_DEFAULT_PORT);
if (_port != newPort) if (_port != newPort)
{ {
_port = newPort; _port = newPort;

3
src/hyperion-aml/hyperion-aml.cpp
View File

@ -164,5 +164,8 @@ int main(int argc, char ** argv)
Error(log, "%s", e.what()); Error(log, "%s", e.what());
return -1; return -1;
} }
Logger::deleteInstance();
return 0; return 0;
} }

2
src/hyperion-dispmanx/hyperion-dispmanx.cpp
View File

@ -167,6 +167,8 @@ int main(int argc, char ** argv)
Error(log, "%s", e.what()); Error(log, "%s", e.what());
return -1; return -1;
} }
Logger::deleteInstance();
return 0; return 0;
} }

3
src/hyperion-framebuffer/hyperion-framebuffer.cpp
View File

@ -167,5 +167,8 @@ int main(int argc, char ** argv)
Error(log, "%s", e.what()); Error(log, "%s", e.what());
return -1; return -1;
} }
Logger::deleteInstance();
return 0; return 0;
} }

3
src/hyperion-osx/hyperion-osx.cpp
View File

@ -162,5 +162,8 @@ int main(int argc, char ** argv)
Error(log, "%s", e.what()); Error(log, "%s", e.what());
return -1; return -1;
} }
Logger::deleteInstance();
return 0; return 0;
} }

3
src/hyperion-qt/hyperion-qt.cpp
View File

@ -167,5 +167,8 @@ int main(int argc, char ** argv)
Error(log, "%s", e.what()); Error(log, "%s", e.what());
return -1; return -1;
} }
Logger::deleteInstance();
return 0; return 0;
} }

2
src/hyperion-remote/hyperion-remote.cpp
View File

@ -410,5 +410,7 @@ int main(int argc, char * argv[])
return 1; return 1;
} }
Logger::deleteInstance();
return 0; return 0;
} }

2
src/hyperion-v4l2/hyperion-v4l2.cpp
View File

@ -287,5 +287,7 @@ int main(int argc, char** argv)
return 1; return 1;
} }
Logger::deleteInstance();
return 0; return 0;
} }

2
src/hyperion-x11/hyperion-x11.cpp
View File

@ -166,5 +166,7 @@ int main(int argc, char ** argv)
return -1; return -1;
} }
Logger::deleteInstance();
return 0; return 0;
} }

2
src/hyperion-xcb/hyperion-xcb.cpp
View File

@ -165,5 +165,7 @@ int main(int argc, char ** argv)
return -1; return -1;
} }
Logger::deleteInstance();
return 0; return 0;
} }

46
src/hyperiond/hyperiond.cpp
View File

@ -1,5 +1,3 @@
#include <cassert>
#include <stdlib.h>
#include <QCoreApplication> #include <QCoreApplication>
#include <QResource> #include <QResource>
@ -10,8 +8,6 @@
#include <QJsonObject> #include <QJsonObject>
#include <QJsonValue> #include <QJsonValue>
#include <QPair> #include <QPair>
#include <cstdint>
#include <limits>
#include <QThread> #include <QThread>
#include <utils/Components.h> #include <utils/Components.h>
@ -92,8 +88,8 @@ HyperionDaemon::HyperionDaemon(const QString& rootPath, QObject* parent, bool lo
, _osxGrabber(nullptr) , _osxGrabber(nullptr)
, _qtGrabber(nullptr) , _qtGrabber(nullptr)
, _dxGrabber(nullptr) , _dxGrabber(nullptr)
, _ssdp(nullptr)
, _audioGrabber(nullptr) , _audioGrabber(nullptr)
, _ssdp(nullptr)
, _eventHandler(nullptr) , _eventHandler(nullptr)
, _osEventHandler(nullptr) , _osEventHandler(nullptr)
, _eventScheduler(nullptr) , _eventScheduler(nullptr)
@ -239,9 +235,13 @@ void HyperionDaemon::handleInstanceStateChange(InstanceState state, quint8 insta
break; break;
case InstanceState::H_STOPPED: case InstanceState::H_STOPPED:
case InstanceState::H_ON_STOP:
case InstanceState::H_CREATED:
case InstanceState::H_DELETED:
break; break;
default: default:
qWarning() << "HyperionDaemon::handleInstanceStateChange - Unhandled state:" << static_cast<int>(state);
break; break;
} }
} }
@ -271,30 +271,27 @@ void HyperionDaemon::freeObjects()
#ifdef ENABLE_MDNS #ifdef ENABLE_MDNS
if (_mDNSProvider != nullptr) if (_mDNSProvider != nullptr)
{ {
auto mDnsThread = _mDNSProvider->thread(); auto *mDnsThread = _mDNSProvider->thread();
mDnsThread->quit(); mDnsThread->quit();
mDnsThread->wait(); mDnsThread->wait();
delete mDnsThread;
_mDNSProvider = nullptr; _mDNSProvider = nullptr;
} }
#endif #endif
if (_jsonServer != nullptr) if (_jsonServer != nullptr)
{ {
auto jsonThread = _jsonServer->thread(); auto *jsonThread = _jsonServer->thread();
jsonThread->quit(); jsonThread->quit();
jsonThread->wait(); jsonThread->wait();
delete jsonThread;
_jsonServer = nullptr; _jsonServer = nullptr;
} }
#if defined(ENABLE_FLATBUF_SERVER) #if defined(ENABLE_FLATBUF_SERVER)
if (_flatBufferServer != nullptr) if (_flatBufferServer != nullptr)
{ {
auto flatBufferServerThread = _flatBufferServer->thread(); auto *flatBufferServerThread = _flatBufferServer->thread();
flatBufferServerThread->quit(); flatBufferServerThread->quit();
flatBufferServerThread->wait(); flatBufferServerThread->wait();
delete flatBufferServerThread;
_flatBufferServer = nullptr; _flatBufferServer = nullptr;
} }
#endif #endif
@ -302,10 +299,9 @@ void HyperionDaemon::freeObjects()
#if defined(ENABLE_PROTOBUF_SERVER) #if defined(ENABLE_PROTOBUF_SERVER)
if (_protoServer != nullptr) if (_protoServer != nullptr)
{ {
auto protoServerThread = _protoServer->thread(); auto *protoServerThread = _protoServer->thread();
protoServerThread->quit(); protoServerThread->quit();
protoServerThread->wait(); protoServerThread->wait();
delete protoServerThread;
_protoServer = nullptr; _protoServer = nullptr;
} }
#endif #endif
@ -313,28 +309,25 @@ void HyperionDaemon::freeObjects()
//ssdp before webserver //ssdp before webserver
if (_ssdp != nullptr) if (_ssdp != nullptr)
{ {
auto ssdpThread = _ssdp->thread(); auto *ssdpThread = _ssdp->thread();
ssdpThread->quit(); ssdpThread->quit();
ssdpThread->wait(); ssdpThread->wait();
delete ssdpThread;
_ssdp = nullptr; _ssdp = nullptr;
} }
if (_webserver != nullptr) if (_webserver != nullptr)
{ {
auto webserverThread = _webserver->thread(); auto *webserverThread = _webserver->thread();
webserverThread->quit(); webserverThread->quit();
webserverThread->wait(); webserverThread->wait();;
delete webserverThread;
_webserver = nullptr; _webserver = nullptr;
} }
if (_sslWebserver != nullptr) if (_sslWebserver != nullptr)
{ {
auto sslWebserverThread = _sslWebserver->thread(); auto *sslWebserverThread = _sslWebserver->thread();
sslWebserverThread->quit(); sslWebserverThread->quit();
sslWebserverThread->wait(); sslWebserverThread->wait();
delete sslWebserverThread;
_sslWebserver = nullptr; _sslWebserver = nullptr;
} }
@ -342,14 +335,15 @@ void HyperionDaemon::freeObjects()
_instanceManager->stopAll(); _instanceManager->stopAll();
delete _amlGrabber; delete _amlGrabber;
if (_dispmanx != nullptr) delete _dispmanx;
delete _dispmanx;
delete _fbGrabber; delete _fbGrabber;
delete _osxGrabber; delete _osxGrabber;
delete _qtGrabber; delete _qtGrabber;
delete _dxGrabber; delete _dxGrabber;
delete _videoGrabber; delete _videoGrabber;
delete _audioGrabber; delete _audioGrabber;
delete _x11Grabber;
delete _xcbGrabber;
_videoGrabber = nullptr; _videoGrabber = nullptr;
_amlGrabber = nullptr; _amlGrabber = nullptr;
@ -359,6 +353,8 @@ void HyperionDaemon::freeObjects()
_qtGrabber = nullptr; _qtGrabber = nullptr;
_dxGrabber = nullptr; _dxGrabber = nullptr;
_audioGrabber = nullptr; _audioGrabber = nullptr;
_x11Grabber = nullptr;
_xcbGrabber = nullptr;
} }
void HyperionDaemon::startNetworkServices() void HyperionDaemon::startNetworkServices()
@ -934,6 +930,8 @@ void HyperionDaemon::startCecHandler()
connect(cecHandlerThread, &QThread::started, _cecHandler, &CECHandler::start); connect(cecHandlerThread, &QThread::started, _cecHandler, &CECHandler::start);
connect(cecHandlerThread, &QThread::finished, _cecHandler, &CECHandler::stop); connect(cecHandlerThread, &QThread::finished, _cecHandler, &CECHandler::stop);
connect(cecHandlerThread, &QThread::finished, _cecHandler, &CECHandler::deleteLater);
connect(this, &HyperionDaemon::settingsChanged, _cecHandler, &CECHandler::handleSettingsUpdate); connect(this, &HyperionDaemon::settingsChanged, _cecHandler, &CECHandler::handleSettingsUpdate);
Info(_log, "CEC event handler created"); Info(_log, "CEC event handler created");
@ -949,13 +947,11 @@ void HyperionDaemon::stopCecHandler()
#if defined(ENABLE_CEC) #if defined(ENABLE_CEC)
if (_cecHandler != nullptr) if (_cecHandler != nullptr)
{ {
auto cecHandlerThread = _cecHandler->thread(); auto *cecHandlerThread = _cecHandler->thread();
cecHandlerThread->quit(); cecHandlerThread->quit();
cecHandlerThread->wait(); cecHandlerThread->wait();
delete cecHandlerThread;
_cecHandler = nullptr; _cecHandler = nullptr;
} }
Info(_log, "CEC handler stopped"); Info(_log, "CEC handler stopped");
#endif #endif
} }

4
src/hyperiond/hyperiond.h
View File

@ -193,7 +193,7 @@ private:
HyperionIManager* _instanceManager; HyperionIManager* _instanceManager;
AuthManager* _authManager; AuthManager* _authManager;
#ifdef ENABLE_MDNS #ifdef ENABLE_MDNS
MdnsProvider* _mDNSProvider; MdnsProvider* _mDNSProvider;
#endif #endif
NetOrigin* _netOrigin; NetOrigin* _netOrigin;
#if defined(ENABLE_EFFECTENGINE) #if defined(ENABLE_EFFECTENGINE)
@ -217,7 +217,7 @@ private:
OsEventHandler* _osEventHandler; OsEventHandler* _osEventHandler;
EventScheduler* _eventScheduler; EventScheduler* _eventScheduler;
#ifdef ENABLE_CEC #ifdef ENABLE_CEC
CECHandler* _cecHandler; CECHandler* _cecHandler;
#endif #endif
#if defined(ENABLE_FLATBUF_SERVER) #if defined(ENABLE_FLATBUF_SERVER)