Changeset 321

Timestamp:

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

Author:

bennylp

Message:

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

Location:

pjproject/trunk

Files:

• pjmedia/build/pjmedia.dsp (modified) (2 diffs)
• pjmedia/include/pjmedia/errno.h (modified) (1 diff)
• pjmedia/include/pjmedia/port.h (modified) (1 diff)
• pjmedia/include/pjmedia/rtcp.h (modified) (14 diffs)
• pjmedia/include/pjmedia/sound.h (modified) (12 diffs)
• pjmedia/include/pjmedia/sound_port.h (added)
• pjmedia/src/pjmedia/conference.c (modified) (7 diffs)
• pjmedia/src/pjmedia/endpoint.c (modified) (4 diffs)
• pjmedia/src/pjmedia/errno.c (modified) (1 diff)
• pjmedia/src/pjmedia/nullsound.c (modified) (9 diffs)
• pjmedia/src/pjmedia/pasound.c (modified) (16 diffs)
• pjmedia/src/pjmedia/rtcp.c (modified) (8 diffs)
• pjmedia/src/pjmedia/sound_port.c (added)
• pjmedia/src/pjmedia/stream.c (modified) (7 diffs)
• pjsip/src/pjsua-lib/pjsua_core.c (modified) (1 diff)

pjproject/trunk/pjmedia/build/pjmedia.dsp

@@ -169 +169 @@
 # Begin Source File
 
+SOURCE=..\src\pjmedia\sound_port.c
+# End Source File
+# Begin Source File
+
 SOURCE=..\src\pjmedia\stream.c
 # End Source File
@@ -254 +258 @@
 
 SOURCE=..\include\pjmedia\sound.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\include\pjmedia\sound_port.h
 # End Source File
 # Begin Source File

pjproject/trunk/pjmedia/include/pjmedia/errno.h

@@ -416 +416 @@
  */
 #define PJMEDIA_ENCBYTES            (PJMEDIA_ERRNO_START+165)    /* 220165 */
+/**
+ * @hideinitializer
+ * Incompatible number of channels
+ */
+#define PJMEDIA_ENCCHANNEL          (PJMEDIA_ERRNO_START+166)    /* 220166 */
 
 

pjproject/trunk/pjmedia/include/pjmedia/port.h

@@ -79 +79 @@
     pj_str_t        encoding_name;      /**< Encoding name.                 */
     unsigned        sample_rate;        /**< Sampling rate.                 */
+    unsigned        channel_count;      /**< Number of channels.            */
     unsigned        bits_per_sample;    /**< Bits/sample                    */
     unsigned        samples_per_frame;  /**< No of samples per frame.       */

pjproject/trunk/pjmedia/include/pjmedia/rtcp.h

@@ -40 +40 @@
  * RTCP sender report.
  */
