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

Added video standards to JsonAPI output

Browse Source
This commit is contained in:
Paulchen-Panther
2021-02-07 14:30:36 +01:00
parent 2ff3c1155b
commit 4f81fbd2ab
8 changed files with 95 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
include/grabber/MFGrabber.h
View File

@@ -61,7 +61,7 @@ public:
bool getCecDetectionEnabled() const { return _cecDetectionEnabled; }
QStringList getDevices() const override;
QString getDeviceName(const QString& devicePath) const override { return devicePath; }
QMultiMap<QString, int> getDeviceInputs(const QString& devicePath) const override { return {{ devicePath, 0}}; }
QMultiMap<QString, int> getDeviceInputs(const QString& devicePath) const override { return { {devicePath, 0} }; }
QStringList getAvailableEncodingFormats(const QString& devicePath, const int& /*deviceInput*/) const override;
QMultiMap<int, int> getAvailableDeviceResolutions(const QString& devicePath, const int& /*deviceInput*/, const PixelFormat& encFormat) const override;
QIntList getAvailableDeviceFramerates(const QString& devicePath, const int& /*deviceInput*/, const PixelFormat& encFormat, const unsigned width, const unsigned height) const override;

8
include/grabber/V4L2Grabber.h
View File

@@ -14,7 +14,7 @@
// util includes
#include <utils/PixelFormat.h>
#include <hyperion/Grabber.h>
#include <grabber/VideoStandard.h>
#include <utils/VideoStandard.h>
#include <utils/Components.h>
#include <cec/CECEvent.h>
@@ -50,6 +50,7 @@ public:
struct InputProperties
{
QString inputName = QString();
QList<VideoStandard> standards = QList<VideoStandard>();
struct EncodingProperties
{
unsigned int width = 0;
@@ -142,6 +143,11 @@ public:
///
QMultiMap<QString, int> getDeviceInputs(const QString& devicePath) const override;
///
/// @brief overwrite Grabber.h implementation
///
QList<VideoStandard> getAvailableDeviceStandards(const QString& devicePath, const int& deviceInput) const override;
///
/// @brief overwrite Grabber.h implementation
///

33
include/grabber/VideoStandard.h
View File

@@ -1,33 +0,0 @@
#pragma once
/**
* Enumeration of the possible video standards the grabber can be set to
*/
enum class VideoStandard {
PAL,
NTSC,
SECAM,
NO_CHANGE
};
inline VideoStandard parseVideoStandard(const QString& videoStandard)
{
// convert to lower case
QString standard = videoStandard.toLower();
if (standard == "pal")
{
return VideoStandard::PAL;
}
else if (standard == "ntsc")
{
return VideoStandard::NTSC;
}
else if (standard == "secam")
{
return VideoStandard::SECAM;
}
// return the default NO_CHANGE
return VideoStandard::NO_CHANGE;
}