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

Timestamp:

Mar 6, 2006 1:30:39 PM (18 years ago)

Author:

bennylp

Message:

Fixed bug if payload type for rx and tx is different (i.e. dyn pt)

File:

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

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

@@ -132 +132 @@
 
     pj_strerror(status, errmsg, sizeof(errmsg));
-    PJ_LOG(3,(sender, "%s: %s [err:%d]", title, errmsg, status));
+    PJ_LOG(4,(sender, "%s: %s [err:%d]", title, errmsg, status));
 }
 
@@ -510 +510 @@
             status != PJMEDIA_RTP_ESESSRESTART) 
         {
-            TRACE_((THIS_FILE, "RTP session_update error", status));
+            TRACE_((THIS_FILE, "RTP session_update error (details follows)", 
+                    status));
+            PJ_LOG(4,(THIS_FILE,"RTP packet detail: pt=%d, seq=%d",
+                      hdr->pt, pj_ntohs(hdr->seq)));
             continue;
         }
@@ -558 +561 @@
                                    pjmedia_stream *stream,
                                    pjmedia_dir dir,
+                                   unsigned pt,
                                    const pjmedia_stream_info *param,
                                    const pjmedia_codec_param *codec_param,
@@ -575 +579 @@
     channel->dir = dir;
     channel->paused = 1;
-    channel->pt = param->fmt.pt;
+    channel->pt = pt;
 
     /* Allocate buffer for incoming packet. */
@@ -609 +613 @@
     /* Create RTP and RTCP sessions: */
 
-    status = pjmedia_rtp_session_init(&channel->rtp, param->fmt.pt, 
-                                 param->ssrc);
+    status = pjmedia_rtp_session_init(&channel->rtp, pt, param->ssrc);
     if (status != PJ_SUCCESS)
         return status;
@@ -749 +752 @@
     /* Create decoder channel: */
 
-    status = create_channel( pool, stream, PJMEDIA_DIR_DECODING, info,
-                             &codec_param, &stream->dec);
+    status = create_channel( pool, stream, PJMEDIA_DIR_DECODING, 
+                             info->fmt.pt, info, &codec_param, &stream->dec);
     if (status != PJ_SUCCESS)
         goto err_cleanup;
@@ -757 +760 @@
     /* Create encoder channel: */
 
-    status = create_channel( pool, stream, PJMEDIA_DIR_ENCODING, info,
-                             &codec_param, &stream->enc);
+    status = create_channel( pool, stream, PJMEDIA_DIR_ENCODING, 
+                             info->tx_pt, info, &codec_param, &stream->enc);
     if (status != PJ_SUCCESS)
         goto err_cleanup;