Merge branch 'amlogic-grabber-refactor' of https://github.com/santievil/HyperHDR into amlogic-grabber-refactor

Author: santievil

BUILDING.md

@@ -17,6 +17,7 @@ Use -D prefix when configuring the build.
   * ENABLE_PIPEWIRE = ON | OFF, enables the Pipewire software grabber (Linux)
   * ENABLE_PIPEWIRE_EGL = ON | OFF, enables EGL for the Pipewire grabber (Linux)
   * ENABLE_X11 = ON | OFF, enables the X11 software grabber (Linux)
+  * ENABLE_AMLOGIC = ON | OFF, forces the Amlogic software grabber (Linux)
 
 * HARDWARE GRABBERS
   * ENABLE_AVF = ON | OFF, enables the AVF USB grabber support (macOS)

CMakeLists.txt

@@ -43,6 +43,7 @@ SET ( DEFAULT_X11                         OFF )
 SET ( DEFAULT_PIPEWIRE                    OFF )
 SET ( DEFAULT_PIPEWIRE_EGL                OFF )
 SET ( DEFAULT_FRAMEBUFFER                 OFF )
+SET ( DEFAULT_AMLOGIC                     OFF )
 SET ( DEFAULT_SOUNDCAPWINDOWS             OFF )
 SET ( DEFAULT_SOUNDCAPMACOS               OFF )
 SET ( DEFAULT_CEC                         OFF )
@@ -431,6 +432,9 @@ colorMe("ENABLE_DX = " ${ENABLE_DX})
 option(ENABLE_FRAMEBUFFER "Enable the framebuffer Linux system grabber" ${DEFAULT_FRAMEBUFFER})
 colorMe("ENABLE_FRAMEBUFFER = " ${ENABLE_FRAMEBUFFER})
 
+option(ENABLE_AMLOGIC "Enable the Amlogic grabber" ${DEFAULT_AMLOGIC})
+colorMe("ENABLE_AMLOGIC = " ${ENABLE_AMLOGIC})
+
 option(ENABLE_MAC_SYSTEM "Enable macOS system grabber" ${DEFAULT_MAC_SYSTEM})
 colorMe("ENABLE_MAC_SYSTEM = " ${ENABLE_MAC_SYSTEM})
 

HyperhdrConfig.h.in

@@ -18,6 +18,9 @@
 // framebuffer linux system grabber
 #cmakedefine ENABLE_FRAMEBUFFER
 
+// amlogic system grabber
+#cmakedefine ENABLE_AMLOGIC
+
 // macOs system grabber
 #cmakedefine ENABLE_MAC_SYSTEM
 

include/grabber/linux/amlogic/AmlogicWrapper.h

@@ -0,0 +1,20 @@
+#pragma once
+
+#include <base/SystemWrapper.h>
+#include <grabber/linux/amlogic/AmlogicGrabber.h>
+
+class AmlogicWrapper : public SystemWrapper
+{
+	Q_OBJECT
+
+public:
+	AmlogicWrapper(const QString& device, const QString& configurationPath);
+	bool isActivated(bool forced) override;
+
+protected:
+	QString getGrabberInfo() override;
+	
+
+private:
+	AmlogicGrabber _grabber;
+};

include/grabber/linux/framebuffer/FrameBufGrabber.h

@@ -20,9 +20,6 @@
 #include <utils/Components.h>
 
 
-//AML
-#include <grabber/linux/amlogic/Amvideocap.h>
-
 
 class FrameBufGrabber : public Grabber
 {
@@ -68,16 +65,6 @@ public slots:
 	bool init() override;
 
 	void uninit() override;
-
-
-	//AMLOGIC
-	bool isVideoPlayingAML();
-	void closeDeviceAML(int& fd);
-	bool openDeviceAML(int& fd, const char* dev);	
-	bool initAmlogic();
-	bool stopAmlogic();
-	bool grabFrameAmlogic();
-	bool grabFrameFramebuffer();
 
 private:
 	QString		_configurationPath;

sources/grabber/CMakeLists.txt

@@ -10,6 +10,10 @@ if (ENABLE_FRAMEBUFFER)
 	add_subdirectory(linux/framebuffer)
 endif(ENABLE_FRAMEBUFFER)
 
+if (ENABLE_AMLOGIC)
+	add_subdirectory(linux/amlogic)
+endif(ENABLE_AMLOGIC)
+
 if (ENABLE_V4L2)
 	add_subdirectory(linux/v4l2)
 endif (ENABLE_V4L2)

sources/grabber/linux/amlogic/AmlogicWrapper.cpp

@@ -0,0 +1,52 @@
+/* AmlogicWrapper.cpp
+*
+*  MIT License
+*
+*  Copyright (c) 2020-2025 awawa-dev
+*
+*  Project homesite: https://github.com/awawa-dev/HyperHDR
+*
+*  Permission is hereby granted, free of charge, to any person obtaining a copy
+*  of this software and associated documentation files (the "Software"), to deal
+*  in the Software without restriction, including without limitation the rights
+*  to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+*  copies of the Software, and to permit persons to whom the Software is
+*  furnished to do so, subject to the following conditions:
+*
+*  The above copyright notice and this permission notice shall be included in all
+*  copies or substantial portions of the Software.
+
+*  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+*  IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+*  FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+*  AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+*  LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+*  OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+*  SOFTWARE.
+ */
+
+#include <QMetaType>
+#include <grabber/linux/amlogic/AmlogicWrapper.h>
+
+
+AmlogicWrapper::AmlogicWrapper(const QString &device,
+		const QString & configurationPath )
+	: SystemWrapper("AMLOGIC_SYSTEM:"+device.left(14), &_grabber)
+	, _grabber(device, configurationPath)
+{	
+	qRegisterMetaType<Image<ColorRgb>>("Image<ColorRgb>");
+    connect(&_grabber, &Grabber::SignalNewCapturedFrame, this, &SystemWrapper::newCapturedFrameHandler, Qt::DirectConnection);
+    connect(&_grabber, &Grabber::SignalCapturingException, this, &SystemWrapper::capturingExceptionHandler, Qt::DirectConnection);
+}
+
+QString AmlogicWrapper::getGrabberInfo()
+{
+	return "amlogic";
+}
+
+bool AmlogicWrapper::isActivated(bool forced)
+{
+	return _grabber.isActivated();
+}
+
+

sources/grabber/linux/amlogic/IonBuffer.cpp

@@ -13,7 +13,7 @@
 * more details.
 *
 */
-#include "IonBuffer.h"
+#include <grabber/linux/amlogic/IonBuffer.h>
 
 int IonBuffer::ion_fd = -1;
 

sources/grabber/linux/framebuffer/FrameBufGrabber.cpp

@@ -332,4 +332,4 @@ void FrameBufGrabber::setCropping(unsigned cropLeft, unsigned cropRight, unsigne
 	_cropRight = cropRight;
 	_cropTop = cropTop;
 	_cropBottom = cropBottom;
-}
+}

sources/hyperhdr/CMakeLists.txt

@@ -98,6 +98,10 @@ if (ENABLE_FRAMEBUFFER)
 	target_link_libraries(hyperhdr framebuffer-grabber "${CMAKE_DL_LIBS}")
 endif ()
 
+if (ENABLE_AMLOGIC)
+	target_link_libraries(hyperhdr amlogic-grabber "${CMAKE_DL_LIBS}")
+endif ()
+
 if (ENABLE_PIPEWIRE)
 	target_link_libraries(hyperhdr Pipewire-grabber "${CMAKE_DL_LIBS}")
 endif ()