summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorOlivier CrĂȘte <olivier.crete@collabora.co.uk>2010-09-09 11:24:57 (GMT)
committerOlivier CrĂȘte <olivier.crete@collabora.co.uk>2010-09-09 11:24:57 (GMT)
commitb37db82922e35133104d9237b0bf9590c41cf51a (patch)
tree9f72b3103487a900d4935b0b124bf12efbc0478a
parent1d6d626cae85cba8e00bec6bf1100064b91f45c6 (diff)
downloadtelepathy-stream-engine-b37db82922e35133104d9237b0bf9590c41cf51a.tar.gz
telepathy-stream-engine-b37db82922e35133104d9237b0bf9590c41cf51a.tar.xz
Switch to subdevsrc
-rw-r--r--gstelements.conf3
-rw-r--r--src/tp-stream-engine.c6
2 files changed, 6 insertions, 3 deletions
diff --git a/gstelements.conf b/gstelements.conf
index b6ddc69..f7a9f43 100644
--- a/gstelements.conf
+++ b/gstelements.conf
@@ -18,6 +18,9 @@ device=/dev/video1
queue-size=8
driver-name=omap3cam
+[subdevsrc]
+camera-device=1
+
[rtph264pay]
spspps-interval=3
config-interval=3
diff --git a/src/tp-stream-engine.c b/src/tp-stream-engine.c
index 0cc946e..8f44278 100644
--- a/src/tp-stream-engine.c
+++ b/src/tp-stream-engine.c
@@ -1383,13 +1383,13 @@ make_video_src (TpStreamEngine *self)
videosrc = gst_element_factory_make ("gconfvideosrc", NULL);
if (videosrc == NULL)
- videosrc = gst_element_factory_make ("v4l2camsrc", NULL);
+ videosrc = gst_element_factory_make ("subdevsrc", NULL);
if (videosrc == NULL)
- videosrc = gst_element_factory_make ("v4l2src", NULL);
+ videosrc = gst_element_factory_make ("v4l2camsrc", NULL);
if (videosrc == NULL)
- videosrc = gst_element_factory_make ("v4lsrc", NULL);
+ videosrc = gst_element_factory_make ("v4l2src", NULL);
if (videosrc != NULL)
{