Changeset 350 for pjproject/trunk/pjmedia/src/pjmedia/stream.c

Timestamp:

Mar 22, 2006 11:59:11 AM (18 years ago)

Author:

bennylp

Message:

Redesign RTP/RTCP stuffs so that stream does not create thread implicitly. Changed pjmedia_endpt_create() API.

File:

• pjproject/trunk/pjmedia/src/pjmedia/stream.c (modified) (14 diffs)

pjproject/trunk/pjmedia/src/pjmedia/stream.c

@@ -27 +27 @@
 #include <pj/compat/socket.h>
 #include <pj/errno.h>
+#include <pj/ioqueue.h>
 #include <pj/log.h>
 #include <pj/os.h>
@@ -79 +80 @@
 struct pjmedia_stream
 {
+    pjmedia_endpt           *endpt;         /**< Media endpoint.            */
+    pjmedia_codec_mgr       *codec_mgr;     /**< Codec manager instance.    */
+
     pjmedia_port             port;          /**< Port interface.            */
     pjmedia_channel         *enc;           /**< Encoding channel.          */
@@ -87 +91 @@
     void                    *user_data;     /**< User data.                 */
 
-    pjmedia_codec_mgr       *codec_mgr;     /**< Codec manager instance.    */
     pjmedia_codec           *codec;         /**< Codec instance being used. */
     pj_size_t                frame_size;    /**< Size of encoded frame.     */
@@ -97 +100 @@
     pj_sockaddr_in           rem_rtcp_addr; /**< Remote RTCP address.       */
 
-    pj_sockaddr_in           rem_src_rtp;   /**< addr of src pkt from remote*/
-    unsigned                 rem_src_cnt;   /**< if different, # of pkt rcv */
 
     pjmedia_rtcp_session     rtcp;          /**< RTCP for incoming RTP.     */
 
-    pj_bool_t                quit_flag;     /**< To signal thread exit.     */
-    pj_thread_t             *thread;        /**< Jitter buffer's thread.    */
+    pj_ioqueue_key_t        *rtp_key;       /**< RTP ioqueue key.           */
+    pj_ioqueue_op_key_t      rtp_op_key;    /**< The pending read op key.   */
+    pj_sockaddr_in           rtp_src_addr;  /**< addr of src pkt from remote*/
+    unsigned                 rtp_src_cnt;   /**< if different, # of pkt rcv */
+    int                      rtp_addrlen;   /**< Address length.            */
+
+    pj_ioqueue_key_t        *rtcp_key;      /**< RTCP ioqueue key.          */
+    pj_ioqueue_op_key_t      rtcp_op_key;   /**< The pending read op key.   */
+
 
     /* RFC 2833 DTMF transmission queue: */
@@ -152 +160 @@
     pj_status_t status;
     struct pjmedia_frame frame_in, frame_out;
-
-    /* Do nothing if we're quitting. */
-    if (stream->quit_flag) {
-        frame->type = PJMEDIA_FRAME_TYPE_NONE;
-        return PJ_SUCCESS;
-    }
 
     /* Lock jitter buffer mutex */
@@ -272 +274 @@
     pj_ssize_t sent;
 
-    /* Check if stream is quitting. */
-    if (stream->quit_flag)
-        return -1;
-
     /* Number of samples in the frame */
     ts_len = frame->size / 2;
@@ -439 +437 @@
 
 /*
- * This thread will poll the socket for incoming packets, and put
- * the packets to jitter buffer.
- */
-static int PJ_THREAD_FUNC jitter_buffer_thread (void*arg)
-{
-    pjmedia_stream *stream = arg;
+ * This callback is called by ioqueue framework on receipt of packets
+ * in the RTP socket. 
+ */
+static void on_rx_rtp( pj_ioqueue_key_t *key, 
+                       pj_ioqueue_op_key_t *op_key, 
+                       pj_ssize_t bytes_read)
+
+{
+    pjmedia_stream *stream = pj_ioqueue_get_user_data(key);
     pjmedia_channel *channel = stream->dec;
-
-
-    while (!stream->quit_flag) {
-        pj_ssize_t len;
+    pj_status_t status;
+
+    
+    PJ_UNUSED_ARG(op_key);
+
+
+    /*
+     * Loop while we have packet.
+     */
+    do {
         const pjmedia_rtp_hdr *hdr;
         const void *payload;
         unsigned payloadlen;
-        int addrlen;
-        int status;
-
-        /* Wait for packet. */
-        pj_fd_set_t fds;
-        pj_time_val timeout;
-
-        PJ_FD_ZERO (&fds);
-        PJ_FD_SET (stream->skinfo.rtp_sock, &fds);
-        timeout.sec = 0;
-        timeout.msec = 1;
-
-        /* Wait with timeout. */
-        status = pj_sock_select(FD_SETSIZE, &fds, NULL, NULL, &timeout);
-        if (status < 0) {
-            TRACE_((THIS_FILE, "Jitter buffer select() error", 
-                    pj_get_netos_error()));
-            pj_thread_sleep(500);
-            continue;
-        } else if (status == 0)
-            continue;
-
-        /* Get packet from socket. */
-        len = channel->in_pkt_size;
-        addrlen = sizeof(stream->rem_src_rtp);
-        status = pj_sock_recvfrom(stream->skinfo.rtp_sock, 
-                                  channel->in_pkt, &len, 0,
-                                  &stream->rem_src_rtp, &addrlen);
-        if (len < 1 || status != PJ_SUCCESS) {
-            if (pj_get_netos_error() == PJ_STATUS_FROM_OS(OSERR_ECONNRESET)) {
-                /* On Win2K SP2 (or above) and WinXP, recv() will get 
-                 * WSAECONNRESET when the sending side receives ICMP port 
-                 * unreachable.
-                 */
-                continue;
-            }
-            pj_thread_sleep(1);
-            continue;
-        }
-
-        if (channel->paused)
-            continue;
+
+        /* Go straight to read next packet if bytes_read == 0.
+         */
+        if (bytes_read == 0)
+            goto read_next_packet;
+
 
         /* Update RTP and RTCP session. */
-        status = pjmedia_rtp_decode_rtp(&channel->rtp, channel->in_pkt, len, 
-                                   &hdr, &payload, &payloadlen);
+        status = pjmedia_rtp_decode_rtp(&channel->rtp, 
+                                        channel->in_pkt, bytes_read, 
+                                        &hdr, &payload, &payloadlen);
         if (status != PJ_SUCCESS) {
             TRACE_((THIS_FILE, "RTP decode error", status));
-            continue;
+            goto read_next_packet;
         }
+
 
         /* Handle incoming DTMF. */
         if (hdr->pt == stream->rx_event_pt) {
             handle_incoming_dtmf(stream, payload, payloadlen);
-            continue;
+            goto read_next_packet;
         }
 
+
+        /* Update RTP session (also checks if RTP session can accept
+         * the incoming packet.
+         */
         status = pjmedia_rtp_session_update(&channel->rtp, hdr);
         if (status != 0 && 
@@ -519 +496 @@
             PJ_LOG(4,(THIS_FILE,"RTP packet detail: pt=%d, seq=%d",
                       hdr->pt, pj_ntohs(hdr->seq)));
-            continue;
+            goto read_next_packet;
         }
-        pjmedia_rtcp_rx_rtp(&stream->rtcp, pj_ntohs(hdr->seq), pj_ntohl(hdr->ts));
+
+
+        /* Update the RTCP session. */
+        pjmedia_rtcp_rx_rtp(&stream->rtcp, pj_ntohs(hdr->seq), 
+                            pj_ntohl(hdr->ts));
+
 
         /* Update stat */
         stream->stat.dec.pkt++;
-        stream->stat.dec.bytes += len;
+        stream->stat.dec.bytes += bytes_read;
+
 
         /* See if source address of RTP packet is different than the 
@@ -531 +514 @@
          */
         if ((stream->rem_rtp_addr.sin_addr.s_addr != 
-             stream->rem_src_rtp.sin_addr.s_addr) ||
-            (stream->rem_rtp_addr.sin_port != stream->rem_src_rtp.sin_port))
+             stream->rtp_src_addr.sin_addr.s_addr) ||
+            (stream->rem_rtp_addr.sin_port != stream->rtp_src_addr.sin_port))
         {
-            stream->rem_src_cnt++;
-
-            if (stream->rem_src_cnt >= PJMEDIA_RTP_NAT_PROBATION_CNT) {
+            stream->rtp_src_cnt++;
+
+            if (stream->rtp_src_cnt >= PJMEDIA_RTP_NAT_PROBATION_CNT) {
             
-                stream->rem_rtp_addr = stream->rem_src_rtp;
-                stream->rem_src_cnt = 0;
+                stream->rem_rtp_addr = stream->rtp_src_addr;
+                stream->rtp_src_cnt = 0;
 
                 PJ_LOG(4,(THIS_FILE,"Remote RTP address switched to %s:%d",
-                          pj_inet_ntoa(stream->rem_src_rtp.sin_addr),
-                          pj_ntohs(stream->rem_src_rtp.sin_port)));
+                          pj_inet_ntoa(stream->rtp_src_addr.sin_addr),
+                          pj_ntohs(stream->rtp_src_addr.sin_port)));
             }
         }
 
+
         /* Put to jitter buffer. */
         pj_mutex_lock( stream->jb_mutex );
-        status = pjmedia_jbuf_put_frame(stream->jb, payload, payloadlen, pj_ntohs(hdr->seq));
+        status = pjmedia_jbuf_put_frame(stream->jb, payload, payloadlen, 
+                                        pj_ntohs(hdr->seq));
         pj_mutex_unlock( stream->jb_mutex );
 
         if (status != 0) {
             TRACE_((THIS_FILE, "Jitter buffer put() error", status));
-            continue;
+            goto read_next_packet;
         }
-    }
-
-    return 0;
+
+read_next_packet:
+        bytes_read = channel->in_pkt_size;
+        stream->rtp_addrlen = sizeof(stream->rtp_src_addr);
+        status = pj_ioqueue_recvfrom( stream->rtp_key,
+                                      &stream->rtp_op_key,
+                                      channel->in_pkt, 
+                                      &bytes_read, 0,
+                                      &stream->rtp_src_addr, 
+                                      &stream->rtp_addrlen);
+
+    } while (status == PJ_SUCCESS);
+
+    if (status != PJ_SUCCESS && status != PJ_EPENDING) {
+        char errmsg[PJ_ERR_MSG_SIZE];
+
+        pj_strerror(status, errmsg, sizeof(errmsg));
+        PJ_LOG(4,(THIS_FILE, "Error reading RTP packet: %s [status=%d]",
+                             errmsg, status));
+    }
+}
+
+
+/*
+ * This callback is called by ioqueue framework on receipt of packets
+ * in the RTCP socket. 
+ */
+static void on_rx_rtcp( pj_ioqueue_key_t *key, 
+                        pj_ioqueue_op_key_t *op_key, 
+                        pj_ssize_t bytes_read)
+{
+    PJ_UNUSED_ARG(key);
+    PJ_UNUSED_ARG(op_key);
+    PJ_UNUSED_ARG(bytes_read);
 }
 
