Changeset 2491


Ignore:
Timestamp:
Mar 6, 2009 4:24:43 PM (10 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:
7 edited
1 moved

Legend:

Unmodified
Added
Removed
  • pjproject/branches/projects/aps-direct/pjlib/include/pj/compat/os_symbian.h

    r2394 r2491  
    115115 * Override features. 
    116116 */ 
    117 #define PJ_HAS_FLOATING_POINT       1 
     117#define PJ_HAS_FLOATING_POINT       0 
    118118#define PJ_HAS_MALLOC               0 
    119119#define PJ_HAS_SEMAPHORE            1 
  • pjproject/branches/projects/aps-direct/pjlib/include/pj/config_site_sample.h

    r2489 r2491  
    119119     */ 
    120120 
     121    /* Disable non-Symbian audio devices */ 
     122    #define PJMEDIA_AUDIO_DEV_HAS_PORTAUDIO     0 
     123    #define PJMEDIA_AUDIO_DEV_HAS_WMME          0 
     124 
    121125    /* Select codecs to disable */ 
    122126    #define PJMEDIA_HAS_L16_CODEC               0 
    123127    #define PJMEDIA_HAS_ILBC_CODEC              0 
     128    #define PJMEDIA_HAS_G722_CODEC              0 
    124129 
    125130    /* Fine tune Speex's default settings for best performance/quality */ 
  • pjproject/branches/projects/aps-direct/pjmedia/include/pjmedia-codec/amr_helper.h

    r2452 r2491  
    823823        out_info->mode = FT_; 
    824824        out->size = 5; 
    825         PJ_ASSERT_RETURN(out->size <= in->size, PJMEDIA_CODEC_EFRMINLEN); 
    826825 
    827826        pj_bzero(out->buf, out->size); 
  • pjproject/branches/projects/aps-direct/pjmedia/src/pjmedia-audiodev/symb_aps_dev.cpp

    r2487 r2491  
    1919 */ 
    2020#include <pjmedia-audiodev/audiodev_imp.h> 
     21#include <pjmedia-audiodev/errno.h> 
    2122#include <pjmedia/alaw_ulaw.h> 
    22 #include <pjmedia/errno.h> 
    2323#include <pj/assert.h> 
    2424#include <pj/log.h> 
     
    3232#include <sounddevice.h> 
    3333#include <APSClientSession.h> 
     34#include <pjmedia-codec/amr_helper.h> 
     35 
     36/* Pack/unpack G.729 frame of S60 DSP codec, taken from:   
     37 * http://wiki.forum.nokia.com/index.php/TSS000776_-_Payload_conversion_for_G.729_audio_format 
     38 */ 
     39#include "s60_g729_bitstream.h" 
     40 
    3441 
    3542#define THIS_FILE                       "symb_aps_dev.c" 
     
    756763 * Internal APS callbacks 
    757764 */ 
    758  
    759 /* Pack/unpack G.729 frame of S60 DSP codec, taken from:   
    760  * http://wiki.forum.nokia.com/index.php/TSS000776_-_Payload_conversion_for_G.729_audio_format 
    761  */ 
    762 #include "../pjmedia/s60_g729_bitstream.h" 
    763 #include <pjmedia-codec/amr_helper.h> 
    764765 
    765766static void RecCb(TAPSCommBuffer &buf, void *user_data) 
  • pjproject/branches/projects/aps-direct/pjmedia/src/pjmedia-audiodev/symb_mda_dev.cpp

    r2489 r2491  
    1919 */ 
    2020#include <pjmedia-audiodev/audiodev_imp.h> 
     21#include <pjmedia-audiodev/errno.h> 
    2122#include <pjmedia/alaw_ulaw.h> 
    2223#include <pj/assert.h> 
     
    2526#include <pj/os.h> 
    2627#include <pj/string.h> 
     28 
     29#if PJMEDIA_AUDIO_DEV_HAS_SYMB_MDA 
    2730 
    2831/* 
     
    11051108} 
    11061109 
     1110#endif /* PJMEDIA_AUDIO_DEV_HAS_SYMB_MDA */ 
  • pjproject/branches/projects/aps-direct/pjsip-apps/src/symbian_ua/main_symbian.cpp

    r2394 r2491  
    3030 
    3131// Needed by APS 
    32 TPtrC APP_UID = _L("A000000D"); 
     32TPtrC APP_UID = _L("200235D3"); 
    3333 
    3434 
  • pjproject/branches/projects/aps-direct/pjsip-apps/src/symbian_ua/ua.cpp

    r2483 r2491  
    2424 
    2525#define THIS_FILE       "symbian_ua.cpp" 
    26 #define LOG_LEVEL       3 
     26#define CON_LOG_LEVEL   3 // console log level 
     27#define FILE_LOG_LEVEL  4 // logfile log level 
    2728 
    2829// 
     
    282283     
    283284    /* Set log level */ 
    284     pj_log_set_level(LOG_LEVEL); 
     285    pj_log_set_level(CON_LOG_LEVEL); 
    285286 
    286287    /* Create pjsua first! */ 
     
    330331     
    331332    pjsua_logging_config_default(&log_cfg); 
    332     log_cfg.level = LOG_LEVEL; 
    333     log_cfg.console_level = LOG_LEVEL; 
     333    log_cfg.level = FILE_LOG_LEVEL; 
     334    log_cfg.console_level = CON_LOG_LEVEL; 
    334335    log_cfg.cb = &log_writer; 
    335336    log_cfg.log_filename = pj_str("C:\\data\\symbian_ua.log"); 
     
    486487static void PrintMainMenu()  
    487488{ 
    488     PJ_LOG(3, (THIS_FILE, "\n\n" 
     489    const char *menu = 
     490            "\n\n" 
    489491            "Main Menu:\n" 
    490492            "  d    Enable/disable codecs\n" 
     
    500502            "  o    Set account online\n" 
    501503            "  O    Set account offline\n" 
    502             "  w    Quit\n")); 
     504            "  w    Quit\n"; 
     505     
     506    PJ_LOG(3, (THIS_FILE, menu)); 
    503507} 
    504508 
    505509static void PrintCodecMenu()  
    506510{ 
    507     PJ_LOG(3, (THIS_FILE, "\n\n" 
     511    const char *menu =  
     512            "\n\n" 
    508513            "Codec Menu:\n" 
    509514            "  a    Enable all codecs\n" 
     
    520525            "  p    Enable only GSM\n" 
    521526            "  t    Enable only PCMU\n" 
    522             "  w    Enable only PCMA\n")); 
     527            "  w    Enable only PCMA\n"; 
     528     
     529    PJ_LOG(3, (THIS_FILE, menu)); 
    523530} 
    524531 
Note: See TracChangeset for help on using the changeset viewer.