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

Revert "Add BGR16 to V42L"

Browse Source 
This reverts commit 42975380f47a30a09f06d7dee7440b64b93aa305.
This commit is contained in:
LordGrey 2024-06-01 16:22:42 +02:00
parent 42975380f4
commit 912abd9fdf
1 changed files with 2 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
libsrc/grabber/video/v4l2/V4L2Grabber.cpp
View File

@ -57,7 +57,6 @@ static PixelFormat GetPixelFormat(const unsigned int format)
if (format == V4L2_PIX_FMT_BGR32) return PixelFormat::BGR32; if (format == V4L2_PIX_FMT_BGR32) return PixelFormat::BGR32;
if (format == V4L2_PIX_FMT_RGB24) return PixelFormat::RGB24; if (format == V4L2_PIX_FMT_RGB24) return PixelFormat::RGB24;
if (format == V4L2_PIX_FMT_BGR24) return PixelFormat::BGR24; if (format == V4L2_PIX_FMT_BGR24) return PixelFormat::BGR24;
if (format == V4L2_PIX_FMT_BGR16) return PixelFormat::BGR16;
if (format == V4L2_PIX_FMT_YUYV) return PixelFormat::YUYV; if (format == V4L2_PIX_FMT_YUYV) return PixelFormat::YUYV;
if (format == V4L2_PIX_FMT_UYVY) return PixelFormat::UYVY; if (format == V4L2_PIX_FMT_UYVY) return PixelFormat::UYVY;
if (format == V4L2_PIX_FMT_NV12) return PixelFormat::NV12; if (format == V4L2_PIX_FMT_NV12) return PixelFormat::NV12;
@ -572,10 +571,6 @@ void V4L2Grabber::init_device(VideoStandard videoStandard)
fmt.fmt.pix.pixelformat = V4L2_PIX_FMT_BGR24; fmt.fmt.pix.pixelformat = V4L2_PIX_FMT_BGR24;
break; break;
case PixelFormat::BGR16:
fmt.fmt.pix.pixelformat = V4L2_PIX_FMT_BGR16;
break;
case PixelFormat::YUYV: case PixelFormat::YUYV:
fmt.fmt.pix.pixelformat = V4L2_PIX_FMT_YUYV; fmt.fmt.pix.pixelformat = V4L2_PIX_FMT_YUYV;
break; break;
@ -730,14 +725,6 @@ void V4L2Grabber::init_device(VideoStandard videoStandard)
} }
break; break;
case V4L2_PIX_FMT_BGR16:
{
_pixelFormat = PixelFormat::BGR16;
_frameByteSize = _width * _height * 2;
Debug(_log, "Pixel format=BGR16");
}
break;
case V4L2_PIX_FMT_YUYV: case V4L2_PIX_FMT_YUYV:
{ {
_pixelFormat = PixelFormat::YUYV; _pixelFormat = PixelFormat::YUYV;
@ -781,9 +768,9 @@ void V4L2Grabber::init_device(VideoStandard videoStandard)
default: default:
#ifdef HAVE_TURBO_JPEG #ifdef HAVE_TURBO_JPEG
throw_exception("Only pixel formats RGB32, BGR32, RGB24, BGR24, BGR16, YUYV, UYVY, NV12, I420 and MJPEG are supported"); throw_exception("Only pixel formats RGB32, BGR32, RGB24, BGR24, YUYV, UYVY, NV12, I420 and MJPEG are supported");
#else #else
throw_exception("Only pixel formats RGB32, BGR32, RGB24, BGR24, BGR16, YUYV, UYVY, NV12 and I420 are supported"); throw_exception("Only pixel formats RGB32, BGR32, RGB24, BGR24, YUYV, UYVY, NV12 and I420 are supported");
#endif #endif
return; return;
} }