Changeset 6106 for pjproject/trunk/pjmedia/src/pjmedia/stream.c
- Timestamp:
- Nov 13, 2019 9:11:04 AM (4 years ago)
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
pjproject/trunk/pjmedia/src/pjmedia/stream.c
r6098 r6106 2252 2252 { 2253 2253 pjmedia_event_rx_rtcp_fb_data *data = (pjmedia_event_rx_rtcp_fb_data*) 2254 event->data.ptr;2254 &event->data.rx_rtcp_fb; 2255 2255 2256 2256 /* Application not configured to listen to NACK, discard this event */ … … 2262 2262 2263 2263 /* Republish events */ 2264 return pjmedia_event_publish(NULL, stream, event, 0); 2264 return pjmedia_event_publish(NULL, stream, event, 2265 PJMEDIA_EVENT_PUBLISH_POST_EVENT); 2265 2266 } 2266 2267 … … 2743 2744 #endif 2744 2745 2745 /* Check if we should send RTCP-FB generic NACK for this codec*/2746 /* Check if we should send RTCP-FB */ 2746 2747 if (stream->si.rem_rtcp_fb.cap_count) { 2747 2748 pjmedia_rtcp_fb_info *rfi = &stream->si.rem_rtcp_fb; 2748 char cid[32];2749 2749 unsigned i; 2750 2751 pjmedia_codec_info_to_id(&stream->si.fmt, cid, sizeof(cid));2752 2750 2753 2751 for (i = 0; i < rfi->cap_count; ++i) { 2754 2752 if (rfi->caps[i].type == PJMEDIA_RTCP_FB_NACK && 2755 (!pj_strcmp2( &rfi->caps[i].codec_id, "*") || 2756 !pj_stricmp2(&rfi->caps[i].codec_id, cid))) 2753 rfi->caps[i].param.slen == 0) 2757 2754 { 2758 2755 stream->send_rtcp_fb_nack = PJ_TRUE; 2756 PJ_LOG(4,(stream->port.info.name.ptr, 2757 "Send RTCP-FB generic NACK")); 2759 2758 break; 2760 2759 } … … 2762 2761 } 2763 2762 2764 /* Check if we handle incoming RTCP-FB generic NACK for this codec*/2763 /* Check if we should process incoming RTCP-FB */ 2765 2764 stream->rtcp_fb_nack_cap_idx = -1; 2766 2765 if (stream->si.loc_rtcp_fb.cap_count) { 2767 2766 pjmedia_rtcp_fb_info *lfi = &stream->si.loc_rtcp_fb; 2768 char cid[32];2769 2767 unsigned i; 2770 2771 pjmedia_codec_info_to_id(&stream->si.fmt, cid, sizeof(cid));2772 2768 2773 2769 for (i = 0; i < lfi->cap_count; ++i) { 2774 2770 if (lfi->caps[i].type == PJMEDIA_RTCP_FB_NACK && 2775 (!pj_strcmp2( &lfi->caps[i].codec_id, "*") || 2776 !pj_stricmp2(&lfi->caps[i].codec_id, cid))) 2771 lfi->caps[i].param.slen == 0) 2777 2772 { 2778 2773 stream->rtcp_fb_nack_cap_idx = i; 2774 PJ_LOG(4,(stream->port.info.name.ptr, 2775 "Receive RTCP-FB generic NACK")); 2779 2776 break; 2780 2777 }
Note: See TracChangeset
for help on using the changeset viewer.