Improvements after review

Author: Lord-Grey

include/utils/MemoryTracker.h

@@ -53,10 +53,14 @@ void objectDeleter(T* ptr, const QString& subComponent, const QString& typeName)
 				// The object's thread is not running, which is a potential issue.
 				// Log a critical error as this indicates a problem in the shutdown sequence.
                 // This should be an *extremely rare* fallback and indicates a bug in the thread shutdown sequence.
-				qCritical().noquote() << QString("|%1| QObject<%2> could not be deleted. Owning thread is not running.").arg(subComponent, typeName);
+                qCritical().noquote() << QString("|%1| QObject<%2> could not be deleted. Owning thread is not running. This may cause a memory leak. Please check thread shutdown sequence and object ownership.")
+                    .arg(subComponent, typeName);
 
+                // [MEMORYTRACKER] CRITICAL: This code path indicates a potential memory leak, as the QObject cannot be safely deleted.
+                // To aid debugging, ensure that all threads are properly shut down before object destruction.
+                // Consider adding more diagnostics here, such as emitting a signal or logging additional context (e.g., stack trace, object address).
                 //qCDebug(memory_objects).noquote() << QString("|%1| QObject<%2> object's owning thread is not running. Deleted immediately (thread not running)").arg(subComponent, typeName);
-				//direct delete will require friendship, to be added (to Logger)
+                //direct delete will require friendship, to be added (to Logger)
                 //delete ptr;
             }
         }

include/utils/Profiler.h

@@ -42,7 +42,7 @@ class Profiler
 private:
 	static void initLogger();
 
-	QSharedPointer<Logger> _logger;
+	static QSharedPointer<Logger> _logger;
 	const char*     _file;
 	const char*     _func;
 	unsigned int    _line;

libsrc/api/JsonInfo.cpp

@@ -715,7 +715,7 @@ QJsonArray JsonInfo::discoverScreenInputs(const QJsonObject& params) const
 	discoverGrabber<DDAGrabber>(screenInputs, params);
 #endif
 
-#ifdef ENABLE_DRM && !defined(ENABLE_AMLOGIC)
+#if defined(ENABLE_DRM) && !defined(ENABLE_AMLOGIC)
 	discoverGrabber<DRMFrameGrabber>(screenInputs, params);
 #endif
 

libsrc/grabber/amlogic/AmlogicGrabber.cpp

@@ -71,7 +71,7 @@ bool AmlogicGrabber::isGbmSupported(bool logMsg) const
 {
 	// Check for the existence of gbm_create_device, a core GBM function, within libdrm.so
 
-	QString libName  = "libMali";
+	QString libName = "libMali";
 	QString lib  = libName + ".so";
 
 	// 1. Attempt to open the library.

libsrc/grabber/drm/DRMFrameGrabber.cpp

@@ -224,58 +224,63 @@ bool DRMFrameGrabber::setWidthHeight(int width, int height)
     return false;
 }
 
