Changeset 2456 for pjproject/branches/projects/aps-direct

Timestamp:

Feb 16, 2009 4:29:05 PM (15 years ago)

Author:

nanang

Message:

Changed term 'fourcc' to 'format' and few minor fixes/updates.

Location:

pjproject/branches/projects/aps-direct

Files:

• pjmedia/include/pjmedia/codec.h (modified) (1 diff)
• pjmedia/include/pjmedia/conference.h (modified) (1 diff)
• pjmedia/include/pjmedia/port.h (modified) (2 diffs)
• pjmedia/include/pjmedia/sound.h (modified) (1 diff)
• pjmedia/include/pjmedia/symbian_sound_aps.h (modified) (1 diff)
• pjmedia/include/pjmedia/types.h (modified) (1 diff)
• pjmedia/src/pjmedia-codec/passthrough.c (modified) (6 diffs)
• pjmedia/src/pjmedia/conf_switch.c (modified) (7 diffs)
• pjmedia/src/pjmedia/sound_port.c (modified) (5 diffs)
• pjmedia/src/pjmedia/stream.c (modified) (2 diffs)
• pjmedia/src/pjmedia/symbian_sound_aps.cpp (modified) (25 diffs)
• pjsip-apps/src/symbian_ua/ua.cpp (modified) (11 diffs)

pjproject/branches/projects/aps-direct/pjmedia/include/pjmedia/codec.h

@@ -276 +276 @@
        pj_uint8_t  pcm_bits_per_sample; /**< Bits/sample in the PCM side    */
        pj_uint8_t  pt;                  /**< Payload type.                  */
-       pjmedia_fourcc format;           /**< Source format, it's format of
+       pjmedia_format format;           /**< Source format, it's format of
                                              encoder input and decoder 
                                              output.                        */

pjproject/branches/projects/aps-direct/pjmedia/include/pjmedia/conference.h

@@ -57 +57 @@
     unsigned            slot;               /**< Slot number.               */
     pj_str_t            name;               /**< Port name.                 */
-    pjmedia_fourcc      format;             /**< Format (FourCC identifier) */
+    pjmedia_format      format;             /**< Format.                    */
     pjmedia_port_op     tx_setting;         /**< Transmit settings.         */
     pjmedia_port_op     rx_setting;         /**< Receive settings.          */

pjproject/branches/projects/aps-direct/pjmedia/include/pjmedia/port.h

@@ -213 +213 @@
     pj_bool_t       need_info;          /**< Need info on connect?          */
     unsigned        pt;                 /**< Payload type (can be dynamic). */
-    pjmedia_fourcc  format;             /**< Format (FourCC identifier)     */
+    pjmedia_format  format;             /**< Format.                        */
     pj_str_t        encoding_name;      /**< Encoding name.                 */
     unsigned        clock_rate;         /**< Sampling rate.                 */
@@ -359 +359 @@
  * @param n                 Number of first subframes to be popped out.
  *
- * @return                  PJ_SUCCESS, or PJ_ENOTFOUND if frame is empty.
+ * @return                  PJ_SUCCESS when successful.
  */
 PJ_INLINE(pj_status_t) 

pjproject/branches/projects/aps-direct/pjmedia/include/pjmedia/sound.h

