Changeset 2491

Timestamp:

Mar 6, 2009 4:24:43 PM (16 years ago)

Author:

nanang

Message:

• Fixed compile errors/warnings for Symbian targets.
• Updated module dependencies of symbian auddev implementations.
• Minor updates, e.g: missing update on symbian_ua UID changing, updated default log level for logfile.

Location:

pjproject/branches/projects/aps-direct

Files:

• pjlib/include/pj/compat/os_symbian.h (modified) (1 diff)
• pjlib/include/pj/config_site_sample.h (modified) (1 diff)
• pjmedia/include/pjmedia-codec/amr_helper.h (modified) (1 diff)
• pjmedia/src/pjmedia-audiodev/s60_g729_bitstream.h (moved) (moved from pjproject/branches/projects/aps-direct/pjmedia/src/pjmedia/s60_g729_bitstream.h)
• pjmedia/src/pjmedia-audiodev/symb_aps_dev.cpp (modified) (3 diffs)
• pjmedia/src/pjmedia-audiodev/symb_mda_dev.cpp (modified) (3 diffs)
• pjsip-apps/src/symbian_ua/main_symbian.cpp (modified) (1 diff)
• pjsip-apps/src/symbian_ua/ua.cpp (modified) (6 diffs)

pjproject/branches/projects/aps-direct/pjlib/include/pj/compat/os_symbian.h

@@ -115 +115 @@
  * Override features.
  */
-#define PJ_HAS_FLOATING_POINT       1
+#define PJ_HAS_FLOATING_POINT       0
 #define PJ_HAS_MALLOC               0
 #define PJ_HAS_SEMAPHORE            1

pjproject/branches/projects/aps-direct/pjlib/include/pj/config_site_sample.h

@@ -119 +119 @@
      */
 
+    /* Disable non-Symbian audio devices */
+    #define PJMEDIA_AUDIO_DEV_HAS_PORTAUDIO     0
+    #define PJMEDIA_AUDIO_DEV_HAS_WMME          0
+
     /* Select codecs to disable */
     #define PJMEDIA_HAS_L16_CODEC               0
     #define PJMEDIA_HAS_ILBC_CODEC              0
+    #define PJMEDIA_HAS_G722_CODEC              0
 
     /* Fine tune Speex's default settings for best performance/quality */

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

@@ -823 +823 @@
         out_info->mode = FT_;
         out->size = 5;
-        PJ_ASSERT_RETURN(out->size <= in->size, PJMEDIA_CODEC_EFRMINLEN);
 
         pj_bzero(out->buf, out->size);

pjproject/branches/projects/aps-direct/pjmedia/src/pjmedia-audiodev/symb_aps_dev.cpp

@@ -19 +19 @@
  */
 #include <pjmedia-audiodev/audiodev_imp.h>
+#include <pjmedia-audiodev/errno.h>
 #include <pjmedia/alaw_ulaw.h>
-#include <pjmedia/errno.h>
 #include <pj/assert.h>
 #include <pj/log.h>
@@ -32 +32 @@
 #include <sounddevice.h>
 #include <APSClientSession.h>
+#include <pjmedia-codec/amr_helper.h>
+
+/* Pack/unpack G.729 frame of S60 DSP codec, taken from:  
+ * http://wiki.forum.nokia.com/index.php/TSS000776_-_Payload_conversion_for_G.729_audio_format
+ */
+#include "s60_g729_bitstream.h"
+
 
 #define THIS_FILE                       "symb_aps_dev.c"
@@ -756 +763 @@
  * Internal APS callbacks
  */
-
-/* Pack/unpack G.729 frame of S60 DSP codec, taken from:  
- * http://wiki.forum.nokia.com/index.php/TSS000776_-_Payload_conversion_for_G.729_audio_format
- */
-#include "../pjmedia/s60_g729_bitstream.h"
-#include <pjmedia-codec/amr_helper.h>
 
 static void RecCb(TAPSCommBuffer &buf, void *user_data)

pjproject/branches/projects/aps-direct/pjmedia/src/pjmedia-audiodev/symb_mda_dev.cpp

@@ -19 +19 @@
  */
 #include <pjmedia-audiodev/audiodev_imp.h>
+#include <pjmedia-audiodev/errno.h>
 #include <pjmedia/alaw_ulaw.h>
 #include <pj/assert.h>
@@ -25 +26 @@
 #include <pj/os.h>
 #include <pj/string.h>
+
+#if PJMEDIA_AUDIO_DEV_HAS_SYMB_MDA
 
 /*
@@ -1105 +1108 @@
 }
 
+#endif /* PJMEDIA_AUDIO_DEV_HAS_SYMB_MDA */

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

@@ -30 +30 @@
 
 // Needed by APS
-TPtrC APP_UID = _L("A000000D");
+TPtrC APP_UID = _L("200235D3");
 
 

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

@@ -24 +24 @@
 
 #define THIS_FILE       "symbian_ua.cpp"
-#define LOG_LEVEL       3
+#define CON_LOG_LEVEL   3 // console log level
+#define FILE_LOG_LEVEL  4 // logfile log level
 
 //
@@ -282 +283 @@
     
     /* Set log level */
-    pj_log_set_level(LOG_LEVEL);
+    pj_log_set_level(CON_LOG_LEVEL);
 
     /* Create pjsua first! */
@@ -330 +331 @@
     
     pjsua_logging_config_default(&log_cfg);
-    log_cfg.level = LOG_LEVEL;
-    log_cfg.console_level = LOG_LEVEL;
+    log_cfg.level = FILE_LOG_LEVEL;
+    log_cfg.console_level = CON_LOG_LEVEL;
     log_cfg.cb = &log_writer;
     log_cfg.log_filename = pj_str("C:\\data\\symbian_ua.log");
@@ -486 +487 @@
 static void PrintMainMenu() 
 {
-    PJ_LOG(3, (THIS_FILE, "\n\n"
+    const char *menu =
+            "\n\n"
             "Main Menu:\n"
             "  d    Enable/disable codecs\n"
@@ -500 +502 @@
             "  o    Set account online\n"
             "  O    Set account offline\n"
-            "  w    Quit\n"));
+            "  w    Quit\n";
+    
+    PJ_LOG(3, (THIS_FILE, menu));
 }
 
 static void PrintCodecMenu() 
 {
-    PJ_LOG(3, (THIS_FILE, "\n\n"
+    const char *menu = 
+            "\n\n"
             "Codec Menu:\n"
             "  a    Enable all codecs\n"
@@ -520 +525 @@
             "  p    Enable only GSM\n"
             "  t    Enable only PCMU\n"
-            "  w    Enable only PCMA\n"));
+            "  w    Enable only PCMA\n";
+    
+    PJ_LOG(3, (THIS_FILE, menu));
 }