Changeset 5898

Timestamp:

Oct 17, 2018 12:52:26 AM (6 years ago)

Author:

ming

Message:

Re #2157: Minor change: prioritize rtp_cb2() and add more robustness

File:

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

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

@@ -211 +211 @@
     pj_assert(adapter->stream_user_data == NULL);
     adapter->stream_user_data = att_param->user_data;
-    if (att_param->rtp_cb) {
+    if (att_param->rtp_cb2) {
+        adapter->stream_rtp_cb2 = att_param->rtp_cb2;
+    } else {
         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;
@@ -220 +220 @@
 
     att_param->rtp_cb2 = &transport_rtp_cb2;
+    att_param->rtp_cb = NULL;    
     att_param->rtcp_cb = &transport_rtcp_cb;
     att_param->user_data = adapter;