[chronojump] Use avfvideosrc instead of osxvideosrc



commit c2eba8a1566d556ae94e7f6697f6e79ab11d8167
Author: Andoni Morales Alastruey <ylatuya gmail com>
Date:   Fri Feb 27 22:19:10 2015 +0100

    Use avfvideosrc instead of osxvideosrc

 libcesarplayer/common.h              |    4 ++--
 libcesarplayer/gst-camera-capturer.c |    6 ++++--
 2 files changed, 6 insertions(+), 4 deletions(-)
---
diff --git a/libcesarplayer/common.h b/libcesarplayer/common.h
index c524ac8..5b8cb2b 100644
--- a/libcesarplayer/common.h
+++ b/libcesarplayer/common.h
@@ -38,8 +38,8 @@
 #define SYSVIDEOSRC "dshowvideosrc"
 #define AUDIOSRC "dshowaudiosrc"
 #elif defined(OSTYPE_OS_X)
-#define DVVIDEOSRC "osxvideosrc"
-#define SYSVIDEOSRC "osxvideosrc"
+#define DVVIDEOSRC "avfvideosrc"
+#define SYSVIDEOSRC "avfvideosrc"
 #define AUDIOSRC "osxaudiosrc"
 #elif defined(OSTYPE_LINUX)
 #define DVVIDEOSRC "dv1394src"
diff --git a/libcesarplayer/gst-camera-capturer.c b/libcesarplayer/gst-camera-capturer.c
index e055d84..b875b09 100644
--- a/libcesarplayer/gst-camera-capturer.c
+++ b/libcesarplayer/gst-camera-capturer.c
@@ -662,7 +662,8 @@ gst_camera_capturer_update_device_id (GstCameraCapturer *gcc)
 
   if (!g_strcmp0 (gcc->priv->source_element_name, "dv1394src"))
     prop_name = "guid";
-  else if (!g_strcmp0 (gcc->priv->source_element_name, "v4l2src"))
+  else if (!g_strcmp0 (gcc->priv->source_element_name, "v4l2src") ||
+      !g_strcmp0 (gcc->priv->source_element_name, "avfvideosrc"))
     prop_name = "device";
   else if (!g_strcmp0 (gcc->priv->source_element_name, "gsettingsvideosrc"))
     prop_name = NULL;
@@ -1765,7 +1766,8 @@ gst_camera_capturer_enum_devices (gchar * device_name)
   if (!g_strcmp0 (device_name, "dv1394src"))
     prop_name = "guid";
   else if (!g_strcmp0 (device_name, "v4l2src") ||
-      !g_strcmp0 (device_name, "osxvideosrc"))
+      !g_strcmp0 (device_name, "osxvideosrc")  ||
+      !g_strcmp0 (device_name, "avfvideosrc"))
     prop_name = "device";
   else
     prop_name = "device-name";


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]