-static bool processLinearFramebuffer(int deviceFd,
-                                    const drmModeFB2* framebuffer,
-                                    int w,
-                                    int h,
-                                    PixelFormat pixelFormat,
-                                    ImageResampler const& imageResampler,
-                                    Logger* log,
-                                    Image<ColorRgb>& image)
+struct LinearFramebufferParams
+{
+    int deviceFd;
+    const drmModeFB2* framebuffer;
+    int w;
+    int h;
+    PixelFormat pixelFormat;
+    const ImageResampler& imageResampler;
+    QSharedPointer<Logger> log;
+    Image<ColorRgb>& image;
+};
+
+static bool processLinearFramebuffer(const LinearFramebufferParams& params)
 {
     int size = 0;
     int lineLength = 0;
     int fb_dmafd = 0;
 
-    if (pixelFormat == PixelFormat::I420 || pixelFormat == PixelFormat::NV12
+    if (params.pixelFormat == PixelFormat::I420 || params.pixelFormat == PixelFormat::NV12
 #ifdef DRM_FORMAT_NV21
-        || pixelFormat == PixelFormat::NV21
+        || params.pixelFormat == PixelFormat::NV21
 #endif
     )
     {
-        size = (w * h * 3) / 2;
-        lineLength = w;
+        size = (params.w * params.h * 3) / 2;
+        lineLength = params.w;
     }
 #ifdef DRM_FORMAT_P030
-    else if (pixelFormat == PixelFormat::P030)
+    else if (params.pixelFormat == PixelFormat::P030)
     {
-        size = (w * h * 2) + (DIV_ROUND_UP(w, 2) * DIV_ROUND_UP(h, 2) * 4); // Y16 + UV32 per 2px
-        lineLength = w * 2; // 16bpp luma
+        size = (params.w * params.h * 2) + (DIV_ROUND_UP(params.w, 2) * DIV_ROUND_UP(params.h, 2) * 4); // Y16 + UV32 per 2px
+        lineLength = params.w * 2; // 16bpp luma
     }
 #endif
-    else if (pixelFormat == PixelFormat::RGB32 || pixelFormat == PixelFormat::BGR32)
+    else if (params.pixelFormat == PixelFormat::RGB32 || params.pixelFormat == PixelFormat::BGR32)
     {
-        size = w * h * 4;
-        lineLength = w * 4;
+        size = params.w * params.h * 4;
+        lineLength = params.w * 4;
     }
 
-    int ret = drmPrimeHandleToFD(deviceFd, framebuffer->handles[0], O_RDONLY, &fb_dmafd);
+    int ret = drmPrimeHandleToFD(params.deviceFd, params.framebuffer->handles[0], O_RDONLY, &fb_dmafd);
     if (ret != 0)
     {
-        Error(log, "drmPrimeHandleToFD failed (handle=%u): %s", framebuffer->handles[0], strerror(errno));
+        Error(params.log, "drmPrimeHandleToFD failed (handle=%u): %s", params.framebuffer->handles[0], strerror(errno));
         return false;
     }
 
     auto* mmapFrameBuffer = (uint8_t*)mmap(nullptr, size, PROT_READ, MAP_SHARED, fb_dmafd, 0);
     if (mmapFrameBuffer != MAP_FAILED)
     {
-        imageResampler.processImage(mmapFrameBuffer, w, h, lineLength, pixelFormat, image);
+        params.imageResampler.processImage(mmapFrameBuffer, params.w, params.h, lineLength, params.pixelFormat, params.image);
         munmap(mmapFrameBuffer, size);
         close(fb_dmafd);
         return true;
     }
 
-    Error(log, "Format: %s failed. Error: %s", QSTRING_CSTR(getDrmFormat(framebuffer->pixel_format)), strerror(errno));
+    Error(params.log, "Format: %s failed. Error: %s", QSTRING_CSTR(getDrmFormat(params.framebuffer->pixel_format)), strerror(errno));
     close(fb_dmafd);
     return false;
 }
@@ -598,7 +603,17 @@ int DRMFrameGrabber::grabFrame(Image<ColorRgb> &image)
         // Linear modifier path
         if (_pixelFormat != PixelFormat::NO_CHANGE && modifier == DRM_FORMAT_MOD_LINEAR)
         {
-            if (processLinearFramebuffer(_deviceFd, framebuffer, w, h, _pixelFormat, _imageResampler, _log.data(), image))
+            LinearFramebufferParams params{
+                _deviceFd,
+                framebuffer,
+                w,
+                h,
+                _pixelFormat,
+                _imageResampler,
+                _log,
+                image
+            };
+            if (processLinearFramebuffer(params))
             {
                 newImage = true;
             }

libsrc/grabber/video/v4l2/V4L2Grabber.cpp

@@ -1556,17 +1556,17 @@ void V4L2Grabber::enumVideoCaptureDevices()
 			if (close(fd) < 0) continue;
 
 			QFile devNameFile(dev+"/name");
-			if (!devNameFile.exists() || !devNameFile.open(QFile::ReadOnly))
-			{
-				Error( _log, "Device file '%s' cannot be opened.", QSTRING_CSTR(devNameFile.fileName()) );
-			}
-			else
+			if (devNameFile.exists() && devNameFile.open(QFile::ReadOnly))
 			{
 				devName = devNameFile.readLine();
 				devName = devName.trimmed();
 				properties.name = devName;
 				devNameFile.close();
 			}
+			else
+			{
+				Error(_log, "Device file '%s' cannot be opened.", QSTRING_CSTR(devNameFile.fileName()));
+			}
 
 			_deviceProperties.insert("/dev/"+it.fileName(), properties);
 		}

libsrc/leddevice/dev_net/LedDeviceWled.cpp

@@ -98,7 +98,7 @@ LedDeviceWled::LedDeviceWled(const QJsonObject &deviceConfig)
 	  ,_isSwitchOffOtherSegments(DEFAULT_IS_SWITCH_OFF_OTHER_SEGMENTS)
 	  ,_isStreamToSegment(false)
 {
-	TRACK_SCOPE_SUBCOMPONENT;;
+	TRACK_SCOPE_SUBCOMPONENT;
 #ifdef ENABLE_MDNS
 	QMetaObject::invokeMethod(MdnsBrowser::getInstance().data(), "browseForServiceType",
 							   Qt::QueuedConnection, Q_ARG(QByteArray, MdnsServiceRegister::getServiceType(_activeDeviceType)));

libsrc/utils/Logger.cpp

@@ -191,11 +191,15 @@ void Logger::Message(LogLevel level, const char* sourceFile, const char* func, u
 {
     auto const globalLevel = static_cast<LogLevel>(int(GLOBAL_MIN_LOG_LEVEL));
 
-    if ((globalLevel == Logger::LogLevel::Unset && level < static_cast<LogLevel>(int(_minLevel))) // no global level, use level from logger
-        || (globalLevel > LogLevel::Unset && level < globalLevel)) // global level set, use global level
-    {
-        return;
-    }
+	// Determine the effective minimum level: prefer global if set, otherwise this logger's level
+	const auto effectiveMinLevel = (globalLevel == Logger::LogLevel::Unset)
+		? getMinLevel()
+		: globalLevel;
+
+	if (level < effectiveMinLevel)
+	{
+		return;
+	}
 
 	const size_t max_msg_length = 1024;
 	char msg[max_msg_length];