mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2024-07-10 16:45:55 +00:00
Code Issues 1 Projects Releases Wiki Activity

v4l2: Use #ifdefs for V4L2_PIX_FMT_PJPG

Browse source 
It's only recently added to kernel headers.
This commit is contained in:
David Schleef 2011-03-04 18:37:38 -08:00
parent b69c605c2c
commit 910a6f0c96
1 changed files with 16 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
sys/v4l2/gstv4l2object.c
View file

@ -774,7 +774,9 @@ static const GstV4L2FormatDesc gst_v4l2_formats[] = {
/* compressed formats */ /* compressed formats */
{V4L2_PIX_FMT_MJPEG, TRUE}, {V4L2_PIX_FMT_MJPEG, TRUE},
{V4L2_PIX_FMT_JPEG, TRUE}, {V4L2_PIX_FMT_JPEG, TRUE},
#ifdef V4L2_PIX_FMT_PJPG
{V4L2_PIX_FMT_PJPG, TRUE}, {V4L2_PIX_FMT_PJPG, TRUE},
#endif
{V4L2_PIX_FMT_DV, TRUE}, {V4L2_PIX_FMT_DV, TRUE},
{V4L2_PIX_FMT_MPEG, FALSE}, {V4L2_PIX_FMT_MPEG, FALSE},
@ -815,10 +817,16 @@ gst_v4l2_object_get_format_from_fourcc (GstV4l2Object * v4l2object,
return fmt; return fmt;
/* special case for jpeg */ /* special case for jpeg */
if (fmt->pixelformat == V4L2_PIX_FMT_MJPEG || if (fmt->pixelformat == V4L2_PIX_FMT_MJPEG ||
fmt->pixelformat == V4L2_PIX_FMT_JPEG || fmt->pixelformat == V4L2_PIX_FMT_JPEG
fmt->pixelformat == V4L2_PIX_FMT_PJPG) { #ifdef V4L2_PIX_FMT_PJPG
if (fourcc == V4L2_PIX_FMT_JPEG || fmt->pixelformat == V4L2_PIX_FMT_PJPG
|| fourcc == V4L2_PIX_FMT_MJPEG || fourcc == V4L2_PIX_FMT_PJPG) { #endif
) {
if (fourcc == V4L2_PIX_FMT_JPEG || fourcc == V4L2_PIX_FMT_MJPEG
#ifdef V4L2_PIX_FMT_PJPG
|| fourcc == V4L2_PIX_FMT_PJPG
#endif
) {
return fmt; return fmt;
} }
} }
@ -858,9 +866,11 @@ gst_v4l2_object_format_get_rank (const struct v4l2_fmtdesc *fmt)
switch (fourcc) { switch (fourcc) {
case V4L2_PIX_FMT_MJPEG: case V4L2_PIX_FMT_MJPEG:
#ifdef V4L2_PIX_FMT_PJPG
case V4L2_PIX_FMT_PJPG: case V4L2_PIX_FMT_PJPG:
rank = JPEG_BASE_RANK; rank = JPEG_BASE_RANK;
break; break;
#endif
case V4L2_PIX_FMT_JPEG: case V4L2_PIX_FMT_JPEG:
rank = JPEG_BASE_RANK + 1; rank = JPEG_BASE_RANK + 1;
break; break;
@ -1077,7 +1087,9 @@ gst_v4l2_object_v4l2fourcc_to_structure (guint32 fourcc)
switch (fourcc) { switch (fourcc) {
case V4L2_PIX_FMT_MJPEG: /* Motion-JPEG */ case V4L2_PIX_FMT_MJPEG: /* Motion-JPEG */
#ifdef V4L2_PIX_FMT_PJPG
case V4L2_PIX_FMT_PJPG: /* Progressive-JPEG */ case V4L2_PIX_FMT_PJPG: /* Progressive-JPEG */
#endif
case V4L2_PIX_FMT_JPEG: /* JFIF JPEG */ case V4L2_PIX_FMT_JPEG: /* JFIF JPEG */
structure = gst_structure_new ("image/jpeg", NULL); structure = gst_structure_new ("image/jpeg", NULL);
break; break;