Changeset 193:ce62e330a677 in mediastreamer2

Timestamp:

Dec 5, 2008 2:56:56 PM (4 years ago)

Author:

smorlat <smorlat@…>

Branch:

default

Message:

allow to disable video preview when video is enabled.

git-svn-id: ​svn+ssh://svn.savannah.nongnu.org/linphone/trunk@196 3f6dc0c8-ddfe-455d-9043-3cd528dc4637

Location:

linphone

Files:

• console/linphonec.c (modified) (3 diffs)
• coreapi/linphonecore.c (modified) (1 diff)
• gtk-glade/main.c (modified) (1 diff)
• mediastreamer2/src/alsa.c (modified) (3 diffs)
• mediastreamer2/src/msv4l.c (modified) (1 diff)

linphone/console/linphonec.c

@@ -116 +116 @@
 static bool_t vcap_enabled=FALSE;
 static bool_t display_enabled=FALSE;
+static bool_t preview_enabled=FALSE;
 static bool_t show_general_state=FALSE;
 LPC_AUTH_STACK auth_stack;
@@ -480 +481 @@
                             NULL);
         linphone_core_enable_video(&linphonec,vcap_enabled,display_enabled);
-        if (!(vcap_enabled || display_enabled)) printf("Warning: video is disabled in linphonec.\n");
+        linphone_core_enable_video_preview(&linphonec,preview_enabled);
+        if (!(vcap_enabled || display_enabled)) printf("Warning: video is disabled in linphonec, use -V or -C or -D to enable.\n");
 #ifdef HAVE_READLINE
         /*
@@ -861 +863 @@
                         display_enabled = TRUE;
                         vcap_enabled = TRUE;
+                        preview_enabled=TRUE;
                 }
                 else if ((strncmp ("-v", argv[arg_num], 2) == 0)

linphone/coreapi/linphonecore.c

@@ -1979 +1979 @@
         lc->video_conf.capture=vcap_enabled;
         lc->video_conf.display=display_enabled;
-        if (vcap_enabled && display_enabled)
-                lc->video_conf.show_local=1;
-        else
-                lc->video_conf.show_local=0;
 
         /* need to re-apply network bandwidth settings*/

linphone/gtk-glade/main.c

@@ -374 +374 @@
 void linphone_gtk_set_audio_video(){
         linphone_core_enable_video(linphone_gtk_get_core(),TRUE,TRUE);
+        linphone_core_enable_video_preview(linphone_gtk_get_core(),TRUE);
 }
 
 void linphone_gtk_set_audio_only(){
         linphone_core_enable_video(linphone_gtk_get_core(),FALSE,FALSE);
+        linphone_core_enable_video_preview(linphone_gtk_get_core(),FALSE);
 }
 

linphone/mediastreamer2/src/alsa.c

@@ -282 +282 @@
 }
 
-static int alsa_can_read(snd_pcm_t *dev, int frames)
+static int alsa_can_read(snd_pcm_t *dev)
 {
         snd_pcm_sframes_t avail;
@@ -288 +288 @@
 
         avail = snd_pcm_avail_update(dev);
-        ms_debug("*** %s %d %d", __FUNCTION__, (long)avail, frames);
         if (avail < 0) {
                 ms_error("snd_pcm_avail_update: %s", snd_strerror(avail));      // most probably -EPIPE
@@ -832 +831 @@
         }
         if (ad->handle==NULL) return;
-        while (alsa_can_read(ad->handle,samples)>=samples){
+        while (alsa_can_read(ad->handle)>=samples){
           
                 int size=samples*2;

linphone/mediastreamer2/src/msv4l.c

@@ -540 +540 @@
         }
 
-        ms_message("Found %s device. (maxsize=%ix%i)",cap.name, cap.maxwidth, cap.maxheight);
+        ms_message("Found %s device. (maxsize=%ix%i, minsize=%ix%i)",cap.name, cap.maxwidth, cap.maxheight,
+                        cap.minwidth, cap.minheight);
         for (i=0;i<cap.channels;i++)
         {