@@ -99 +99 @@
 typedef struct pjmedia_snd_setting
 {
-    pjmedia_fourcc      format;   /**< Format (FourCC ID).          */ 
+    pjmedia_format      format;   /**< Format.                      */ 
     pj_uint32_t         bitrate;  /**< Bitrate (bps).               */
     pj_uint32_t         mode;     /**< Mode, e.g: iLBC format has

pjproject/branches/projects/aps-direct/pjmedia/include/pjmedia/symbian_sound_aps.h

@@ -32 +32 @@
 
 /**
- * Declaration of APS sound setting.  
- */
-typedef struct pjmedia_snd_aps_setting
-{
-    pjmedia_fourcc      format;   /**< Format (FourCC ID).      */ 
-    pj_uint32_t         bitrate;  /**< Bitrate (bps).           */
-    pj_uint32_t         mode;     /**< Mode, currently only used 
-                                       for specifying iLBC mode,
-                                       20ms or 30ms frame size. */
-    pj_bool_t           plc;      /**< PLC enabled/disabled.    */
-    pj_bool_t           vad;      /**< VAD enabled/disabled.    */
-    pj_bool_t           cng;      /**< CNG enabled/disabled.    */
-    pj_bool_t           loudspk;  /**< Audio routed to loudspeaker.*/
-    
-} pjmedia_snd_aps_setting;
-
-
-/**
  * Activate/deactivate loudspeaker, when loudspeaker is inactive, audio
  * will be routed to earpiece.

pjproject/branches/projects/aps-direct/pjmedia/include/pjmedia/types.h

@@ -180 +180 @@
 
 /**
- * Declaration of FourCC type.
- */
-typedef union pjmedia_fourcc {
+ * Declaration of format.
+ */
+typedef union pjmedia_format {
    pj_uint32_t  u32;
    char         c[4];
-} pjmedia_fourcc;
-
-
-/**
- * FourCC packing macro.
- */
-#define PJMEDIA_FOURCC_PACK(C1, C2, C3, C4) ( C4<<24 | C3<<16 | C2<<8 | C1 )
-
-/**
- * FourCC identifier definitions.
- */
-#define PJMEDIA_FOURCC_L16      PJMEDIA_FOURCC_PACK(' ', 'L', '1', '6')
-#define PJMEDIA_FOURCC_PCMA     PJMEDIA_FOURCC_PACK('A', 'L', 'A', 'W')
-#define PJMEDIA_FOURCC_PCMU     PJMEDIA_FOURCC_PACK('u', 'L', 'A', 'W')
-#define PJMEDIA_FOURCC_AMR      PJMEDIA_FOURCC_PACK(' ', 'A', 'M', 'R')
-#define PJMEDIA_FOURCC_G729     PJMEDIA_FOURCC_PACK('G', '7', '2', '9')
-#define PJMEDIA_FOURCC_ILBC     PJMEDIA_FOURCC_PACK('I', 'L', 'B', 'C')
+} pjmedia_format;
+
+
+/**
+ * Macro for packing format.
+ */
+#define PJMEDIA_FORMAT_PACK(C1, C2, C3, C4) ( C4<<24 | C3<<16 | C2<<8 | C1 )
+
+/**
+ * Format identifier definitions.
+ */
+#define PJMEDIA_FORMAT_L16      0
+#define PJMEDIA_FORMAT_PCMA     PJMEDIA_FORMAT_PACK('A', 'L', 'A', 'W')
+#define PJMEDIA_FORMAT_PCMU     PJMEDIA_FORMAT_PACK('u', 'L', 'A', 'W')
+#define PJMEDIA_FORMAT_AMR      PJMEDIA_FORMAT_PACK(' ', 'A', 'M', 'R')
+#define PJMEDIA_FORMAT_G729     PJMEDIA_FORMAT_PACK('G', '7', '2', '9')
+#define PJMEDIA_FORMAT_ILBC     PJMEDIA_FORMAT_PACK('I', 'L', 'B', 'C')
 
 

pjproject/branches/projects/aps-direct/pjmedia/src/pjmedia-codec/passthrough.c

@@ -156 +156 @@
     const char      *name;              /* Codec name.                      */
     pj_uint8_t       pt;                /* Payload type.                    */
-    pjmedia_fourcc   format;            /* Source format.                   */
+    pjmedia_format   format;            /* Source format.                   */
     unsigned         clock_rate;        /* Codec's clock rate.              */
     unsigned         channel_count;     /* Codec's channel count.           */
@@ -173 +173 @@
 {
 #   if PJMEDIA_HAS_PASSTHROUGH_CODEC_AMR
-    {1, "AMR",      PJMEDIA_RTP_PT_AMR,       {PJMEDIA_FOURCC_AMR},
+    {1, "AMR",      PJMEDIA_RTP_PT_AMR,       {PJMEDIA_FORMAT_AMR},
                     8000, 1, 160, 
                     7400, 12200, 2, 1, 1,
@@ -182 +182 @@
 
 #   if PJMEDIA_HAS_PASSTHROUGH_CODEC_G729
-    {1, "G729",     PJMEDIA_RTP_PT_G729,      {PJMEDIA_FOURCC_G729},
+    {1, "G729",     PJMEDIA_RTP_PT_G729,      {PJMEDIA_FORMAT_G729},
                     8000, 1,  80,
                     8000, 8000, 2, 1, 1
@@ -189 +189 @@
 
 #   if PJMEDIA_HAS_PASSTHROUGH_CODEC_ILBC
-    {1, "iLBC",     PJMEDIA_RTP_PT_ILBC,      {PJMEDIA_FOURCC_ILBC},
+    {1, "iLBC",     PJMEDIA_RTP_PT_ILBC,      {PJMEDIA_FORMAT_ILBC},
                     8000, 1,  240,
                     13333, 15200, 1, 1, 1,
@@ -198 +198 @@
 
 #   if PJMEDIA_HAS_PASSTHROUGH_CODEC_PCMU
-    {1, "PCMU",     PJMEDIA_RTP_PT_PCMU,      {PJMEDIA_FOURCC_PCMU},
+    {1, "PCMU",     PJMEDIA_RTP_PT_PCMU,      {PJMEDIA_FORMAT_PCMU},
                     8000, 1,  80,
                     64000, 64000, 2, 1, 1
@@ -205 +205 @@
 
 #   if PJMEDIA_HAS_PASSTHROUGH_CODEC_PCMA
-    {1, "PCMA",     PJMEDIA_RTP_PT_PCMA,      {PJMEDIA_FOURCC_PCMA},
+    {1, "PCMA",     PJMEDIA_RTP_PT_PCMA,      {PJMEDIA_FORMAT_PCMA},
                     8000, 1,  80,
                     64000, 64000, 2, 1, 1

pjproject/branches/projects/aps-direct/pjmedia/src/pjmedia/conf_switch.c

@@ -588 +588 @@
     dst_port = conf->ports[sink_slot];
 
+    /* Source and sink format must match. */
+    if (src_port->info->format.u32 != dst_port->info->format.u32) {
+        pj_mutex_unlock(conf->mutex);
+        return PJMEDIA_ENOTCOMPATIBLE;
+    }
+
     /* Source and sink ptime must be equal or a multiplication factor. */
     if ((src_port->info->samples_per_frame % 
@@ -598 +604 @@
     }
     
-    /* Check if source and sink has compatible format */
-    if (src_slot != 0 && sink_slot != 0 && 
-        src_port->port->info.format.u32 != dst_port->port->info.format.u32)
-    {
-        pj_mutex_unlock(conf->mutex);
-        return PJMEDIA_ENOTCOMPATIBLE;
-    }
-
     /* Check if sink is listening to other ports */
     if (dst_port->transmitter_cnt > 0) {
@@ -954 +952 @@
 
     /* Level adjustment is applicable only for ports that work with raw PCM. */
-    PJ_ASSERT_RETURN(conf_port->info->format.u32 == 0 || 
-                     conf_port->info->format.u32 == PJMEDIA_FOURCC_L16,
+    PJ_ASSERT_RETURN(conf_port->info->format.u32 == PJMEDIA_FORMAT_L16,
                      PJ_EIGNORED);
 
@@ -989 +986 @@
 
     /* Level adjustment is applicable only for ports that work with raw PCM. */
-    PJ_ASSERT_RETURN(conf_port->info->format.u32 == 0 || 
-                     conf_port->info->format.u32 == PJMEDIA_FOURCC_L16,
+    PJ_ASSERT_RETURN(conf_port->info->format.u32 == PJMEDIA_FORMAT_L16,
                      PJ_EIGNORED);
 
@@ -1114 +1110 @@
 
         /* Check port format. */
-        if (cport_dst->port && (cport_dst->port->info.format.u32==0 ||
-            cport_dst->port->info.format.u32 == PJMEDIA_FOURCC_L16))
+        if (cport_dst->port &&
+            cport_dst->port->info.format.u32 == PJMEDIA_FORMAT_L16)
         {
             /* When there is already some samples in listener's TX buffer, 
@@ -1266 +1262 @@
                 }
             } else if (f->type == PJMEDIA_FRAME_TYPE_EXTENDED) {
-                /* For extended frame, TX level is unknown, so we just set 
+                /* For extended frame, level is unknown, so we just set 
                  * it to NORMAL_LEVEL. 
                  */
@@ -1474 +1470 @@
         }
     } else if (f->type == PJMEDIA_FRAME_TYPE_EXTENDED) {
-        /* For extended frame, TX level is unknown, so we just set 
+        /* For extended frame, level is unknown, so we just set 
          * it to NORMAL_LEVEL. 
          */

pjproject/branches/projects/aps-direct/pjmedia/src/pjmedia/sound_port.c

@@ -291 +291 @@
 
         switch (snd_port->setting.format.u32) {
-        case PJMEDIA_FOURCC_PCMA:
+        case PJMEDIA_FORMAT_PCMA:
             decoder = &pjmedia_alaw_decode;
             break;
-        case PJMEDIA_FOURCC_PCMU:
+        case PJMEDIA_FORMAT_PCMU:
             decoder = &pjmedia_ulaw_decode;
             break;
@@ -393 +393 @@
 
     switch (snd_port->setting.format.u32) {
-    case PJMEDIA_FOURCC_PCMA:
+    case PJMEDIA_FORMAT_PCMA:
         encoder = &pjmedia_alaw_encode;
         break;
-    case PJMEDIA_FOURCC_PCMU:
+    case PJMEDIA_FORMAT_PCMU:
         encoder = &pjmedia_ulaw_encode;
         break;
@@ -435 +435 @@
                      PJ_EBUG);
 
-    if (snd_port->setting.format.u32 == 0 ||
-        snd_port->setting.format.u32 == PJMEDIA_FOURCC_L16)
-    {
+    if (snd_port->setting.format.u32 == PJMEDIA_FORMAT_L16) {
         snd_rec_cb = &rec_cb;
         snd_play_cb = &play_cb;
@@ -701 +699 @@
     
 #if PJMEDIA_SOUND_USE_DELAYBUF
-    if (snd_port->setting.format.u32 == 0 ||
-        snd_port->setting.format.u32 == PJMEDIA_FOURCC_L16) 
-    {
+    if (snd_port->setting.format.u32 == PJMEDIA_FORMAT_L16) {
         pj_status_t status;
         unsigned ptime;
@@ -720 +716 @@
 #if !defined(PJMEDIA_SND_SUPPORT_OPEN2) || PJMEDIA_SND_SUPPORT_OPEN2==0
     /* For devices that doesn't support open2(), enable simulation */
-    if (snd_port->setting.format.u32 != 0 &&
-        snd_port->setting.format.u32 != PJMEDIA_FOURCC_L16) 
-    {
+    if (snd_port->setting.format.u32 != PJMEDIA_FORMAT_L16) {
         snd_port->frm_buf_size = sizeof(pjmedia_frame_ext) + 
                                  (samples_per_frame << 1) +

pjproject/branches/projects/aps-direct/pjmedia/src/pjmedia/stream.c

@@ -868 +868 @@
     } else if (frame->type == PJMEDIA_FRAME_TYPE_AUDIO &&
                frame->buf == NULL &&
-               (stream->port.info.format.u32 == 0 ||
-                stream->port.info.format.u32 == PJMEDIA_FOURCC_L16) &&
+               stream->port.info.format.u32 == PJMEDIA_FORMAT_L16 &&
                (stream->dir & PJMEDIA_DIR_ENCODING) &&
                stream->codec_param.info.frm_ptime *
@@ -1609 +1608 @@
     stream->port.info.format = info->param->info.format;
     stream->port.port_data.pdata = stream;
-    if (stream->port.info.format.u32 == 0 ||
-        stream->port.info.format.u32 == PJMEDIA_FOURCC_L16)
-    {
+    if (stream->port.info.format.u32 == PJMEDIA_FORMAT_L16) {
         stream->port.put_frame = &put_frame;
         stream->port.get_frame = &get_frame;

pjproject/branches/projects/aps-direct/pjmedia/src/pjmedia/symbian_sound_aps.cpp

@@ -509 +509 @@
         iSession.Stop();
         state_ = STATE_READY;
-        TRACE_((THIS_FILE, "Streaming stopped"));
+        TRACE_((THIS_FILE, "Sound device stopped"));
     }
 }
@@ -550 +550 @@
     if (parentStrm_->dir != PJMEDIA_DIR_CAPTURE) {
         iSession.Write();
-        TRACE_((THIS_FILE, "Player streaming started"));
+        TRACE_((THIS_FILE, "Player started"));
     }
 
@@ -556 +556 @@
     if (parentStrm_->dir != PJMEDIA_DIR_PLAYBACK) {
         iSession.Read();
-        TRACE_((THIS_FILE, "Recorder streaming started"));
+        TRACE_((THIS_FILE, "Recorder started"));
     }
 
@@ -569 +569 @@
 void CPjAudioEngine::InputStreamInitialized(const TInt aStatus)
 {
-    TRACE_((THIS_FILE, "InputStreamInitialized %d", aStatus));
+    TRACE_((THIS_FILE, "Recorder initialized, err=%d", aStatus));
 
     state_ = STATE_READY;
@@ -579 +579 @@
 void CPjAudioEngine::OutputStreamInitialized(const TInt aStatus)
 {
-    TRACE_((THIS_FILE, "OutputStreamInitialized %d", aStatus));
+    TRACE_((THIS_FILE, "Player initialized, err=%d", aStatus));
 
     if (aStatus == KErrNone) {
@@ -605 +605 @@
     if (state_ == STATE_READY || state_ == STATE_STREAMING) {
         iSession.ActivateLoudspeaker(active);
-        TRACE_((THIS_FILE, "Loudspeaker on/off: %d", active));
+        TRACE_((THIS_FILE, "Loudspeaker turned %s", (active? "on":"off")));
         return KErrNone;
     }
@@ -709 +709 @@
     
     switch(strm->setting.format.u32) {
-    case PJMEDIA_FOURCC_AMR:
+    case PJMEDIA_FORMAT_AMR:
         {
             const pj_uint8_t *p = (const pj_uint8_t*)buf.iBuffer.Ptr() + 1;
@@ -724 +724 @@
         break;
         
-    case PJMEDIA_FOURCC_G729:
+    case PJMEDIA_FORMAT_G729:
         {
             /* Check if we got a normal or SID frame. */
@@ -753 +753 @@
         break;
 
-    case PJMEDIA_FOURCC_ILBC:
+    case PJMEDIA_FORMAT_ILBC:
         {
             unsigned samples_got;
@@ -779 +779 @@
         break;
         
-    case PJMEDIA_FOURCC_PCMU:
-    case PJMEDIA_FOURCC_PCMA:
+    case PJMEDIA_FORMAT_PCMU:
+    case PJMEDIA_FORMAT_PCMA:
         {
             unsigned samples_processed = 0;
@@ -837 +837 @@
 
     switch(strm->setting.format.u32) {
-    case PJMEDIA_FOURCC_AMR:
+    case PJMEDIA_FORMAT_AMR:
         {
             if (frame->samples_cnt == 0) {
@@ -884 +884 @@
         break;
         
-    case PJMEDIA_FOURCC_G729:
+    case PJMEDIA_FORMAT_G729:
         {
             if (frame->samples_cnt == 0) {
@@ -933 +933 @@
         break;
         
-    case PJMEDIA_FOURCC_ILBC:
+    case PJMEDIA_FORMAT_ILBC:
         {
             if (frame->samples_cnt == 0) {
@@ -973 +973 @@
         break;
         
-    case PJMEDIA_FOURCC_PCMU:
-    case PJMEDIA_FOURCC_PCMA:
+    case PJMEDIA_FORMAT_PCMU:
+    case PJMEDIA_FORMAT_PCMA:
         {
             unsigned samples_ready = 0;
@@ -1006 +1006 @@
                     } else {
                         pj_uint8_t silc;
-                        silc = (strm->setting.format.u32==PJMEDIA_FOURCC_PCMU)?
+                        silc = (strm->setting.format.u32==PJMEDIA_FORMAT_PCMU)?
                                 pjmedia_linear2ulaw(0) : pjmedia_linear2alaw(0);
                         buf.iBuffer.AppendFill(silc, samples_cnt);
@@ -1017 +1017 @@
                     pj_uint8_t silc;
                     
-                    silc = (strm->setting.format.u32==PJMEDIA_FOURCC_PCMU)?
+                    silc = (strm->setting.format.u32==PJMEDIA_FORMAT_PCMU)?
                             pjmedia_linear2ulaw(0) : pjmedia_linear2alaw(0);
                     buf.iBuffer.AppendFill(silc, samples_req - samples_ready);
@@ -1105 +1105 @@
     strm->setting = *setting;
 
-    if (strm->setting.format.u32 == 0)
-        strm->setting.format.u32 = PJMEDIA_FOURCC_L16;
-
     /* Set audio engine fourcc. */
-    if (strm->setting.format.u32 == PJMEDIA_FOURCC_PCMU ||
-        strm->setting.format.u32 == PJMEDIA_FOURCC_PCMA ||
-        strm->setting.format.u32 == PJMEDIA_FOURCC_L16)
+    if (strm->setting.format.u32 == PJMEDIA_FORMAT_PCMU ||
+        strm->setting.format.u32 == PJMEDIA_FORMAT_PCMA ||
+        strm->setting.format.u32 == PJMEDIA_FORMAT_L16)
     {
         aps_setting.fourcc = TFourCC(KMCPFourCCIdG711);
@@ -1119 +1116 @@
 
     /* Set audio engine mode. */
-    if (strm->setting.format.u32 == PJMEDIA_FOURCC_AMR)
+    if (strm->setting.format.u32 == PJMEDIA_FORMAT_AMR)
     {
         aps_setting.mode = (TAPSCodecMode)strm->setting.bitrate;
     } 
-    else if (strm->setting.format.u32 == PJMEDIA_FOURCC_PCMU ||
-             strm->setting.format.u32 == PJMEDIA_FOURCC_L16   ||
-            (strm->setting.format.u32 == PJMEDIA_FOURCC_ILBC  &&
+    else if (strm->setting.format.u32 == PJMEDIA_FORMAT_PCMU ||
+             strm->setting.format.u32 == PJMEDIA_FORMAT_L16 ||
+            (strm->setting.format.u32 == PJMEDIA_FORMAT_ILBC  &&
              strm->setting.mode == 30))
     {
         aps_setting.mode = EULawOr30ms;
     } 
-    else if (strm->setting.format.u32 == PJMEDIA_FOURCC_PCMA ||
-            (strm->setting.format.u32 == PJMEDIA_FOURCC_ILBC &&
+    else if (strm->setting.format.u32 == PJMEDIA_FORMAT_PCMA ||
+            (strm->setting.format.u32 == PJMEDIA_FORMAT_ILBC &&
              strm->setting.mode == 20))
     {
@@ -1138 +1135 @@
 
     /* Disable VAD on L16 and G711. */
-    if (strm->setting.format.u32 == PJMEDIA_FOURCC_PCMU ||
-        strm->setting.format.u32 == PJMEDIA_FOURCC_PCMA ||
-        strm->setting.format.u32 == PJMEDIA_FOURCC_L16)
+    if (strm->setting.format.u32 == PJMEDIA_FORMAT_PCMU ||
+        strm->setting.format.u32 == PJMEDIA_FORMAT_PCMA ||
+        strm->setting.format.u32 == PJMEDIA_FORMAT_L16)
     {
         aps_setting.vad = EFalse;
@@ -1153 +1150 @@
 
     /* Set audio engine callbacks. */
-    if (strm->setting.format.u32 == PJMEDIA_FOURCC_L16) {
+    if (strm->setting.format.u32 == PJMEDIA_FORMAT_L16) {
         aps_play_cb = &PlayCbPcm;
         aps_rec_cb  = &RecCbPcm;
@@ -1183 +1180 @@
     strm->rec_buf_len = 0;
 
-    if (strm->setting.format.u32 == PJMEDIA_FOURCC_G729) {
+    if (strm->setting.format.u32 == PJMEDIA_FORMAT_G729) {
         TBitStream *g729_bitstream = new TBitStream;
         
@@ -1215 +1212 @@
 
     pj_bzero(&setting, sizeof(setting));
-    setting.format.u32 = PJMEDIA_FOURCC_L16;
+    setting.format.u32 = PJMEDIA_FORMAT_L16;
     
     return sound_open(PJMEDIA_DIR_CAPTURE, clock_rate, channel_count,
@@ -1237 +1234 @@
 
     pj_bzero(&setting, sizeof(setting));
-    setting.format.u32 = PJMEDIA_FOURCC_L16;
+    setting.format.u32 = PJMEDIA_FORMAT_L16;
 
     return sound_open(PJMEDIA_DIR_PLAYBACK, clock_rate, channel_count,
@@ -1262 +1259 @@
 
     pj_bzero(&setting, sizeof(setting));
-    setting.format.u32 = PJMEDIA_FOURCC_L16;
+    setting.format.u32 = PJMEDIA_FORMAT_L16;
 
     return sound_open(PJMEDIA_DIR_CAPTURE_PLAYBACK, clock_rate, channel_count,
@@ -1350 +1347 @@
     stream->engine = NULL;
 
-    if (stream->setting.format.u32 == PJMEDIA_FOURCC_G729) {
+    if (stream->setting.format.u32 == PJMEDIA_FORMAT_G729) {
         TBitStream *g729_bitstream = (TBitStream*)stream->strm_data;
         stream->strm_data = NULL;

pjproject/branches/projects/aps-direct/pjsip-apps/src/symbian_ua/ua.cpp

@@ -93 +93 @@
 
 static pj_pool_t *app_pool;
-static pjmedia_snd_port *snd_port;
+static pjmedia_snd_port *g_snd_port;
 
 
@@ -134 +134 @@
         if (call_id == g_call_id)
             g_call_id = PJSUA_INVALID_ID;
-        if (snd_port) {
-            pjmedia_snd_port_destroy(snd_port);
-            snd_port = NULL;
-        }
     } else if (ci.state != PJSIP_INV_STATE_INCOMING) {
         if (g_call_id == PJSUA_INVALID_ID)
@@ -270 +266 @@
     unsigned samples_per_frame;
     pj_status_t status;
+    
+    PJ_UNUSED_ARG(call_id);
+    PJ_UNUSED_ARG(p_port);
     
     status = pjmedia_session_get_info(sess, &sess_info);
@@ -289 +288 @@
     setting.vad = strm_info->param->setting.vad;
     setting.plc = strm_info->param->setting.plc;
-    if (setting.format.u32 == PJMEDIA_FOURCC_ILBC) {
+    if (setting.format.u32 == PJMEDIA_FORMAT_ILBC) {
         unsigned i;
         pjmedia_codec_fmtp *fmtp = &strm_info->param->setting.dec_fmtp;
@@ -315 +314 @@
     /* Reset conference attributes. */
     conf->info.samples_per_frame = samples_per_frame;
-    conf->info.clock_rate = 8000;
-    conf->info.channel_count = 1;
+    conf->info.clock_rate = strm_info->param->info.clock_rate;
+    conf->info.channel_count = strm_info->param->info.channel_cnt;
     conf->info.bits_per_sample = 16;
+    conf->info.format = strm_info->param->info.format;
 
     /* Reopen sound device. */
@@ -324 +324 @@
                                       0,
                                       0,
-                                      8000,
-                                      1,
+                                      strm_info->param->info.clock_rate,
+                                      strm_info->param->info.channel_cnt,
                                       samples_per_frame,
                                       16,
                                       &setting,
-                                      &snd_port);
+                                      &g_snd_port);
     if (status != PJ_SUCCESS) {
         PJ_LOG(1,(THIS_FILE, "on_stream_created() failed to reopen sound "
@@ -336 +336 @@
     }
     
-    status = pjmedia_snd_port_connect(snd_port, conf);
+    status = pjmedia_snd_port_connect(g_snd_port, conf);
     if (status != PJ_SUCCESS) {
         PJ_LOG(1,(THIS_FILE, "on_stream_created() failed to connect sound "
                              "device to conference, status=%d", status));
         return;
+    }
+}
+
+static void on_stream_destroyed(pjsua_call_id call_id,
+                                pjmedia_session *sess, 
+                                unsigned stream_idx)
+{
+    PJ_UNUSED_ARG(call_id);
+    PJ_UNUSED_ARG(sess);
+    PJ_UNUSED_ARG(stream_idx);
+
+    if (g_snd_port) {
+        pjmedia_snd_port_destroy(g_snd_port);
+        g_snd_port = NULL;
     }
 }
@@ -407 +421 @@
     cfg.cb.on_nat_detect = &on_nat_detect;
     cfg.cb.on_stream_created = &on_stream_created;
+    cfg.cb.on_stream_destroyed = &on_stream_destroyed;
     
     if (SIP_PROXY) {
@@ -429 +444 @@
     log_cfg.console_level = LOG_LEVEL;
     log_cfg.cb = &log_writer;
-    //log_cfg.log_filename = pj_str("C:\\data\\symbian_ua.log");
+    log_cfg.log_filename = pj_str("C:\\data\\symbian_ua.log");
 
     pjsua_media_config_default(&med_cfg);
@@ -621 +636 @@
 #   if PJMEDIA_SOUND_IMPLEMENTATION == PJMEDIA_SOUND_SYMB_APS_SOUND
     case 't':
-        if (snd_port) {
+        if (g_snd_port) {
             static pj_bool_t act_loudspk = PJ_TRUE;
             pjmedia_snd_stream *strm;
             
-            strm = pjmedia_snd_port_get_snd_stream(snd_port);
+            strm = pjmedia_snd_port_get_snd_stream(g_snd_port);
             pjmedia_snd_aps_activate_loudspeaker(strm, act_loudspk);
             act_loudspk = !act_loudspk;
@@ -998 +1013 @@
 #endif
         
-    if (snd_port) {
-        pjmedia_snd_port_destroy(snd_port);
-        snd_port = NULL;
+    if (g_snd_port) {
+        pjmedia_snd_port_destroy(g_snd_port);
+        g_snd_port = NULL;
     }