- Fix dependency issue (Microsoft.VC90.DebugCRT) introduced by libspeex binaries

- Cleanup the code
This commit is contained in:
bossiel 2011-10-13 02:59:21 +00:00
parent 339d8efa2c
commit fb7efc2e43
11 changed files with 17 additions and 18 deletions

View File

@ -122,7 +122,7 @@
Name="VCCLCompilerTool"
EnableIntrinsicFunctions="false"
AdditionalIncludeDirectories=""$(PSDK_DIR)include";"$(DXSDK_DIR)include";..\thirdparties\win32\include;include;..\tinyMSRP\include;..\tinyRTP\include;..\tinyMEDIA\include;..\tinySDP\include;..\tinyNET\src;..\tinyDSHOW\include;..\tinySAK\src;..\thirdparties\win32\include\BroadVoice16\bvcommon;..\thirdparties\win32\include\BroadVoice16\bv16"
PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;TINYDAV_EXPORTS;DEBUG_LEVEL=DEBUG_LEVEL_INFOS;HAVE_CUDA=0;HAVE_G729=0;HAVE_BV16=0;HAVE_OPENCORE_AMR=1;HAVE_ILBC=0;HAVE_LIBGSM=1;HAVE_TINYDSHOW=1;HAVE_DSOUND_H=1;HAVE_WAVE_API=0;HAVE_FFMPEG=1;HAVE_SPEEX_DSP=1;HAVE_WEBRTC=1;HAVE_SPEEX_JB=1;HAVE_LIB_SPEEX=1;HAVE_LIBVPX=1;G192BITSTREAM=0;_WIN32_WINNT=0x0501"
PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;TINYDAV_EXPORTS;DEBUG_LEVEL=DEBUG_LEVEL_INFOS;HAVE_CUDA=0;HAVE_G729=0;HAVE_BV16=0;HAVE_OPENCORE_AMR=1;HAVE_ILBC=0;HAVE_LIBGSM=1;HAVE_TINYDSHOW=1;HAVE_DSOUND_H=1;HAVE_WAVE_API=0;HAVE_FFMPEG=1;HAVE_WEBRTC=1;HAVE_SPEEX_DSP=1;HAVE_SPEEX_JB=1;HAVE_LIB_SPEEX=1;HAVE_LIBVPX=1;G192BITSTREAM=0;_WIN32_WINNT=0x0501"
RuntimeLibrary="2"
EnableFunctionLevelLinking="false"
UsePrecompiledHeader="0"

View File

@ -738,7 +738,7 @@ bail:
TSK_DEBUG_INFO("Stopped [%s] server with IP {%s} on port {%d}...", transport->description, transport->master->ip, transport->master->port);
return 0;
return tsk_null;
}

View File

@ -70,7 +70,7 @@ int tsk_fsm_set(tsk_fsm_t* self, ...)
}
va_start(args, self);
while((guard = va_arg(args, int))){
while((guard = va_arg(args, int)) == 1){
tsk_fsm_entry_t* entry;
if((entry = tsk_fsm_entry_create())){
entry->from = va_arg(args, tsk_fsm_state_id);

View File

@ -112,7 +112,7 @@ void tsk_free(void** ptr)
*/
void* tsk_calloc(tsk_size_t num, tsk_size_t size)
{
void* ret = 0;
void* ret = tsk_null;
if(num && size){
ret = calloc(num, size);
if(!ret){

View File

@ -118,7 +118,7 @@ tsk_semaphore_handle_t* tsk_semaphore_create_2(int initial_val)
#endif
if(!handle){
TSK_DEBUG_ERROR("Failed to create new mutex.");
TSK_DEBUG_ERROR("Failed to create new semaphore");
}
return handle;
}
@ -184,7 +184,7 @@ void tsk_semaphore_destroy(tsk_semaphore_handle_t** handle)
{
#if TSK_UNDER_WINDOWS
CloseHandle((SEMAPHORE_T)*handle);
*handle = 0;
*handle = tsk_null;
#else
# if TSK_USE_NAMED_SEM
named_sem_t * nsem = ((named_sem_t*)*handle);

View File

@ -179,8 +179,9 @@ char* tsk_strndup(const char *s1, tsk_size_t n)
tsk_size_t len = tsk_strlen(s1);
tsk_size_t nret = (n > len) ? (len) : (n);
ret = tsk_calloc((nret+1), sizeof(uint8_t));
memcpy(ret, s1, nret);
if((ret = tsk_calloc((nret+1), sizeof(uint8_t)))){
memcpy(ret, s1, nret);
}
}
return ret;

View File

@ -80,17 +80,15 @@ int tsk_thread_create(void** tid, void *(*start) (void *), void *arg)
*/
int tsk_thread_set_priority(void* tid, int32_t priority)
{
#if TSK_UNDER_WINDOWS
// SetPriorityClass()
TSK_DEBUG_ERROR("Not implemented");
return -1;
#else
struct sched_param sp;
int ret;
if(!tid){
TSK_DEBUG_ERROR("Invalid parameter");
return -1;
}
#if TSK_UNDER_WINDOWS
return SetThreadPriority(tid, priority) ? 0 : -1;
#else
struct sched_param sp;
int ret;
memset(&sp, 0, sizeof(struct sched_param));
sp.sched_priority = priority;
if ((ret = pthread_setschedparam(*((pthread_t*)tid), SCHED_RR, &sp))) {

View File

@ -346,7 +346,7 @@ peek_first:
TSK_DEBUG_INFO("TIMER MANAGER -- STOP");
return 0;
return tsk_null;
}

View File

@ -59,7 +59,7 @@
</tr>
<tr>
<td><a href="http://code.google.com/p/idoubs/">iDoubs</a></td>
<td>SIP/IMS VideoPhone for iOS (iPhone, iPad and iPod Touch)</td>
<td>SIP/IMS VideoPhone for iOS (iPhone, iPad and iPod Touch) and MAC OS X</td>
</tr>
<tr bgcolor="#99CCFF"><td colspan="2">Server-side components</td></tr>
@ -132,7 +132,7 @@
<li>MSRP (RFC 4975 and 5547)</li>
<li>Audio/Video (AMR, Speex, G.711, GSM, H.264, H.263, Theora...)</li>
<li>Audio/Video (AMR, Speex, G.711, GSM, iLBC, VP8, H.264, H.263, Theora, MP4V-ES...)</li>
<li>...and many other features</li>