- fixes to avoid dynamic linking problems in Linux + workaround build problems for Opus
This commit is contained in:
parent
9f875b5f15
commit
5030064925
|
|
@ -406,7 +406,9 @@ int RTPUDPv4Transmitter::GetLocalHostName(uint8_t *buffer,size_t *bufferlength)
|
|||
if (!init)
|
||||
return ERR_RTP_UDPV4TRANS_NOTINIT;
|
||||
|
||||
MAINMUTEX_LOCK
|
||||
return ERR_RTP_UDPV4TRANS_NOLOCALIPS;
|
||||
|
||||
/*MAINMUTEX_LOCK
|
||||
if (!created)
|
||||
{
|
||||
MAINMUTEX_UNLOCK
|
||||
|
|
@ -533,6 +535,7 @@ int RTPUDPv4Transmitter::GetLocalHostName(uint8_t *buffer,size_t *bufferlength)
|
|||
*bufferlength = localhostnamelength;
|
||||
|
||||
MAINMUTEX_UNLOCK
|
||||
*/
|
||||
return 0;
|
||||
}
|
||||
|
||||
|
|
@ -1636,7 +1639,7 @@ int RTPUDPv4Transmitter::CreateLocalIPList()
|
|||
if (!GetLocalIPList_Interfaces())
|
||||
{
|
||||
// If this fails, we'll have to depend on DNS info
|
||||
GetLocalIPList_DNS();
|
||||
// GetLocalIPList_DNS();
|
||||
}
|
||||
AddLoopbackAddress();
|
||||
return 0;
|
||||
|
|
@ -1773,7 +1776,10 @@ bool RTPUDPv4Transmitter::GetLocalIPList_Interfaces()
|
|||
|
||||
void RTPUDPv4Transmitter::GetLocalIPList_DNS()
|
||||
{
|
||||
struct hostent *he;
|
||||
// Commented out as this functionality is not used and adds dependency on DNS resolver in Linux/glibc systems
|
||||
return;
|
||||
|
||||
/*struct hostent *he;
|
||||
char name[1024];
|
||||
uint32_t ip;
|
||||
bool done;
|
||||
|
|
@ -1800,7 +1806,7 @@ void RTPUDPv4Transmitter::GetLocalIPList_DNS()
|
|||
localIPs.push_back(ip);
|
||||
i++;
|
||||
}
|
||||
}
|
||||
}*/
|
||||
}
|
||||
|
||||
void RTPUDPv4Transmitter::AbortWaitInternal()
|
||||
|
|
|
|||
|
|
@ -411,8 +411,9 @@ int RTPUDPv6Transmitter::GetLocalHostName(uint8_t *buffer,size_t *bufferlength)
|
|||
{
|
||||
if (!init)
|
||||
return ERR_RTP_UDPV6TRANS_NOTINIT;
|
||||
return ERR_RTP_UDPV6TRANS_NOLOCALIPS;
|
||||
|
||||
MAINMUTEX_LOCK
|
||||
/*MAINMUTEX_LOCK
|
||||
if (!created)
|
||||
{
|
||||
MAINMUTEX_UNLOCK
|
||||
|
|
@ -542,7 +543,7 @@ int RTPUDPv6Transmitter::GetLocalHostName(uint8_t *buffer,size_t *bufferlength)
|
|||
*bufferlength = localhostnamelength;
|
||||
|
||||
MAINMUTEX_UNLOCK
|
||||
return 0;
|
||||
return 0;*/
|
||||
}
|
||||
|
||||
bool RTPUDPv6Transmitter::ComesFromThisTransmitter(const RTPAddress *addr)
|
||||
|
|
@ -1726,6 +1727,8 @@ bool RTPUDPv6Transmitter::GetLocalIPList_Interfaces()
|
|||
|
||||
void RTPUDPv6Transmitter::GetLocalIPList_DNS()
|
||||
{
|
||||
return;
|
||||
/*
|
||||
int status;
|
||||
char name[1024];
|
||||
|
||||
|
|
@ -1754,7 +1757,7 @@ void RTPUDPv6Transmitter::GetLocalIPList_DNS()
|
|||
tmp = tmp->ai_next;
|
||||
}
|
||||
|
||||
freeaddrinfo(res);
|
||||
freeaddrinfo(res); */
|
||||
}
|
||||
|
||||
|
||||
|
|
|
|||
|
|
@ -168,7 +168,7 @@ if(OPUS_CPU_X86 OR OPUS_CPU_X64)
|
|||
set(OPUS_X86_MAY_HAVE_SSE4_1_HELP_STR "does runtime check for SSE4.1 support.")
|
||||
cmake_dependent_option(OPUS_X86_MAY_HAVE_SSE4_1
|
||||
${OPUS_X86_MAY_HAVE_SSE4_1_HELP_STR}
|
||||
ON
|
||||
OFF
|
||||
"SSE4_1_SUPPORTED; NOT OPUS_DISABLE_INTRINSICS"
|
||||
OFF)
|
||||
add_feature_info(OPUS_X86_MAY_HAVE_SSE4_1 OPUS_X86_MAY_HAVE_SSE4_1 ${OPUS_X86_MAY_HAVE_SSE4_1_HELP_STR})
|
||||
|
|
@ -187,13 +187,13 @@ if(OPUS_CPU_X86 OR OPUS_CPU_X64)
|
|||
if(OPUS_CPU_X64) # Assume x86_64 has up to SSE2 support
|
||||
cmake_dependent_option(OPUS_X86_PRESUME_SSE
|
||||
${OPUS_X86_PRESUME_SSE_HELP_STR}
|
||||
ON
|
||||
OFF
|
||||
"OPUS_X86_MAY_HAVE_SSE; NOT OPUS_DISABLE_INTRINSICS"
|
||||
OFF)
|
||||
|
||||
cmake_dependent_option(OPUS_X86_PRESUME_SSE2
|
||||
${OPUS_X86_PRESUME_SSE2_HELP_STR}
|
||||
ON
|
||||
OFF
|
||||
"OPUS_X86_MAY_HAVE_SSE2; NOT OPUS_DISABLE_INTRINSICS"
|
||||
OFF)
|
||||
else()
|
||||
|
|
|
|||
Loading…
Reference in New Issue