kenmirrors
/
freeswitch
mirror of https://github.com/signalwire/freeswitch.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

conflict

This commit is contained in:
Nenad Corbic 2010-04-15 19:59:21 -04:00
parent af89e40938 0780e04511
commit 7269d4618c
5 changed files with 1196 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
Freeswitch.2008.sln
View File

@ -1082,6 +1082,14 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Download JSON", "libs\win32
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libjson", "libs\win32\json\libjson.2008.vcproj", "{9778F1C0-09BC-4698-8EBC-BD982247209A}"
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mod_silk", "src\mod\codecs\mod_silk\mod_silk.2008.vcproj", "{AFA983D6-4569-4F88-BA94-555ED00FD9A8}"
ProjectSection(ProjectDependencies) = postProject
{56B91D01-9150-4BBF-AFA1-5B68AB991B76} = {56B91D01-9150-4BBF-AFA1-5B68AB991B76}
{202D7A4E-760D-4D0E-AFA1-D7459CED30FF} = {202D7A4E-760D-4D0E-AFA1-D7459CED30FF}
EndProjectSection
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Silk_FIX", "libs\silk\src\Silk_FIX.2008.vcproj", "{56B91D01-9150-4BBF-AFA1-5B68AB991B76}"
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
All|Win32 = All|Win32
@ -2704,6 +2712,28 @@ Global
{9778F1C0-09BC-4698-8EBC-BD982247209A}.Debug|x64.ActiveCfg = Debug|x64
{9778F1C0-09BC-4698-8EBC-BD982247209A}.Release|Win32.ActiveCfg = Release|Win32
{9778F1C0-09BC-4698-8EBC-BD982247209A}.Release|x64.ActiveCfg = Release|x64
{AFA983D6-4569-4F88-BA94-555ED00FD9A8}.All|Win32.ActiveCfg = Release|x64
{AFA983D6-4569-4F88-BA94-555ED00FD9A8}.All|x64.ActiveCfg = Release|x64
{AFA983D6-4569-4F88-BA94-555ED00FD9A8}.All|x64.Build.0 = Release|x64
{AFA983D6-4569-4F88-BA94-555ED00FD9A8}.Debug|Win32.ActiveCfg = Debug|Win32
{AFA983D6-4569-4F88-BA94-555ED00FD9A8}.Debug|Win32.Build.0 = Debug|Win32
{AFA983D6-4569-4F88-BA94-555ED00FD9A8}.Debug|x64.ActiveCfg = Debug|x64
{AFA983D6-4569-4F88-BA94-555ED00FD9A8}.Debug|x64.Build.0 = Debug|x64
{AFA983D6-4569-4F88-BA94-555ED00FD9A8}.Release|Win32.ActiveCfg = Release|Win32
{AFA983D6-4569-4F88-BA94-555ED00FD9A8}.Release|Win32.Build.0 = Release|Win32
{AFA983D6-4569-4F88-BA94-555ED00FD9A8}.Release|x64.ActiveCfg = Release|x64
{AFA983D6-4569-4F88-BA94-555ED00FD9A8}.Release|x64.Build.0 = Release|x64
{56B91D01-9150-4BBF-AFA1-5B68AB991B76}.All|Win32.ActiveCfg = Release|Win32
{56B91D01-9150-4BBF-AFA1-5B68AB991B76}.All|Win32.Build.0 = Release|Win32
{56B91D01-9150-4BBF-AFA1-5B68AB991B76}.All|x64.ActiveCfg = Release|Win32
{56B91D01-9150-4BBF-AFA1-5B68AB991B76}.Debug|Win32.ActiveCfg = Debug|Win32
{56B91D01-9150-4BBF-AFA1-5B68AB991B76}.Debug|Win32.Build.0 = Debug|Win32
{56B91D01-9150-4BBF-AFA1-5B68AB991B76}.Debug|x64.ActiveCfg = Debug|x64
{56B91D01-9150-4BBF-AFA1-5B68AB991B76}.Debug|x64.Build.0 = Debug|x64
{56B91D01-9150-4BBF-AFA1-5B68AB991B76}.Release|Win32.ActiveCfg = Release|Win32
{56B91D01-9150-4BBF-AFA1-5B68AB991B76}.Release|Win32.Build.0 = Release|Win32
{56B91D01-9150-4BBF-AFA1-5B68AB991B76}.Release|x64.ActiveCfg = Release|x64
{56B91D01-9150-4BBF-AFA1-5B68AB991B76}.Release|x64.Build.0 = Release|x64
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
@ -2719,6 +2749,7 @@ Global
{0B6C905B-142E-4999-B39D-92FF7951E921} = {F881ADA2-2F1A-4046-9FEB-191D9422D781}
{D5C87B19-150D-4EF3-A671-96589BD2D14A} = {F881ADA2-2F1A-4046-9FEB-191D9422D781}
{4D418176-3B33-47E6-A63E-01BA34ADD21C} = {F881ADA2-2F1A-4046-9FEB-191D9422D781}
{AFA983D6-4569-4F88-BA94-555ED00FD9A8} = {F881ADA2-2F1A-4046-9FEB-191D9422D781}
{5FD31A25-5D83-4794-8BEE-904DAD84CE71} = {9460B5F1-0A95-41C4-BEB7-9C2C96459A7C}
{FFAA4C52-3A53-4F99-90C1-D59D1F0427F3} = {9460B5F1-0A95-41C4-BEB7-9C2C96459A7C}
{0DF3ABD0-DDC0-4265-B778-07C66780979B} = {9460B5F1-0A95-41C4-BEB7-9C2C96459A7C}
@ -2818,6 +2849,7 @@ Global
{62F27B1A-C919-4A70-8478-51F178F3B18F} = {EB910B0D-F27D-4B62-B67B-DE834C99AC5B}
{ABB71A76-42B0-47A4-973A-42E3D920C6FD} = {EB910B0D-F27D-4B62-B67B-DE834C99AC5B}
{9778F1C0-09BC-4698-8EBC-BD982247209A} = {EB910B0D-F27D-4B62-B67B-DE834C99AC5B}
{56B91D01-9150-4BBF-AFA1-5B68AB991B76} = {EB910B0D-F27D-4B62-B67B-DE834C99AC5B}
{8B3B4C4C-13C2-446C-BEB0-F412CC2CFB9A} = {C120A020-773F-4EA3-923F-B67AF28B750D}
{4F92B672-DADB-4047-8D6A-4BB3796733FD} = {C120A020-773F-4EA3-923F-B67AF28B750D}
{2DEE4895-1134-439C-B688-52203E57D878} = {C120A020-773F-4EA3-923F-B67AF28B750D}

