Changeset 752:6c5818bde02d in mediastreamer2

Timestamp:

Oct 27, 2009 10:01:14 PM (4 years ago)

Author:

smorlat <smorlat@…>

Branch:

default

Message:

linphonec patches from Peter Meerwald - bugfix and new 'codec' command.

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

File:

• linphone/console/commands.c (modified) (8 diffs)

linphone/console/commands.c

@@ -33 +33 @@
 #include <linphonecore.h>
 #include "linphonec.h"
+#include "private.h"
 
 #ifndef WIN32
@@ -70 +71 @@
 static int lpc_cmd_ports(LinphoneCore *lc, char *args);
 static int lpc_cmd_speak(LinphoneCore *lc, char *args);
+static int lpc_cmd_codec(LinphoneCore *lc, char *args);
 
 /* Command handler helpers */
@@ -86 +88 @@
 #endif
 static int linphonec_friend_delete(LinphoneCore *lc, int num);
+static int linphonec_friend_delete(LinphoneCore *lc, int num);
+static void linphonec_codec_list(LinphoneCore *lc);
+static void linphonec_codec_enable(LinphoneCore *lc, int index);
+static void linphonec_codec_disable(LinphoneCore *lc, int index);
 
 
@@ -108 +114 @@
         { "help", lpc_cmd_help, "Print commands help", NULL },
         { "call", lpc_cmd_call, "Call a SIP uri",
-                "'call <sip-url>' or 'c <sip-url>' "
+                "'call <sip-url>' "
                 ": initiate a call to the specified destination."
                 },
@@ -192 +198 @@
                         "Example for english voice: 'speak default Hello my friend !'"
         },
+    { "codec", lpc_cmd_codec, "Codec configuration",
+            "'codec list' : list codecs\n"  
+            "'codec enable <index>' : enable available codec\n"  
+            "'codec disable <index>' : disable codecs" }, 
+
         { (char *)NULL, (lpc_cmd_handler)NULL, (char *)NULL, (char *)NULL }
 };
@@ -1342 +1353 @@
         LinphoneProxyConfig *cfg;
         const MSList *elem;
+    if (!args) return 0;
         passwd[0]=proxy[0]=identity[0]='\0';
         sscanf(args,"%s %s %s",identity,proxy,passwd);
@@ -1489 +1501 @@
         int status;
         FILE *file;
+    if (!args) return 0;
         memset(voice,0,sizeof(voice));
         sscanf(args,"%s63",voice);
@@ -1512 +1525 @@
 }
 
+static int lpc_cmd_codec(LinphoneCore *lc, char *args){
+        char *arg1 = args;
+        char *arg2 = NULL;
+        char *ptr = args;
+
+        if (!args) return 0;
+
+        /* Isolate first and second arg */
+        while(*ptr && !isspace(*ptr)) ++ptr;
+        if ( *ptr )
+        {
+                *ptr='\0';
+                arg2=ptr+1;
+                while(*arg2 && isspace(*arg2)) ++arg2;
+        }
+
+        if (strcmp(arg1,"enable")==0)
+        {
+#ifdef HAVE_READLINE
+                rl_inhibit_completion=1;
+#endif
+        if (!strcmp(arg2,"all")) linphonec_codec_enable(lc,-1);
+        else linphonec_codec_enable(lc,atoi(arg2));
+#ifdef HAVE_READLINE
+                rl_inhibit_completion=0;
+#endif
+        }
+        else if (strcmp(arg1,"list")==0)
+        {
+                linphonec_codec_list(lc);
+        }
+        else if (strcmp(arg1,"disable")==0)
+        {
+        if (!strcmp(arg2,"all")) linphonec_codec_disable(lc,-1);
+        else linphonec_codec_disable(lc,atoi(arg2));
+        }
+        else
+        {
+                return 0; /* syntax error */
+        }
+
+        return 1;
+}
+
+static void linphonec_codec_list(LinphoneCore *lc){
+        PayloadType *pt;
+    codecs_config_t *config=&lc->codecs_conf;
+        int index=0;
+        MSList *node;
+        for(node=config->audio_codecs;node!=NULL;node=ms_list_next(node)){
+                pt=(PayloadType*)(node->data);
+        linphonec_out("%2d: %s (%d) %s\n", index, pt->mime_type, pt->clock_rate, payload_type_enabled(pt) ? "enabled" : "disabled");
+                index++;
+        }
+}
+
+static void linphonec_codec_enable(LinphoneCore *lc, int sel_index){
+        PayloadType *pt;
+    codecs_config_t *config=&lc->codecs_conf;
+        int index=0;
+        MSList *node;
+    for(node=config->audio_codecs;node!=NULL;node=ms_list_next(node)){
+        if (index == sel_index || sel_index == -1) {
+                    pt=(PayloadType*)(node->data);
+            pt->flags|=PAYLOAD_TYPE_ENABLED;
+            linphonec_out("%2d: %s (%d) %s\n", index, pt->mime_type, pt->clock_rate, "enabled");
+        }
+                index++;
+        }
+}
+
+static void linphonec_codec_disable(LinphoneCore *lc, int sel_index){
+        PayloadType *pt;
+    codecs_config_t *config=&lc->codecs_conf;
+        int index=0;
+        MSList *node;
+        for(node=config->audio_codecs;node!=NULL;node=ms_list_next(node)){
+        if (index == sel_index || sel_index == -1) {
+                pt=(PayloadType*)(node->data);
+            pt->flags&=~PAYLOAD_TYPE_ENABLED;
+            linphonec_out("%2d: %s (%d) %s\n", index, pt->mime_type, pt->clock_rate, "disabled");
+        }
+                index++;
+        }
+}
+
 /***************************************************************************
  *