Changeset 2061

Timestamp:

Jun 26, 2008 3:48:14 PM (16 years ago)

Author:

bennylp

Message:

Specifying star in codec selection will select all codecs. Fixed the codec selection in codec.c to select all codecs when empty string is given.

Location:

pjproject/trunk

Files:

• pjmedia/src/pjmedia/codec.c (modified) (1 diff)
• pjsip-apps/src/pjsua/pjsua_app.c (modified) (1 diff)
• pjsip/src/pjsua-lib/pjsua_media.c (modified) (3 diffs)

pjproject/trunk/pjmedia/src/pjmedia/codec.c

@@ -232 +232 @@
     for (i=0; i<mgr->codec_cnt; ++i) {
 
-        if (pj_strnicmp2(codec_id, mgr->codec_desc[i].id, 
+        if (codec_id->slen == 0 ||
+            pj_strnicmp2(codec_id, mgr->codec_desc[i].id, 
                          codec_id->slen) == 0) 
         {

pjproject/trunk/pjsip-apps/src/pjsua/pjsua_app.c

@@ -2774 +2774 @@
 
     puts("");
-    puts("Enter codec name and its new priority (e.g. \"speex/16000 200\"), empty to cancel:");
-
-    printf("Codec name and priority: ");
+    puts("Enter codec id and its new priority "
+         "(e.g. \"speex/16000 200\"), empty to cancel:");
+
+    printf("Codec name (\"*\" for all) and priority: ");
     fgets(input, sizeof(input), stdin);
     if (input[0]=='\r' || input[0]=='\n') {

pjproject/trunk/pjsip/src/pjsua-lib/pjsua_media.c

@@ -2228 +2228 @@
                                               pj_uint8_t priority )
 {
+    const pj_str_t all = { NULL, 0 };
     pjmedia_codec_mgr *codec_mgr;
 
     codec_mgr = pjmedia_endpt_get_codec_mgr(pjsua_var.med_endpt);
+
+    if (codec_id->slen==1 && *codec_id->ptr=='*')
+        codec_id = &all;
 
     return pjmedia_codec_mgr_set_codec_priority(codec_mgr, codec_id, 
@@ -2243 +2247 @@
                                            pjmedia_codec_param *param )
 {
+    const pj_str_t all = { NULL, 0 };
     const pjmedia_codec_info *info;
     pjmedia_codec_mgr *codec_mgr;
@@ -2250 +2255 @@
     codec_mgr = pjmedia_endpt_get_codec_mgr(pjsua_var.med_endpt);
 
+    if (codec_id->slen==1 && *codec_id->ptr=='*')
+        codec_id = &all;
+
     status = pjmedia_codec_mgr_find_codecs_by_id(codec_mgr, codec_id,
                                                  &count, &info, NULL);