@@ -642 +658 @@
     pjmedia_stream *stream;
     pjmedia_codec_param codec_param;
+    pj_ioqueue_callback ioqueue_cb;
     pj_status_t status;
 
@@ -668 +685 @@
 
     /* Init stream: */
-   
+    stream->endpt = endpt;
+    stream->codec_mgr = pjmedia_endpt_get_codec_mgr(endpt);
     stream->dir = info->dir;
     stream->user_data = user_data;
-    stream->codec_mgr = pjmedia_endpt_get_codec_mgr(endpt);
     stream->skinfo = info->sock_info;
     stream->rem_rtp_addr = info->rem_addr;
@@ -733 +750 @@
 
 
-    /*  Create jitter buffer thread: */
-
-    status = pj_thread_create(pool, "decode", 
-                              &jitter_buffer_thread, stream,
-                              0, PJ_THREAD_SUSPENDED, &stream->thread);
-    if (status != PJ_SUCCESS)
-        goto err_cleanup;
-
-
     /* Create decoder channel: */
 
@@ -757 +765 @@
         goto err_cleanup;
 
-    /* Resume jitter buffer thread. */
-    status = pj_thread_resume( stream->thread );
+    /*  Register RTP socket to ioqueue */
+    pj_memset(&ioqueue_cb, 0, sizeof(ioqueue_cb));
+    ioqueue_cb.on_read_complete = &on_rx_rtp;
+
+    status = pj_ioqueue_register_sock( pool, 
+                                       pjmedia_endpt_get_ioqueue(endpt), 
+                                       stream->skinfo.rtp_sock,
+                                       stream, &ioqueue_cb, &stream->rtp_key);
     if (status != PJ_SUCCESS)
         goto err_cleanup;
