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

Timestamp:

Apr 27, 2006 10:36:40 PM (18 years ago)

Author:

bennylp

Message:

Initial support for stereo codecs, and added L16 codecs. Also better handling for case remote media is restarted

File:

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

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

@@ -159 +159 @@
     struct pjmedia_frame frame_in, frame_out;
 
+    /* Return no frame is channel is paused */
+    if (channel->paused) {
+        frame->type = PJMEDIA_FRAME_TYPE_NONE;
+        return PJ_SUCCESS;
+    }
+
     /* Lock jitter buffer mutex */
     pj_mutex_lock( stream->jb_mutex );
@@ -175 +181 @@
         return PJ_SUCCESS;
     }
-
 
     /* Decode */
@@ -321 +326 @@
     int rtphdrlen;
     pj_ssize_t sent;
+
+
+    /* Don't do anything if stream is paused */
+    if (channel->paused)
+        return PJ_SUCCESS;
+
 
     /* Number of samples in the frame */
@@ -758 +769 @@
     /* Allocate buffer for decoding to PCM: */
 
-    channel->pcm_buf_size = codec_param->sample_rate * 
+    channel->pcm_buf_size = codec_param->clock_rate * 
+                            codec_param->channel_cnt *
                             codec_param->pcm_bits_per_sample / 8 *
                             PJMEDIA_MAX_FRAME_DURATION_MS / 1000;
@@ -791 +803 @@
     pj_ioqueue_callback ioqueue_cb;
     pj_uint16_t rtcp_port;
+    unsigned jbuf_init, jbuf_max;
     pj_status_t status;
 
@@ -814 +827 @@
     stream->port.info.pt = info->fmt.pt;
     pj_strdup(pool, &stream->port.info.encoding_name, &info->fmt.encoding_name);
-    stream->port.info.channel_count = 1;
-    stream->port.info.sample_rate = info->fmt.sample_rate;
+    stream->port.info.clock_rate = info->fmt.clock_rate;
+    stream->port.info.channel_count = info->fmt.channel_cnt;
     stream->port.user_data = stream;
     stream->port.put_frame = &put_frame;
@@ -832 +845 @@
     stream->rem_rtcp_addr.sin_port = pj_htons(rtcp_port);
     stream->rtcp_interval = (PJMEDIA_RTCP_INTERVAL + (pj_rand() % 8000)) * 
-                            info->fmt.sample_rate / 1000;
+                            info->fmt.clock_rate / 1000;
 
     stream->tx_event_pt = info->tx_event_pt ? info->tx_event_pt : -1;
@@ -856 +869 @@
     /* Get default codec param: */
 
-    status = stream->codec->op->default_attr(stream->codec, &codec_param);
+    //status = stream->codec->op->default_attr(stream->codec, &codec_param);
+    status = pjmedia_codec_mgr_get_default_param( stream->codec_mgr, 
+                                                  &info->fmt, &codec_param);
     if (status != PJ_SUCCESS)
         goto err_cleanup;
@@ -862 +877 @@
     /* Set additional info. */
     stream->port.info.bits_per_sample = 16;
-    stream->port.info.samples_per_frame = info->fmt.sample_rate*codec_param.ptime/1000;
+    stream->port.info.samples_per_frame = info->fmt.clock_rate*codec_param.ptime/1000;
     stream->port.info.bytes_per_frame = codec_param.avg_bps/8 * codec_param.ptime/1000;
 
@@ -881 +896 @@
 
     pjmedia_rtcp_init(&stream->rtcp, stream->port.info.name.ptr,
-                      info->fmt.sample_rate, 
+                      info->fmt.clock_rate, 
                       stream->port.info.samples_per_frame, 
                       info->ssrc);
@@ -887 +902 @@
 
     /* Create jitter buffer: */
-
+    jbuf_init = 100 / (stream->port.info.samples_per_frame * 1000 / 
+                       info->fmt.clock_rate);
+    jbuf_max = 600 / (stream->port.info.samples_per_frame * 1000 / 
+                       info->fmt.clock_rate);
     status = pjmedia_jbuf_create(pool, &stream->port.info.name,
-                                 stream->frame_size, 15, 100,
+                                 stream->frame_size, 
+                                 jbuf_init, jbuf_max,
                                  &stream->jb);
     if (status != PJ_SUCCESS)