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

move whole logic to MF-grabber

Browse Source
This commit is contained in:
unknown
2024-06-05 21:40:51 +02:00
parent 0b75e90c54
commit 9cd21272c9
8 changed files with 21 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
include/grabber/video/EncoderThread.h
View File

@@ -31,7 +31,7 @@ public:
PixelFormat pixelFormat, uint8_t* sharedData,
int size, int width, int height, int lineLength,
int cropLeft, int cropTop, int cropBottom, int cropRight,
VideoMode videoMode, bool bottomUp, FlipMode flipMode, int pixelDecimation);
VideoMode videoMode, FlipMode flipMode, int pixelDecimation);
void process();
@@ -55,7 +55,6 @@ private:
int _cropTop;
int _cropBottom;
int _cropRight;
bool _bottomUp;
FlipMode _flipMode;
VideoMode _videoMode;
bool _doTransform;
@@ -96,14 +95,14 @@ public:
PixelFormat pixelFormat, uint8_t* sharedData,
int size, int width, int height, int lineLength,
int cropLeft, int cropTop, int cropBottom, int cropRight,
VideoMode videoMode, bool bottomUp, FlipMode flipMode, int pixelDecimation)
VideoMode videoMode, FlipMode flipMode, int pixelDecimation)
{
auto encThread = qobject_cast<EncoderThread*>(_thread);
if (encThread != nullptr)
encThread->setup(pixelFormat, sharedData,
size, width, height, lineLength,
cropLeft, cropTop, cropBottom, cropRight,
videoMode, bottomUp, flipMode, pixelDecimation);
videoMode, flipMode, pixelDecimation);
}
bool isBusy()

1
include/grabber/video/mediafoundation/MFGrabber.h
View File

@@ -109,7 +109,6 @@ private:
EncoderThreadManager* _threadManager;
PixelFormat _pixelFormat,
_pixelFormatConfig;
bool _bottomUp;
int _lineLength,
_frameByteSize,
_noSignalCounterThreshold,

2
include/utils/ImageResampler.h
View File

@@ -15,7 +15,6 @@ public:
void setVerticalPixelDecimation(int decimator) { _verticalDecimation = decimator; }
void setCropping(int cropLeft, int cropRight, int cropTop, int cropBottom);
void setVideoMode(VideoMode mode) { _videoMode = mode; }
void setBottomUp(bool isBottomUp) { _bottomUp = isBottomUp; }
void setFlipMode(FlipMode mode) { _flipMode = mode; }
void processImage(const uint8_t * data, int width, int height, int lineLength, PixelFormat pixelFormat, Image<ColorRgb> & outputImage) const;
@@ -27,7 +26,6 @@ private:
int _cropTop;
int _cropBottom;
VideoMode _videoMode;
bool _bottomUp;
FlipMode _flipMode;
};

4
include/utils/PixelFormat.h
View File

@@ -124,10 +124,10 @@ inline QString pixelFormatToString(const PixelFormat& pixelFormat)
enum class FlipMode
{
NO_CHANGE,
HORIZONTAL,
VERTICAL,
BOTH,
NO_CHANGE
BOTH
};
inline FlipMode parseFlipMode(const QString& flipMode)