Changeset 5513 for pjproject/branches/projects/uwp/pjmedia/src/pjmedia/stream.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/stream.c (modified) (11 diffs)

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

@@ -23 +23 @@
 #include <pjmedia/rtcp.h>
 #include <pjmedia/jbuf.h>
-#include <pjmedia/stream_common.h>
 #include <pj/array.h>
 #include <pj/assert.h>
@@ -441 +440 @@
     /* Send RTCP */
     send_rtcp(stream, PJ_TRUE, PJ_FALSE, PJ_FALSE);
+    
+    /* Update stats in case the stream is paused */
+    stream->rtcp.stat.rtp_tx_last_seq = pj_ntohs(stream->enc->rtp.out_hdr.seq);
 
 #elif PJMEDIA_STREAM_ENABLE_KA == PJMEDIA_STREAM_KA_USER
@@ -1567 +1569 @@
 
     /* Ignore unknown event. */
+#if defined(PJMEDIA_HAS_DTMF_FLASH) && PJMEDIA_HAS_DTMF_FLASH!= 0
     if (event->event > 16) {
+#else
+    if (event->event > 15) {
+#endif    
         PJ_LOG(5,(stream->port.info.name.ptr,
                   "Ignored RTP pkt with bad DTMF event %d",
@@ -1629 +1635 @@
     if (bytes_read < 0) {
         status = (pj_status_t)-bytes_read;
+        if (status == PJ_STATUS_FROM_OS(OSERR_EWOULDBLOCK)) {
+            return;
+        }
         if (stream->rtp_rx_last_err != status) {
             char errmsg[PJ_ERR_MSG_SIZE];
@@ -1895 +1904 @@
     /* Check for errors */
     if (bytes_read < 0) {
-        LOGERR_((stream->port.info.name.ptr, "RTCP recv() error",
-                (pj_status_t)-bytes_read));
+        if (bytes_read != -PJ_STATUS_FROM_OS(OSERR_EWOULDBLOCK)) {
+            LOGERR_((stream->port.info.name.ptr, "RTCP recv() error",
+                    (pj_status_t)-bytes_read));
+        }
         return;
     }
@@ -1994 +2005 @@
     char *p;
     pj_status_t status;
+    pjmedia_transport_attach_param att_param;
 
     PJ_ASSERT_RETURN(endpt && info && p_stream, PJ_EINVAL);
@@ -2105 +2117 @@
 
     /* Open the codec. */
+
+    /* The clock rate for Opus codec is not static,
+     * it's negotiated in the SDP.
+     */
+    if (!pj_stricmp2(&info->fmt.encoding_name, "opus")) {
+        stream->codec_param.info.clock_rate = info->fmt.clock_rate;
+        stream->codec_param.info.channel_cnt = info->fmt.channel_cnt;
+    }
+
     status = pjmedia_codec_open(stream->codec, &stream->codec_param);
     if (status != PJ_SUCCESS)
@@ -2219 +2240 @@
         /* RTP clock rate = 1/2 real clock rate */
         stream->rtp_tx_ts_len_per_pkt >>= 1;
+    } else if (!pj_stricmp2(&info->fmt.encoding_name, "opus")) {
+        unsigned opus_ts_modifier = 48000 / afd->clock_rate;
+        stream->rtp_rx_check_cnt = 0;
+        stream->has_g722_mpeg_bug = PJ_TRUE;
+        stream->rtp_tx_ts_len_per_pkt *= opus_ts_modifier;
+        stream->rtp_rx_ts_len_per_frame *= opus_ts_modifier;
     }
 #endif
@@ -2320 +2347 @@
 
     stream->out_rtcp_pkt = pj_pool_alloc(pool, stream->out_rtcp_pkt_size);
+    att_param.stream = stream;
+    att_param.media_type = PJMEDIA_TYPE_AUDIO;
+    att_param.user_data = stream;
+    pj_sockaddr_cp(&att_param.rem_addr, &info->rem_addr);
+    pj_sockaddr_cp(&att_param.rem_rtcp, &info->rem_rtcp);
+    att_param.addr_len = pj_sockaddr_get_len(&info->rem_addr);
+    att_param.rtp_cb = &on_rx_rtp;
+    att_param.rtcp_cb = &on_rx_rtcp;
 
     /* Only attach transport when stream is ready. */
-    status = pjmedia_transport_attach(tp, stream, &info->rem_addr,
-                                      &info->rem_rtcp,
-                                      pj_sockaddr_get_len(&info->rem_addr),
-                                      &on_rx_rtp, &on_rx_rtcp);
+    status = pjmedia_transport_attach2(tp, &att_param);
     if (status != PJ_SUCCESS)
         goto err_cleanup;
@@ -2767 +2799 @@
                 pt = 11;
             }
+#if defined(PJMEDIA_HAS_DTMF_FLASH) && PJMEDIA_HAS_DTMF_FLASH!= 0           
             else if (dig == 'r')
             {
                 pt = 16;
             }
+#endif
             else
             {
@@ -2889 +2923 @@
     return PJ_SUCCESS;
 }
+
+
+/**
+ * Get RTP session information from stream.
+ */
+PJ_DEF(pj_status_t)
+pjmedia_stream_get_rtp_session_info(pjmedia_stream *stream,
+                                    pjmedia_stream_rtp_sess_info *session_info)
+{
+    session_info->rx_rtp = &stream->dec->rtp;
+    session_info->tx_rtp = &stream->enc->rtp;
+    session_info->rtcp = &stream->rtcp;
+    return PJ_SUCCESS;
+}