Changeset 5897

Timestamp:

Oct 16, 2018 12:03:21 PM (6 years ago)

Author:

ming

Message:

Fixed #2157: Update media transport adapter sample

File:

• pjproject/trunk/pjmedia/src/pjmedia/transport_adapter_sample.c (modified) (4 diffs)

pjproject/trunk/pjmedia/src/pjmedia/transport_adapter_sample.c

@@ -97 +97 @@
                                         void *pkt,
                                         pj_ssize_t);
+    void               (*stream_rtp_cb2)(pjmedia_tp_cb_param *param);
     void               (*stream_rtcp_cb)(void *user_data,
                                          void *pkt,
@@ -161 +162 @@
  * receives RTP packet.
  */
-static void transport_rtp_cb(void *user_data, void *pkt, pj_ssize_t size)
-{
-    struct tp_adapter *adapter = (struct tp_adapter*)user_data;
-
-    pj_assert(adapter->stream_rtp_cb != NULL);
+static void transport_rtp_cb2(pjmedia_tp_cb_param *param)
+{
+    struct tp_adapter *adapter = (struct tp_adapter*)param->user_data;
+
+    pj_assert(adapter->stream_rtp_cb != NULL ||
+              adapter->stream_rtp_cb2 != NULL);
 
     /* Call stream's callback */
-    adapter->stream_rtp_cb(adapter->stream_user_data, pkt, size);
+    if (adapter->stream_rtp_cb2) {
+        pjmedia_tp_cb_param cbparam;
+        
+        pj_memcpy(&cbparam, param, sizeof(cbparam));
+        cbparam.user_data = adapter->stream_user_data;
+        adapter->stream_rtp_cb2(&cbparam);
+    } else {
+        adapter->stream_rtp_cb(adapter->stream_user_data, param->pkt,
+                               param->size);
+    }
 }
 
@@ -200 +211 @@
     pj_assert(adapter->stream_user_data == NULL);
     adapter->stream_user_data = att_param->user_data;
-    adapter->stream_rtp_cb = att_param->rtp_cb;
+    if (att_param->rtp_cb) {
+        adapter->stream_rtp_cb = att_param->rtp_cb;
+    } else {
+        adapter->stream_rtp_cb2 = att_param->rtp_cb2;
+    }
     adapter->stream_rtcp_cb = att_param->rtcp_cb;
     adapter->stream_ref = att_param->stream;
 
-    att_param->rtp_cb = &transport_rtp_cb;
+    att_param->rtp_cb2 = &transport_rtp_cb2;
     att_param->rtcp_cb = &transport_rtcp_cb;
     att_param->user_data = adapter;
@@ -212 +227 @@
         adapter->stream_user_data = NULL;
         adapter->stream_rtp_cb = NULL;
+        adapter->stream_rtp_cb2 = NULL;
         adapter->stream_rtcp_cb = NULL;
         adapter->stream_ref = NULL;