summaryrefslogtreecommitdiff
path: root/sys
diff options
context:
space:
mode:
authorSjoerd Simons <sjoerd@greynoise.nl>2013-02-03 14:31:13 +0100
committerSjoerd Simons <sjoerd@luon.net>2013-02-11 22:05:00 +0100
commit8ea208548420b94d1c66ff00af4bcba185b7a48e (patch)
tree7cfdc889a26bb315bcf81821d2169c07ec42d18e /sys
parentadb6aa6b724de4c239c7feaafa6afcd63feb01dc (diff)
downloadgstreamer-plugins-bad-8ea208548420b94d1c66ff00af4bcba185b7a48e.tar.gz
uvch264: Add image/jpg to vfsrc and vidsrc caps
Diffstat (limited to 'sys')
-rw-r--r--sys/uvch264/gstuvch264_src.c11
1 files changed, 9 insertions, 2 deletions
diff --git a/sys/uvch264/gstuvch264_src.c b/sys/uvch264/gstuvch264_src.c
index 87b647434..9206eba57 100644
--- a/sys/uvch264/gstuvch264_src.c
+++ b/sys/uvch264/gstuvch264_src.c
@@ -156,8 +156,15 @@ GST_DEBUG_CATEGORY (uvc_h264_src_debug);
#define gst_uvc_h264_src_parent_class parent_class
G_DEFINE_TYPE (GstUvcH264Src, gst_uvc_h264_src, GST_TYPE_BASE_CAMERA_SRC);
+#define GST_UVC_H264_SRC_VF_CAPS_STR \
+ GST_VIDEO_CAPS_MAKE (GST_VIDEO_FORMATS_ALL) ";" \
+ "image/jpeg," \
+ "width = " GST_VIDEO_SIZE_RANGE "," \
+ "height = " GST_VIDEO_SIZE_RANGE "," \
+ "framerate = " GST_VIDEO_FPS_RANGE
+
#define GST_UVC_H264_SRC_VID_CAPS_STR \
- GST_VIDEO_CAPS_MAKE (GST_VIDEO_FORMATS_ALL) ";" \
+ GST_UVC_H264_SRC_VF_CAPS_STR ";" \
"video/x-h264, " \
"width = " GST_VIDEO_SIZE_RANGE ", " \
"height = " GST_VIDEO_SIZE_RANGE ", " \
@@ -170,7 +177,7 @@ static GstStaticPadTemplate vfsrc_template =
GST_STATIC_PAD_TEMPLATE (GST_BASE_CAMERA_SRC_VIEWFINDER_PAD_NAME,
GST_PAD_SRC,
GST_PAD_ALWAYS,
- GST_STATIC_CAPS (GST_VIDEO_CAPS_MAKE (GST_VIDEO_FORMATS_ALL)));
+ GST_STATIC_CAPS (GST_UVC_H264_SRC_VF_CAPS_STR));
static GstStaticPadTemplate imgsrc_template =
GST_STATIC_PAD_TEMPLATE (GST_BASE_CAMERA_SRC_IMAGE_PAD_NAME,