Changeset 5673

Timestamp:

Oct 16, 2017 3:49:22 AM (7 years ago)

Author:

ming

Message:

Re #2045 (misc): Prevent iLBC codec to be initialized more than once

Thanks to Kal Conley for the patch.

File:

• pjproject/trunk/pjmedia/src/pjmedia-codec/ilbc.c (modified) (4 diffs)

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

@@ -178 +178 @@
     PJ_ASSERT_RETURN(mode==0 || mode==20 || mode==30, PJ_EINVAL);
 
+    if (ilbc_factory.endpt != NULL) {
+        /* Already initialized. */
+        return PJ_SUCCESS;
+    }
+
     /* Create iLBC codec factory. */
     ilbc_factory.base.op = &ilbc_factory_op;
@@ -189 +194 @@
 
     if (mode == 20) {
-        ilbc_factory.bps = 15200;       
+        ilbc_factory.bps = 15200;
     } else {
         ilbc_factory.bps = 13333;
@@ -196 +201 @@
     /* Get the codec manager. */
     codec_mgr = pjmedia_endpt_get_codec_mgr(endpt);
-    if (!codec_mgr)
+    if (!codec_mgr) {
+        ilbc_factory.endpt = NULL;
         return PJ_EINVALIDOP;
+    }
 
     /* Register codec factory to endpoint. */
     status = pjmedia_codec_mgr_register_factory(codec_mgr, 
                                                 &ilbc_factory.base);
-    if (status != PJ_SUCCESS)
+    if (status != PJ_SUCCESS) {
+        ilbc_factory.endpt = NULL;
         return status;
-
+    }
 
     /* Done. */
@@ -221 +229 @@
     pj_status_t status;
 
+    if (ilbc_factory.endpt == NULL) {
+        /* Not registered. */
+        return PJ_SUCCESS;
+    }
 
     /* Get the codec manager. */