[Sumover-dev] [svn commit] r3948 - vic/branches/mpeg4/video

[sumover-dev at cs.ucl.ac.uk]

Author: barz
Date: Tue Dec  5 10:40:45 2006
New Revision: 3948

Modified:
   vic/branches/mpeg4/video/grabber-v4l2.cpp
   vic/branches/mpeg4/video/grabber-video4linux.cpp

Log:
using s-video as default port

Modified: vic/branches/mpeg4/video/grabber-v4l2.cpp
==============================================================================
--- vic/branches/mpeg4/video/grabber-v4l2.cpp	(original)
+++ vic/branches/mpeg4/video/grabber-v4l2.cpp	Tue Dec  5 10:40:45 2006
@@ -218,6 +218,8 @@
 
                 debug_msg("V4l2:   ports:");
                 strcat(attr,"port { ");
+		char attr_tmp[100]="";
+		
                 for (j = 0; j < 16; j++) {
                         if (-1 == ioctl(fd,VIDIOC_S_INPUT,&j)) {
                                 perror("ioctl VIDIOC_S_INPUT");
@@ -231,8 +233,14 @@
                                         debug_msg(" %s: ",input.name);
                                         for (unsigned int s=0 ; s<strlen((const char*)input.name) ; s++)
                                                 if (input.name[s]==' ') input.name[s]='-';
-                                        strcat(attr,(const char*)input.name);
-                                        strcat(attr," ");
+
+					if(strcasecmp((const char*)input.name, "S-Video")==0){
+					   strcat(attr, (const char*)input.name);
+					   strcat(attr," ");																
+					}else{
+                                           strcat(attr_tmp,(const char*)input.name);
+                                           strcat(attr_tmp," ");
+					}
                                 }
 
                                 pixfmt.index=j;
@@ -242,6 +250,7 @@
                                 } else debug_msg("%s ",pixfmt.description);
                         }
                 }
+		strcat(attr, attr_tmp);
                 debug_msg("\n");
                 strcat(attr,"} ");
 

Modified: vic/branches/mpeg4/video/grabber-video4linux.cpp
==============================================================================
--- vic/branches/mpeg4/video/grabber-video4linux.cpp	(original)
+++ vic/branches/mpeg4/video/grabber-video4linux.cpp	Tue Dec  5 10:40:45 2006
@@ -239,6 +239,9 @@
 
 	debug_msg("V4l:   ports:");
 	strcat(attr, "port { ");
+
+	char attr_tmp[100]="";
+	
 	for (j = 0; j < capability.channels; j++) {
 	    channel.channel = j;
 	    if (-1 == ioctl(fd, VIDIOCGCHAN, &channel)) {
@@ -246,10 +249,18 @@
 	    }
 	    else {
 		debug_msg(" %s", channel.name);
-		strcat(attr, channel.name);
-		strcat(attr, " ");
+		// Using S-Video as default
+		if(strcasecmp(channel.name, "S-Video")==0){
+		  strcat(attr, channel.name);
+		  strcat(attr, " ");
+		}else{
+		  strcat(attr_tmp, channel.name);
+		  strcat(attr_tmp, " ");
+		}
 	    }
 	}
+	strcat(attr, attr_tmp);
+			
 	debug_msg("\n");
 	strcat(attr, "} ");