-struct pj_rtcp_sr
+struct pjmedia_rtcp_sr
 {
     pj_uint32_t     ssrc;           /**< SSRC identification.           */
@@ -51 +51 @@
 
 /**
- * @see pj_rtcp_sr
- */
-typedef struct pj_rtcp_sr pj_rtcp_sr;
+ * @see pjmedia_rtcp_sr
+ */
+typedef struct pjmedia_rtcp_sr pjmedia_rtcp_sr;
 
 /**
  * RTCP receiver report.
  */
-struct pj_rtcp_rr
+struct pjmedia_rtcp_rr
 {
     pj_uint32_t     ssrc;           /**< SSRC identification.           */
@@ -79 +79 @@
 
 /**
- * @see pj_rtcp_rr
- */
-typedef struct pj_rtcp_rr pj_rtcp_rr;
+ * @see pjmedia_rtcp_rr
+ */
+typedef struct pjmedia_rtcp_rr pjmedia_rtcp_rr;
 
 
@@ -87 +87 @@
  * RTCP common header.
  */
-struct pj_rtcp_common
+struct pjmedia_rtcp_common
 {
 #if defined(PJ_IS_BIG_ENDIAN) && PJ_IS_BIG_ENDIAN!=0
@@ -104 +104 @@
 
 /**
- * @see pj_rtcp_common
- */
-typedef struct pj_rtcp_common pj_rtcp_common;
+ * @see pjmedia_rtcp_common
+ */
+typedef struct pjmedia_rtcp_common pjmedia_rtcp_common;
 
 /**
  * RTCP packet.
  */
-struct pj_rtcp_pkt
-{
-    pj_rtcp_common  common;     /**< Common header.         */
-    pj_rtcp_sr      sr;         /**< Sender report.         */
-    pj_rtcp_rr      rr;         /**< variable-length list   */
-};
-
-/**
- * @see pj_rtcp_pkt
- */
-typedef struct pj_rtcp_pkt pj_rtcp_pkt;
+struct pjmedia_rtcp_pkt
+{
+    pjmedia_rtcp_common  common;        /**< Common header.         */
+    pjmedia_rtcp_sr sr;         /**< Sender report.         */
+    pjmedia_rtcp_rr rr;         /**< variable-length list   */
+};
+
+/**
+ * @see pjmedia_rtcp_pkt
+ */
+typedef struct pjmedia_rtcp_pkt pjmedia_rtcp_pkt;
 
 
@@ -127 +127 @@
  * NTP time representation.
  */
-struct pj_rtcp_ntp_rec
+struct pjmedia_rtcp_ntp_rec
 {
     pj_uint32_t     hi;         /**< High order 32-bit part.    */
@@ -134 +134 @@
 
 /**
- * @see pj_rtcp_ntp_rec
- */
-typedef struct pj_rtcp_ntp_rec pj_rtcp_ntp_rec;
+ * @see pjmedia_rtcp_ntp_rec
+ */
+typedef struct pjmedia_rtcp_ntp_rec pjmedia_rtcp_ntp_rec;
 
 
@@ -143 +143 @@
  * RTCP session.
  */
-struct pj_rtcp_session
-{
-    pj_rtcp_pkt     rtcp_pkt;       /**< Cached RTCP packet.                */
+struct pjmedia_rtcp_session
+{
+    pjmedia_rtcp_pkt        rtcp_pkt;   /**< Cached RTCP packet.            */
     
     pjmedia_rtp_seq_session seq_ctrl;   /**< RTCP sequence number control.  */
@@ -155 +155 @@
     pj_uint32_t     jitter;         /**< Estimated jitter                   */
     
-    pj_rtcp_ntp_rec rtcp_lsr;       /**< NTP ts in last SR received         */
-    unsigned        rtcp_lsr_time;  /**< Time when last SR is received.     */
-    pj_uint32_t     peer_ssrc;      /**< Peer SSRC                          */
+    pjmedia_rtcp_ntp_rec rtcp_lsr;       /**< NTP ts in last SR received    */
+    unsigned             rtcp_lsr_time;  /**< Time when last SR is received.*/
+    pj_uint32_t          peer_ssrc;      /**< Peer SSRC                     */
     
 };
 
 /**
- * @see pj_rtcp_session
- */
-typedef struct pj_rtcp_session pj_rtcp_session;
+ * @see pjmedia_rtcp_session
+ */
+typedef struct pjmedia_rtcp_session pjmedia_rtcp_session;
 
 
@@ -173 +173 @@
  * @param ssrc      The SSRC used in to identify the session.
  */
-PJ_DECL(void) pj_rtcp_init( pj_rtcp_session *session, pj_uint32_t ssrc );
+PJ_DECL(void) pjmedia_rtcp_init( pjmedia_rtcp_session *session, 
+                                 pj_uint32_t ssrc );
 
 
@@ -181 +182 @@
  * @param session   The session.
  */
-PJ_DECL(void) pj_rtcp_fini( pj_rtcp_session *session);
+PJ_DECL(void) pjmedia_rtcp_fini( pjmedia_rtcp_session *session);
 
 
@@ -192 +193 @@
  * @param ts        The RTP packet timestamp, in host byte order.
  */
-PJ_DECL(void) pj_rtcp_rx_rtp( pj_rtcp_session *session, pj_uint16_t seq, 
-                              pj_uint32_t ts );
+PJ_DECL(void) pjmedia_rtcp_rx_rtp( pjmedia_rtcp_session *session, 
+                                   pj_uint16_t seq, 
+                                   pj_uint32_t ts );
 
 
@@ -204 +206 @@
  *                  RTP header) in bytes.
  */
-PJ_DECL(void) pj_rtcp_tx_rtp( pj_rtcp_session *session, pj_uint16_t ptsize );
+PJ_DECL(void) pjmedia_rtcp_tx_rtp( pjmedia_rtcp_session *session, 
+                                   pj_uint16_t ptsize );
 
 
@@ -216 +219 @@
  *                  the RTCP packet.
  */
-PJ_DECL(void) pj_rtcp_build_rtcp( pj_rtcp_session *session, 
-                                  pj_rtcp_pkt **rtcp_pkt, 
-                                  int *len );
+PJ_DECL(void) pjmedia_rtcp_build_rtcp( pjmedia_rtcp_session *session, 
+                                       pjmedia_rtcp_pkt **rtcp_pkt, 
+                                       int *len );
 
 

pjproject/trunk/pjmedia/include/pjmedia/sound.h

@@ -37 +37 @@
 
 /** Opaque data type for audio stream. */
-typedef struct pj_snd_stream pj_snd_stream;
-
-/**
- * Device information structure returned by #pj_snd_get_dev_info.
- */
-typedef struct pj_snd_dev_info
+typedef struct pjmedia_snd_stream pjmedia_snd_stream;
+
+/**
+ * Device information structure returned by #pjmedia_snd_get_dev_info.
+ */
+typedef struct pjmedia_snd_dev_info
 {
     char        name[64];               /**< Device name.                   */
@@ -48 +48 @@
     unsigned    output_count;           /**< Max number of output channels. */
     unsigned    default_samples_per_sec;/**< Default sampling rate.         */
-} pj_snd_dev_info;
+} pjmedia_snd_dev_info;
 
 /** 
@@ -63 +63 @@
  * @return              Non-zero to stop the stream.
  */
-typedef pj_status_t (*pj_snd_play_cb)(/* in */   void *user_data,
+typedef pj_status_t (*pjmedia_snd_play_cb)(/* in */   void *user_data,
                                       /* in */   pj_uint32_t timestamp,
                                       /* out */  void *output,
@@ -79 +79 @@
  * @return              Non-zero to stop the stream.
  */
-typedef pj_status_t (*pj_snd_rec_cb)(/* in */   void *user_data,
+typedef pj_status_t (*pjmedia_snd_rec_cb)(/* in */   void *user_data,
                                      /* in */   pj_uint32_t timestamp,
                                      /* in */   const void *input,
@@ -91 +91 @@
  * @return              Zero on success.
  */
-PJ_DECL(pj_status_t) pj_snd_init(pj_pool_factory *factory);
+PJ_DECL(pj_status_t) pjmedia_snd_init(pj_pool_factory *factory);
 
 
@@ -99 +99 @@
  * @return              Number of devices.
  */
-PJ_DECL(int) pj_snd_get_dev_count(void);
+PJ_DECL(int) pjmedia_snd_get_dev_count(void);
 
 
@@ -106 +106 @@
  *
  * @param index         The index of the device, which should be in the range
- *                      from zero to #pj_snd_get_dev_count - 1.
- */
-PJ_DECL(const pj_snd_dev_info*) pj_snd_get_dev_info(unsigned index);
+ *                      from zero to #pjmedia_snd_get_dev_count - 1.
+ */
+PJ_DECL(const pjmedia_snd_dev_info*) pjmedia_snd_get_dev_info(unsigned index);
 
 
@@ -114 +114 @@
  * Create a new audio stream for audio capture purpose.
  *
- * @param index         Device index, or -1 to let the library choose the first
- *                      available device, or -2 to use NULL device.
- * @param param         Stream parameters.
- * @param rec_cb        Callback to handle captured audio samples.
- * @param user_data     User data to be associated with the stream.
- *
- * @return              Audio stream, or NULL if failed.
- */
-PJ_DECL(pj_status_t) pj_snd_open_recorder( int index,
+ * @param index             Device index, or -1 to let the library choose the 
+ *                          first available device.
+ * @param clock_rate        Sound device's clock rate to set.
+ * @param channel_count     Set number of channels, 1 for mono, or 2 for
+ *                          stereo. The channel count determines the format
+ *                          of the frame.
+ * @param samples_per_frame Number of samples per frame.
+ * @param bits_per_sample   Set the number of bits per sample. The normal 
+ *                          value for this parameter is 16 bits per sample.
+ * @param rec_cb            Callback to handle captured audio samples.
+ * @param user_data         User data to be associated with the stream.
+ * @param p_snd_strm        Pointer to receive the stream instance.
+ *
+ * @return                  PJ_SUCCESS on success.
+ */
+PJ_DECL(pj_status_t) pjmedia_snd_open_recorder( int index,
                                            unsigned clock_rate,
                                            unsigned channel_count,
                                            unsigned samples_per_frame,
                                            unsigned bits_per_sample,
-                                           pj_snd_rec_cb rec_cb,
+                                           pjmedia_snd_rec_cb rec_cb,
                                            void *user_data,
-                                           pj_snd_stream **p_snd_strm);
+                                           pjmedia_snd_stream **p_snd_strm);
 
 /**
  * Create a new audio stream for playing audio samples.
  *
- * @param index         Device index, or -1 to let the library choose the first
- *                      available device, or -2 to use NULL device.
- * @param param         Stream parameters.
- * @param play_cb       Callback to supply audio samples.
- * @param user_data     User data to be associated with the stream.
- *
- * @return              Audio stream, or NULL if failed.
- */
-PJ_DECL(pj_status_t) pj_snd_open_player( int index,
+ * @param index             Device index, or -1 to let the library choose the 
+ *                          first available device.
+ * @param clock_rate        Sound device's clock rate to set.
+ * @param channel_count     Set number of channels, 1 for mono, or 2 for
+ *                          stereo. The channel count determines the format
+ *                          of the frame.
+ * @param samples_per_frame Number of samples per frame.
+ * @param bits_per_sample   Set the number of bits per sample. The normal 
+ *                          value for this parameter is 16 bits per sample.
+ * @param play_cb           Callback to be called when the sound player needs
+ *                          more audio samples to play.
+ * @param user_data         User data to be associated with the stream.
+ * @param p_snd_strm        Pointer to receive the stream instance.
+ *
+ * @return                  PJ_SUCCESS on success.
+ */
+PJ_DECL(pj_status_t) pjmedia_snd_open_player( int index,
                                          unsigned clock_rate,
                                          unsigned channel_count,
                                          unsigned samples_per_frame,
                                          unsigned bits_per_sample,
-                                         pj_snd_play_cb play_cb,
+                                         pjmedia_snd_play_cb play_cb,
                                          void *user_data,
-                                         pj_snd_stream **p_snd_strm );
+                                         pjmedia_snd_stream **p_snd_strm );
 
 /**
@@ -158 +173 @@
  * @return              Zero on success.
  */
-PJ_DECL(pj_status_t) pj_snd_stream_start(pj_snd_stream *stream);
+PJ_DECL(pj_status_t) pjmedia_snd_stream_start(pjmedia_snd_stream *stream);
 
 /**
@@ -167 +182 @@
  * @return              Zero on success.
  */
-PJ_DECL(pj_status_t) pj_snd_stream_stop(pj_snd_stream *stream);
+PJ_DECL(pj_status_t) pjmedia_snd_stream_stop(pjmedia_snd_stream *stream);
 
 /**
@@ -176 +191 @@
  * @return              Zero on success.
  */
-PJ_DECL(pj_status_t) pj_snd_stream_close(pj_snd_stream *stream);
+PJ_DECL(pj_status_t) pjmedia_snd_stream_close(pjmedia_snd_stream *stream);
 
 /**
@@ -183 +198 @@
  * @return              Zero on success.
  */
-PJ_DECL(pj_status_t) pj_snd_deinit(void);
+PJ_DECL(pj_status_t) pjmedia_snd_deinit(void);
 
 

pjproject/trunk/pjmedia/src/pjmedia/conference.c

@@ -132 +132 @@
     unsigned              port_cnt;     /**< Current number of ports.       */
     unsigned              connect_cnt;  /**< Total number of connections    */
-    pj_snd_stream        *snd_rec;      /**< Sound recorder stream.         */
-    pj_snd_stream        *snd_player;   /**< Sound player stream.           */
+    pjmedia_snd_stream   *snd_rec;      /**< Sound recorder stream.         */
+    pjmedia_snd_stream   *snd_player;   /**< Sound player stream.           */
     pj_mutex_t           *mutex;        /**< Conference mutex.              */
     struct conf_port    **ports;        /**< Array of ports.                */
@@ -383 +383 @@
     /* Open recorder only if mic is not disabled. */
     if ((conf->options & PJMEDIA_CONF_NO_MIC) == 0) {
-        status = pj_snd_open_recorder(-1, conf->clock_rate, 1, 
+        status = pjmedia_snd_open_recorder(-1, conf->clock_rate, 1, 
                                       conf->samples_per_frame,
                                       conf->bits_per_sample,
@@ -394 +394 @@
 
     /* Open player */
-    status = pj_snd_open_player(-1, conf->clock_rate, 1,
+    status = pjmedia_snd_open_player(-1, conf->clock_rate, 1,
                                 conf->samples_per_frame,
                                 conf->bits_per_sample, 
@@ -400 +400 @@
     if (status != PJ_SUCCESS) {
         if (conf->snd_rec) {
-            pj_snd_stream_close(conf->snd_rec);
+            pjmedia_snd_stream_close(conf->snd_rec);
             conf->snd_rec = NULL;
         }
@@ -416 +416 @@
 {
     if (conf->snd_rec) {
-        pj_snd_stream_close(conf->snd_rec);
+        pjmedia_snd_stream_close(conf->snd_rec);
         conf->snd_rec = NULL;
     }
     if (conf->snd_player) {
-        pj_snd_stream_close(conf->snd_player);
+        pjmedia_snd_stream_close(conf->snd_player);
         conf->snd_player = NULL;
     }
@@ -442 +442 @@
     /* Start recorder. */
     if (conf->snd_rec) {
-        status = pj_snd_stream_start(conf->snd_rec);
+        status = pjmedia_snd_stream_start(conf->snd_rec);
         if (status != PJ_SUCCESS)
             goto on_error;
@@ -449 +449 @@
     /* Start player. */
     if (conf->snd_player) {
-        status = pj_snd_stream_start(conf->snd_player);
+        status = pjmedia_snd_stream_start(conf->snd_player);
         if (status != PJ_SUCCESS)
             goto on_error;

pjproject/trunk/pjmedia/src/pjmedia/endpoint.c

@@ -107 +107 @@
 
     /* Sound */
-    pj_snd_init(pf);
+    pjmedia_snd_init(pf);
 
     /* Init codec manager. */
     status = pjmedia_codec_mgr_init(&endpt->codec_mgr);
     if (status != PJ_SUCCESS) {
-        pj_snd_deinit();
+        pjmedia_snd_deinit();
         goto on_error;
     }
@@ -123 +123 @@
     status = g711_init_factory (factory, endpt->pool);
     if (status != PJ_SUCCESS) {
-        pj_snd_deinit();
+        pjmedia_snd_deinit();
         goto on_error;
     }
@@ -129 +129 @@
     status = pjmedia_codec_mgr_register_factory (&endpt->codec_mgr, factory);
     if (status != PJ_SUCCESS)  {
-        pj_snd_deinit();
+        pjmedia_snd_deinit();
         goto on_error;
     }
@@ -159 +159 @@
     endpt->pf = NULL;
 
-    pj_snd_deinit();
+    pjmedia_snd_deinit();
     pj_pool_release (endpt->pool);
 

pjproject/trunk/pjmedia/src/pjmedia/errno.c

@@ -114 +114 @@
     { PJMEDIA_ENCBITS,              "Media ports have incompatible bits per sample" },
     { PJMEDIA_ENCBYTES,             "Media ports have incompatible bytes per frame" },
+    { PJMEDIA_ENCCHANNEL,           "Media ports have incompatible number of channels" },
 
     /* Media file errors: */

pjproject/trunk/pjmedia/src/pjmedia/nullsound.c

@@ -22 +22 @@
 #if defined(PJMEDIA_HAS_NULL_SOUND) && PJMEDIA_HAS_NULL_SOUND!=0
 
-static pj_snd_dev_info null_info = 
+static pjmedia_snd_dev_info null_info = 
 {
     "Null Device",
@@ -31 +31 @@
 
 
-PJ_DEF(pj_status_t) pj_snd_init(pj_pool_factory *factory)
+PJ_DEF(pj_status_t) pjmedia_snd_init(pj_pool_factory *factory)
 {
     PJ_UNUSED_ARG(factory);
@@ -37 +37 @@
 }
 
-PJ_DEF(int) pj_snd_get_dev_count(void)
+PJ_DEF(int) pjmedia_snd_get_dev_count(void)
 {
     return 1;
 }
 
-PJ_DEF(const pj_snd_dev_info*) pj_snd_get_dev_info(unsigned index)
+PJ_DEF(const pjmedia_snd_dev_info*) pjmedia_snd_get_dev_info(unsigned index)
 {
     PJ_ASSERT_RETURN(index==0, NULL);
@@ -48 +48 @@
 }
 
-PJ_DEF(pj_status_t) pj_snd_open_recorder( int index,
+PJ_DEF(pj_status_t) pjmedia_snd_open_recorder( int index,
                                           unsigned clock_rate,
                                           unsigned channel_count,
                                           unsigned samples_per_frame,
                                           unsigned bits_per_sample,
-                                          pj_snd_rec_cb rec_cb,
+                                          pjmedia_snd_rec_cb rec_cb,
                                           void *user_data,
-                                          pj_snd_stream **p_snd_strm)
+                                          pjmedia_snd_stream **p_snd_strm)
 {
     PJ_UNUSED_ARG(index);
@@ -70 +70 @@
 }
 
-PJ_DEF(pj_status_t) pj_snd_open_player( int index,
+PJ_DEF(pj_status_t) pjmedia_snd_open_player( int index,
                                         unsigned clock_rate,
                                         unsigned channel_count,
                                         unsigned samples_per_frame,
                                         unsigned bits_per_sample,
-                                        pj_snd_play_cb play_cb,
+                                        pjmedia_snd_play_cb play_cb,
                                         void *user_data,
-                                        pj_snd_stream **p_snd_strm )
+                                        pjmedia_snd_stream **p_snd_strm )
 {
     PJ_UNUSED_ARG(index);
@@ -92 +92 @@
 }
 
-PJ_DEF(pj_status_t) pj_snd_stream_start(pj_snd_stream *stream)
+PJ_DEF(pj_status_t) pjmedia_snd_stream_start(pjmedia_snd_stream *stream)
 {
     PJ_UNUSED_ARG(stream);
@@ -98 +98 @@
 }
 
-PJ_DEF(pj_status_t) pj_snd_stream_stop(pj_snd_stream *stream)
+PJ_DEF(pj_status_t) pjmedia_snd_stream_stop(pjmedia_snd_stream *stream)
 {
     PJ_UNUSED_ARG(stream);
@@ -104 +104 @@
 }
 
-PJ_DEF(pj_status_t) pj_snd_stream_close(pj_snd_stream *stream)
+PJ_DEF(pj_status_t) pjmedia_snd_stream_close(pjmedia_snd_stream *stream)
 {
     PJ_UNUSED_ARG(stream);
@@ -110 +110 @@
 }
 
-PJ_DEF(pj_status_t) pj_snd_deinit(void)
+PJ_DEF(pj_status_t) pjmedia_snd_deinit(void)
 {
     return PJ_SUCCESS;

pjproject/trunk/pjmedia/src/pjmedia/pasound.c

@@ -33 +33 @@
 } snd_mgr;
 
-struct pj_snd_stream
+struct pjmedia_snd_stream
 {
     pj_pool_t       *pool;
@@ -46 +46 @@
     pj_uint32_t      overflow;
     void            *user_data;
-    pj_snd_rec_cb    rec_cb;
-    pj_snd_play_cb   play_cb;
+    pjmedia_snd_rec_cb    rec_cb;
+    pjmedia_snd_play_cb   play_cb;
     pj_bool_t        quit_flag;
     pj_bool_t        thread_has_exited;
@@ -63 +63 @@
                               void *userData )
 {
-    pj_snd_stream *stream = userData;
+    pjmedia_snd_stream *stream = userData;
     pj_status_t status;
 
@@ -103 +103 @@
                              void *userData )
 {
-    pj_snd_stream *stream = userData;
+    pjmedia_snd_stream *stream = userData;
     pj_status_t status;
     unsigned size = frameCount * stream->bytes_per_sample;
@@ -141 +141 @@
  * Init sound library.
  */
-PJ_DEF(pj_status_t) pj_snd_init(pj_pool_factory *factory)
+PJ_DEF(pj_status_t) pjmedia_snd_init(pj_pool_factory *factory)
 {
     int err;
@@ -152 +152 @@
                          Pa_GetHostApiCount()));
     PJ_LOG(4,(THIS_FILE, "Sound device count=%d",
-                         pj_snd_get_dev_count()));
-
-    return err;
+                         pjmedia_snd_get_dev_count()));
+
+    return err ? PJMEDIA_ERRNO_FROM_PORTAUDIO(err) : PJ_SUCCESS;
 }
 
@@ -161 +161 @@
  * Get device count.
  */
-PJ_DEF(int) pj_snd_get_dev_count(void)
+PJ_DEF(int) pjmedia_snd_get_dev_count(void)
 {
     return Pa_GetDeviceCount();
@@ -170 +170 @@
  * Get device info.
  */
-PJ_DEF(const pj_snd_dev_info*) pj_snd_get_dev_info(unsigned index)
-{
-    static pj_snd_dev_info info;
+PJ_DEF(const pjmedia_snd_dev_info*) pjmedia_snd_get_dev_info(unsigned index)
+{
+    static pjmedia_snd_dev_info info;
     const PaDeviceInfo *pa_info;
 
@@ -193 +193 @@
  * Open stream.
  */
-PJ_DEF(pj_status_t) pj_snd_open_recorder( int index,
+PJ_DEF(pj_status_t) pjmedia_snd_open_recorder( int index,
                                           unsigned clock_rate,
                                           unsigned channel_count,
                                           unsigned samples_per_frame,
                                           unsigned bits_per_sample,
-                                          pj_snd_rec_cb rec_cb,
+                                          pjmedia_snd_rec_cb rec_cb,
                                           void *user_data,
-                                          pj_snd_stream **p_snd_strm)
+                                          pjmedia_snd_stream **p_snd_strm)
 {
     pj_pool_t *pool;
-    pj_snd_stream *stream;
+    pjmedia_snd_stream *stream;
     PaStreamParameters inputParam;
     int sampleFormat;
@@ -278 +278 @@
 
 
-PJ_DEF(pj_status_t) pj_snd_open_player( int index,
+PJ_DEF(pj_status_t) pjmedia_snd_open_player( int index,
                                         unsigned clock_rate,
                                         unsigned channel_count,
                                         unsigned samples_per_frame,
                                         unsigned bits_per_sample,
-                                        pj_snd_play_cb play_cb,
+                                        pjmedia_snd_play_cb play_cb,
                                         void *user_data,
-                                        pj_snd_stream **p_snd_strm)
+                                        pjmedia_snd_stream **p_snd_strm)
 {
     pj_pool_t *pool;
-    pj_snd_stream *stream;
+    pjmedia_snd_stream *stream;
     PaStreamParameters outputParam;
     int sampleFormat;
@@ -367 +367 @@
  * Start stream.
  */
-PJ_DEF(pj_status_t) pj_snd_stream_start(pj_snd_stream *stream)
-{
-    pj_status_t status;
+PJ_DEF(pj_status_t) pjmedia_snd_stream_start(pjmedia_snd_stream *stream)
+{
+    pj_status_t err;
 
     PJ_LOG(5,(THIS_FILE, "Starting %s stream..", stream->name.ptr));
 
-    status = Pa_StartStream(stream->stream);
-
-    PJ_LOG(5,(THIS_FILE, "Done, status=%d", status));
-
-    return status;
+    err = Pa_StartStream(stream->stream);
+
+    PJ_LOG(5,(THIS_FILE, "Done, status=%d", err));
+
+    return err ? PJMEDIA_ERRNO_FROM_PORTAUDIO(err) : PJ_SUCCESS;
 }
 
@@ -383 +383 @@
  * Stop stream.
  */
-PJ_DEF(pj_status_t) pj_snd_stream_stop(pj_snd_stream *stream)
+PJ_DEF(pj_status_t) pjmedia_snd_stream_stop(pjmedia_snd_stream *stream)
 {
     int i, err;
@@ -399 +399 @@
     PJ_LOG(5,(THIS_FILE, "Done, status=%d", err));
 
-    return err;
+    return err ? PJMEDIA_ERRNO_FROM_PORTAUDIO(err) : PJ_SUCCESS;
 }
 
@@ -405 +405 @@
  * Destroy stream.
  */
-PJ_DEF(pj_status_t) pj_snd_stream_close(pj_snd_stream *stream)
+PJ_DEF(pj_status_t) pjmedia_snd_stream_close(pjmedia_snd_stream *stream)
 {
     int i, err;
@@ -424 +424 @@
     err = Pa_CloseStream(stream->stream);
     pj_pool_release(stream->pool);
-    return err;
+
+    return err ? PJMEDIA_ERRNO_FROM_PORTAUDIO(err) : PJ_SUCCESS;
 }
 
@@ -430 +431 @@
  * Deinitialize sound library.
  */
-PJ_DEF(pj_status_t) pj_snd_deinit(void)
-{
+PJ_DEF(pj_status_t) pjmedia_snd_deinit(void)
+{
+    int err;
+
     PJ_LOG(4,(THIS_FILE, "PortAudio sound library shutting down.."));
 
-    return Pa_Terminate();
+    err = Pa_Terminate();
+
+    return err ? PJMEDIA_ERRNO_FROM_PORTAUDIO(err) : PJ_SUCCESS;
 }
 

pjproject/trunk/pjmedia/src/pjmedia/rtcp.c

@@ -32 +32 @@
  * Get NTP time.
  */
-static void rtcp_get_ntp_time(struct pj_rtcp_ntp_rec *ntp)
+static void rtcp_get_ntp_time(struct pjmedia_rtcp_ntp_rec *ntp)
 {
     pj_time_val tv;
@@ -45 +45 @@
 
 
-PJ_DEF(void) pj_rtcp_init(pj_rtcp_session *s, pj_uint32_t ssrc)
-{
-    pj_rtcp_pkt *rtcp_pkt = &s->rtcp_pkt;
-    
-    pj_memset(rtcp_pkt, 0, sizeof(pj_rtcp_pkt));
+PJ_DEF(void) pjmedia_rtcp_init(pjmedia_rtcp_session *s, 
+                               pj_uint32_t ssrc)
+{
+    pjmedia_rtcp_pkt *rtcp_pkt = &s->rtcp_pkt;
+    
+    pj_memset(rtcp_pkt, 0, sizeof(pjmedia_rtcp_pkt));
     
     /* Init time */
@@ -67 +68 @@
 }
 
-PJ_DEF(void) pj_rtcp_fini(pj_rtcp_session *session)
+PJ_DEF(void) pjmedia_rtcp_fini(pjmedia_rtcp_session *session)
 {
     /* Nothing to do. */
@@ -73 +74 @@
 }
 
-static void rtcp_init_seq(pj_rtcp_session *s, pj_uint16_t  seq)
+static void rtcp_init_seq(pjmedia_rtcp_session *s, pj_uint16_t  seq)
 {
     s->received = 0;
@@ -84 +85 @@
 }
 
-PJ_DEF(void) pj_rtcp_rx_rtp(pj_rtcp_session *s, pj_uint16_t seq, pj_uint32_t rtp_ts)
+PJ_DEF(void) pjmedia_rtcp_rx_rtp(pjmedia_rtcp_session *s, 
+                                 pj_uint16_t seq, 
+                                 pj_uint32_t rtp_ts)
 {   
     pj_uint32_t arrival;
@@ -130 +133 @@
 }
 
-PJ_DEF(void) pj_rtcp_tx_rtp(pj_rtcp_session *s, pj_uint16_t  bytes_payload_size)
-{
-    pj_rtcp_pkt *rtcp_pkt = &s->rtcp_pkt;
+PJ_DEF(void) pjmedia_rtcp_tx_rtp(pjmedia_rtcp_session *s, 
+                                 pj_uint16_t  bytes_payload_size)
+{
+    pjmedia_rtcp_pkt *rtcp_pkt = &s->rtcp_pkt;
     rtcp_pkt->sr.sender_pcount = pj_htonl( pj_ntohl(rtcp_pkt->sr.sender_pcount) + 1);
     rtcp_pkt->sr.sender_bcount = pj_htonl( pj_ntohl(rtcp_pkt->sr.sender_bcount) + bytes_payload_size );
 }
 
-static void rtcp_build_rtcp(pj_rtcp_session *s, pj_uint32_t receiver_ssrc)
+static void rtcp_build_rtcp(pjmedia_rtcp_session *s, 
+                            pj_uint32_t receiver_ssrc)
 {   
     pj_uint32_t expected;
     pj_uint32_t u32;
     pj_uint32_t expected_interval, received_interval, lost_interval;
-    pj_rtcp_pkt *rtcp_pkt = &s->rtcp_pkt;
+    pjmedia_rtcp_pkt *rtcp_pkt = &s->rtcp_pkt;
     
     /* SSRC and last_seq */
@@ -176 +181 @@
 }
 
-PJ_DEF(void) pj_rtcp_build_rtcp(pj_rtcp_session *session, pj_rtcp_pkt **ret_p_pkt, int *len)
-{
-    pj_rtcp_pkt *rtcp_pkt = &session->rtcp_pkt;
-    pj_rtcp_ntp_rec ntp;
+PJ_DEF(void) pjmedia_rtcp_build_rtcp(pjmedia_rtcp_session *session, 
+                                     pjmedia_rtcp_pkt **ret_p_pkt, 
+                                     int *len)
+{
+    pjmedia_rtcp_pkt *rtcp_pkt = &session->rtcp_pkt;
+    pjmedia_rtcp_ntp_rec ntp;
     pj_time_val now;
     
@@ -214 +221 @@
     /* Return pointer. */
     *ret_p_pkt = rtcp_pkt;
-    *len = sizeof(pj_rtcp_pkt);
-}
-
+    *len = sizeof(pjmedia_rtcp_pkt);
+}
+

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 {

pjproject/trunk/pjsip/src/pjsua-lib/pjsua_core.c

@@ -1085 +1085 @@
 
 
-    /* Destroy sound framework: 
-     * (this should be done in pjmedia_shutdown())
-     */
-    pj_snd_deinit();
-
     /* Shutdown all codecs: */
     for (i = pjsua.codec_cnt-1; i >= 0; --i) {