56
libs/freetdm/src/ftmod/ftmod_sangoma_boost/ftmod_sangoma_boost.c
View File

@ -69,6 +69,9 @@ static ftdm_status_t ftdm_sangoma_boost_list_sigmods(ftdm_stream_handle_t *strea
#define BOOST_SPAN(ftdmchan) ((ftdm_sangoma_boost_data_t*)(ftdmchan)->span->signal_data)->sigmod ? ftdmchan->physical_span_id : ftdmchan->physical_span_id-1
#define BOOST_CHAN(ftdmchan) ((ftdm_sangoma_boost_data_t*)(ftdmchan)->span->signal_data)->sigmod ? ftdmchan->physical_chan_id : ftdmchan->physical_chan_id-1
#define BOOST_EVENT_SPAN(sigmod, event) ((sigmod)? event->span:event->span+1)
#define BOOST_EVENT_CHAN(sigmod, event) ((sigmod)? event->chan:event->chan+1)
/**
* \brief SANGOMA boost notification flag
*/
@ -137,7 +140,7 @@ static void __release_request_id_span_chan(int span, int chan, const char *func,
ftdm_mutex_lock(request_mutex);
if ((id = SETUP_GRID[span][chan])) {
ftdm_assert(id <= MAX_REQ_ID, "Invalid id");
ftdm_assert(id <= MAX_REQ_ID, "Invalid request id\n");
req_map[id] = 0;
SETUP_GRID[span][chan] = 0;
}
@ -153,7 +156,7 @@ static void __release_request_id_span_chan(int span, int chan, const char *func,
*/
static void __release_request_id(sangoma_boost_request_id_t r, const char *func, int line)
{
ftdm_assert(r <= MAX_REQ_ID, "Invalid id");
ftdm_assert(r <= MAX_REQ_ID, "Invalid request id\n");
ftdm_mutex_lock(request_mutex);
req_map[r] = 0;
ftdm_mutex_unlock(request_mutex);
@ -239,9 +242,10 @@ static ftdm_channel_t *find_ftdmchan(ftdm_span_t *span, sangomabc_short_event_t
{
uint32_t i;
ftdm_channel_t *ftdmchan = NULL;
ftdm_sangoma_boost_data_t *sangoma_boost_data;
uint32_t targetspan = event->span+1;
uint32_t targetchan = event->chan+1;
ftdm_sangoma_boost_data_t *sangoma_boost_data = span->signal_data;
uint32_t targetspan = BOOST_EVENT_SPAN(sangoma_boost_data->sigmod, event);
uint32_t targetchan = BOOST_EVENT_CHAN(sangoma_boost_data->sigmod, event);
/* NC: Sanity check in case the call setup id does not relate
to span. This can happen if RESTART is received on a
@ -257,13 +261,6 @@ static ftdm_channel_t *find_ftdmchan(ftdm_span_t *span, sangomabc_short_event_t
return NULL;
}
sangoma_boost_data = span->signal_data;
if (sangoma_boost_data->sigmod) {
/* span is not strictly needed here since we're supposed to get only events for our span */
targetspan = event->span;
targetchan = event->chan;
}
for(i = 1; i <= span->chan_count; i++) {
if (span->channels[i]->physical_span_id == targetspan && span->channels[i]->physical_chan_id == targetchan) {
@ -608,8 +605,8 @@ static void handle_call_start_ack(sangomabc_connection_t *mcon, sangomabc_short_
{
ftdm_channel_t *ftdmchan = NULL;
uint32_t event_span = event->span+1;
uint32_t event_chan = event->chan+1;
uint32_t event_span = BOOST_EVENT_SPAN(mcon->sigmod, event);
uint32_t event_chan = BOOST_EVENT_CHAN(mcon->sigmod, event);
if (nack_map[event->call_setup_id]) {
@ -620,11 +617,6 @@ static void handle_call_start_ack(sangomabc_connection_t *mcon, sangomabc_short_
return;
}
if (mcon->sigmod) {
event_span = event->span;
event_chan = event->chan;
}
if (mcon->sigmod) {
ftdmchan = OUTBOUND_REQUESTS[event->call_setup_id].ftdmchan;
} else {
@ -712,7 +704,7 @@ static void handle_call_start_ack(sangomabc_connection_t *mcon, sangomabc_short_
if (!ftdmchan) {
ftdm_log(FTDM_LOG_CRIT, "START ACK CANT FIND A CHAN %d:%d\n", event->span+1,event->chan+1);
ftdm_log(FTDM_LOG_CRIT, "START ACK CANT FIND A CHAN %d:%d\n", BOOST_EVENT_SPAN(mcon->sigmod, event), BOOST_EVENT_CHAN(mcon->sigmod, event));
} else {
/* only reason to be here is failed to open channel when we we're in sigmod */
ftdm_set_state_locked(ftdmchan, FTDM_CHANNEL_STATE_TERMINATING);
@ -974,7 +966,7 @@ static void handle_call_answer(ftdm_span_t *span, sangomabc_connection_t *mcon,
}
ftdm_mutex_unlock(ftdmchan->mutex);
} else {
ftdm_log(FTDM_LOG_CRIT, "ANSWER CANT FIND A CHAN %d:%d\n", event->span+1,event->chan+1);
ftdm_log(FTDM_LOG_CRIT, "ANSWER CANT FIND A CHAN %d:%d\n", BOOST_EVENT_SPAN(mcon, event), BOOST_EVENT_CHAN(mcon, event));
sangomabc_exec_command(mcon,
event->span,
event->chan,
@ -1020,12 +1012,12 @@ static void handle_call_start(ftdm_span_t *span, sangomabc_connection_t *mcon, s
ftdm_set_sflag(ftdmchan, SFLAG_SENT_FINAL_MSG);
ftdmchan = NULL;
}
ftdm_log(FTDM_LOG_CRIT, "START CANT FIND CHAN %d:%d\n", event->span+1,event->chan+1);
ftdm_log(FTDM_LOG_CRIT, "START CANT FIND CHAN %d:%d\n", BOOST_EVENT_SPAN(mcon->sigmod, event), BOOST_EVENT_CHAN(mcon->sigmod, event));
goto error;
}
if (ftdm_channel_open_chan(ftdmchan) != FTDM_SUCCESS) {
ftdm_log(FTDM_LOG_CRIT, "START CANT OPEN CHAN %d:%d\n", event->span+1,event->chan+1);
ftdm_log(FTDM_LOG_CRIT, "START CANT OPEN CHAN %d:%d\n", BOOST_EVENT_SPAN(mcon->sigmod, event), BOOST_EVENT_CHAN(mcon->sigmod, event));
goto error;
}
@ -1091,12 +1083,12 @@ static void handle_call_loop_start(ftdm_span_t *span, sangomabc_connection_t *mc
ftdm_channel_t *ftdmchan;
if (!(ftdmchan = find_ftdmchan(span, (sangomabc_short_event_t*)event, 0))) {
ftdm_log(FTDM_LOG_CRIT, "CANNOT START LOOP, CHAN NOT AVAILABLE %d:%d\n", event->span+1,event->chan+1);
ftdm_log(FTDM_LOG_CRIT, "CANNOT START LOOP, CHAN NOT AVAILABLE %d:%d\n", BOOST_EVENT_SPAN(mcon->sigmod, event), BOOST_EVENT_CHAN(mcon->sigmod, event));
return;
}
if (ftdm_channel_open_chan(ftdmchan) != FTDM_SUCCESS) {
ftdm_log(FTDM_LOG_CRIT, "CANNOT START LOOP, CANT OPEN CHAN %d:%d\n", event->span+1,event->chan+1);
ftdm_log(FTDM_LOG_CRIT, "CANNOT START LOOP, CANT OPEN CHAN %d:%d\n", BOOST_EVENT_SPAN(mcon->sigmod, event), BOOST_EVENT_CHAN(mcon->sigmod, event));
return;
}
@ -1114,7 +1106,7 @@ static void handle_call_loop_stop(ftdm_span_t *span, sangomabc_connection_t *mco
ftdm_channel_t *ftdmchan;
ftdm_status_t res = FTDM_FAIL;
if (!(ftdmchan = find_ftdmchan(span, (sangomabc_short_event_t*)event, 1))) {
ftdm_log(FTDM_LOG_CRIT, "CANNOT STOP LOOP, INVALID CHAN REQUESTED %d:%d\n", event->span+1,event->chan+1);
ftdm_log(FTDM_LOG_CRIT, "CANNOT STOP LOOP, INVALID CHAN REQUESTED %d:%d\n", BOOST_EVENT_SPAN(mcon->sigmod, event), BOOST_EVENT_CHAN(mcon->sigmod, event));
return;
}
if (ftdmchan->state != FTDM_CHANNEL_STATE_IN_LOOP) {
@ -1192,14 +1184,14 @@ static void handle_incoming_digit(sangomabc_connection_t *mcon, ftdm_span_t *spa
ftdm_log(FTDM_LOG_WARNING, "Error Incoming digit with len %s %d [w%dg%d]\n",
event->called_number_digits,
event->called_number_digits_count,
event->span+1, event->chan+1);
BOOST_EVENT_SPAN(mcon->sigmod, event), BOOST_EVENT_CHAN(mcon->sigmod, event));
return;
}
ftdm_log(FTDM_LOG_WARNING, "Incoming digit with len %s %d [w%dg%d]\n",
event->called_number_digits,
event->called_number_digits_count,
event->span+1, event->chan+1);
event->called_number_digits,
event->called_number_digits_count,
BOOST_EVENT_SPAN(mcon->sigmod, event), BOOST_EVENT_CHAN(mcon->sigmod, event));
memcpy(digits, event->called_number_digits, event->called_number_digits_count);
ftdm_channel_queue_dtmf(ftdmchan, digits);
@ -1236,7 +1228,9 @@ static ftdm_channel_t* event_process_states(ftdm_span_t *span, sangomabc_short_e
case SIGBOOST_EVENT_REMOVE_CHECK_LOOP:
case SIGBOOST_EVENT_CALL_RELEASED:
if (!(ftdmchan = find_ftdmchan(span, (sangomabc_short_event_t*)event, 1))) {
ftdm_log(FTDM_LOG_DEBUG, "PROCESS STATES CANT FIND CHAN %d:%d\n", event->span+1,event->chan+1);
ftdm_log(FTDM_LOG_DEBUG, "PROCESS STATES CANT FIND CHAN %d:%d\n",
BOOST_EVENT_SPAN(((ftdm_sangoma_boost_data_t*)(span->signal_data))->sigmod, event),
BOOST_EVENT_CHAN(((ftdm_sangoma_boost_data_t*)(span->signal_data))->sigmod, event));
return NULL;
}
break;

841
libs/silk/src/Silk_FIX.2008.vcproj Normal file
View File

@ -0,0 +1,841 @@
<?xml version="1.0" encoding="Windows-1252"?>
<VisualStudioProject
ProjectType="Visual C++"
Version="9.00"
Name="Silk_FIX"
ProjectGUID="{56B91D01-9150-4BBF-AFA1-5B68AB991B76}"
RootNamespace="Silk"
Keyword="Win32Proj"
TargetFrameworkVersion="131072"
>
<Platforms>
<Platform
Name="Win32"
/>
<Platform
Name="x64"
/>
</Platforms>
<ToolFiles>
</ToolFiles>
<Configurations>
<Configuration
Name="Debug|Win32"
OutputDirectory="$(SolutionDir)"
IntermediateDirectory="$(ConfigurationName)"
ConfigurationType="4"
CharacterSet="1"
>
<Tool
Name="VCPreBuildEventTool"
/>
<Tool
Name="VCCustomBuildTool"
/>
<Tool
Name="VCXMLDataGeneratorTool"
/>
<Tool
Name="VCWebServiceProxyGeneratorTool"
/>
<Tool
Name="VCMIDLTool"
/>
<Tool
Name="VCCLCompilerTool"
Optimization="0"
FavorSizeOrSpeed="0"
AdditionalIncludeDirectories="../interface"
PreprocessorDefinitions="WIN32;_DEBUG;_LIB;"
MinimalRebuild="true"
BasicRuntimeChecks="3"
RuntimeLibrary="1"
FloatingPointModel="2"
UsePrecompiledHeader="0"
WarningLevel="3"
Detect64BitPortabilityProblems="true"
DebugInformationFormat="4"
/>
<Tool
Name="VCManagedResourceCompilerTool"
/>
<Tool
Name="VCResourceCompilerTool"
/>
<Tool
Name="VCPreLinkEventTool"
/>
<Tool
Name="VCLibrarianTool"
OutputFile="SKP_Silk_FIX_Win32_debug.lib"
/>
<Tool
Name="VCALinkTool"
/>
<Tool
Name="VCXDCMakeTool"
/>
<Tool
Name="VCBscMakeTool"
/>
<Tool
Name="VCFxCopTool"
/>
<Tool
Name="VCPostBuildEventTool"
CommandLine=""
/>
</Configuration>
<Configuration
Name="Release|Win32"
OutputDirectory="$(SolutionDir)"
IntermediateDirectory="$(ConfigurationName)"
ConfigurationType="4"
CharacterSet="1"
WholeProgramOptimization="1"
>
<Tool
Name="VCPreBuildEventTool"
/>
<Tool
Name="VCCustomBuildTool"
/>
<Tool
Name="VCXMLDataGeneratorTool"
/>
<Tool
Name="VCWebServiceProxyGeneratorTool"
/>
<Tool
Name="VCMIDLTool"
/>
<Tool
Name="VCCLCompilerTool"
Optimization="2"
InlineFunctionExpansion="0"
FavorSizeOrSpeed="0"
AdditionalIncludeDirectories="../interface"
PreprocessorDefinitions="WIN32;NDEBUG;_LIB"
GeneratePreprocessedFile="0"
RuntimeLibrary="0"
FloatingPointModel="2"
UsePrecompiledHeader="0"
WarningLevel="3"
Detect64BitPortabilityProblems="true"
DebugInformationFormat="3"
/>
<Tool
Name="VCManagedResourceCompilerTool"
/>
<Tool
Name="VCResourceCompilerTool"
/>
<Tool
Name="VCPreLinkEventTool"
/>
<Tool
Name="VCLibrarianTool"
OutputFile="SKP_Silk_FIX_Win32_mt.lib"
/>
<Tool
Name="VCALinkTool"
/>
<Tool
Name="VCXDCMakeTool"
/>
<Tool
Name="VCBscMakeTool"
/>
<Tool
Name="VCFxCopTool"
/>
<Tool
Name="VCPostBuildEventTool"
CommandLine=""
/>
</Configuration>
<Configuration
Name="Debug|x64"
OutputDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)"
IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
ConfigurationType="4"
CharacterSet="1"
>
<Tool
Name="VCPreBuildEventTool"
/>
<Tool
Name="VCCustomBuildTool"
/>
<Tool
Name="VCXMLDataGeneratorTool"
/>
<Tool
Name="VCWebServiceProxyGeneratorTool"
/>
<Tool
Name="VCMIDLTool"
TargetEnvironment="3"
/>
<Tool
Name="VCCLCompilerTool"
Optimization="0"
FavorSizeOrSpeed="0"
AdditionalIncludeDirectories="../interface"
PreprocessorDefinitions="WIN32;_DEBUG;_LIB;"
MinimalRebuild="true"
BasicRuntimeChecks="3"
RuntimeLibrary="1"
FloatingPointModel="2"
UsePrecompiledHeader="0"
WarningLevel="3"
Detect64BitPortabilityProblems="true"
DebugInformationFormat="3"
/>
<Tool
Name="VCManagedResourceCompilerTool"
/>
<Tool
Name="VCResourceCompilerTool"
/>
<Tool
Name="VCPreLinkEventTool"
/>
<Tool
Name="VCLibrarianTool"
OutputFile="SKP_Silk_FIX_Win32_debug.lib"
/>
<Tool
Name="VCALinkTool"
/>
<Tool
Name="VCXDCMakeTool"
/>
<Tool
Name="VCBscMakeTool"
/>
<Tool
Name="VCFxCopTool"
/>
<Tool
Name="VCPostBuildEventTool"
CommandLine=""
/>
</Configuration>
<Configuration
Name="Release|x64"
OutputDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)"
IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
ConfigurationType="4"
CharacterSet="1"
WholeProgramOptimization="1"
>
<Tool
Name="VCPreBuildEventTool"
/>
<Tool
Name="VCCustomBuildTool"
/>
<Tool
Name="VCXMLDataGeneratorTool"
/>
<Tool
Name="VCWebServiceProxyGeneratorTool"
/>
<Tool
Name="VCMIDLTool"
TargetEnvironment="3"
/>
<Tool
Name="VCCLCompilerTool"
Optimization="2"
InlineFunctionExpansion="0"
FavorSizeOrSpeed="0"
AdditionalIncludeDirectories="../interface"
PreprocessorDefinitions="WIN32;NDEBUG;_LIB"
GeneratePreprocessedFile="0"
RuntimeLibrary="0"
FloatingPointModel="2"
UsePrecompiledHeader="0"
WarningLevel="3"
Detect64BitPortabilityProblems="true"
DebugInformationFormat="3"
/>
<Tool
Name="VCManagedResourceCompilerTool"
/>
<Tool
Name="VCResourceCompilerTool"
/>
<Tool
Name="VCPreLinkEventTool"
/>
<Tool
Name="VCLibrarianTool"
OutputFile="SKP_Silk_FIX_Win32_mt.lib"
/>
<Tool
Name="VCALinkTool"
/>
<Tool
Name="VCXDCMakeTool"
/>
<Tool
Name="VCBscMakeTool"
/>
<Tool
Name="VCFxCopTool"
/>
<Tool
Name="VCPostBuildEventTool"
CommandLine=""
/>
</Configuration>
</Configurations>
<References>
</References>
<Files>
<Filter
Name="Source Files"
Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx"
UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
>
<File
RelativePath=".\SKP_Silk_A2NLSF.c"
>
</File>
<File
RelativePath=".\SKP_Silk_allpass_int.c"
>
</File>
<File
RelativePath=".\SKP_Silk_ana_filt_bank_1.c"
>
</File>
<File
RelativePath=".\SKP_Silk_apply_sine_window.c"
>
</File>
<File
RelativePath=".\SKP_Silk_array_maxabs.c"
>
</File>
<File
RelativePath=".\SKP_Silk_autocorr.c"
>
</File>
<File
RelativePath=".\SKP_Silk_biquad.c"
>
</File>
<File
RelativePath=".\SKP_Silk_biquad_alt.c"
>
</File>
<File
RelativePath=".\SKP_Silk_burg_modified.c"
>
</File>
<File
RelativePath=".\SKP_Silk_bwexpander.c"
>
</File>
<File
RelativePath=".\SKP_Silk_bwexpander_32.c"
>
</File>
<File
RelativePath=".\SKP_Silk_CNG.c"
>
</File>
<File
RelativePath=".\SKP_Silk_code_signs.c"
>
</File>
<File
RelativePath=".\SKP_Silk_control_codec_FIX.c"
>
</File>
<File
RelativePath=".\SKP_Silk_corrMatrix_FIX.c"
>
</File>
<File
RelativePath=".\SKP_Silk_create_init_destroy.c"
>
</File>
<File
RelativePath=".\SKP_Silk_dec_API.c"
>
</File>
<File
RelativePath=".\SKP_Silk_decode_core.c"
>
</File>
<File
RelativePath=".\SKP_Silk_decode_frame.c"
>
</File>
<File
RelativePath=".\SKP_Silk_decode_indices_v4.c"
>
</File>
<File
RelativePath=".\SKP_Silk_decode_parameters.c"
>
</File>
<File
RelativePath=".\SKP_Silk_decode_parameters_v4.c"
>
</File>
<File
RelativePath=".\SKP_Silk_decode_pulses.c"
>
</File>
<File
RelativePath=".\SKP_Silk_decoder_set_fs.c"
>
</File>
<File
RelativePath=".\SKP_Silk_detect_SWB_input.c"
>
</File>
<File
RelativePath=".\SKP_Silk_enc_API.c"
>
</File>
<File
RelativePath=".\SKP_Silk_encode_frame_FIX.c"
>
</File>
<File
RelativePath=".\SKP_Silk_encode_parameters.c"
>
</File>
<File
RelativePath=".\SKP_Silk_encode_parameters_v4.c"
>
</File>
<File
RelativePath=".\SKP_Silk_encode_pulses.c"
>
</File>
<File
RelativePath=".\SKP_Silk_find_LPC_FIX.c"
>
</File>
<File
RelativePath=".\SKP_Silk_find_LTP_FIX.c"
>
</File>
<File
RelativePath=".\SKP_Silk_find_pitch_lags_FIX.c"
>
</File>
<File
RelativePath=".\SKP_Silk_find_pred_coefs_FIX.c"
>
</File>
<File
RelativePath=".\SKP_Silk_gain_quant.c"
>
</File>
<File
RelativePath=".\SKP_Silk_HP_variable_cutoff_FIX.c"
>
</File>
<File
RelativePath=".\SKP_Silk_init_encoder_FIX.c"
>
</File>
<File
RelativePath=".\SKP_Silk_inner_prod_aligned.c"
>
</File>
<File
RelativePath=".\SKP_Silk_interpolate.c"
>
</File>
<File
RelativePath=".\SKP_Silk_k2a.c"
>
</File>
<File
RelativePath=".\SKP_Silk_k2a_Q16.c"
>
</File>
<File
RelativePath=".\SKP_Silk_LBRR_reset.c"
>
</File>
<File
RelativePath=".\SKP_Silk_lin2log.c"
>
</File>
<File
RelativePath=".\SKP_Silk_log2lin.c"
>
</File>
<File
RelativePath=".\SKP_Silk_lowpass_int.c"
>
</File>
<File
RelativePath=".\SKP_Silk_lowpass_short.c"
>
</File>
<File
RelativePath=".\SKP_Silk_LP_variable_cutoff.c"
>
</File>
<File
RelativePath=".\SKP_Silk_LPC_inv_pred_gain.c"
>
</File>
<File
RelativePath=".\SKP_Silk_LPC_stabilize.c"
>
</File>
<File
RelativePath=".\SKP_Silk_LPC_synthesis_filter.c"
>
</File>
<File
RelativePath=".\SKP_Silk_LPC_synthesis_order16.c"
>
</File>
<File
RelativePath=".\SKP_Silk_LSF_cos_table.c"
>
</File>
<File
RelativePath=".\SKP_Silk_LTP_analysis_filter_FIX.c"
>
</File>
<File
RelativePath=".\SKP_Silk_LTP_scale_ctrl_FIX.c"
>
</File>
<File
RelativePath=".\SKP_Silk_MA.c"
>
</File>
<File
RelativePath=".\SKP_Silk_NLSF2A.c"
>
</File>
<File
RelativePath=".\SKP_Silk_NLSF2A_stable.c"
>
</File>
<File
RelativePath=".\SKP_Silk_NLSF_MSVQ_decode.c"
>
</File>
<File
RelativePath=".\SKP_Silk_NLSF_MSVQ_encode_FIX.c"
>
</File>
<File
RelativePath=".\SKP_Silk_NLSF_stabilize.c"
>
</File>
<File
RelativePath=".\SKP_Silk_NLSF_VQ_rate_distortion_FIX.c"
>
</File>
<File
RelativePath=".\SKP_Silk_NLSF_VQ_sum_error_FIX.c"
>
</File>
<File
RelativePath=".\SKP_Silk_NLSF_VQ_weights_laroia.c"
>
</File>
<File
RelativePath=".\SKP_Silk_noise_shape_analysis_FIX.c"
>
</File>
<File
RelativePath=".\SKP_Silk_NSQ.c"
>
</File>
<File
RelativePath=".\SKP_Silk_NSQ_del_dec.c"
>
</File>
<File
RelativePath=".\SKP_Silk_pitch_analysis_core.c"
>
</File>
<File
RelativePath=".\SKP_Silk_pitch_est_tables.c"
>
</File>
<File
RelativePath=".\SKP_Silk_PLC.c"
>
</File>
<File
RelativePath=".\SKP_Silk_prefilter_FIX.c"
>
</File>
<File
RelativePath=".\SKP_Silk_process_gains_FIX.c"
>
</File>
<File
RelativePath=".\SKP_Silk_process_NLSFs_FIX.c"
>
</File>
<File
RelativePath=".\SKP_Silk_pulses_to_bytes.c"
>
</File>
<File
RelativePath=".\SKP_Silk_quant_LTP_gains_FIX.c"
>
</File>
<File
RelativePath=".\SKP_Silk_range_coder.c"
>
</File>
<File
RelativePath=".\SKP_Silk_regularize_correlations_FIX.c"
>
</File>
<File
RelativePath=".\SKP_Silk_resample_1_2.c"
>
</File>
<File
RelativePath=".\SKP_Silk_resample_1_2_coarse.c"
>
</File>
<File
RelativePath=".\SKP_Silk_resample_1_2_coarsest.c"
>
</File>
<File
RelativePath=".\SKP_Silk_resample_1_3.c"
>
</File>
<File
RelativePath=".\SKP_Silk_resample_2_1_coarse.c"
>
</File>
<File
RelativePath=".\SKP_Silk_resample_2_3.c"
>
</File>
<File
RelativePath=".\SKP_Silk_resample_2_3_coarse.c"
>
</File>
<File
RelativePath=".\SKP_Silk_resample_2_3_coarsest.c"
>
</File>
<File
RelativePath=".\SKP_Silk_resample_2_3_rom.c"
>
</File>
<File
RelativePath=".\SKP_Silk_resample_3_1.c"
>
</File>
<File
RelativePath=".\SKP_Silk_resample_3_2.c"
>
</File>
<File
RelativePath=".\SKP_Silk_resample_3_2_rom.c"
>
</File>
<File
RelativePath=".\SKP_Silk_resample_3_4.c"
>
</File>
<File
RelativePath=".\SKP_Silk_resample_4_3.c"
>
</File>
<File
RelativePath=".\SKP_Silk_residual_energy16_FIX.c"
>
</File>
<File
RelativePath=".\SKP_Silk_residual_energy_FIX.c"
>
</File>
<File
RelativePath=".\SKP_Silk_scale_copy_vector16.c"
>
</File>
<File
RelativePath=".\SKP_Silk_scale_vector.c"
>
</File>
<File
RelativePath=".\SKP_Silk_schur.c"
>
</File>
<File
RelativePath=".\SKP_Silk_schur64.c"
>
</File>
<File
RelativePath=".\SKP_Silk_shell_coder.c"
>
</File>
<File
RelativePath=".\SKP_Silk_sigm_Q15.c"
>
</File>
<File
RelativePath=".\SKP_Silk_solve_LS_FIX.c"
>
</File>
<File
RelativePath=".\SKP_Silk_sort.c"
>
</File>
<File
RelativePath=".\SKP_Silk_sum_sqr_shift.c"
>
</File>
<File
RelativePath=".\SKP_Silk_tables_gain.c"
>
</File>
<File
RelativePath=".\SKP_Silk_tables_LTP.c"
>
</File>
<File
RelativePath=".\SKP_Silk_tables_NLSF_CB0_10.c"
>
</File>
<File
RelativePath=".\SKP_Silk_tables_NLSF_CB0_16.c"
>
</File>
<File
RelativePath=".\SKP_Silk_tables_NLSF_CB1_10.c"
>
</File>
<File
RelativePath=".\SKP_Silk_tables_NLSF_CB1_16.c"
>
</File>
<File
RelativePath=".\SKP_Silk_tables_other.c"
>
</File>
<File
RelativePath=".\SKP_Silk_tables_pitch_lag.c"
>
</File>
<File
RelativePath=".\SKP_Silk_tables_pulses_per_block.c"
>
</File>
<File
RelativePath=".\SKP_Silk_tables_sign.c"
>
</File>
<File
RelativePath=".\SKP_Silk_tables_type_offset.c"
>
</File>
<File
RelativePath=".\SKP_Silk_VAD.c"
>
</File>
<File
RelativePath=".\SKP_Silk_VQ_nearest_neighbor_FIX.c"
>
</File>
</Filter>
<Filter
Name="Header Files"
Filter="h;hpp;hxx;hm;inl;inc;xsd"
UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}"
>
<File
RelativePath="..\interface\SKP_Silk_control.h"
>
</File>
<File
RelativePath=".\SKP_Silk_define.h"
>
</File>
<File
RelativePath=".\SKP_Silk_define_FIX.h"
>
</File>
<File
RelativePath="..\interface\SKP_Silk_errors.h"
>
</File>
<File
RelativePath=".\SKP_Silk_Inlines.h"
>
</File>
<File
RelativePath=".\SKP_Silk_macros.h"
>
</File>
<File
RelativePath=".\SKP_Silk_main.h"
>
</File>
<File
RelativePath=".\SKP_Silk_main_FIX.h"
>
</File>
<File
RelativePath=".\SKP_Silk_perceptual_parameters_FIX.h"
>
</File>
<File
RelativePath=".\SKP_Silk_pitch_est_defines.h"
>
</File>
<File
RelativePath=".\SKP_Silk_PLC.h"
>
</File>
<File
RelativePath=".\SKP_Silk_resample_rom.h"
>
</File>
<File
RelativePath="..\interface\SKP_Silk_SDK_API.h"
>
</File>
<File
RelativePath=".\SKP_Silk_SigProc_FIX.h"
>
</File>
<File
RelativePath=".\SKP_Silk_structs.h"
>
</File>
<File
RelativePath=".\SKP_Silk_structs_FIX.h"
>
</File>
<File
RelativePath=".\SKP_Silk_tables.h"
>
</File>
<File
RelativePath="..\interface\SKP_Silk_typedef.h"
>
</File>
</Filter>
</Files>
<Globals>
</Globals>
</VisualStudioProject>

12
scripts/setup-git.sh
View File

@ -47,11 +47,21 @@ cat 1>&2 <<EOF
This does NOT rewrite history on the remote FS repo, but it does
change the commit hashes in your local tree.
By default, 'git pull' is equivalent to running:
git fetch && git merge origin/master
What we've done here is change things such that 'git pull' is now
equivalent to:
git fetch && git rebase origin/master
If you really want to merge rather than rebasing, run:
git merge <commit>
See 'man git-config' for more information.
See 'man git-config' for more information. Also see the man pages
for git-pull, git-fetch, git-merge, and git-rebase.
EOF
[ -n "$name" ] \

287
src/mod/codecs/mod_silk/mod_silk.2008.vcproj Normal file
View File

@ -0,0 +1,287 @@
<?xml version="1.0" encoding="Windows-1252"?>
<VisualStudioProject
ProjectType="Visual C++"
Version="9.00"
Name="mod_silk"
ProjectGUID="{AFA983D6-4569-4F88-BA94-555ED00FD9A8}"
RootNamespace="mod_silk"
Keyword="Win32Proj"
TargetFrameworkVersion="131072"
>
<Platforms>
<Platform
Name="Win32"
/>
<Platform
Name="x64"
/>
</Platforms>
<ToolFiles>
</ToolFiles>
<Configurations>
<Configuration
Name="Debug|Win32"
ConfigurationType="2"
InheritedPropertySheets="..\..\..\..\w32\module_debug.vsprops"
CharacterSet="2"
>
<Tool
Name="VCPreBuildEventTool"
/>
<Tool
Name="VCCustomBuildTool"
/>
<Tool
Name="VCXMLDataGeneratorTool"
/>
<Tool
Name="VCWebServiceProxyGeneratorTool"
/>
<Tool
Name="VCMIDLTool"
/>
<Tool
Name="VCCLCompilerTool"
AdditionalIncludeDirectories="&quot;$(InputDir)..\..\..\..\libs\silk\interface&quot;"
UsePrecompiledHeader="0"
/>
<Tool
Name="VCManagedResourceCompilerTool"
/>
<Tool
Name="VCResourceCompilerTool"
/>
<Tool
Name="VCPreLinkEventTool"
/>
<Tool
Name="VCLinkerTool"
RandomizedBaseAddress="1"
DataExecutionPrevention="0"
/>
<Tool
Name="VCALinkTool"
/>
<Tool
Name="VCManifestTool"
/>
<Tool
Name="VCXDCMakeTool"
/>
<Tool
Name="VCBscMakeTool"
/>
<Tool
Name="VCFxCopTool"
/>
<Tool
Name="VCAppVerifierTool"
/>
<Tool
Name="VCPostBuildEventTool"
/>
</Configuration>
<Configuration
Name="Debug|x64"
ConfigurationType="2"
InheritedPropertySheets="..\..\..\..\w32\module_debug.vsprops"
CharacterSet="2"
>
<Tool
Name="VCPreBuildEventTool"
/>
<Tool
Name="VCCustomBuildTool"
/>
<Tool
Name="VCXMLDataGeneratorTool"
/>
<Tool
Name="VCWebServiceProxyGeneratorTool"
/>
<Tool
Name="VCMIDLTool"
TargetEnvironment="3"
/>
<Tool
Name="VCCLCompilerTool"
AdditionalIncludeDirectories="&quot;$(InputDir)..\..\..\..\libs\silk\interface&quot;"
UsePrecompiledHeader="0"
/>
<Tool
Name="VCManagedResourceCompilerTool"
/>
<Tool
Name="VCResourceCompilerTool"
/>
<Tool
Name="VCPreLinkEventTool"
/>
<Tool
Name="VCLinkerTool"
OutputFile="$(SolutionDir)$(PlatformName)\$(ConfigurationName)/mod/$(ProjectName).dll"
RandomizedBaseAddress="1"
DataExecutionPrevention="0"
TargetMachine="17"
/>
<Tool
Name="VCALinkTool"
/>
<Tool
Name="VCManifestTool"
/>
<Tool
Name="VCXDCMakeTool"
/>
<Tool
Name="VCBscMakeTool"
/>
<Tool
Name="VCFxCopTool"
/>
<Tool
Name="VCAppVerifierTool"
/>
<Tool
Name="VCPostBuildEventTool"
/>
</Configuration>
<Configuration
Name="Release|Win32"
ConfigurationType="2"
InheritedPropertySheets="..\..\..\..\w32\module_release.vsprops"
CharacterSet="2"
>
<Tool
Name="VCPreBuildEventTool"
/>
<Tool
Name="VCCustomBuildTool"
/>
<Tool
Name="VCXMLDataGeneratorTool"
/>
<Tool
Name="VCWebServiceProxyGeneratorTool"
/>
<Tool
Name="VCMIDLTool"
/>
<Tool
Name="VCCLCompilerTool"
AdditionalIncludeDirectories="&quot;$(InputDir)..\..\..\..\libs\silk\interface&quot;"
UsePrecompiledHeader="0"
/>
<Tool
Name="VCManagedResourceCompilerTool"
/>
<Tool
Name="VCResourceCompilerTool"
/>
<Tool
Name="VCPreLinkEventTool"
/>
<Tool
Name="VCLinkerTool"
RandomizedBaseAddress="1"
DataExecutionPrevention="0"
/>
<Tool
Name="VCALinkTool"
/>
<Tool
Name="VCManifestTool"
/>
<Tool
Name="VCXDCMakeTool"
/>
<Tool
Name="VCBscMakeTool"
/>
<Tool
Name="VCFxCopTool"
/>
<Tool
Name="VCAppVerifierTool"
/>
<Tool
Name="VCPostBuildEventTool"
/>
</Configuration>
<Configuration
Name="Release|x64"
ConfigurationType="2"
InheritedPropertySheets="..\..\..\..\w32\module_release.vsprops"
CharacterSet="2"
>
<Tool
Name="VCPreBuildEventTool"
/>
<Tool
Name="VCCustomBuildTool"
/>
<Tool
Name="VCXMLDataGeneratorTool"
/>
<Tool
Name="VCWebServiceProxyGeneratorTool"
/>
<Tool
Name="VCMIDLTool"
TargetEnvironment="3"
/>
<Tool
Name="VCCLCompilerTool"
AdditionalIncludeDirectories="&quot;$(InputDir)..\..\..\..\libs\silk\interface&quot;"
UsePrecompiledHeader="0"
/>
<Tool
Name="VCManagedResourceCompilerTool"
/>
<Tool
Name="VCResourceCompilerTool"
/>
<Tool
Name="VCPreLinkEventTool"
/>
<Tool
Name="VCLinkerTool"
OutputFile="$(SolutionDir)$(PlatformName)\$(ConfigurationName)/mod/$(ProjectName).dll"
RandomizedBaseAddress="1"
DataExecutionPrevention="0"
TargetMachine="17"
/>
<Tool
Name="VCALinkTool"
/>
<Tool
Name="VCManifestTool"
/>
<Tool
Name="VCXDCMakeTool"
/>
<Tool
Name="VCBscMakeTool"
/>
<Tool
Name="VCFxCopTool"
/>
<Tool
Name="VCAppVerifierTool"
/>
<Tool
Name="VCPostBuildEventTool"
/>
</Configuration>
</Configurations>
<References>
</References>
<Files>
<File
RelativePath=".\mod_silk.c"
>
</File>
</Files>
<Globals>
</Globals>
</VisualStudioProject>