Changeset 159 for pjproject/trunk/pjmedia/src/pjmedia/rtp.c

Timestamp:

Feb 8, 2006 10:43:39 PM (18 years ago)

Author:

bennylp

Message:

Finished new pjmedia rewrite

File:

• pjproject/trunk/pjmedia/src/pjmedia/rtp.c (modified) (9 diffs)

pjproject/trunk/pjmedia/src/pjmedia/rtp.c

@@ -44 +44 @@
     if (sizeof(struct pj_rtp_hdr) != 12) {
         pj_assert(!"Wrong RTP header packing!");
-        return PJ_RTP_ERR_RTP_PACKING;
+        return PJMEDIA_RTP_ERR_RTP_PACKING;
     }
 
@@ -129 +129 @@
     if ((*hdr)->v != RTP_VERSION) {
         PJ_LOG(4, (THIS_FILE, "  invalid RTP version!"));
-        return PJ_RTP_ERR_INVALID_VERSION;
+        return PJMEDIA_RTP_ERR_INVALID_VERSION;
     }
 
@@ -143 +143 @@
     /* Check that offset is less than packet size */
     if (offset >= pkt_len)
-        return PJ_RTP_ERR_INVALID_PACKET;
+        return PJMEDIA_RTP_ERR_INVALID_PACKET;
 
     /* Find and set payload. */
@@ -163 +163 @@
         PJ_LOG(4, (THIS_FILE, "pj_rtp_session_update: ses=%p, invalid ssrc 0x%p (!=0x%p)",
                    ses, pj_ntohl(hdr->ssrc), ses->peer_ssrc));
-        return PJ_RTP_ERR_INVALID_SSRC;
+        return PJMEDIA_RTP_ERR_INVALID_SSRC;
     }
     */
@@ -171 +171 @@
         PJ_LOG(4, (THIS_FILE, "pj_rtp_session_update: ses=%p, invalid payload type %d (!=%d)",
                    ses, hdr->pt, ses->out_pt));
-        return PJ_RTP_ERR_INVALID_PT;
+        return PJMEDIA_RTP_ERR_INVALID_PT;
     }
 
@@ -180 +180 @@
     /* Check sequence number to see if remote session has been restarted. */
     status = pj_rtp_seq_update( &ses->seq_ctrl, pj_ntohs(hdr->seq));
-    if (status == PJ_RTP_ERR_SESSION_RESTARTED) {
+    if (status == PJMEDIA_RTP_ERR_SESSION_RESTARTED) {
         pj_rtp_seq_restart( &ses->seq_ctrl, pj_ntohs(hdr->seq));
         ++ses->received;
-    } else if (status == 0 || status == PJ_RTP_ERR_SESSION_PROBATION) {
+    } else if (status == 0 || status == PJMEDIA_RTP_ERR_SESSION_PROBATION) {
         ++ses->received;
     }
@@ -224 +224 @@
             sctrl->max_seq = seq;
             if (sctrl->probation == 0) {
-                return PJ_RTP_ERR_SESSION_RESTARTED;
+                return PJMEDIA_RTP_ERR_SESSION_RESTARTED;
             }
         } else {
@@ -230 +230 @@
             sctrl->max_seq = seq;
         }
-        return PJ_RTP_ERR_SESSION_PROBATION;
+        return PJMEDIA_RTP_ERR_SESSION_PROBATION;
 
     } else if (udelta < MAX_DROPOUT) {
@@ -248 +248 @@
              * (i.e., pretend this was the first packet).
              */
-            return PJ_RTP_ERR_SESSION_RESTARTED;
+            return PJMEDIA_RTP_ERR_SESSION_RESTARTED;
         }
         else {
             sctrl->bad_seq = (seq + 1) & (RTP_SEQ_MOD-1);
-            return PJ_RTP_ERR_BAD_SEQUENCE;
+            return PJMEDIA_RTP_ERR_BAD_SEQUENCE;
         }
     } else {