Changeset 558


Ignore:
Timestamp:
Jun 28, 2006 11:48:51 AM (16 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:
3 edited

Legend:

Unmodified
Added
Removed
  • pjproject/trunk/pjmedia/build/Makefile

    r525 r558  
    6666export PJMEDIA_OBJS += $(OS_OBJS) $(M_OBJS) $(CC_OBJS) $(HOST_OBJS) \ 
    6767                        clock_thread.o codec.o conference.o endpoint.o errno.o \ 
    68                         wav_player.o wav_writer.o g711.o jbuf.o \ 
    69                         master_port.o null_port.o plc_common.o plc_g711.o \ 
     68                        g711.o jbuf.o master_port.o mem_capture.o mem_player.o \ 
     69                        null_port.o plc_common.o plc_g711.o \ 
    7070                        port.o resample.o \ 
    7171                        resample_port.o rtcp.o rtp.o sdp.o sdp_cmp.o sdp_neg.o \ 
    7272                        session.o silencedet.o sound_port.o stream.o \ 
    73                         transport_udp.o wave.o \ 
     73                        transport_udp.o wav_player.o wav_writer.o wave.o \ 
    7474                        $(SOUND_OBJS) $(NULLSOUND_OBJS) 
    7575 
  • pjproject/trunk/pjmedia/include/pjmedia.h

    r518 r558  
    3434#include <pjmedia/jbuf.h> 
    3535#include <pjmedia/master_port.h> 
     36#include <pjmedia/mem_port.h> 
    3637#include <pjmedia/null_port.h> 
    3738#include <pjmedia/plc.h> 
     
    4243#include <pjmedia/sdp.h> 
    4344#include <pjmedia/sdp_neg.h> 
     45#include <pjmedia/session.h> 
    4446#include <pjmedia/silencedet.h> 
    45 #include <pjmedia/session.h> 
     47#include <pjmedia/sound.h> 
     48#include <pjmedia/sound_port.h> 
     49#include <pjmedia/splitcomb.h> 
    4650#include <pjmedia/transport.h> 
    4751#include <pjmedia/transport_udp.h> 
    48 #include <pjmedia/sound.h> 
    49 #include <pjmedia/sound_port.h> 
    5052#include <pjmedia/wav_port.h> 
    5153#include <pjmedia/wave.h> 
  • pjproject/trunk/pjmedia/src/pjmedia/transport_udp.c

    r539 r558  
    5252    pj_sockaddr_in      rem_rtp_addr;   /**< Remote RTP address             */ 
    5353    pj_sockaddr_in      rem_rtcp_addr;  /**< Remote RTCP address            */ 
    54     void  (*rtp_cb)(    pjmedia_stream*,/**< To report incoming RTP.        */ 
     54    void  (*rtp_cb)(    void*,          /**< To report incoming RTP.        */ 
    5555                        const void*, 
    5656                        pj_ssize_t); 
    57     void  (*rtcp_cb)(   pjmedia_stream*,/**< To report incoming RTCP.       */ 
     57    void  (*rtcp_cb)(   void*,          /**< To report incoming RTCP.       */ 
    5858                        const void*, 
    5959                        pj_ssize_t); 
     
    322322    PJ_ASSERT_RETURN(tp, PJ_EINVAL); 
    323323 
    324     /* Must not close while stream is using this */ 
     324    /* Must not close while application is using this */ 
    325325    PJ_ASSERT_RETURN(!udp->attached, PJ_EINVALIDOP); 
    326326     
     
    449449 
    450450 
    451 /* Called by stream to initialize the transport */ 
     451/* Called by application to initialize the transport */ 
    452452static pj_status_t transport_attach(   pjmedia_transport *tp, 
    453453                                       void *user_data, 
     
    466466    PJ_ASSERT_RETURN(tp && rem_addr && addr_len, PJ_EINVAL); 
    467467 
    468     /* Must not be "attached" to existing stream */ 
     468    /* Must not be "attached" to existing application */ 
    469469    PJ_ASSERT_RETURN(!udp->attached, PJ_EINVALIDOP); 
    470470 
    471     /* "Attach" the stream: */ 
     471    /* "Attach" the application: */ 
    472472 
    473473    /* Copy remote RTP address */ 
     
    491491 
    492492 
    493 /* Called by stream when it no longer needs the transport */ 
     493/* Called by application when it no longer needs the transport */ 
    494494static void transport_detach( pjmedia_transport *tp, 
    495495                              void *user_data) 
     
    505505    pj_assert(user_data == udp->user_data); 
    506506 
    507     /* First, mark stream as unattached */ 
     507    /* First, mark transport as unattached */ 
    508508    udp->attached = PJ_FALSE; 
    509509 
    510     /* Clear up stream infos from transport */ 
     510    /* Clear up application infos from transport */ 
    511511    udp->rtp_cb = NULL; 
    512512    udp->rtcp_cb = NULL; 
     
    515515 
    516516 
    517 /* Called by stream to send RTP packet */ 
     517/* Called by application to send RTP packet */ 
    518518static pj_status_t transport_send_rtp( pjmedia_transport *tp, 
    519519                                       const void *pkt, 
     
    557557} 
    558558 
    559 /* Called by stream to send RTCP packet */ 
     559/* Called by application to send RTCP packet */ 
    560560static pj_status_t transport_send_rtcp(pjmedia_transport *tp, 
    561561                                       const void *pkt, 
Note: See TracChangeset for help on using the changeset viewer.