+
+    /* Init pending operation key. */
+    pj_ioqueue_op_key_init(&stream->rtp_op_key, sizeof(stream->rtp_op_key));
+
+    /* Bootstrap the first recvfrom() operation. */
+    on_rx_rtp( stream->rtp_key, &stream->rtp_op_key, 0);
+
+
+    /* Register RTCP socket to ioqueue. */
+    if (stream->skinfo.rtcp_sock != PJ_INVALID_SOCKET) {
+        pj_memset(&ioqueue_cb, 0, sizeof(ioqueue_cb));
+        ioqueue_cb.on_read_complete = &on_rx_rtcp;
+
+        status = pj_ioqueue_register_sock( pool, 
+                                           pjmedia_endpt_get_ioqueue(endpt),
+                                           stream->skinfo.rtcp_sock,
+                                           stream, &ioqueue_cb, 
+                                           &stream->rtcp_key);
+        if (status != PJ_SUCCESS)
+            goto err_cleanup;
+    }
+
+    /* Init pending operation key. */
+    pj_ioqueue_op_key_init(&stream->rtcp_op_key, sizeof(stream->rtcp_op_key));
+
+    /* Bootstrap the first recvfrom() operation. */
+    on_rx_rtcp( stream->rtcp_key, &stream->rtcp_op_key, 0);
 
     /* Success! */
