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

Timestamp:

Mar 16, 2006 6:52:55 PM (18 years ago)

Author:

bennylp

Message:

Added sound port (sound_port.h/c), and changed sound and RTCP names from pj_* to pjmedia_*

File:

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

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

@@ -100 +100 @@
     unsigned                 rem_src_cnt;   /**< if different, # of pkt rcv */
 
-    pj_rtcp_session          rtcp;          /**< RTCP for incoming RTP.     */
+    pjmedia_rtcp_session     rtcp;          /**< RTCP for incoming RTP.     */
 
     pj_bool_t                quit_flag;     /**< To signal thread exit.     */
@@ -521 +521 @@
             continue;
         }
-        pj_rtcp_rx_rtp(&stream->rtcp, pj_ntohs(hdr->seq), pj_ntohl(hdr->ts));
+        pjmedia_rtcp_rx_rtp(&stream->rtcp, pj_ntohs(hdr->seq), pj_ntohl(hdr->ts));
 
         /* Update stat */
@@ -721 +721 @@
     /* Init RTCP session: */
 
-    pj_rtcp_init(&stream->rtcp, info->ssrc);
+    pjmedia_rtcp_init(&stream->rtcp, info->ssrc);
 
 
@@ -790 +790 @@
     if (stream->enc && stream->enc->snd_stream) {
 
-        pj_snd_stream_stop(stream->enc->snd_stream);
-        pj_snd_stream_close(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;
 
@@ -802 +802 @@
     if (stream->dec && stream->dec->snd_stream) {
 
-        pj_snd_stream_stop(stream->dec->snd_stream);
-        pj_snd_stream_close(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;
 
@@ -858 +858 @@
     if (stream->enc && (stream->dir & PJMEDIA_DIR_ENCODING)) {
         stream->enc->paused = 0;
-        //pj_snd_stream_start(stream->enc->snd_stream);
+        //pjmedia_snd_stream_start(stream->enc->snd_stream);
         PJ_LOG(4,(THIS_FILE, "Encoder stream started"));
     } else {
@@ -866 +866 @@
     if (stream->dec && (stream->dir & PJMEDIA_DIR_DECODING)) {
         stream->dec->paused = 0;
-        //pj_snd_stream_start(stream->dec->snd_stream);
+        //pjmedia_snd_stream_start(stream->dec->snd_stream);
         PJ_LOG(4,(THIS_FILE, "Decoder stream started"));
     } else {