Changeset 5923 for pjproject/trunk/pjsip/src/pjsua2/endpoint.cpp

Timestamp:

Dec 13, 2018 6:57:23 AM (6 years ago)

Author:

nanang

Message:

Re #2168:

• Added a new PJSUA callback on_media_event().
• Added audio device error handling into PJSUA2.

File:

• pjproject/trunk/pjsip/src/pjsua2/endpoint.cpp (modified) (4 diffs)

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

@@ -1431 +1431 @@
     virtual void execute(bool is_pending)
     {
-        Call *call = Call::lookup(call_id);
-        if (!call)
-            return;
-
         if (is_pending) {
             /* Can't do this anymore, pointer is invalid */
@@ -1440 +1436 @@
         }
 
-        call->onCallMediaEvent(prm);
+        if (call_id == PJSUA_INVALID_ID) {
+            OnMediaEventParam prm2;
+            prm2.ev = prm.ev;
+            Endpoint::instance().onMediaEvent(prm2);
+        } else {
+            Call *call = Call::lookup(call_id);
+            
+            if (call)
+                call->onCallMediaEvent(prm);
+        }
     }
 };
+
+void Endpoint::on_media_event(pjmedia_event *event)
+{
+    PendingOnMediaEventCallback *job = new PendingOnMediaEventCallback;
+
+    job->call_id = PJSUA_INVALID_ID;
+    job->prm.medIdx = 0;
+    job->prm.ev.fromPj(*event);
+    
+    Endpoint::instance().utilAddPendingJob(job);
+}
 
 void Endpoint::on_call_media_event(pjsua_call_id call_id,
@@ -1448 +1464 @@
                                    pjmedia_event *event)
 {
-    Call *call = Call::lookup(call_id);
-    if (!call) {
-        return;
-    }
-    
     PendingOnMediaEventCallback *job = new PendingOnMediaEventCallback;
 
@@ -1666 +1677 @@
     ua_cfg.cb.on_call_media_transport_state =
         &Endpoint::on_call_media_transport_state;
+    ua_cfg.cb.on_media_event            = &Endpoint::on_media_event;
     ua_cfg.cb.on_call_media_event       = &Endpoint::on_call_media_event;
     ua_cfg.cb.on_create_media_transport = &Endpoint::on_create_media_transport;