Changeset 1447 for pjproject/branches/pjproject-0.5-stable/pjmedia/src/pjmedia/stream.c

Timestamp:

Sep 20, 2007 1:19:03 PM (17 years ago)

Author:

bennylp

Message:

Ticket #13: Send RTCP RR if stream is not transmitting any RTP packets

File:

• pjproject/branches/pjproject-0.5-stable/pjmedia/src/pjmedia/stream.c (modified) (21 diffs)

pjproject/branches/pjproject-0.5-stable/pjmedia/src/pjmedia/stream.c

@@ -63 +63 @@
 {
     int             event;
-    pj_uint32_t     start_ts;
+    pj_uint32_t     duration;
 };
 
@@ -167 +167 @@
 static pj_status_t get_frame( pjmedia_port *port, pjmedia_frame *frame)
 {
-    pjmedia_stream *stream = port->port_data.pdata;
+    pjmedia_stream *stream = (pjmedia_stream*) port->port_data.pdata;
     pjmedia_channel *channel = stream->dec;
     unsigned samples_count, samples_per_frame, samples_required;
@@ -192 +192 @@
                         stream->codec_param.info.channel_cnt / 
                         1000;
-    p_out_samp = frame->buf;
+    p_out_samp = (pj_int16_t*) frame->buf;
 
     for (samples_count=0; samples_count < samples_required; 
@@ -374 +374 @@
  */
 static void create_dtmf_payload(pjmedia_stream *stream, 
-                          struct pjmedia_frame *frame_out)
+                                struct pjmedia_frame *frame_out,
+                                int *first, int *last)
 {
     pjmedia_rtp_dtmf_event *event;
     struct dtmf *digit = &stream->tx_dtmf_buf[0];
-    unsigned duration;
     pj_uint32_t cur_ts;
 
     pj_assert(sizeof(pjmedia_rtp_dtmf_event) == 4);
 
-    event = frame_out->buf;
+    *first = *last = 0;
+
+    event = (pjmedia_rtp_dtmf_event*) frame_out->buf;
     cur_ts = pj_ntohl(stream->enc->rtp.out_hdr.ts);
-    duration = cur_ts - digit->start_ts;
+
+    if (digit->duration == 0) {
+        PJ_LOG(5,(stream->port.info.name.ptr, "Sending DTMF digit id %c", 
+                  digitmap[digit->event]));
+        *first = 1;
+    }
+
+    digit->duration += stream->port.info.samples_per_frame;
 
     event->event = (pj_uint8_t)digit->event;
     event->e_vol = 10;
-    event->duration = pj_htons((pj_uint16_t)duration);
-
-    if (duration >= PJMEDIA_DTMF_DURATION) {
+    event->duration = pj_htons((pj_uint16_t)digit->duration);
+
+
+    if (digit->duration >= PJMEDIA_DTMF_DURATION) {
+
         event->e_vol |= 0x80;
+        *last = 1;
 
         /* Prepare next digit. */
         pj_mutex_lock(stream->jb_mutex);
+
         pj_array_erase(stream->tx_dtmf_buf, sizeof(stream->tx_dtmf_buf[0]),
                        stream->tx_dtmf_count, 0);
         --stream->tx_dtmf_count;
 
-        stream->tx_dtmf_buf[0].start_ts = cur_ts;
         pj_mutex_unlock(stream->jb_mutex);
-
-        if (stream->tx_dtmf_count) {
-            PJ_LOG(5,(stream->port.info.name.ptr,
-                      "Sending DTMF digit id %c", 
-                      digitmap[stream->tx_dtmf_buf[0].event]));
-        }
-
-    } else if (duration == 0) {
-        PJ_LOG(5,(stream->port.info.name.ptr, "Sending DTMF digit id %c", 
-                  digitmap[digit->event]));
-    }
-
+    }
 
     frame_out->size = 4;
@@ -439 +440 @@
     } else if (timestamp - stream->rtcp_last_tx >= stream->rtcp_interval) {
         
-        pjmedia_rtcp_pkt *rtcp_pkt;
+        void *rtcp_pkt;
         int len;
 
@@ -515 +516 @@
                                   const pjmedia_frame *frame )
 {
-    pjmedia_stream *stream = port->port_data.pdata;
+    pjmedia_stream *stream = (pjmedia_stream*) port->port_data.pdata;
     pjmedia_channel *channel = stream->enc;
     pj_status_t status = 0;
@@ -522 +523 @@
     void *rtphdr;
     int rtphdrlen;
-
+    int inc_timestamp = 0;
 
     /* Don't do anything if stream is paused */
@@ -551 +552 @@
      */
     if (stream->tx_dtmf_count) {
-
-        create_dtmf_payload(stream, &frame_out);
-
-        /* Encapsulate. */
+        int first=0, last=0;
+
+        create_dtmf_payload(stream, &frame_out, &first, &last);
+
+        /* Encapsulate into RTP packet. Note that:
+         *  - RTP marker should be set on the beginning of a new event
+         *  - RTP timestamp is constant for the same packet. 
+         */
         status = pjmedia_rtp_encode_rtp( &channel->rtp, 
-                                         stream->tx_event_pt, 0, 
-                                         frame_out.size, ts_len, 
+                                         stream->tx_event_pt, first, 
+                                         frame_out.size, (first?ts_len:0), 
                                          (const void**)&rtphdr, 
                                          &rtphdrlen);
+
+        if (last) {
+            /* This is the last packet for the event. 
+             * Increment the RTP timestamp of the RTP session, for next
+             * RTP packets.
+             */
+            inc_timestamp = PJMEDIA_DTMF_DURATION - ts_len;
+        }
 
     } else if (frame->type != PJMEDIA_FRAME_TYPE_NONE) {
@@ -663 +676 @@
     pj_memcpy(channel->out_pkt, rtphdr, sizeof(pjmedia_rtp_hdr));
 
+    /* Special case for DTMF: timestamp remains constant for
+     * the same event, and is only updated after a complete event
+     * has been transmitted.
+     */
+    if (inc_timestamp) {
+        pjmedia_rtp_encode_rtp( &channel->rtp, stream->tx_event_pt, 0,
+                                0, inc_timestamp, NULL, NULL);
+    }
 
     /* Set RTP marker bit if currently not streaming */
     if (stream->is_streaming == PJ_FALSE) {
-        pjmedia_rtp_hdr *rtp = channel->out_pkt;
+        pjmedia_rtp_hdr *rtp = (pjmedia_rtp_hdr*) channel->out_pkt;
 
         rtp->m = 1;
@@ -698 +719 @@
                               const pjmedia_frame *frame )
 {
-    pjmedia_stream *stream = port->port_data.pdata;
+    pjmedia_stream *stream = (pjmedia_stream*) port->port_data.pdata;
     pjmedia_frame tmp_zero_frame;
     unsigned samples_per_frame;
@@ -831 +852 @@
                                   const void *payload, unsigned payloadlen)
 {
-    const pjmedia_rtp_dtmf_event *event = payload;
+    pjmedia_rtp_dtmf_event *event = (pjmedia_rtp_dtmf_event*) payload;
 
     /* Check compiler packing. */
@@ -903 +924 @@
 
 {
-    pjmedia_stream *stream = data;
+    pjmedia_stream *stream = (pjmedia_stream*) data;
     pjmedia_channel *channel = stream->dec;
     const pjmedia_rtp_hdr *hdr;
@@ -919 +940 @@
 
     /* Ignore keep-alive packets */
-    if (bytes_read < sizeof(pjmedia_rtp_hdr))
+    if (bytes_read < (pj_ssize_t) sizeof(pjmedia_rtp_hdr))
         return;
 
@@ -1053 +1074 @@
                         pj_ssize_t bytes_read)
 {
-    pjmedia_stream *stream = data;
+    pjmedia_stream *stream = (pjmedia_stream*) data;
 
     /* Check for errors */
@@ -1081 +1102 @@
     /* Allocate memory for channel descriptor */
 
-    channel = pj_pool_zalloc(pool, sizeof(pjmedia_channel));
+    channel = (pjmedia_channel*) pj_pool_zalloc(pool, sizeof(pjmedia_channel));
     PJ_ASSERT_RETURN(channel != NULL, PJ_ENOMEM);
 
@@ -1147 +1168 @@
     /* Allocate the media stream: */
 
-    stream = pj_pool_zalloc(pool, sizeof(pjmedia_stream));
+    stream = (pjmedia_stream*) pj_pool_zalloc(pool, sizeof(pjmedia_stream));
     PJ_ASSERT_RETURN(stream != NULL, PJ_ENOMEM);
 
     /* Init stream/port name */
-    name.ptr = pj_pool_alloc(pool, M);
+    name.ptr = (char*) pj_pool_alloc(pool, M);
     name.slen = pj_ansi_snprintf(name.ptr, M, "strm%p", stream);
 
@@ -1263 +1284 @@
         /* Allocate buffer */
         stream->enc_buf_size = stream->port.info.clock_rate * ptime / 1000;
-        stream->enc_buf = pj_pool_alloc(pool, stream->enc_buf_size * 2);
+        stream->enc_buf = (pj_int16_t*)
+                          pj_pool_alloc(pool, stream->enc_buf_size * 2);
 
     } else {
@@ -1536 +1558 @@
     
     if (stream->tx_dtmf_count+digit_char->slen >=
-        PJ_ARRAY_SIZE(stream->tx_dtmf_buf))
+        (long)PJ_ARRAY_SIZE(stream->tx_dtmf_buf))
     {
         status = PJ_ETOOMANY;
@@ -1572 +1594 @@
 
             stream->tx_dtmf_buf[stream->tx_dtmf_count+i].event = pt;
+            stream->tx_dtmf_buf[stream->tx_dtmf_count+i].duration = 0;
         }
 
@@ -1577 +1600 @@
             goto on_return;
 
-        /* Init start_ts and end_ts only for the first digit.
-         * Subsequent digits are initialized on the fly.
-         */
-        if (stream->tx_dtmf_count ==0) {
-            pj_uint32_t start_ts;
-
-            start_ts = pj_ntohl(stream->enc->rtp.out_hdr.ts);
-            stream->tx_dtmf_buf[0].start_ts = start_ts;
-        }
-
         /* Increment digit count only if all digits are valid. */
         stream->tx_dtmf_count += digit_char->slen;
-
     }
 
@@ -1646 +1658 @@
  * Set callback to be called upon receiving DTMF digits.
  */
-PJ_DEF(pj_status_t)
-pjmedia_stream_set_dtmf_callback(pjmedia_stream *stream,
+PJ_DEF(pj_status_t) pjmedia_stream_set_dtmf_callback(pjmedia_stream *stream,
                                  void (*cb)(pjmedia_stream*, 
                                             void *user_data,