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

Fix MF-Grabber

Browse Source
This commit is contained in:
Lord-Grey 2024-06-01 08:14:13 +02:00
parent a5b42e3024
commit 6d196c65db
1 changed files with 8 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
libsrc/grabber/video/mediafoundation/MFSourceReaderCB.h
View File

@ -28,7 +28,6 @@ static PixelFormat GetPixelFormatForGuid(const GUID guid)
{ {
if (IsEqualGUID(guid, MFVideoFormat_RGB32)) return PixelFormat::RGB32; if (IsEqualGUID(guid, MFVideoFormat_RGB32)) return PixelFormat::RGB32;
if (IsEqualGUID(guid, MFVideoFormat_RGB24)) return PixelFormat::RGB24; if (IsEqualGUID(guid, MFVideoFormat_RGB24)) return PixelFormat::RGB24;
if (IsEqualGUID(guid, MFVideoFormat_BGR24)) return PixelFormat::BGR24;
if (IsEqualGUID(guid, MFVideoFormat_YUY2)) return PixelFormat::YUYV; if (IsEqualGUID(guid, MFVideoFormat_YUY2)) return PixelFormat::YUYV;
if (IsEqualGUID(guid, MFVideoFormat_UYVY)) return PixelFormat::UYVY; if (IsEqualGUID(guid, MFVideoFormat_UYVY)) return PixelFormat::UYVY;
#ifdef HAVE_TURBO_JPEG #ifdef HAVE_TURBO_JPEG
@ -146,9 +145,9 @@ public:
} }
#ifdef HAVE_TURBO_JPEG #ifdef HAVE_TURBO_JPEG
if (_pixelformat != PixelFormat::MJPEG && _pixelformat != PixelFormat::RGB24 && _pixelformat != PixelFormat::BGR24 && _pixelformat != PixelFormat::NO_CHANGE) if (_pixelformat != PixelFormat::MJPEG && _pixelformat != PixelFormat::RGB24 && _pixelformat != PixelFormat::NO_CHANGE)
#else #else
if (_pixelformat != PixelFormat::RGB24 && _pixelformat != PixelFormat::BGR24 && _pixelformat != PixelFormat::NO_CHANGE) if (_pixelformat != PixelFormat::RGB24 && _pixelformat != PixelFormat::NO_CHANGE)
#endif #endif
pSample = TransformSample(_transform, pSample); pSample = TransformSample(_transform, pSample);
@ -182,9 +181,9 @@ public:
_bEOS = TRUE; // Reached the end of the stream. _bEOS = TRUE; // Reached the end of the stream.
#ifdef HAVE_TURBO_JPEG #ifdef HAVE_TURBO_JPEG
if (_pixelformat != PixelFormat::MJPEG && _pixelformat != PixelFormat::RGB24 && _pixelformat != PixelFormat::BGR24 && _pixelformat != PixelFormat::NO_CHANGE) if (_pixelformat != PixelFormat::MJPEG && _pixelformat != PixelFormat::RGB24 && _pixelformat != PixelFormat::NO_CHANGE)
#else #else
if (_pixelformat != PixelFormat::RGB24 && _pixelformat != PixelFormat::BGR24 && _pixelformat != PixelFormat::NO_CHANGE) if (_pixelformat != PixelFormat::RGB24 && _pixelformat != PixelFormat::NO_CHANGE)
#endif #endif
SAFE_RELEASE(pSample); SAFE_RELEASE(pSample);
@ -197,9 +196,9 @@ public:
{ {
_pixelformat = format; _pixelformat = format;
#ifdef HAVE_TURBO_JPEG #ifdef HAVE_TURBO_JPEG
if (format == PixelFormat::MJPEG || format == PixelFormat::RGB24 || format == PixelFormat::BGR24 || format == PixelFormat::NO_CHANGE) if (format == PixelFormat::MJPEG || format == PixelFormat::RGB24 || format == PixelFormat::NO_CHANGE)
#else #else
if (format == PixelFormat::RGB24 || format == PixelFormat::BGR24 || format == PixelFormat::NO_CHANGE) if (format == PixelFormat::RGB24 || format == PixelFormat::NO_CHANGE)
#endif #endif
return S_OK; return S_OK;
@ -393,10 +392,10 @@ private:
private: private:
long _nRefCount; long _nRefCount;
CRITICAL_SECTION _critsec; CRITICAL_SECTION _critsec;
MFGrabber* _grabber; MFGrabber* _grabber;
BOOL _bEOS; BOOL _bEOS;
HRESULT _hrStatus; HRESULT _hrStatus;
IMFTransform* _transform; IMFTransform* _transform;
PixelFormat _pixelformat; PixelFormat _pixelformat;
std::atomic<bool> _isBusy; std::atomic<bool> _isBusy;
}; };