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

Timestamp:

Oct 24, 2017 7:31:39 AM (7 years ago)

Author:

ming

Message:

Fixed #2052: Add option for pjsua callback on_stream_created to destroy application's supplied media port

File:

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

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

@@ -1071 +1071 @@
 }
 
-void Endpoint::on_stream_created(pjsua_call_id call_id,
-                                 pjmedia_stream *strm,
-                                 unsigned stream_idx,
-                                 pjmedia_port **p_port)
+void Endpoint::on_stream_created2(pjsua_call_id call_id,
+                                  pjsua_on_stream_created_param *param)
 {
     Call *call = Call::lookup(call_id);
@@ -1082 +1080 @@
     
     OnStreamCreatedParam prm;
-    prm.stream = strm;
-    prm.streamIdx = stream_idx;
-    prm.pPort = (void *)*p_port;
+    prm.stream = param->stream;
+    prm.streamIdx = param->stream_idx;
+    prm.destroyPort = param->destroy_port;
+    prm.pPort = (MediaPort)param->port;
     
     call->onStreamCreated(prm);
     
-    if (prm.pPort != (void *)*p_port)
-        *p_port = (pjmedia_port *)prm.pPort;
+    param->destroy_port = prm.destroyPort;
+    param->port = (pjmedia_port *)prm.pPort;
 }
 
@@ -1558 +1557 @@
     ua_cfg.cb.on_call_media_state       = &Endpoint::on_call_media_state;
     ua_cfg.cb.on_call_sdp_created       = &Endpoint::on_call_sdp_created;
-    ua_cfg.cb.on_stream_created         = &Endpoint::on_stream_created;
+    ua_cfg.cb.on_stream_created2        = &Endpoint::on_stream_created2;
     ua_cfg.cb.on_stream_destroyed       = &Endpoint::on_stream_destroyed;
     ua_cfg.cb.on_dtmf_digit             = &Endpoint::on_dtmf_digit;