From b6529acff90535f3f54b57d093bae7bc90139bff Mon Sep 17 00:00:00 2001 From: Nanang Izzuddin Date: Wed, 17 Dec 2008 11:36:22 +0000 Subject: Ticket #675: - Fixed ICE+STUN panic E32User-CBASE 46, the problem seems to be inside the Symbian version of pjsua_handle_events(). - Updated minor things, e.g: compile warnings git-svn-id: http://svn.pjsip.org/repos/pjproject/trunk@2379 74dad513-b988-da41-8d7b-12977e46ad98 --- pjmedia/src/pjmedia/sound_port.c | 26 +++++++++++++------------- pjmedia/src/pjmedia/symbian_sound.cpp | 4 ++-- pjmedia/src/pjmedia/transport_adapter_sample.c | 5 +++-- pjmedia/src/pjmedia/wav_player.c | 2 +- 4 files changed, 19 insertions(+), 18 deletions(-) (limited to 'pjmedia/src') diff --git a/pjmedia/src/pjmedia/sound_port.c b/pjmedia/src/pjmedia/sound_port.c index 50f35d8e..766fb14b 100644 --- a/pjmedia/src/pjmedia/sound_port.c +++ b/pjmedia/src/pjmedia/sound_port.c @@ -371,8 +371,6 @@ PJ_DEF(pj_status_t) pjmedia_snd_port_create( pj_pool_t *pool, pjmedia_snd_port **p_port) { pjmedia_snd_port *snd_port; - pj_status_t status; - unsigned ptime; PJ_ASSERT_RETURN(pool && p_port, PJ_EINVAL); @@ -389,17 +387,19 @@ PJ_DEF(pj_status_t) pjmedia_snd_port_create( pj_pool_t *pool, snd_port->bits_per_sample = bits_per_sample; #if PJMEDIA_SOUND_USE_DELAYBUF - ptime = samples_per_frame * 1000 / (clock_rate * channel_count); - - status = pjmedia_delay_buf_create(pool, "snd_buff", - clock_rate, samples_per_frame, - channel_count, - PJMEDIA_SOUND_BUFFER_COUNT * ptime, - 0, &snd_port->delay_buf); - PJ_ASSERT_RETURN(status == PJ_SUCCESS, status); -#else - PJ_UNUSED_ARG(status); - PJ_UNUSED_ARG(ptime); + do { + pj_status_t status; + unsigned ptime; + + ptime = samples_per_frame * 1000 / (clock_rate * channel_count); + + status = pjmedia_delay_buf_create(pool, "snd_buff", + clock_rate, samples_per_frame, + channel_count, + PJMEDIA_SOUND_BUFFER_COUNT * ptime, + 0, &snd_port->delay_buf); + PJ_ASSERT_RETURN(status == PJ_SUCCESS, status); + } while (0); #endif *p_port = snd_port; diff --git a/pjmedia/src/pjmedia/symbian_sound.cpp b/pjmedia/src/pjmedia/symbian_sound.cpp index 1759e99a..a57c8c4e 100644 --- a/pjmedia/src/pjmedia/symbian_sound.cpp +++ b/pjmedia/src/pjmedia/symbian_sound.cpp @@ -297,7 +297,7 @@ void CPjAudioInputEngine::Stop() // Wait until it's actually stopped while (lastError_ == KRequestPending) - pj_thread_sleep(100); + pj_symbianos_poll(-1, 100); } if (iInputStream_) { @@ -533,7 +533,7 @@ void CPjAudioOutputEngine::Stop() // Wait until it's actually stopped while (lastError_ == KRequestPending) - pj_thread_sleep(100); + pj_symbianos_poll(-1, 100); } if (iOutputStream_) { diff --git a/pjmedia/src/pjmedia/transport_adapter_sample.c b/pjmedia/src/pjmedia/transport_adapter_sample.c index b4d4c9da..414a86ad 100644 --- a/pjmedia/src/pjmedia/transport_adapter_sample.c +++ b/pjmedia/src/pjmedia/transport_adapter_sample.c @@ -1,4 +1,4 @@ -/* $Id:$ */ +/* $Id$ */ /* * Copyright (C) 2003-2008 Benny Prijono * @@ -131,7 +131,8 @@ PJ_DEF(pj_status_t) pjmedia_tp_adapter_create( pjmedia_endpt *endpt, adapter->pool = pool; pj_ansi_strncpy(adapter->base.name, pool->obj_name, sizeof(adapter->base.name)); - adapter->base.type = PJMEDIA_TRANSPORT_TYPE_USER + 1; + adapter->base.type = (pjmedia_transport_type) + (PJMEDIA_TRANSPORT_TYPE_USER + 1); adapter->base.op = &tp_adapter_op; /* Save the transport as the slave transport */ diff --git a/pjmedia/src/pjmedia/wav_player.c b/pjmedia/src/pjmedia/wav_player.c index 30c2531e..fa94d071 100644 --- a/pjmedia/src/pjmedia/wav_player.c +++ b/pjmedia/src/pjmedia/wav_player.c @@ -263,7 +263,7 @@ PJ_DEF(pj_status_t) pjmedia_wav_player_port_create( pj_pool_t *pool, return status; } - fport->fmt_tag = wave_hdr.fmt_hdr.fmt_tag; + fport->fmt_tag = (pjmedia_wave_fmt_tag)wave_hdr.fmt_hdr.fmt_tag; fport->bytes_per_sample = (pj_uint16_t) (wave_hdr.fmt_hdr.bits_per_sample / 8); -- cgit v1.2.3