Changeset 6106 for pjproject/trunk/pjmedia/src/pjmedia/rtcp.c

Timestamp:

Nov 13, 2019 9:11:04 AM (4 years ago)

Author:

nanang

Message:

Close #1437: Video keyframe request/response using RTCP-FB PLI.

File:

• pjproject/trunk/pjmedia/src/pjmedia/rtcp.c (modified) (1 diff)

pjproject/trunk/pjmedia/src/pjmedia/rtcp.c

@@ -780 +780 @@
     //pjmedia_rtcp_fb_rpsi rpsi;
     pjmedia_event ev;
-    pjmedia_event_rx_rtcp_fb_data ev_data;
     pj_timestamp ts_now;
 
     pj_get_timestamp(&ts_now);
-    pj_bzero(&ev_data, sizeof(ev_data));
 
     if (pjmedia_rtcp_fb_parse_nack(pkt, size, &cnt, nack)==PJ_SUCCESS)
     {
         pjmedia_event_init(&ev, PJMEDIA_EVENT_RX_RTCP_FB, &ts_now, sess);
-        ev_data.cap.type = PJMEDIA_RTCP_FB_NACK;
-        ev_data.msg.nack = nack[0];
-        ev.data.ptr = &ev_data;
-
-        /* Sync publish, i.e: don't use PJMEDIA_EVENT_PUBLISH_POST_EVENT */
+        ev.data.rx_rtcp_fb.cap.type = PJMEDIA_RTCP_FB_NACK;
+        ev.data.rx_rtcp_fb.msg.nack = nack[0];
         pjmedia_event_publish(NULL, sess, &ev, 0);
 
-        /*  For other FB type implementations later
     } else if (pjmedia_rtcp_fb_parse_pli(pkt, size)==PJ_SUCCESS)
     {
+        pjmedia_event_init(&ev, PJMEDIA_EVENT_RX_RTCP_FB, &ts_now, sess);
+        ev.data.rx_rtcp_fb.cap.type = PJMEDIA_RTCP_FB_NACK;
+        pj_strset2(&ev.data.rx_rtcp_fb.cap.param, (char*)"pli");
+        pjmedia_event_publish(NULL, sess, &ev, 0);
+
+        /*  For other FB type implementations later
     } else if (pjmedia_rtcp_fb_parse_sli(pkt, size, &cnt, sli)==PJ_SUCCESS)
     {