@@ -781 +822 @@
     PJ_ASSERT_RETURN(stream != NULL, PJ_EINVAL);
 
-    /* Signal threads to quit. */
-
-    stream->quit_flag = 1;
-
-
-    /* Close encoding sound stream. */
-    
-    /*
-    if (stream->enc && stream->enc->snd_stream) {
-
-        pjmedia_snd_stream_stop(stream->enc->snd_stream);
-        pjmedia_snd_stream_close(stream->enc->snd_stream);
-        stream->enc->snd_stream = NULL;
-
-    }
-    */
-
-    /* Close decoding sound stream. */
-
-    /*
-    if (stream->dec && stream->dec->snd_stream) {
-
-        pjmedia_snd_stream_stop(stream->dec->snd_stream);
-        pjmedia_snd_stream_close(stream->dec->snd_stream);
-        stream->dec->snd_stream = NULL;
-
-    }
-    */
-
-    /* Wait for jitter buffer thread to quit: */
-
-    if (stream->thread) {
-        pj_thread_join(stream->thread);
-        pj_thread_destroy(stream->thread);
-        stream->thread = NULL;
+
+    /* This function may be called when stream is partly initialized. */
+    if (stream->jb_mutex)
+        pj_mutex_lock(stream->jb_mutex);
+
+
+    /* Unregister from ioqueue. */
+    if (stream->rtp_key) {
+        pj_ioqueue_unregister(stream->rtp_key);
+        stream->rtp_key = NULL;
+    }
+    if (stream->rtcp_key) {
+        pj_ioqueue_unregister(stream->rtcp_key);
+        stream->rtcp_key = NULL;
     }