[svn-commits] rizzo: branch rizzo/video_v2 r84126 - /team/rizzo/video_v2/channels/

[SVN commits to the Digium repositories]

Author: rizzo
Date: Sat Sep 29 12:05:27 2007
New Revision: 84126

URL: http://svn.digium.com/view/asterisk?view=rev&rev=84126
Log:
Re-enable v4l support, erroneously commented out.
Make the 'X11' grabber name case-insensitive.


Modified:
    team/rizzo/video_v2/channels/console_video.c

Modified: team/rizzo/video_v2/channels/console_video.c
URL: http://svn.digium.com/view/asterisk/team/rizzo/video_v2/channels/console_video.c?view=diff&rev=84126&r1=84125&r2=84126
==============================================================================
--- team/rizzo/video_v2/channels/console_video.c (original)
+++ team/rizzo/video_v2/channels/console_video.c Sat Sep 29 12:05:27 2007
@@ -18,7 +18,7 @@
 
 
 //#define DROP_PACKETS 5       // if set, simulate this percentage of lost video packets
-//#define HAVE_V4L	1
+#define HAVE_V4L	1
 #define HAVE_SDL	1
 #define HAVE_FFMPEG	1
 #define OLD_FFMPEG	1	/* set for old ffmpeg with no swscale */
@@ -307,7 +307,7 @@
 	/*
 	 * if the device is "X11", then open the x11 grabber
 	 */
-    if (!strcmp(v->device, "X11")) {
+    if (!strcasecmp(v->device, "X11")) {
 	int x_ofs = 0;
 	int y_ofs = 0;
 	XImage *im;
@@ -389,6 +389,7 @@
 			b->size);
 		goto error;
 	}
+	ast_log(LOG_WARNING, "success opening camera\n");
     }
 #endif /* HAVE_V4L */
 
@@ -1136,7 +1137,7 @@
 	struct fbuf_t *b = &v->enc_out;
 
 	if (!v->loc_src.data) {
-		ast_log(LOG_WARNING, "fail, no buffer\n");
+		ast_log(LOG_WARNING, "fail, no loc_src buffer\n");
 		return NULL;
 	}