Changeset 5489

Timestamp:

Nov 23, 2016 8:15:49 AM (8 years ago)

Author:

riza

Message:

Re #1945: Change the error message on pjsua_media_channel_update() when unknown/unsupported media type is found.

Location:

pjproject/trunk

Files:

• pjmedia/include/pjmedia/errno.h (modified) (1 diff)
• pjmedia/src/pjmedia/errno.c (modified) (1 diff)
• pjsip/src/pjsua-lib/pjsua_media.c (modified) (2 diffs)

pjproject/trunk/pjmedia/include/pjmedia/errno.h

@@ -407 +407 @@
  */
 #define PJMEDIA_EBADFMT             (PJMEDIA_ERRNO_START+108)    /* 220108 */
-
+/**
+ * @hideinitializer
+ * Unsupported media type.
+ */
+#define PJMEDIA_EUNSUPMEDIATYPE     (PJMEDIA_ERRNO_START+109)    /* 220109 */
 
 /************************************************************

pjproject/trunk/pjmedia/src/pjmedia/errno.c

@@ -118 +118 @@
     PJ_BUILD_ERR( PJMEDIA_RTP_EREMNORFC2833,"Remote does not support RFC 2833" ),
     PJ_BUILD_ERR( PJMEDIA_EBADFMT,          "Bad format"),
+    PJ_BUILD_ERR( PJMEDIA_EUNSUPMEDIATYPE,  "Unsupported media type"),
 
     /* RTP session errors. */

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

@@ -3233 +3233 @@
 #endif
         } else {
-            status = PJMEDIA_EINVALIMEDIATYPE;
+            status = PJMEDIA_EUNSUPMEDIATYPE;
         }
 
@@ -3262 +3262 @@
             call_med->dir = PJMEDIA_DIR_NONE;
 
-            PJ_PERROR(1,(THIS_FILE, status, "Error updating media call%02d:%d",
-                         call_id, mi));
+            if (status != PJMEDIA_EUNSUPMEDIATYPE) {
+                PJ_PERROR(1, (THIS_FILE, status, "Error updating media "
+                              "call%02d:%d", call_id, mi));
+            } else {
+                PJ_PERROR(3, (THIS_FILE, status, "Skipped updating media "
+                              "call%02d:%d (media type=%s)", call_id, mi, 
+                              pjmedia_type_name(call_med->type)));
+            }
+
         } else {
             /* Only set 'got_media' flag if this media is not disabled */