Changeset 5976

Timestamp:

May 6, 2019 10:05:03 AM (6 years ago)

Author:

ming

Message:

Fixed #2194: onStreamDestroyed callback is not called upon call disconnection

Location:

pjproject/trunk/pjsip/src/pjsua2

Files:

• call.cpp (modified) (2 diffs)
• endpoint.cpp (modified) (1 diff)

pjproject/trunk/pjsip/src/pjsua2/call.cpp

@@ -25 +25 @@
 using namespace pj;
 using namespace std;
+
+#include <pjsua-lib/pjsua_internal.h>
 
 #define THIS_FILE               "call.cpp"
@@ -901 +903 @@
         pj_ci.state == PJSIP_INV_STATE_DISCONNECTED)
     {
+        pjsua_call *call = &pjsua_var.calls[id];
+
+        /* We are going to remove the Call object association below,
+         * so we need to call onStreamDestroyed() callback here.
+         */
+        for (mi = 0; mi < call->med_cnt; ++mi) {
+            pjsua_call_media *call_med = &call->media[mi];
+            if (call_med->type == PJMEDIA_TYPE_AUDIO &&
+                call_med->strm.a.stream)
+            {
+                OnStreamDestroyedParam prm;
+                prm.stream = call_med->strm.a.stream;
+                prm.streamIdx = mi;
+    
+                onStreamDestroyed(prm);         
+            }
+        }
+
         /* Clear medias. */
         for (mi = 0; mi < medias.size(); mi++) {

pjproject/trunk/pjsip/src/pjsua2/endpoint.cpp

@@ -1119 +1119 @@
     Call *call = Call::lookup(call_id);
     if (!call) {
+        /* This can happen for call disconnection case. The callback
+         * should have been called from on_call_state() instead.
+         */
         return;
     }