Changeset 5513 for pjproject/branches/projects/uwp/pjmedia/src/pjmedia/transport_adapter_sample.c

Timestamp:

Dec 28, 2016 3:40:07 AM (7 years ago)

Author:

nanang

Message:

Re #1900: More merged from trunk (r5512 mistakenly contains merged changes in third-party dir only).

Location:

pjproject/branches/projects/uwp

Files:

• . (modified) (1 prop)
• pjmedia/src/pjmedia/transport_adapter_sample.c (modified) (7 diffs)

pjproject/branches/projects/uwp/pjmedia/src/pjmedia/transport_adapter_sample.c

@@ -27 +27 @@
 static pj_status_t transport_get_info (pjmedia_transport *tp,
                                        pjmedia_transport_info *info);
-static pj_status_t transport_attach   (pjmedia_transport *tp,
-                                       void *user_data,
-                                       const pj_sockaddr_t *rem_addr,
-                                       const pj_sockaddr_t *rem_rtcp,
-                                       unsigned addr_len,
-                                       void (*rtp_cb)(void*,
-                                                      void*,
-                                                      pj_ssize_t),
-                                       void (*rtcp_cb)(void*,
-                                                       void*,
-                                                       pj_ssize_t));
+static pj_status_t transport_attach2  (pjmedia_transport *tp,
+                                       pjmedia_transport_attach_param *att_prm);
 static void        transport_detach   (pjmedia_transport *tp,
                                        void *strm);
@@ -77 +68 @@
 {
     &transport_get_info,
-    &transport_attach,
+    NULL,
     &transport_detach,
     &transport_send_rtp,
@@ -87 +78 @@
     &transport_media_stop,
     &transport_simulate_lost,
-    &transport_destroy
+    &transport_destroy,
+    &transport_attach2,
 };
 
@@ -101 +93 @@
     /* Stream information. */
     void                *stream_user_data;
+    void                *stream_ref;
     void               (*stream_rtp_cb)(void *user_data,
                                         void *pkt,
@@ -191 +184 @@
 }
 
-
-/*
- * attach() is called by stream to register callbacks that we should
+/*
+ * attach2() is called by stream to register callbacks that we should
  * call on receipt of RTP and RTCP packets.
  */
-static pj_status_t transport_attach(pjmedia_transport *tp,
-                                    void *user_data,
-                                    const pj_sockaddr_t *rem_addr,
-                                    const pj_sockaddr_t *rem_rtcp,
-                                    unsigned addr_len,
-                                    void (*rtp_cb)(void*,
-                                                   void*,
-                                                   pj_ssize_t),
-                                    void (*rtcp_cb)(void*,
-                                                    void*,
-                                                    pj_ssize_t))
+static pj_status_t transport_attach2(pjmedia_transport *tp,
+                                     pjmedia_transport_attach_param *att_param)
 {
     struct tp_adapter *adapter = (struct tp_adapter*)tp;
@@ -216 +199 @@
      */
     pj_assert(adapter->stream_user_data == NULL);
-    adapter->stream_user_data = user_data;
-    adapter->stream_rtp_cb = rtp_cb;
-    adapter->stream_rtcp_cb = rtcp_cb;
-
-    status = pjmedia_transport_attach(adapter->slave_tp, adapter, rem_addr,
-                                      rem_rtcp, addr_len, &transport_rtp_cb,
-                                      &transport_rtcp_cb);
+    adapter->stream_user_data = att_param->user_data;
+    adapter->stream_rtp_cb = att_param->rtp_cb;
+    adapter->stream_rtcp_cb = att_param->rtcp_cb;
+    adapter->stream_ref = att_param->stream;
+
+    att_param->rtp_cb = &transport_rtp_cb;
+    att_param->rtcp_cb = &transport_rtcp_cb;
+    att_param->user_data = adapter;
+        
+    status = pjmedia_transport_attach2(adapter->slave_tp, att_param);
     if (status != PJ_SUCCESS) {
         adapter->stream_user_data = NULL;
         adapter->stream_rtp_cb = NULL;
         adapter->stream_rtcp_cb = NULL;
+        adapter->stream_ref = NULL;
         return status;
     }
@@ -248 +235 @@
         adapter->stream_rtp_cb = NULL;
         adapter->stream_rtcp_cb = NULL;
+        adapter->stream_ref = NULL;
     }
 }