Changeset 558 for pjproject

Timestamp:

Jun 28, 2006 11:48:51 AM (18 years ago)

Author:

bennylp

Message:

Fixed minor compliation warning in transport_udp.c, also corrected misleading comments, and added memory based capture/playback to the Makefile

Location:

pjproject/trunk/pjmedia

Files:

• build/Makefile (modified) (1 diff)
• include/pjmedia.h (modified) (2 diffs)
• src/pjmedia/transport_udp.c (modified) (8 diffs)

pjproject/trunk/pjmedia/build/Makefile

@@ -66 +66 @@
 export PJMEDIA_OBJS += $(OS_OBJS) $(M_OBJS) $(CC_OBJS) $(HOST_OBJS) \
                         clock_thread.o codec.o conference.o endpoint.o errno.o \
-                        wav_player.o wav_writer.o g711.o jbuf.o \
-                        master_port.o null_port.o plc_common.o plc_g711.o \
+                        g711.o jbuf.o master_port.o mem_capture.o mem_player.o \
+                        null_port.o plc_common.o plc_g711.o \
                         port.o resample.o \
                         resample_port.o rtcp.o rtp.o sdp.o sdp_cmp.o sdp_neg.o \
                         session.o silencedet.o sound_port.o stream.o \
-                        transport_udp.o wave.o \
+                        transport_udp.o wav_player.o wav_writer.o wave.o \
                         $(SOUND_OBJS) $(NULLSOUND_OBJS)
 

pjproject/trunk/pjmedia/include/pjmedia.h

@@ -34 +34 @@
 #include <pjmedia/jbuf.h>
 #include <pjmedia/master_port.h>
+#include <pjmedia/mem_port.h>
 #include <pjmedia/null_port.h>
 #include <pjmedia/plc.h>
@@ -42 +43 @@
 #include <pjmedia/sdp.h>
 #include <pjmedia/sdp_neg.h>
+#include <pjmedia/session.h>
 #include <pjmedia/silencedet.h>
-#include <pjmedia/session.h>
+#include <pjmedia/sound.h>
+#include <pjmedia/sound_port.h>
+#include <pjmedia/splitcomb.h>
 #include <pjmedia/transport.h>
 #include <pjmedia/transport_udp.h>
-#include <pjmedia/sound.h>
-#include <pjmedia/sound_port.h>
 #include <pjmedia/wav_port.h>
 #include <pjmedia/wave.h>

pjproject/trunk/pjmedia/src/pjmedia/transport_udp.c

@@ -52 +52 @@
     pj_sockaddr_in      rem_rtp_addr;   /**< Remote RTP address             */
     pj_sockaddr_in      rem_rtcp_addr;  /**< Remote RTCP address            */
-    void  (*rtp_cb)(    pjmedia_stream*,/**< To report incoming RTP.        */
+    void  (*rtp_cb)(    void*,          /**< To report incoming RTP.        */
                         const void*,
                         pj_ssize_t);
-    void  (*rtcp_cb)(   pjmedia_stream*,/**< To report incoming RTCP.       */
+    void  (*rtcp_cb)(   void*,          /**< To report incoming RTCP.       */
                         const void*,
                         pj_ssize_t);
@@ -322 +322 @@
     PJ_ASSERT_RETURN(tp, PJ_EINVAL);
 
-    /* Must not close while stream is using this */
+    /* Must not close while application is using this */
     PJ_ASSERT_RETURN(!udp->attached, PJ_EINVALIDOP);
     
@@ -449 +449 @@
 
 
-/* Called by stream to initialize the transport */
+/* Called by application to initialize the transport */
 static pj_status_t transport_attach(   pjmedia_transport *tp,
                                        void *user_data,
@@ -466 +466 @@
     PJ_ASSERT_RETURN(tp && rem_addr && addr_len, PJ_EINVAL);
 
-    /* Must not be "attached" to existing stream */
+    /* Must not be "attached" to existing application */
     PJ_ASSERT_RETURN(!udp->attached, PJ_EINVALIDOP);
 
-    /* "Attach" the stream: */
+    /* "Attach" the application: */
 
     /* Copy remote RTP address */
@@ -491 +491 @@
 
 
-/* Called by stream when it no longer needs the transport */
+/* Called by application when it no longer needs the transport */
 static void transport_detach( pjmedia_transport *tp,
                               void *user_data)
@@ -505 +505 @@
     pj_assert(user_data == udp->user_data);
 
-    /* First, mark stream as unattached */
+    /* First, mark transport as unattached */
     udp->attached = PJ_FALSE;
 
-    /* Clear up stream infos from transport */
+    /* Clear up application infos from transport */
     udp->rtp_cb = NULL;
     udp->rtcp_cb = NULL;
@@ -515 +515 @@
 
 
-/* Called by stream to send RTP packet */
+/* Called by application to send RTP packet */
 static pj_status_t transport_send_rtp( pjmedia_transport *tp,
                                        const void *pkt,
@@ -557 +557 @@
 }
 
-/* Called by stream to send RTCP packet */
+/* Called by application to send RTCP packet */
 static pj_status_t transport_send_rtcp(pjmedia_transport *tp,
                                        const void *pkt,