ZaneYork
/
zoneminder
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Removed or conditionally commented out V4L2 pix formats that are nopt in older kernels 

git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2740 e3e1d417-86f3-4887-817a-d78f3d33393f
This commit is contained in:
stan 2009-02-04 15:02:47 +00:00
parent cd269623c1
commit 885c090f12
1 changed files with 19 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
src/zm_local_camera.cpp
View File

@ -113,9 +113,11 @@ void LocalCamera::Initialise()
ffPixFormat = PIX_FMT_NONE; ffPixFormat = PIX_FMT_NONE;
switch( palette ) switch( palette )
{ {
#ifdef V4L2_PIX_FMT_RGB444
case V4L2_PIX_FMT_RGB444 : case V4L2_PIX_FMT_RGB444 :
ffPixFormat = PIX_FMT_RGB32; ffPixFormat = PIX_FMT_RGB32;
break; break;
#endif // V4L2_PIX_FMT_RGB444
case V4L2_PIX_FMT_RGB555 : case V4L2_PIX_FMT_RGB555 :
ffPixFormat = PIX_FMT_RGB555; ffPixFormat = PIX_FMT_RGB555;
break; break;
@ -146,9 +148,11 @@ void LocalCamera::Initialise()
case V4L2_PIX_FMT_YUV411P : case V4L2_PIX_FMT_YUV411P :
ffPixFormat = PIX_FMT_YUV411P; ffPixFormat = PIX_FMT_YUV411P;
break; break;
#ifdef V4L2_PIX_FMT_YUV444
case V4L2_PIX_FMT_YUV444 : case V4L2_PIX_FMT_YUV444 :
ffPixFormat = PIX_FMT_YUV444P; ffPixFormat = PIX_FMT_YUV444P;
break; break;
#endif // V4L2_PIX_FMT_YUV444
case V4L2_PIX_FMT_YUV410 : case V4L2_PIX_FMT_YUV410 :
ffPixFormat = PIX_FMT_YUV410P; ffPixFormat = PIX_FMT_YUV410P;
break; break;
@ -164,22 +168,22 @@ void LocalCamera::Initialise()
case V4L2_PIX_FMT_RGB332 : case V4L2_PIX_FMT_RGB332 :
case V4L2_PIX_FMT_RGB555X : case V4L2_PIX_FMT_RGB555X :
case V4L2_PIX_FMT_RGB565X : case V4L2_PIX_FMT_RGB565X :
case V4L2_PIX_FMT_Y16 : //case V4L2_PIX_FMT_Y16 :
case V4L2_PIX_FMT_PAL8 : //case V4L2_PIX_FMT_PAL8 :
case V4L2_PIX_FMT_YVU410 : case V4L2_PIX_FMT_YVU410 :
case V4L2_PIX_FMT_YVU420 : case V4L2_PIX_FMT_YVU420 :
case V4L2_PIX_FMT_Y41P : case V4L2_PIX_FMT_Y41P :
case V4L2_PIX_FMT_YUV555 : //case V4L2_PIX_FMT_YUV555 :
case V4L2_PIX_FMT_YUV565 : //case V4L2_PIX_FMT_YUV565 :
case V4L2_PIX_FMT_YUV32 : //case V4L2_PIX_FMT_YUV32 :
case V4L2_PIX_FMT_NV12 : case V4L2_PIX_FMT_NV12 :
case V4L2_PIX_FMT_NV21 : case V4L2_PIX_FMT_NV21 :
case V4L2_PIX_FMT_YYUV : case V4L2_PIX_FMT_YYUV :
case V4L2_PIX_FMT_HI240 : case V4L2_PIX_FMT_HI240 :
case V4L2_PIX_FMT_HM12 : case V4L2_PIX_FMT_HM12 :
case V4L2_PIX_FMT_SBGGR8 : //case V4L2_PIX_FMT_SBGGR8 :
case V4L2_PIX_FMT_SGBRG8 : //case V4L2_PIX_FMT_SGBRG8 :
case V4L2_PIX_FMT_SBGGR16 : //case V4L2_PIX_FMT_SBGGR16 :
case V4L2_PIX_FMT_MJPEG : case V4L2_PIX_FMT_MJPEG :
case V4L2_PIX_FMT_DV : case V4L2_PIX_FMT_DV :
case V4L2_PIX_FMT_MPEG : case V4L2_PIX_FMT_MPEG :
@ -188,13 +192,13 @@ void LocalCamera::Initialise()
case V4L2_PIX_FMT_PWC1 : case V4L2_PIX_FMT_PWC1 :
case V4L2_PIX_FMT_PWC2 : case V4L2_PIX_FMT_PWC2 :
case V4L2_PIX_FMT_ET61X251 : case V4L2_PIX_FMT_ET61X251 :
case V4L2_PIX_FMT_SPCA501 : //case V4L2_PIX_FMT_SPCA501 :
case V4L2_PIX_FMT_SPCA505 : //case V4L2_PIX_FMT_SPCA505 :
case V4L2_PIX_FMT_SPCA508 : //case V4L2_PIX_FMT_SPCA508 :
case V4L2_PIX_FMT_SPCA561 : //case V4L2_PIX_FMT_SPCA561 :
case V4L2_PIX_FMT_PAC207 : //case V4L2_PIX_FMT_PAC207 :
case V4L2_PIX_FMT_PJPG : //case V4L2_PIX_FMT_PJPG :
case V4L2_PIX_FMT_YVYU : //case V4L2_PIX_FMT_YVYU :
default : default :
{ {
Fatal( "Can't find swscale format for palette %d", palette ); Fatal( "Can't find swscale format for palette %d", palette );