mirror of
https://github.com/hyperion-project/hyperion.ng.git
synced 2025-03-01 10:33:28 +00:00
05d24b99c4
* 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>
131 lines
3.1 KiB
C++
131 lines
3.1 KiB
C++
#pragma once
|
|
#include <QAbstractEventDispatcher>
|
|
#include <QAbstractNativeEventFilter>
|
|
#include <QCoreApplication>
|
|
|
|
// QT includes
|
|
#include <QObject>
|
|
#include <QJsonObject>
|
|
#include <QJsonArray>
|
|
#include <QJsonDocument>
|
|
|
|
|
|
// Hyperion-utils includes
|
|
#include <utils/ColorRgb.h>
|
|
#include <hyperion/Grabber.h>
|
|
|
|
// X11 includes
|
|
#include <X11/Xlib.h>
|
|
#include <X11/extensions/Xrandr.h>
|
|
#include <X11/extensions/Xrender.h>
|
|
#include <X11/extensions/XShm.h>
|
|
#include <sys/ipc.h>
|
|
#include <sys/shm.h>
|
|
|
|
#ifdef Bool
|
|
#undef Bool
|
|
#endif
|
|
|
|
class X11Grabber : public Grabber , public QAbstractNativeEventFilter
|
|
{
|
|
public:
|
|
|
|
X11Grabber(int cropLeft=0, int cropRight=0, int cropTop=0, int cropBottom=0);
|
|
|
|
~X11Grabber() override;
|
|
|
|
bool open();
|
|
|
|
bool setupDisplay();
|
|
|
|
///
|
|
/// Captures a single snapshot of the display and writes the data to the given image. The
|
|
/// provided image should have the same dimensions as the configured values (_width and
|
|
/// _height)
|
|
///
|
|
/// @param[out] image The snapped screenshot (should be initialized with correct width and
|
|
/// height)
|
|
///
|
|
int grabFrame(Image<ColorRgb> & image, bool forceUpdate=false);
|
|
|
|
///
|
|
/// update dimension according current screen
|
|
int updateScreenDimensions(bool force=false);
|
|
|
|
void setVideoMode(VideoMode mode) override;
|
|
|
|
///
|
|
/// @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; }
|
|
|
|
///
|
|
/// @brief Apply new pixelDecimation
|
|
///
|
|
bool setPixelDecimation(int pixelDecimation) override;
|
|
|
|
///
|
|
/// Set the crop values
|
|
/// @param cropLeft Left pixel crop
|
|
/// @param cropRight Right pixel crop
|
|
/// @param cropTop Top pixel crop
|
|
/// @param cropBottom Bottom pixel crop
|
|
///
|
|
void setCropping(int cropLeft, int cropRight, int cropTop, int cropBottom) override;
|
|
|
|
///
|
|
/// @brief Discover X11 screens available (for configuration).
|
|
///
|
|
/// @param[in] params Parameters used to overwrite discovery default behaviour
|
|
///
|
|
/// @return A JSON structure holding a list of devices found
|
|
///
|
|
QJsonObject discover(const QJsonObject& params);
|
|
|
|
protected:
|
|
#if (QT_VERSION >= QT_VERSION_CHECK(6, 0, 0))
|
|
bool nativeEventFilter(const QByteArray & eventType, void * message, qintptr * result) override;
|
|
#else
|
|
bool nativeEventFilter(const QByteArray & eventType, void * message, long int * result) override;
|
|
#endif
|
|
|
|
private:
|
|
|
|
void freeResources();
|
|
void setupResources();
|
|
|
|
/// Reference to the X11 display (nullptr if not opened)
|
|
Display* _x11Display;
|
|
Window _window;
|
|
XWindowAttributes _windowAttr;
|
|
|
|
XImage* _xImage;
|
|
XShmSegmentInfo _shminfo;
|
|
|
|
Pixmap _pixmap;
|
|
XRenderPictFormat* _srcFormat;
|
|
XRenderPictFormat* _dstFormat;
|
|
XRenderPictureAttributes _pictAttr;
|
|
Picture _srcPicture;
|
|
Picture _dstPicture;
|
|
|
|
int _xRandREventBase;
|
|
|
|
XTransform _transform;
|
|
|
|
int _screenWidth;
|
|
int _screenHeight;
|
|
int _src_x;
|
|
int _src_y;
|
|
|
|
bool _xShmAvailable;
|
|
bool _xShmPixmapAvailable;
|
|
bool _xRenderAvailable;
|
|
bool _xRandRAvailable;
|
|
bool _isWayland;
|
|
|
|
Logger * _logger;
|
|
|
|
Image<ColorRgb> _image;
|
|
};
|