- Freeswitch-svn - FreeSWITCH Mailing Lists

[commit] r7567 - freeswitch/trunk/src/mod/applications/mod_fsv
by Freeswitch SVN 09 Feb '08

09 Feb '08

Author: mikej Date: Fri Feb 8 23:26:52 2008 New Revision: 7567 Removed: freeswitch/trunk/src/mod/applications/mod_fsv/Makefile Log: We generate these instead of using hardcoded paths.

1 0

[commit] r7566 - in freeswitch/trunk/libs/voipcodecs: . src/msvc
by Freeswitch SVN 09 Feb '08

09 Feb '08

Author: mikej Date: Fri Feb 8 23:24:46 2008 New Revision: 7566 Modified: freeswitch/trunk/libs/voipcodecs/libvoipcodecs.vcproj freeswitch/trunk/libs/voipcodecs/src/msvc/voipcodecs.def Log: closer to building on windows Modified: freeswitch/trunk/libs/voipcodecs/libvoipcodecs.vcproj ============================================================================== --- freeswitch/trunk/libs/voipcodecs/libvoipcodecs.vcproj (original) +++ freeswitch/trunk/libs/voipcodecs/libvoipcodecs.vcproj Fri Feb 8 23:24:46 2008 @@ -1,657 +1,334 @@ -<?xml version="1.0" encoding="Windows-1252"?> -<VisualStudioProject - ProjectType="Visual C++" - Version="8.00" - Name="libvoipcodecs" - ProjectGUID="{CF70F278-3364-4395-A2E1-23501C9B8AD2}" - RootNamespace="libvoipcodecs" - Keyword="Win32Proj" - > - <Platforms> - <Platform - Name="Win32" - /> - </Platforms> - <ToolFiles> - </ToolFiles> - <Configurations> - <Configuration - Name="Debug|Win32" - OutputDirectory="$(SolutionDir)$(ConfigurationName)" - IntermediateDirectory="$(ConfigurationName)" - ConfigurationType="2" - CharacterSet="1" - > - <Tool - Name="VCPreBuildEventTool" - /> - <Tool - Name="VCCustomBuildTool" - /> - <Tool - Name="VCXMLDataGeneratorTool" - /> - <Tool - Name="VCWebServiceProxyGeneratorTool" - /> - <Tool - Name="VCMIDLTool" - /> - <Tool - Name="VCCLCompilerTool" - Optimization="0" - AdditionalIncludeDirectories="src; src\voipcodecs; src\msvc" - PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;LIBvoipcodecs_EXPORTS;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE" - MinimalRebuild="true" - BasicRuntimeChecks="3" - RuntimeLibrary="3" - UsePrecompiledHeader="0" - WarningLevel="4" - Detect64BitPortabilityProblems="true" - DebugInformationFormat="4" - /> - <Tool - Name="VCManagedResourceCompilerTool" - /> - <Tool - Name="VCResourceCompilerTool" - /> - <Tool - Name="VCPreLinkEventTool" - /> - <Tool - Name="VCLinkerTool" - LinkIncremental="2" - ModuleDefinitionFile="src/msvc/voipcodecs.def" - GenerateDebugInformation="true" - SubSystem="2" - TargetMachine="1" - /> - <Tool - Name="VCALinkTool" - /> - <Tool - Name="VCManifestTool" - /> - <Tool - Name="VCXDCMakeTool" - /> - <Tool - Name="VCBscMakeTool" - /> - <Tool - Name="VCFxCopTool" - /> - <Tool - Name="VCAppVerifierTool" - /> - <Tool - Name="VCWebDeploymentTool" - /> - <Tool - Name="VCPostBuildEventTool" - /> - </Configuration> - <Configuration - Name="Release|Win32" - OutputDirectory="$(SolutionDir)$(ConfigurationName)" - IntermediateDirectory="$(ConfigurationName)" - ConfigurationType="2" - CharacterSet="1" - WholeProgramOptimization="1" - > - <Tool - Name="VCPreBuildEventTool" - /> - <Tool - Name="VCCustomBuildTool" - /> - <Tool - Name="VCXMLDataGeneratorTool" - /> - <Tool - Name="VCWebServiceProxyGeneratorTool" - /> - <Tool - Name="VCMIDLTool" - /> - <Tool - Name="VCCLCompilerTool" - AdditionalIncludeDirectories="src; src\voipcodecs; src\msvc" - PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;LIBvoipcodecs_EXPORTS;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE" - RuntimeLibrary="2" - UsePrecompiledHeader="0" - WarningLevel="4" - Detect64BitPortabilityProblems="true" - DebugInformationFormat="3" - /> - <Tool - Name="VCManagedResourceCompilerTool" - /> - <Tool - Name="VCResourceCompilerTool" - /> - <Tool - Name="VCPreLinkEventTool" - /> - <Tool - Name="VCLinkerTool" - LinkIncremental="1" - ModuleDefinitionFile="src/msvc/voipcodecs.def" - GenerateDebugInformation="true" - SubSystem="2" - OptimizeReferences="2" - EnableCOMDATFolding="2" - TargetMachine="1" - /> - <Tool - Name="VCALinkTool" - /> - <Tool - Name="VCManifestTool" - /> - <Tool - Name="VCXDCMakeTool" - /> - <Tool - Name="VCBscMakeTool" - /> - <Tool - Name="VCFxCopTool" - /> - <Tool - Name="VCAppVerifierTool" - /> - <Tool - Name="VCWebDeploymentTool" - /> - <Tool - Name="VCPostBuildEventTool" - /> - </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=".\src\adsi.c" - > - </File> - <File - RelativePath=".\src\async.c" - > - </File> - <File - RelativePath=".\src\awgn.c" - > - </File> - <File - RelativePath=".\src\bert.c" - > - </File> - <File - RelativePath=".\src\complex_dds.c" - > - </File> - <File - RelativePath=".\src\complex_filters.c" - > - </File> - <File - RelativePath=".\src\dds.c" - > - </File> - <File - RelativePath=".\src\ec_disable_tone.c" - > - </File> - <File - RelativePath=".\src\echo.c" - > - </File> - <File - RelativePath=".\src\fax.c" - > - </File> - <File - RelativePath=".\src\fsk.c" - > - </File> - <File - RelativePath=".\src\g722_decode.c" - > - </File> - <File - RelativePath=".\src\g722_encode.c" - > - </File> - <File - RelativePath=".\src\g726.c" - > - </File> - <File - RelativePath=".\src\msvc\gettimeofday.c" - > - </File> - <File - RelativePath=".\src\hdlc.c" - > - </File> - <File - RelativePath=".\src\ima_adpcm.c" - > - </File> - <File - RelativePath=".\src\logging.c" - > - </File> - <File - RelativePath=".\src\modem_echo.c" - > - </File> - <File - RelativePath=".\src\noise.c" - > - </File> - <File - RelativePath=".\src\oki_adpcm.c" - > - </File> - <File - RelativePath=".\src\playout.c" - > - </File> - <File - RelativePath=".\src\plc.c" - > - </File> - <File - RelativePath=".\src\power_meter.c" - > - </File> - <File - RelativePath=".\src\queue.c" - > - </File> - <File - RelativePath=".\src\schedule.c" - > - </File> - <File - RelativePath=".\src\sig_tone.c" - > - </File> - <File - RelativePath=".\src\super_tone_rx.c" - > - </File> - <File - RelativePath=".\src\super_tone_tx.c" - > - </File> - <File - RelativePath=".\src\t30.c" - > - </File> - <File - RelativePath=".\src\t31.c" - > - </File> - <File - RelativePath=".\src\t35.c" - > - </File> - <File - RelativePath=".\src\t38_gateway.c" - > - </File> - <File - RelativePath=".\src\t38_ifppacket.c" - > - </File> - <File - RelativePath=".\src\t38_terminal.c" - > - </File> - <File - RelativePath=".\src\t4.c" - > - </File> - <File - RelativePath=".\src\testcpuid.c" - > - </File> - <File - RelativePath=".\src\time_scale.c" - > - </File> - <File - RelativePath=".\src\tone_detect.c" - > - </File> - <File - RelativePath=".\src\tone_generate.c" - > - </File> - <File - RelativePath=".\src\v17rx.c" - > - </File> - <File - RelativePath=".\src\v17tx.c" - > - </File> - <File - RelativePath=".\src\v22bis_rx.c" - > - </File> - <File - RelativePath=".\src\v22bis_tx.c" - > - </File> - <File - RelativePath=".\src\v27ter_rx.c" - > - </File> - <File - RelativePath=".\src\v27ter_tx.c" - > - </File> - <File - RelativePath=".\src\v29rx.c" - > - </File> - <File - RelativePath=".\src\v29tx.c" - > - </File> - <File - RelativePath=".\src\v42.c" - > - </File> - <File - RelativePath=".\src\v42bis.c" - > - </File> - <File - RelativePath=".\src\v8.c" - > - </File> - </Filter> - <Filter - Name="Header Files" - Filter="h;hpp;hxx;hm;inl;inc;xsd" - UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}" - > - <File - RelativePath=".\src\voipcodecs\adsi.h" - > - </File> - <File - RelativePath=".\src\voipcodecs\alaw_ulaw.h" - > - </File> - <File - RelativePath=".\src\voipcodecs\arctan2.h" - > - </File> - <File - RelativePath=".\src\voipcodecs\async.h" - > - </File> - <File - RelativePath=".\src\voipcodecs\awgn.h" - > - </File> - <File - RelativePath=".\src\voipcodecs\bert.h" - > - </File> - <File - RelativePath=".\src\voipcodecs\biquad.h" - > - </File> - <File - RelativePath=".\src\voipcodecs\complex.h" - > - </File> - <File - RelativePath=".\src\voipcodecs\complex_filters.h" - > - </File> - <File - RelativePath=".\src\voipcodecs\dc_restore.h" - > - </File> - <File - RelativePath=".\src\voipcodecs\dds.h" - > - </File> - <File - RelativePath=".\src\voipcodecs\ec_disable_detector.h" - > - </File> - <File - RelativePath=".\src\voipcodecs\ec_disable_tone.h" - > - </File> - <File - RelativePath=".\src\voipcodecs\echo.h" - > - </File> - <File - RelativePath=".\src\voipcodecs\fax.h" - > - </File> - <File - RelativePath=".\src\faxfont.h" - > - </File> - <File - RelativePath=".\src\voipcodecs\fir.h" - > - </File> - <File - RelativePath=".\src\voipcodecs\fsk.h" - > - </File> - <File - RelativePath=".\src\voipcodecs\g168models.h" - > - </File> - <File - RelativePath=".\src\voipcodecs\g722.h" - > - </File> - <File - RelativePath=".\src\voipcodecs\g726.h" - > - </File> - <File - RelativePath=".\src\voipcodecs\hdlc.h" - > - </File> - <File - RelativePath=".\src\voipcodecs\ima_adpcm.h" - > - </File> - <File - RelativePath=".\src\msvc\inttypes.h" - > - </File> - <File - RelativePath=".\src\voipcodecs\logging.h" - > - </File> - <File - RelativePath=".\src\voipcodecs\modem_echo.h" - > - </File> - <File - RelativePath=".\src\voipcodecs\noise.h" - > - </File> - <File - RelativePath=".\src\voipcodecs\oki_adpcm.h" - > - </File> - <File - RelativePath=".\src\voipcodecs\oss.h" - > - </File> - <File - RelativePath=".\src\voipcodecs\playout.h" - > - </File> - <File - RelativePath=".\src\voipcodecs\plc.h" - > - </File> - <File - RelativePath=".\src\voipcodecs\power_meter.h" - > - </File> - <File - RelativePath=".\src\voipcodecs\queue.h" - > - </File> - <File - RelativePath=".\src\voipcodecs\schedule.h" - > - </File> - <File - RelativePath=".\src\voipcodecs\sig_tone.h" - > - </File> - <File - RelativePath=".\src\voipcodecs.h" - > - </File> - <File - RelativePath=".\src\voipcodecs\super_tone_rx.h" - > - </File> - <File - RelativePath=".\src\voipcodecs\super_tone_tx.h" - > - </File> - <File - RelativePath=".\src\voipcodecs\t30.h" - > - </File> - <File - RelativePath=".\src\voipcodecs\t30_fcf.h" - > - </File> - <File - RelativePath=".\src\voipcodecs\t31.h" - > - </File> - <File - RelativePath=".\src\voipcodecs\t35.h" - > - </File> - <File - RelativePath=".\src\voipcodecs\t38.h" - > - </File> - <File - RelativePath=".\src\voipcodecs\t4.h" - > - </File> - <File - RelativePath=".\src\t4states.h" - > - </File> - <File - RelativePath=".\src\voipcodecs\telephony.h" - > - </File> - <File - RelativePath=".\src\msvc\tgmath.h" - > - </File> - <File - RelativePath=".\src\msvc\sys\time.h" - > - </File> - <File - RelativePath=".\src\voipcodecs\time_scale.h" - > - </File> - <File - RelativePath=".\src\voipcodecs\timing.h" - > - </File> - <File - RelativePath=".\src\voipcodecs\tone_detect.h" - > - </File> - <File - RelativePath=".\src\voipcodecs\tone_generate.h" - > - </File> - <File - RelativePath=".\src\msvc\unistd.h" - > - </File> - <File - RelativePath=".\src\voipcodecs\v17rx.h" - > - </File> - <File - RelativePath=".\src\voipcodecs\v17tx.h" - > - </File> - <File - RelativePath=".\src\voipcodecs\v22bis.h" - > - </File> - <File - RelativePath=".\src\voipcodecs\v27ter_rx.h" - > - </File> - <File - RelativePath=".\src\voipcodecs\v27ter_tx.h" - > - </File> - <File - RelativePath=".\src\voipcodecs\v29rx.h" - > - </File> - <File - RelativePath=".\src\voipcodecs\v29tx.h" - > - </File> - <File - RelativePath=".\src\voipcodecs\v42.h" - > - </File> - <File - RelativePath=".\src\voipcodecs\v42bis.h" - > - </File> - <File - RelativePath=".\src\voipcodecs\v8.h" - > - </File> - <File - RelativePath=".\src\voipcodecs\vector.h" - > - </File> - </Filter> - <Filter - Name="Resource Files" - Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav" - UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}" - > - </Filter> - </Files> - <Globals> - </Globals> -</VisualStudioProject> +<?xml version="1.0" encoding="Windows-1252"?> +<VisualStudioProject + ProjectType="Visual C++" + Version="9.00" + Name="libvoipcodecs" + ProjectGUID="{CF70F278-3364-4395-A2E1-23501C9B8AD2}" + RootNamespace="libvoipcodecs" + Keyword="Win32Proj" + TargetFrameworkVersion="131072" + > + <Platforms> + <Platform + Name="Win32" + /> + </Platforms> + <ToolFiles> + </ToolFiles> + <Configurations> + <Configuration + Name="Debug|Win32" + OutputDirectory="$(SolutionDir)$(ConfigurationName)" + IntermediateDirectory="$(ConfigurationName)" + ConfigurationType="2" + CharacterSet="1" + > + <Tool + Name="VCPreBuildEventTool" + /> + <Tool + Name="VCCustomBuildTool" + /> + <Tool + Name="VCXMLDataGeneratorTool" + /> + <Tool + Name="VCWebServiceProxyGeneratorTool" + /> + <Tool + Name="VCMIDLTool" + /> + <Tool + Name="VCCLCompilerTool" + Optimization="0" + AdditionalIncludeDirectories="src; src\voipcodecs; src\msvc" + PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;LIBvoipcodecs_EXPORTS;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;HAVE_MATH_H" + MinimalRebuild="true" + BasicRuntimeChecks="3" + RuntimeLibrary="3" + UsePrecompiledHeader="0" + WarningLevel="4" + Detect64BitPortabilityProblems="true" + DebugInformationFormat="4" + /> + <Tool + Name="VCManagedResourceCompilerTool" + /> + <Tool + Name="VCResourceCompilerTool" + /> + <Tool + Name="VCPreLinkEventTool" + /> + <Tool + Name="VCLinkerTool" + LinkIncremental="2" + ModuleDefinitionFile="src/msvc/voipcodecs.def" + GenerateDebugInformation="true" + SubSystem="2" + RandomizedBaseAddress="1" + DataExecutionPrevention="0" + TargetMachine="1" + /> + <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" + OutputDirectory="$(SolutionDir)$(ConfigurationName)" + IntermediateDirectory="$(ConfigurationName)" + ConfigurationType="2" + CharacterSet="1" + WholeProgramOptimization="1" + > + <Tool + Name="VCPreBuildEventTool" + /> + <Tool + Name="VCCustomBuildTool" + /> + <Tool + Name="VCXMLDataGeneratorTool" + /> + <Tool + Name="VCWebServiceProxyGeneratorTool" + /> + <Tool + Name="VCMIDLTool" + /> + <Tool + Name="VCCLCompilerTool" + AdditionalIncludeDirectories="src; src\voipcodecs; src\msvc" + PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;LIBvoipcodecs_EXPORTS;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;HAVE_MATH_H" + RuntimeLibrary="2" + UsePrecompiledHeader="0" + WarningLevel="4" + Detect64BitPortabilityProblems="true" + DebugInformationFormat="3" + /> + <Tool + Name="VCManagedResourceCompilerTool" + /> + <Tool + Name="VCResourceCompilerTool" + /> + <Tool + Name="VCPreLinkEventTool" + /> + <Tool + Name="VCLinkerTool" + LinkIncremental="1" + ModuleDefinitionFile="src/msvc/voipcodecs.def" + GenerateDebugInformation="true" + SubSystem="2" + OptimizeReferences="2" + EnableCOMDATFolding="2" + RandomizedBaseAddress="1" + DataExecutionPrevention="0" + TargetMachine="1" + /> + <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> + <Filter + Name="Source Files" + Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx" + UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}" + > + <File + RelativePath=".\src\bitstream.c" + > + </File> + <File + RelativePath=".\src\g711.c" + > + </File> + <File + RelativePath=".\src\g722_decode.c" + > + </File> + <File + RelativePath=".\src\g722_encode.c" + > + </File> + <File + RelativePath=".\src\g726.c" + > + </File> + <File + RelativePath=".\src\gsm0610_decode.c" + > + </File> + <File + RelativePath=".\src\gsm0610_encode.c" + > + </File> + <File + RelativePath=".\src\gsm0610_long_term.c" + > + </File> + <File + RelativePath=".\src\gsm0610_lpc.c" + > + </File> + <File + RelativePath=".\src\gsm0610_preprocess.c" + > + </File> + <File + RelativePath=".\src\gsm0610_rpe.c" + > + </File> + <File + RelativePath=".\src\gsm0610_short_term.c" + > + </File> + <File + RelativePath=".\src\ima_adpcm.c" + > + </File> + <File + RelativePath=".\src\lpc10_analyse.c" + > + </File> + <File + RelativePath=".\src\lpc10_decode.c" + > + </File> + <File + RelativePath=".\src\lpc10_encode.c" + > + </File> + <File + RelativePath=".\src\lpc10_placev.c" + > + </File> + <File + RelativePath=".\src\lpc10_voicing.c" + > + </File> + <File + RelativePath=".\src\oki_adpcm.c" + > + </File> + <File + RelativePath=".\src\vector_int.c" + > + </File> + </Filter> + <Filter + Name="Header Files" + Filter="h;hpp;hxx;hm;inl;inc;xsd" + UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}" + > + <File + RelativePath=".\src\voipcodecs\bit_operations.h" + > + </File> + <File + RelativePath=".\src\voipcodecs\bitstream.h" + > + </File> + <File + RelativePath=".\src\voipcodecs\dc_restore.h" + > + </File> + <File + RelativePath=".\src\float_fudge.h" + > + </File> + <File + RelativePath=".\src\voipcodecs\g711.h" + > + </File> + <File + RelativePath=".\src\voipcodecs\g722.h" + > + </File> + <File + RelativePath=".\src\voipcodecs\g726.h" + > + </File> + <File + RelativePath=".\src\voipcodecs\gsm0610.h" + > + </File> + <File + RelativePath=".\src\gsm0610_local.h" + > + </File> + <File + RelativePath=".\src\voipcodecs\ima_adpcm.h" + > + </File> + <File + RelativePath=".\src\voipcodecs\lpc10.h" + > + </File> + <File + RelativePath=".\src\lpc10_encdecs.h" + > + </File> + <File + RelativePath=".\src\voipcodecs\oki_adpcm.h" + > + </File> + <File + RelativePath=".\src\voipcodecs\telephony.h" + > + </File> + <File + RelativePath=".\src\voipcodecs\vector_int.h" + > + </File> + <File + RelativePath=".\src\voipcodecs\version.h" + > + </File> + </Filter> + </Files> + <Globals> + </Globals> +</VisualStudioProject> Modified: freeswitch/trunk/libs/voipcodecs/src/msvc/voipcodecs.def ============================================================================== --- freeswitch/trunk/libs/voipcodecs/src/msvc/voipcodecs.def (original) +++ freeswitch/trunk/libs/voipcodecs/src/msvc/voipcodecs.def Fri Feb 8 23:24:46 2008 @@ -1,62 +1,4 @@ EXPORTS -adsi_rx_init -adsi_rx -adsi_tx_init -adsi_send_alert_tone -adsi_put_message -adsi_next_field -adsi_add_field -async_tx_init -async_rx_init -awgn -bert_init -bert_get_bit -bert_put_bit -bert_set_report -bert_result -filter_create -filter_delete -filter_step -cfilter_create -cfilter_delete -cfilter_step -dds_phase_rate -dds_frequency -dds_scaling_dbm0 -dds_scaling_dbov -dds_lookup -dds_offset -dds -dds_mod -dds_complex -dds_complex_mod -dds_phase_ratef -dds_frequencyf -dds_scaling_dbm0f -dds_scaling_dbovf -ddsf -dds_modf -dds_complexf -dds_complex_modf -echo_can_create -echo_can_free -echo_can_flush -echo_can_adaption_mode -echo_can_update -fax_rx -fax_tx -fax_set_flush_handler -fax_init -fax_release -fsk_tx_init -fsk_tx_power -fsk_tx_set_get_bit -fsk_tx -fsk_rx_signal_power -fsk_rx_signal_cutoff -fsk_rx_init -fsk_rx -fsk_rx_set_put_bit g722_encode_init g722_encode_release g722_encode @@ -65,240 +7,7 @@ g722_decode g726_init g726_release -crc_itu32_calc -crc_itu32_append -crc_itu32_check -crc_itu16_calc -crc_itu16_append -crc_itu16_check -hdlc_rx_init -hdlc_rx_get_stats -hdlc_tx_init -hdlc_tx_frame -hdlc_tx_preamble ima_adpcm_init ima_adpcm_release -span_log_test -span_log -span_log_buf -span_log_init -span_log_set_protocol -span_set_message_handler -span_set_error_handler -modem_echo_can_create -modem_echo_can_free -modem_echo_can_flush -modem_echo_can_adaption_mode -modem_echo_can_update -noise oki_adpcm_init oki_adpcm_release -playout_put -playout_get -playout_get_unconditional -playout_current_length -playout_next_due -playout_new -playout_free -playout_restart -plc_rx -plc_fillin -plc_init -plc_release -power_meter_init -power_meter_damping -power_meter_update -power_meter_dbm0 -power_meter_dbov -power_meter_level_dbm0 -power_meter_level_dbov -queue_empty -queue_free_space -queue_contents -queue_flush -queue_view -queue_read -queue_write -queue_test_msg -queue_read_msg -queue_write_msg -queue_create -queue_delete -sig_tone_init -sig_tone_rx -sig_tone_tx -super_tone_rx_make_descriptor -super_tone_rx_add_tone -super_tone_rx_add_element -super_tone_rx_init -super_tone_rx_free -super_tone_rx_segment_callback -super_tone_rx -super_tone_tx_make_step -super_tone_tx_free -super_tone_tx_init -super_tone_tx -t30_init -t30_release -t30_restart -t30_create -t30_free -t30_frametype -t30_decode_dis_dtc_dcs -t30_completion_code_to_str -t30_set_header_info -t30_set_local_ident -t30_get_sub_address -t30_get_header_info -t30_get_local_ident -t30_get_far_ident -t30_get_transfer_statistics -t30_set_phase_b_handler -t30_set_phase_d_handler -t30_set_phase_e_handler -t30_set_document_handler -t30_set_rx_file -t30_set_tx_file -t30_local_interrupt_request -t30_send_complete -t30_hdlc_accept -t30_timer_update -t31_call_event -t31_at_rx -t31_rx -t31_tx -t31_init -t31_release -t35_decode -t38_indicator -t38_data_type -t38_field_type -t38_terminal_init -t38_gateway_init -t4_rx_create -t4_rx_init -t4_rx_start_page -t4_rx_end_page -t4_rx_delete -t4_rx_end -t4_rx_set_rx_encoding -t4_rx_set_sub_address -t4_rx_set_far_ident -t4_rx_set_vendor -t4_rx_set_model -t4_tx_create -t4_tx_init -t4_tx_start_page -t4_tx_restart_page -t4_tx_end_page -t4_tx_delete -t4_tx_end -t4_tx_set_tx_encoding -t4_tx_set_min_row_bits -t4_tx_set_local_ident -t4_tx_set_header_info -t4_get_transfer_statistics -t4_encoding_to_str -time_scale_init -time_scale_rate -time_scale -make_goertzel_descriptor -goertzel_init -goertzel_update -goertzel_result -dtmf_rx_init -dtmf_rx_set_realtime_callback -dtmf_rx_parms -dtmf_rx -make_tone_descriptor -make_tone_gen_descriptor -tone_gen_init -tone_gen -dtmf_tx_init -dtmf_tx -v17_rx_init -v17_rx_restart -v17_rx_release -v17_rx_set_put_bit -v17_rx -v17_rx_equalizer_state -v17_rx_carrier_frequency -v17_rx_symbol_timing_correction -v17_rx_signal_power -v17_rx_signal_cutoff -v17_rx_set_qam_report_handler -v17_tx_power -v17_tx_init -v17_tx_restart -v17_tx_release -v17_tx_set_get_bit -v17_tx -v22bis_rx_restart -v22bis_rx -v22bis_rx_equalizer_state -v22bis_rx_carrier_frequency -v22bis_rx_symbol_timing_correction -v22bis_rx_signal_power -v22bis_rx_set_qam_report_handler -v22bis_tx -v22bis_tx_power -v22bis_restart -v22bis_init -v22bis_set_get_bit -v22bis_set_put_bit -v27ter_rx_init -v27ter_rx_restart -v27ter_rx_release -v27ter_rx_set_put_bit -v27ter_rx -v27ter_rx_equalizer_state -v27ter_rx_carrier_frequency -v27ter_rx_symbol_timing_correction -v27ter_rx_signal_power -v27ter_rx_signal_cutoff -v27ter_rx_set_qam_report_handler -v27ter_tx_power -v27ter_tx_init -v27ter_tx_restart -v27ter_tx_release -v27ter_tx_set_get_bit -v27ter_tx -v29_rx_init -v29_rx_restart -v29_rx_release -v29_rx_set_put_bit -v29_rx -v29_rx_equalizer_state -v29_rx_carrier_frequency -v29_rx_symbol_timing_correction -v29_rx_signal_power -v29_rx_signal_cutoff -v29_rx_set_qam_report_handler -v29_tx_power -v29_tx_init -v29_tx_restart -v29_tx_release -v29_tx_set_get_bit -v29_tx -lapm_dump -lapm_receive -lapm_tx -lapm_tx_iframe -v42_set_status_callback -v42_rx_bit -v42_tx_bit -v42_init -v42_restart -v42_release -v42bis_compress -v42bis_compress_flush -v42bis_decompress -v42bis_decompress_flush -v42bis_init -v42bis_release -v8_init -v8_release -v8_tx -v8_rx -v8_log_supported_modulations -

1 0

[commit] r7565 - in freeswitch/trunk/src: . include include/private mod/endpoints/mod_sofia
by Freeswitch SVN 09 Feb '08

09 Feb '08

Author: anthm Date: Fri Feb 8 19:38:23 2008 New Revision: 7565 Modified: freeswitch/trunk/src/include/private/switch_core_pvt.h freeswitch/trunk/src/include/switch_core.h freeswitch/trunk/src/include/switch_types.h freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia_glue.c freeswitch/trunk/src/switch_core_codec.c Log: few core tweaks Modified: freeswitch/trunk/src/include/private/switch_core_pvt.h ============================================================================== --- freeswitch/trunk/src/include/private/switch_core_pvt.h (original) +++ freeswitch/trunk/src/include/private/switch_core_pvt.h Fri Feb 8 19:38:23 2008 @@ -101,6 +101,8 @@ switch_io_event_hooks_t event_hooks; switch_codec_t *read_codec; switch_codec_t *write_codec; + switch_codec_t *video_read_codec; + switch_codec_t *video_write_codec; switch_buffer_t *raw_write_buffer; switch_frame_t raw_write_frame; Modified: freeswitch/trunk/src/include/switch_core.h ============================================================================== --- freeswitch/trunk/src/include/switch_core.h (original) +++ freeswitch/trunk/src/include/switch_core.h Fri Feb 8 19:38:23 2008 @@ -1084,6 +1084,36 @@ */ SWITCH_DECLARE(switch_codec_t *) switch_core_session_get_write_codec(_In_ switch_core_session_t *session); +/*! + \brief Assign the video_read codec to a given session + \param session session to add the codec to + \param codec the codec to add + \return SWITCH_STATUS_SUCCESS if successful +*/ +SWITCH_DECLARE(switch_status_t) switch_core_session_set_video_read_codec(_In_ switch_core_session_t *session, switch_codec_t *codec); + +/*! + \brief Retrieve the video_read codec from a given session + \param session session to retrieve from + \return a pointer to the codec +*/ +SWITCH_DECLARE(switch_codec_t *) switch_core_session_get_video_read_codec(_In_ switch_core_session_t *session); + +/*! + \brief Assign the video_write codec to a given session + \param session session to add the codec to + \param codec the codec to add + \return SWITCH_STATUS_SUCCESS if successful +*/ +SWITCH_DECLARE(switch_status_t) switch_core_session_set_video_write_codec(_In_ switch_core_session_t *session, switch_codec_t *codec); + +/*! + \brief Retrieve the video_write codec from a given session + \param session session to retrieve from + \return a pointer to the codec +*/ +SWITCH_DECLARE(switch_codec_t *) switch_core_session_get_video_write_codec(_In_ switch_core_session_t *session); + ///\} ///\defgroup db Database Functions ///\ingroup core1 Modified: freeswitch/trunk/src/include/switch_types.h ============================================================================== --- freeswitch/trunk/src/include/switch_types.h (original) +++ freeswitch/trunk/src/include/switch_types.h Fri Feb 8 19:38:23 2008 @@ -386,6 +386,40 @@ SWITCH_RTP_FLAG_SECURE_RECV_RESET = (1 << 17) } switch_rtp_flag_t; + +#ifdef _MSC_VER +#pragma pack(push, r1, 1) +#endif + +#if __BYTE_ORDER == __BIG_ENDIAN +typedef struct { + unsigned version:2; /* protocol version */ + unsigned p:1; /* padding flag */ + unsigned x:1; /* header extension flag */ + unsigned cc:4; /* CSRC count */ + unsigned m:1; /* marker bit */ + unsigned pt:7; /* payload type */ + unsigned seq:16; /* sequence number */ + unsigned ts:32; /* timestamp */ + unsigned ssrc:32; /* synchronization source */ +} switch_rtp_hdr_t; + +#else /* BIG_ENDIAN */ + +typedef struct { + unsigned cc:4; /* CSRC count */ + unsigned x:1; /* header extension flag */ + unsigned p:1; /* padding flag */ + unsigned version:2; /* protocol version */ + unsigned pt:7; /* payload type */ + unsigned m:1; /* marker bit */ + unsigned seq:16; /* sequence number */ + unsigned ts:32; /* timestamp */ + unsigned ssrc:32; /* synchronization source */ +} switch_rtp_hdr_t; + +#endif + /*! \enum switch_priority_t \brief Priority Indication Modified: freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia_glue.c ============================================================================== --- freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia_glue.c (original) +++ freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia_glue.c Fri Feb 8 19:38:23 2008 @@ -47,6 +47,7 @@ int use_cng = 1; const char *val; const char *pass_fmtp = switch_channel_get_variable(tech_pvt->channel, "sip_video_fmtp"); + const char *ov_fmtp = switch_channel_get_variable(tech_pvt->channel, "sip_force_video_fmtp"); if (sofia_test_pflag(tech_pvt->profile, PFLAG_SUPRESS_CNG) || ((val = switch_channel_get_variable(tech_pvt->channel, "supress_cng")) && switch_true(val))) { @@ -261,21 +262,22 @@ rate = tech_pvt->video_rm_rate; switch_snprintf(buf + strlen(buf), sizeof(buf) - strlen(buf), "a=rtpmap:%d %s/%ld\n", tech_pvt->video_pt, tech_pvt->video_rm_encoding, tech_pvt->video_rm_rate); - + pass_fmtp = NULL; + if (switch_channel_get_variable(tech_pvt->channel, SWITCH_SIGNAL_BOND_VARIABLE)) { if ((of = switch_channel_get_variable_partner(tech_pvt->channel, "sip_video_fmtp"))) { pass_fmtp = of; } } - if (!pass_fmtp) { - pass_fmtp = tech_pvt->video_fmtp_out; + if (ov_fmtp) { + pass_fmtp = ov_fmtp; } if (pass_fmtp) { switch_snprintf(buf + strlen(buf), sizeof(buf) - strlen(buf), "a=fmtp:%d %s\n", tech_pvt->video_pt, pass_fmtp); } - + } else if (tech_pvt->num_codecs) { int i; int already_did[128] = { 0 }; @@ -1063,7 +1065,8 @@ tech_pvt->video_read_frame.codec = &tech_pvt->video_read_codec; tech_pvt->video_fmtp_out = switch_core_session_strdup(tech_pvt->session, tech_pvt->video_write_codec.fmtp_out); - + switch_core_session_set_video_read_codec(tech_pvt->session, &tech_pvt->video_read_codec); + switch_core_session_set_video_write_codec(tech_pvt->session, &tech_pvt->video_write_codec); } } return SWITCH_STATUS_SUCCESS; Modified: freeswitch/trunk/src/switch_core_codec.c ============================================================================== --- freeswitch/trunk/src/switch_core_codec.c (original) +++ freeswitch/trunk/src/switch_core_codec.c Fri Feb 8 19:38:23 2008 @@ -98,6 +98,62 @@ return session->write_codec; } + + +SWITCH_DECLARE(switch_status_t) switch_core_session_set_video_read_codec(switch_core_session_t *session, switch_codec_t *codec) +{ + switch_event_t *event; + switch_channel_t *channel = switch_core_session_get_channel(session); + char tmp[30]; + + if (switch_event_create(&event, SWITCH_EVENT_CODEC) == SWITCH_STATUS_SUCCESS) { + switch_channel_event_set_data(session->channel, event); + switch_event_add_header(event, SWITCH_STACK_BOTTOM, "channel-video-read-codec-name", "%s", codec->implementation->iananame); + switch_event_add_header(event, SWITCH_STACK_BOTTOM, "channel-video-read-codec-rate", "%d", codec->implementation->actual_samples_per_second); + switch_event_fire(&event); + } + + switch_channel_set_variable(channel, "video_read_codec", codec->implementation->iananame); + switch_snprintf(tmp, sizeof(tmp), "%d", codec->implementation->actual_samples_per_second); + switch_channel_set_variable(channel, "video_read_rate", tmp); + + session->video_read_codec = codec; + + return SWITCH_STATUS_SUCCESS; +} + +SWITCH_DECLARE(switch_codec_t *) switch_core_session_get_video_read_codec(switch_core_session_t *session) +{ + return session->video_read_codec; +} + +SWITCH_DECLARE(switch_status_t) switch_core_session_set_video_write_codec(switch_core_session_t *session, switch_codec_t *codec) +{ + switch_event_t *event; + switch_channel_t *channel = switch_core_session_get_channel(session); + char tmp[30]; + + if (switch_event_create(&event, SWITCH_EVENT_CODEC) == SWITCH_STATUS_SUCCESS) { + switch_channel_event_set_data(session->channel, event); + switch_event_add_header(event, SWITCH_STACK_BOTTOM, "channel-video-write-codec-name", "%s", codec->implementation->iananame); + switch_event_add_header(event, SWITCH_STACK_BOTTOM, "channel-video-write-codec-rate", "%d", codec->implementation->actual_samples_per_second); + switch_event_fire(&event); + } + + switch_channel_set_variable(channel, "video_write_codec", codec->implementation->iananame); + switch_snprintf(tmp, sizeof(tmp), "%d", codec->implementation->actual_samples_per_second); + switch_channel_set_variable(channel, "video_write_rate", tmp); + + session->video_write_codec = codec; + return SWITCH_STATUS_SUCCESS; +} + +SWITCH_DECLARE(switch_codec_t *) switch_core_session_get_video_write_codec(switch_core_session_t *session) +{ + return session->video_write_codec; +} + + SWITCH_DECLARE(switch_status_t) switch_core_codec_init(switch_codec_t *codec, char *codec_name, char *fmtp, uint32_t rate, int ms, int channels, uint32_t flags, const switch_codec_settings_t *codec_settings, switch_memory_pool_t *pool)

1 0

[commit] r7564 - freeswitch/trunk/src/mod/applications/mod_fsv
by Freeswitch SVN 09 Feb '08

09 Feb '08

Author: anthm Date: Fri Feb 8 19:37:58 2008 New Revision: 7564 Added: freeswitch/trunk/src/mod/applications/mod_fsv/ freeswitch/trunk/src/mod/applications/mod_fsv/Makefile freeswitch/trunk/src/mod/applications/mod_fsv/mod_fsv.c Log: initial check in of fsv Added: freeswitch/trunk/src/mod/applications/mod_fsv/Makefile ============================================================================== --- (empty file) +++ freeswitch/trunk/src/mod/applications/mod_fsv/Makefile Fri Feb 8 19:37:58 2008 @@ -0,0 +1,2 @@ +BASE=../../../.. +include /usr/src/freeswitch.trunk/build/modmake.rules Added: freeswitch/trunk/src/mod/applications/mod_fsv/mod_fsv.c ============================================================================== --- (empty file) +++ freeswitch/trunk/src/mod/applications/mod_fsv/mod_fsv.c Fri Feb 8 19:37:58 2008 @@ -0,0 +1,374 @@ +/* + * FreeSWITCH Modular Media Switching Software Library / Soft-Switch Application + * Copyright (C) 2005/2006, Anthony Minessale II <anthmct(a)yahoo.com> + * + * Version: MPL 1.1 + * + * The contents of this file are subject to the Mozilla Public License Version + * 1.1 (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * http://www.mozilla.org/MPL/ + * + * Software distributed under the License is distributed on an "AS IS" basis, + * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License + * for the specific language governing rights and limitations under the + * License. + * + * The Original Code is FreeSWITCH Modular Media Switching Software Library / Soft-Switch Application + * + * The Initial Developer of the Original Code is + * Anthony Minessale II <anthmct(a)yahoo.com> + * Portions created by the Initial Developer are Copyright (C) + * the Initial Developer. All Rights Reserved. + * + * Contributor(s): + * + * Anthony Minessale II <anthmct(a)yahoo.com> + * + * mod_fsv -- FS Video File Format + * + */ +#include <switch.h> + + +SWITCH_MODULE_LOAD_FUNCTION(mod_fsv_load); +SWITCH_MODULE_DEFINITION(mod_fsv, mod_fsv_load, NULL, NULL); + +#define VID_BIT (1 << 31) +#define VERSION 4201 + +struct file_header { + int32_t version; + char video_codec_name[32]; + char video_fmtp[128]; + uint32_t audio_rate; + uint32_t audio_ptime; + switch_time_t created; +}; + +struct record_helper { + switch_core_session_t *session; + switch_mutex_t *mutex; + int fd; + int up; +}; + +static void *SWITCH_THREAD_FUNC record_video_thread(switch_thread_t *thread, void *obj) +{ + struct record_helper *eh = obj; + switch_core_session_t *session = eh->session; + switch_channel_t *channel = switch_core_session_get_channel(session); + switch_status_t status; + switch_frame_t *read_frame; + int bytes; + + eh->up = 1; + while(switch_channel_ready(channel)) { + status = switch_core_session_read_video_frame(session, &read_frame, -1, 0); + + if (!SWITCH_READ_ACCEPTABLE(status)) { + break; + } + + if (switch_test_flag(read_frame, SFF_CNG)) { + continue; + } + + bytes = read_frame->packetlen |VID_BIT; + + switch_mutex_lock(eh->mutex); + + if (write(eh->fd, &bytes, sizeof(bytes)) != sizeof(bytes)) { + switch_mutex_unlock(eh->mutex); + break; + } + + if (write(eh->fd, read_frame->packet, read_frame->packetlen) != read_frame->packetlen) { + switch_mutex_unlock(eh->mutex); + break; + } + + switch_mutex_unlock(eh->mutex); + + switch_core_session_write_video_frame(session, read_frame, -1, 0); + } + eh->up = 0; + return NULL; +} + +SWITCH_STANDARD_APP(record_fsv_function) +{ + switch_status_t status; + switch_frame_t *read_frame; + switch_channel_t *channel = switch_core_session_get_channel(session); + struct record_helper eh = {0}; + switch_thread_t *thread; + switch_threadattr_t *thd_attr = NULL; + int fd; + switch_mutex_t *mutex = NULL; + switch_codec_t codec, *read_codec, *vid_codec; + + switch_channel_answer(channel); + + if ((fd = open((char *)data, O_WRONLY | O_CREAT | O_TRUNC, S_IRUSR | S_IWUSR)) < 0) { + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_CRIT, "Error opening file %s\n", (char *) data); + return; + } + + switch_channel_answer(channel); + + read_codec = switch_core_session_get_read_codec(session); + + if (switch_core_codec_init(&codec, + "L16", + NULL, + read_codec->implementation->samples_per_second, + read_codec->implementation->microseconds_per_frame / 1000, + 1, SWITCH_CODEC_FLAG_ENCODE | SWITCH_CODEC_FLAG_DECODE, + NULL, switch_core_session_get_pool(session)) == SWITCH_STATUS_SUCCESS) { + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Audio Codec Activation Success\n"); + } else { + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Audio Codec Activation Fail\n"); + goto end; + } + + switch_core_session_set_read_codec(session, &codec); + + if (switch_channel_test_flag(channel, CF_VIDEO)) { + struct file_header h; + memset(&h, 0, sizeof(h)); + vid_codec = switch_core_session_get_video_read_codec(session); + + h.version = VERSION; + h.created = switch_timestamp_now(); + switch_set_string(h.video_codec_name, vid_codec->implementation->iananame); + switch_set_string(h.video_fmtp, vid_codec->fmtp_in); + h.audio_rate = read_codec->implementation->samples_per_second; + h.audio_ptime = read_codec->implementation->microseconds_per_frame / 1000; + + if (write(fd, &h, sizeof(h)) != sizeof(h)) { + goto end; + } + + switch_mutex_init(&mutex, SWITCH_MUTEX_NESTED, switch_core_session_get_pool(session)); + eh.mutex = mutex; + eh.fd = fd; + eh.session = session; + switch_threadattr_create(&thd_attr, switch_core_session_get_pool(session)); + switch_threadattr_detach_set(thd_attr, 1); + switch_threadattr_stacksize_set(thd_attr, SWITCH_THREAD_STACKSIZE); + switch_thread_create(&thread, thd_attr, record_video_thread, &eh, switch_core_session_get_pool(session)); + } + + + while(switch_channel_ready(channel)) { + + status = switch_core_session_read_frame(session, &read_frame, -1, 0); + + if (!SWITCH_READ_ACCEPTABLE(status)) { + break; + } + + if (switch_test_flag(read_frame, SFF_CNG)) { + continue; + } + + if (mutex) { + switch_mutex_lock(mutex); + } + + if (write(fd, &read_frame->datalen, sizeof(read_frame->datalen)) != sizeof(read_frame->datalen)) { + if (mutex) { + switch_mutex_unlock(mutex); + } + break; + } + + if (write(fd, read_frame->data, read_frame->datalen) != read_frame->datalen) { + if (mutex) { + switch_mutex_unlock(mutex); + } + break; + } + + if (mutex) { + switch_mutex_unlock(mutex); + } + } + + + end: + + if (eh.up) { + while(eh.up) { + switch_yield(1000); + } + } + + switch_core_session_set_read_codec(session, read_codec); + switch_core_codec_destroy(&codec); + +} + +SWITCH_STANDARD_APP(play_fsv_function) +{ + switch_channel_t *channel = switch_core_session_get_channel(session); + switch_frame_t write_frame = {0}, vid_frame = {0}; + int fd = -1; + int bytes; + switch_codec_t *read_codec = NULL, codec = {0}, vid_codec = {0}; + unsigned char *aud_buffer; + unsigned char *vid_buffer; + struct file_header h; + uint32_t ts = 0, last = 0; + switch_timer_t timer = {0}; + + aud_buffer = switch_core_session_alloc(session, SWITCH_RECOMMENDED_BUFFER_SIZE); + vid_buffer = switch_core_session_alloc(session, SWITCH_RECOMMENDED_BUFFER_SIZE); + + if ((fd = open((char *)data, O_RDONLY)) < 0) { + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_CRIT, "Error opening file %s\n", (char *) data); + return; + } + + if (read(fd, &h, sizeof(h)) != sizeof(h)) { + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_CRIT, "error reading file header\n"); + goto end; + } + + if (h.version != VERSION) { + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_CRIT, "file version does not match!\n"); + goto end; + } + + switch_channel_set_variable(channel, "sip_force_video_fmtp", h.video_fmtp); + switch_channel_answer(channel); + + write_frame.codec = &codec; + write_frame.data = aud_buffer; + write_frame.buflen = SWITCH_RECOMMENDED_BUFFER_SIZE; + + vid_frame.codec = &vid_codec; + vid_frame.packet = vid_buffer; + vid_frame.data = vid_buffer + 12; + vid_frame.buflen = SWITCH_RECOMMENDED_BUFFER_SIZE - 12; + switch_set_flag((&vid_frame), SFF_RAW_RTP); + + read_codec = switch_core_session_get_read_codec(session); + + if (switch_core_timer_init(&timer, "soft", read_codec->implementation->microseconds_per_frame / 1000, + read_codec->implementation->samples_per_frame, switch_core_session_get_pool(session)) != SWITCH_STATUS_SUCCESS) { + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "timer Activation Fail\n"); + goto end; + } + + if (switch_core_codec_init(&codec, + "L16", + NULL, + h.audio_rate, + h.audio_ptime, + 1, SWITCH_CODEC_FLAG_ENCODE | SWITCH_CODEC_FLAG_DECODE, + NULL, switch_core_session_get_pool(session)) == SWITCH_STATUS_SUCCESS) { + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Audio Codec Activation Success\n"); + } else { + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Audio Codec Activation Fail\n"); + goto end; + } + + if (switch_core_codec_init(&vid_codec, + h.video_codec_name, + NULL, + 0, + 0, + 1, SWITCH_CODEC_FLAG_ENCODE | SWITCH_CODEC_FLAG_DECODE, + NULL, switch_core_session_get_pool(session)) == SWITCH_STATUS_SUCCESS) { + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Video Codec Activation Success\n"); + } else { + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Video Codec Activation Fail\n"); + goto end; + } + switch_core_session_set_read_codec(session, &codec); + + while(switch_channel_ready(channel)) { + + if (read(fd, &bytes, sizeof(bytes)) != sizeof(bytes)) { + break; + } + + if (bytes & VID_BIT) { + switch_rtp_hdr_t *h = vid_frame.packet; + bytes &= ~VID_BIT; + + if ((vid_frame.packetlen = read(fd, vid_frame.packet, bytes)) != bytes) { + break; + } + + ts = ntohl(h->ts); + h->pt = vid_codec.implementation->ianacode; + if (switch_channel_test_flag(channel, CF_VIDEO)) { + switch_core_session_write_video_frame(session, &vid_frame, -1, 0); + } + if (ts && last && last != ts) { + switch_yield(1000); + } + last = ts; + } else { + if (bytes > write_frame.buflen) { + bytes = write_frame.buflen; + } + if ((write_frame.datalen = read(fd, write_frame.data, bytes)) <= 0) { + break; + } + switch_core_session_write_frame(session, &write_frame, -1, 0); + switch_core_timer_next(&timer); + } + + } + + end: + + if (timer.interval) { + switch_core_timer_destroy(&timer); + } + + if (read_codec) { + switch_core_session_set_read_codec(session, read_codec); + } + + if (codec.implementation) { + switch_core_codec_destroy(&codec); + } + + if (vid_codec.implementation) { + switch_core_codec_destroy(&vid_codec); + } + + if (fd > -1) { + close(fd); + } +} + +SWITCH_MODULE_LOAD_FUNCTION(mod_fsv_load) +{ + switch_application_interface_t *app_interface; + + /* connect my internal structure to the blank pointer passed to me */ + *module_interface = switch_loadable_module_create_module_interface(pool, modname); + + SWITCH_ADD_APP(app_interface, "play_fsv", "play an fsv file", "play an fsv file", play_fsv_function, "<file>", SAF_NONE); + SWITCH_ADD_APP(app_interface, "record_fsv", "record an fsv file", "record an fsv file", record_fsv_function, "<file>", SAF_NONE); + + /* indicate that the module should continue to be loaded */ + return SWITCH_STATUS_SUCCESS; +} + +/* For Emacs: + * Local Variables: + * mode:c + * indent-tabs-mode:t + * tab-width:4 + * c-basic-offset:4 + * End: + * For VIM: + * vim:set softtabstop=4 shiftwidth=4 tabstop=4 expandtab: + */

1 0

[commit] r7563 - freeswitch/trunk/src/mod/applications/mod_voicemail
by Freeswitch SVN 08 Feb '08

08 Feb '08

Author: mikej Date: Fri Feb 8 18:31:22 2008 New Revision: 7563 Modified: freeswitch/trunk/src/mod/applications/mod_voicemail/mod_voicemail.c Log: dup these too. Modified: freeswitch/trunk/src/mod/applications/mod_voicemail/mod_voicemail.c ============================================================================== --- freeswitch/trunk/src/mod/applications/mod_voicemail/mod_voicemail.c (original) +++ freeswitch/trunk/src/mod/applications/mod_voicemail/mod_voicemail.c Fri Feb 8 18:31:22 2008 @@ -584,8 +584,8 @@ profile->email_body = email_body; profile->email_headers = email_headers; - profile->email_from = email_from; - profile->date_fmt = date_fmt; + profile->email_from = switch_core_strdup(globals.pool, email_from); + profile->date_fmt = switch_core_strdup(globals.pool, date_fmt); profile->digit_timeout = timeout; profile->max_login_attempts = max_login_attempts;

1 0

[commit] r7562 - freeswitch/trunk/src/mod/codecs/mod_voipcodecs
by Freeswitch SVN 08 Feb '08

08 Feb '08

Author: brian Date: Fri Feb 8 15:44:42 2008 New Revision: 7562 Modified: freeswitch/trunk/src/mod/codecs/mod_voipcodecs/mod_voipcodecs.c Log: tweak Modified: freeswitch/trunk/src/mod/codecs/mod_voipcodecs/mod_voipcodecs.c ============================================================================== --- freeswitch/trunk/src/mod/codecs/mod_voipcodecs/mod_voipcodecs.c (original) +++ freeswitch/trunk/src/mod/codecs/mod_voipcodecs/mod_voipcodecs.c Fri Feb 8 15:44:42 2008 @@ -158,7 +158,7 @@ return SWITCH_STATUS_FALSE; } - *encoded_data_len = gsm0610_encode(&context->encoder_object, (uint8_t *) encoded_data, (int16_t *) decoded_data, decoded_data_len / decoded_data_len); + *encoded_data_len = gsm0610_encode(&context->encoder_object, (uint8_t *) encoded_data, (int16_t *) decoded_data, decoded_data_len / 320); return SWITCH_STATUS_SUCCESS; }

1 0

[commit] r7561 - freeswitch/trunk/src/mod/codecs/mod_voipcodecs
by Freeswitch SVN 08 Feb '08

08 Feb '08

Author: brian Date: Fri Feb 8 15:29:20 2008 New Revision: 7561 Modified: freeswitch/trunk/src/mod/codecs/mod_voipcodecs/mod_voipcodecs.c Log: fix gsm woops Modified: freeswitch/trunk/src/mod/codecs/mod_voipcodecs/mod_voipcodecs.c ============================================================================== --- freeswitch/trunk/src/mod/codecs/mod_voipcodecs/mod_voipcodecs.c (original) +++ freeswitch/trunk/src/mod/codecs/mod_voipcodecs/mod_voipcodecs.c Fri Feb 8 15:29:20 2008 @@ -158,7 +158,7 @@ return SWITCH_STATUS_FALSE; } - *encoded_data_len = gsm0610_encode(&context->encoder_object, (uint8_t *) encoded_data, (int16_t *) decoded_data, decoded_data_len / 2); + *encoded_data_len = gsm0610_encode(&context->encoder_object, (uint8_t *) encoded_data, (int16_t *) decoded_data, decoded_data_len / decoded_data_len); return SWITCH_STATUS_SUCCESS; } @@ -176,7 +176,7 @@ return SWITCH_STATUS_FALSE; } - *decoded_data_len = (2 * gsm0610_decode(&context->decoder_object, (int16_t *) decoded_data, (uint8_t *) encoded_data, encoded_data_len)); + *decoded_data_len = (2 * gsm0610_decode(&context->decoder_object, (int16_t *) decoded_data, (uint8_t *) encoded_data, encoded_data_len / 33)); return SWITCH_STATUS_SUCCESS; }

1 0

[commit] r7559 - in freeswitch/trunk/src/mod: applications/mod_conference loggers/mod_console xml_int/mod_xml_cdr
by Freeswitch SVN 08 Feb '08

08 Feb '08

Author: mikej Date: Fri Feb 8 14:06:13 2008 New Revision: 7559 Modified: freeswitch/trunk/src/mod/applications/mod_conference/mod_conference.c freeswitch/trunk/src/mod/loggers/mod_console/mod_console.c freeswitch/trunk/src/mod/xml_int/mod_xml_cdr/mod_xml_cdr.c Log: extra error checking. Modified: freeswitch/trunk/src/mod/applications/mod_conference/mod_conference.c ============================================================================== --- freeswitch/trunk/src/mod/applications/mod_conference/mod_conference.c (original) +++ freeswitch/trunk/src/mod/applications/mod_conference/mod_conference.c Fri Feb 8 14:06:13 2008 @@ -856,7 +856,7 @@ break; } switch_mutex_lock(conference->mutex); - ready = has_file_data = total = 0; + has_file_data = ready = total = 0; /* Read one frame of audio from each member channel and save it for redistribution */ for (imember = conference->members; imember; imember = imember->next) { Modified: freeswitch/trunk/src/mod/loggers/mod_console/mod_console.c ============================================================================== --- freeswitch/trunk/src/mod/loggers/mod_console/mod_console.c (original) +++ freeswitch/trunk/src/mod/loggers/mod_console/mod_console.c Fri Feb 8 14:06:13 2008 @@ -138,7 +138,7 @@ #else COLORIZE = 1; #endif - } else if (!strcasecmp(var, "loglevel")) { + } else if (!strcasecmp(var, "loglevel") && !switch_strlen_zero(val)) { hard_log_level = switch_log_str2level(val); } } Modified: freeswitch/trunk/src/mod/xml_int/mod_xml_cdr/mod_xml_cdr.c ============================================================================== --- freeswitch/trunk/src/mod/xml_int/mod_xml_cdr/mod_xml_cdr.c (original) +++ freeswitch/trunk/src/mod/xml_int/mod_xml_cdr/mod_xml_cdr.c Fri Feb 8 14:06:13 2008 @@ -265,23 +265,23 @@ char *var = (char *) switch_xml_attr_soft(param, "name"); char *val = (char *) switch_xml_attr_soft(param, "value"); - if (!strcasecmp(var, "cred")) { + if (!strcasecmp(var, "cred") && !switch_strlen_zero(val)) { globals.cred = strdup(val); - } else if (!strcasecmp(var, "url")) { + } else if (!strcasecmp(var, "url") && !switch_strlen_zero(val)) { globals.url = strdup(val); - } else if (!strcasecmp(var, "delay")) { + } else if (!strcasecmp(var, "delay") && !switch_strlen_zero(val)) { globals.delay = (uint32_t) atoi(val); } else if (!strcasecmp(var, "log-b-leg")) { globals.log_b = switch_true(val); } else if (!strcasecmp(var, "disable-100-continue") && switch_true(val)) { globals.disable100continue = 1; - } else if (!strcasecmp(var, "encode")) { + } else if (!strcasecmp(var, "encode") && !switch_strlen_zero(val)) { if (!strcasecmp(val, "base64")) { globals.encode = 2; } else { globals.encode = switch_true(val) ? 1 : 0; } - } else if (!strcasecmp(var, "retries")) { + } else if (!strcasecmp(var, "retries") && !switch_strlen_zero(val)) { globals.retries = (uint32_t) atoi(val); } else if (!strcasecmp(var, "log-dir")) { if (switch_strlen_zero(val)) {

1 0

[commit] r7558 - in freeswitch/trunk: . src/mod/applications/mod_expr src/mod/codecs/mod_g726
by Freeswitch SVN 08 Feb '08

08 Feb '08

Author: mikej Date: Fri Feb 8 13:26:34 2008 New Revision: 7558 Modified: freeswitch/trunk/Freeswitch.sln freeswitch/trunk/src/mod/applications/mod_expr/mod_expr.vcproj freeswitch/trunk/src/mod/codecs/mod_g726/mod_g726.vcproj Log: tweak windows build. Modified: freeswitch/trunk/Freeswitch.sln ============================================================================== --- freeswitch/trunk/Freeswitch.sln (original) +++ freeswitch/trunk/Freeswitch.sln Fri Feb 8 13:26:34 2008 @@ -3,20 +3,20 @@ # Visual Studio 2005 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "FreeSwitchConsole", "w32\Console\FreeSwitchConsole.vcproj", "{1AF3A893-F7BE-43DD-B697-8AB2397C0D67}" ProjectSection(ProjectDependencies) = postProject - {202D7A4E-760D-4D0E-AFA1-D7459CED30FF} = {202D7A4E-760D-4D0E-AFA1-D7459CED30FF} {F6C55D93-B927-4483-BB69-15AEF3DD2DFF} = {F6C55D93-B927-4483-BB69-15AEF3DD2DFF} + {202D7A4E-760D-4D0E-AFA1-D7459CED30FF} = {202D7A4E-760D-4D0E-AFA1-D7459CED30FF} EndProjectSection EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "FreeSwitchCoreLib", "w32\Library\FreeSwitchCore.vcproj", "{202D7A4E-760D-4D0E-AFA1-D7459CED30FF}" ProjectSection(ProjectDependencies) = postProject - {50AD0E28-B8D7-4FCC-8FC3-599F6AC69761} = {50AD0E28-B8D7-4FCC-8FC3-599F6AC69761} - {8D04B550-D240-4A44-8A18-35DA3F7038D9} = {8D04B550-D240-4A44-8A18-35DA3F7038D9} - {89385C74-5860-4174-9CAF-A39E7C48909C} = {89385C74-5860-4174-9CAF-A39E7C48909C} - {F057DA7F-79E5-4B00-845C-EF446EF055E3} = {F057DA7F-79E5-4B00-845C-EF446EF055E3} - {F6C55D93-B927-4483-BB69-15AEF3DD2DFF} = {F6C55D93-B927-4483-BB69-15AEF3DD2DFF} - {EEF031CB-FED8-451E-A471-91EC8D4F6750} = {EEF031CB-FED8-451E-A471-91EC8D4F6750} - {101130D1-3EA6-4ED2-B65D-CEB5243A20ED} = {101130D1-3EA6-4ED2-B65D-CEB5243A20ED} {6EDFEFD5-3596-4FA9-8EBA-B331547B35A3} = {6EDFEFD5-3596-4FA9-8EBA-B331547B35A3} + {101130D1-3EA6-4ED2-B65D-CEB5243A20ED} = {101130D1-3EA6-4ED2-B65D-CEB5243A20ED} + {EEF031CB-FED8-451E-A471-91EC8D4F6750} = {EEF031CB-FED8-451E-A471-91EC8D4F6750} + {F6C55D93-B927-4483-BB69-15AEF3DD2DFF} = {F6C55D93-B927-4483-BB69-15AEF3DD2DFF} + {F057DA7F-79E5-4B00-845C-EF446EF055E3} = {F057DA7F-79E5-4B00-845C-EF446EF055E3} + {89385C74-5860-4174-9CAF-A39E7C48909C} = {89385C74-5860-4174-9CAF-A39E7C48909C} + {8D04B550-D240-4A44-8A18-35DA3F7038D9} = {8D04B550-D240-4A44-8A18-35DA3F7038D9} + {50AD0E28-B8D7-4FCC-8FC3-599F6AC69761} = {50AD0E28-B8D7-4FCC-8FC3-599F6AC69761} EndProjectSection EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mod_g729", "src\mod\codecs\mod_g729\mod_g729.vcproj", "{1D95CD95-0DE2-48C3-AC23-D5C7D1C9C0F0}" @@ -26,15 +26,15 @@ EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mod_gsm", "src\mod\codecs\mod_gsm\mod_gsm.vcproj", "{4926323F-4EA8-4B7D-A3D3-65488725988F}" ProjectSection(ProjectDependencies) = postProject - {202D7A4E-760D-4D0E-AFA1-D7459CED30FF} = {202D7A4E-760D-4D0E-AFA1-D7459CED30FF} {8FD2E297-4096-47E5-9258-C48FF1841523} = {8FD2E297-4096-47E5-9258-C48FF1841523} + {202D7A4E-760D-4D0E-AFA1-D7459CED30FF} = {202D7A4E-760D-4D0E-AFA1-D7459CED30FF} EndProjectSection EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mod_sndfile", "src\mod\formats\mod_sndfile\mod_sndfile.vcproj", "{AFAC0568-7548-42D5-9F6A-8D3400A1E4F6}" ProjectSection(ProjectDependencies) = postProject - {202D7A4E-760D-4D0E-AFA1-D7459CED30FF} = {202D7A4E-760D-4D0E-AFA1-D7459CED30FF} - {F6C55D93-B927-4483-BB69-15AEF3DD2DFF} = {F6C55D93-B927-4483-BB69-15AEF3DD2DFF} {3D0370CA-BED2-4657-A475-32375CBCB6E4} = {3D0370CA-BED2-4657-A475-32375CBCB6E4} + {F6C55D93-B927-4483-BB69-15AEF3DD2DFF} = {F6C55D93-B927-4483-BB69-15AEF3DD2DFF} + {202D7A4E-760D-4D0E-AFA1-D7459CED30FF} = {202D7A4E-760D-4D0E-AFA1-D7459CED30FF} EndProjectSection EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mod_g711", "src\mod\codecs\mod_g711\mod_g711.vcproj", "{B1FE4613-3F4B-4DAF-9714-2472BF8F56AE}" @@ -44,16 +44,16 @@ EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mod_iax", "src\mod\endpoints\mod_iax\mod_iax.vcproj", "{3A5B9131-F20C-4A85-9447-6C1610941CEE}" ProjectSection(ProjectDependencies) = postProject - {202D7A4E-760D-4D0E-AFA1-D7459CED30FF} = {202D7A4E-760D-4D0E-AFA1-D7459CED30FF} - {F6C55D93-B927-4483-BB69-15AEF3DD2DFF} = {F6C55D93-B927-4483-BB69-15AEF3DD2DFF} {5CC054B7-6DAA-46BF-9A08-3B33B83E8D3E} = {5CC054B7-6DAA-46BF-9A08-3B33B83E8D3E} + {F6C55D93-B927-4483-BB69-15AEF3DD2DFF} = {F6C55D93-B927-4483-BB69-15AEF3DD2DFF} + {202D7A4E-760D-4D0E-AFA1-D7459CED30FF} = {202D7A4E-760D-4D0E-AFA1-D7459CED30FF} EndProjectSection EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mod_PortAudio", "src\mod\endpoints\mod_portaudio\mod_PortAudio.vcproj", "{5FD31A25-5D83-4794-8BEE-904DAD84CE71}" ProjectSection(ProjectDependencies) = postProject - {202D7A4E-760D-4D0E-AFA1-D7459CED30FF} = {202D7A4E-760D-4D0E-AFA1-D7459CED30FF} - {0A18A071-125E-442F-AFF7-A3F68ABECF99} = {0A18A071-125E-442F-AFF7-A3F68ABECF99} {F6C55D93-B927-4483-BB69-15AEF3DD2DFF} = {F6C55D93-B927-4483-BB69-15AEF3DD2DFF} + {0A18A071-125E-442F-AFF7-A3F68ABECF99} = {0A18A071-125E-442F-AFF7-A3F68ABECF99} + {202D7A4E-760D-4D0E-AFA1-D7459CED30FF} = {202D7A4E-760D-4D0E-AFA1-D7459CED30FF} EndProjectSection EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mod_l16", "src\mod\codecs\mod_l16\mod_l16.vcproj", "{5844AFE1-AA3E-4BDB-A9EF-119AEF19DF88}" @@ -63,14 +63,14 @@ EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mod_speex", "src\mod\codecs\mod_speex\mod_speex.vcproj", "{5580D60E-0F77-4716-9CD4-B8E5986FA375}" ProjectSection(ProjectDependencies) = postProject - {202D7A4E-760D-4D0E-AFA1-D7459CED30FF} = {202D7A4E-760D-4D0E-AFA1-D7459CED30FF} {1C469CDD-A3AF-4A94-A592-B2CF12F2D918} = {1C469CDD-A3AF-4A94-A592-B2CF12F2D918} + {202D7A4E-760D-4D0E-AFA1-D7459CED30FF} = {202D7A4E-760D-4D0E-AFA1-D7459CED30FF} EndProjectSection EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mod_woomera", "src\mod\endpoints\mod_woomera\mod_woomera.vcproj", "{FE3540C5-3303-46E0-A69E-D92F775687F1}" ProjectSection(ProjectDependencies) = postProject - {202D7A4E-760D-4D0E-AFA1-D7459CED30FF} = {202D7A4E-760D-4D0E-AFA1-D7459CED30FF} {F6C55D93-B927-4483-BB69-15AEF3DD2DFF} = {F6C55D93-B927-4483-BB69-15AEF3DD2DFF} + {202D7A4E-760D-4D0E-AFA1-D7459CED30FF} = {202D7A4E-760D-4D0E-AFA1-D7459CED30FF} EndProjectSection EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Codecs", "Codecs", "{F881ADA2-2F1A-4046-9FEB-191D9422D781}" @@ -91,8 +91,8 @@ EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mod_dialplan_xml", "src\mod\dialplans\mod_dialplan_xml\mod_dialplan_xml.vcproj", "{07113B25-D3AF-4E04-BA77-4CD1171F022C}" ProjectSection(ProjectDependencies) = postProject - {202D7A4E-760D-4D0E-AFA1-D7459CED30FF} = {202D7A4E-760D-4D0E-AFA1-D7459CED30FF} {F6C55D93-B927-4483-BB69-15AEF3DD2DFF} = {F6C55D93-B927-4483-BB69-15AEF3DD2DFF} + {202D7A4E-760D-4D0E-AFA1-D7459CED30FF} = {202D7A4E-760D-4D0E-AFA1-D7459CED30FF} EndProjectSection EndProject Project("{54435603-DBB4-11D2-8724-00A0C9A8B90C}") = "FreeSwitchSetup", "w32\Setup\Setup.vdproj", "{B17FFBE6-A942-4056-8346-B624FB5D995B}" @@ -106,22 +106,22 @@ EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mod_dialplan_directory", "src\mod\dialplans\mod_dialplan_directory\mod_dialplan_directory.vcproj", "{A27CCA23-1541-4337-81A4-F0A6413078A0}" ProjectSection(ProjectDependencies) = postProject - {202D7A4E-760D-4D0E-AFA1-D7459CED30FF} = {202D7A4E-760D-4D0E-AFA1-D7459CED30FF} {F6C55D93-B927-4483-BB69-15AEF3DD2DFF} = {F6C55D93-B927-4483-BB69-15AEF3DD2DFF} + {202D7A4E-760D-4D0E-AFA1-D7459CED30FF} = {202D7A4E-760D-4D0E-AFA1-D7459CED30FF} EndProjectSection EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mod_zeroconf", "src\mod\event_handlers\mod_zeroconf\mod_zeroconf.vcproj", "{C7705DC4-2088-493E-AF8D-65BC6D65C125}" ProjectSection(ProjectDependencies) = postProject - {202D7A4E-760D-4D0E-AFA1-D7459CED30FF} = {202D7A4E-760D-4D0E-AFA1-D7459CED30FF} - {49C34584-B6DA-448F-83CF-27584DC9FC90} = {49C34584-B6DA-448F-83CF-27584DC9FC90} - {F6C55D93-B927-4483-BB69-15AEF3DD2DFF} = {F6C55D93-B927-4483-BB69-15AEF3DD2DFF} {0D826AF5-0506-4C50-BB8B-7DB019AC21AE} = {0D826AF5-0506-4C50-BB8B-7DB019AC21AE} + {F6C55D93-B927-4483-BB69-15AEF3DD2DFF} = {F6C55D93-B927-4483-BB69-15AEF3DD2DFF} + {49C34584-B6DA-448F-83CF-27584DC9FC90} = {49C34584-B6DA-448F-83CF-27584DC9FC90} + {202D7A4E-760D-4D0E-AFA1-D7459CED30FF} = {202D7A4E-760D-4D0E-AFA1-D7459CED30FF} EndProjectSection EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mod_event_multicast", "src\mod\event_handlers\mod_event_multicast\mod_event_multicast.vcproj", "{784113EF-44D9-4949-835D-7065D3C7AD08}" ProjectSection(ProjectDependencies) = postProject - {202D7A4E-760D-4D0E-AFA1-D7459CED30FF} = {202D7A4E-760D-4D0E-AFA1-D7459CED30FF} {F6C55D93-B927-4483-BB69-15AEF3DD2DFF} = {F6C55D93-B927-4483-BB69-15AEF3DD2DFF} + {202D7A4E-760D-4D0E-AFA1-D7459CED30FF} = {202D7A4E-760D-4D0E-AFA1-D7459CED30FF} EndProjectSection EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libteletone", "libs\libteletone\libteletone.vcproj", "{89385C74-5860-4174-9CAF-A39E7C48909C}" @@ -130,10 +130,10 @@ EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mod_spidermonkey", "src\mod\languages\mod_spidermonkey\mod_spidermonkey.vcproj", "{1AD3F51E-BBB6-4090-BA39-9DFAB1EF1F5F}" ProjectSection(ProjectDependencies) = postProject - {202D7A4E-760D-4D0E-AFA1-D7459CED30FF} = {202D7A4E-760D-4D0E-AFA1-D7459CED30FF} - {F6C55D93-B927-4483-BB69-15AEF3DD2DFF} = {F6C55D93-B927-4483-BB69-15AEF3DD2DFF} - {87EE9DA4-DE1E-4448-8324-183C98DCA588} = {87EE9DA4-DE1E-4448-8324-183C98DCA588} {204FA0DE-305D-4414-AE2E-F195A23F390D} = {204FA0DE-305D-4414-AE2E-F195A23F390D} + {87EE9DA4-DE1E-4448-8324-183C98DCA588} = {87EE9DA4-DE1E-4448-8324-183C98DCA588} + {F6C55D93-B927-4483-BB69-15AEF3DD2DFF} = {F6C55D93-B927-4483-BB69-15AEF3DD2DFF} + {202D7A4E-760D-4D0E-AFA1-D7459CED30FF} = {202D7A4E-760D-4D0E-AFA1-D7459CED30FF} EndProjectSection EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ASR-TTS", "ASR-TTS", "{4CF6A6AC-07DE-4B9E-ABE1-7F98B64E0BB0}" @@ -145,22 +145,22 @@ EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mod_ilbc", "src\mod\codecs\mod_ilbc\mod_ilbc.vcproj", "{D3EC0AFF-76FC-4210-A825-9A17410660A3}" ProjectSection(ProjectDependencies) = postProject - {202D7A4E-760D-4D0E-AFA1-D7459CED30FF} = {202D7A4E-760D-4D0E-AFA1-D7459CED30FF} {989BB874-7AF1-44CB-8E5C-CC8113D267E8} = {989BB874-7AF1-44CB-8E5C-CC8113D267E8} + {202D7A4E-760D-4D0E-AFA1-D7459CED30FF} = {202D7A4E-760D-4D0E-AFA1-D7459CED30FF} EndProjectSection EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mod_dingaling", "src\mod\endpoints\mod_dingaling\mod_dingaling.vcproj", "{FFAA4C52-3A53-4F99-90C1-D59D1F0427F3}" ProjectSection(ProjectDependencies) = postProject - {1906D736-08BD-4EE1-924F-B536249B9A54} = {1906D736-08BD-4EE1-924F-B536249B9A54} - {202D7A4E-760D-4D0E-AFA1-D7459CED30FF} = {202D7A4E-760D-4D0E-AFA1-D7459CED30FF} - {F6C55D93-B927-4483-BB69-15AEF3DD2DFF} = {F6C55D93-B927-4483-BB69-15AEF3DD2DFF} {E727E8F6-935D-46FE-8B0E-37834748A0E3} = {E727E8F6-935D-46FE-8B0E-37834748A0E3} + {F6C55D93-B927-4483-BB69-15AEF3DD2DFF} = {F6C55D93-B927-4483-BB69-15AEF3DD2DFF} + {202D7A4E-760D-4D0E-AFA1-D7459CED30FF} = {202D7A4E-760D-4D0E-AFA1-D7459CED30FF} + {1906D736-08BD-4EE1-924F-B536249B9A54} = {1906D736-08BD-4EE1-924F-B536249B9A54} EndProjectSection EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mod_commands", "src\mod\applications\mod_commands\mod_commands.vcproj", "{30A5B29C-983E-4580-9FD0-D647CCDCC7EB}" ProjectSection(ProjectDependencies) = postProject - {202D7A4E-760D-4D0E-AFA1-D7459CED30FF} = {202D7A4E-760D-4D0E-AFA1-D7459CED30FF} {F6C55D93-B927-4483-BB69-15AEF3DD2DFF} = {F6C55D93-B927-4483-BB69-15AEF3DD2DFF} + {202D7A4E-760D-4D0E-AFA1-D7459CED30FF} = {202D7A4E-760D-4D0E-AFA1-D7459CED30FF} EndProjectSection EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Loggers", "Loggers", "{A7AB4405-FDB7-4853-9FBB-1516B1C3D80A}" @@ -174,35 +174,35 @@ EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mod_xml_rpc", "src\mod\xml_int\mod_xml_rpc\mod_xml_rpc.vcproj", "{CBEC7225-0C21-4DA8-978E-1F158F8AD950}" ProjectSection(ProjectDependencies) = postProject - {356EC96D-4C9F-47B5-9083-FC328B87BA94} = {356EC96D-4C9F-47B5-9083-FC328B87BA94} - {202D7A4E-760D-4D0E-AFA1-D7459CED30FF} = {202D7A4E-760D-4D0E-AFA1-D7459CED30FF} - {A3FE0076-B366-429D-A238-D7304DA7D3C1} = {A3FE0076-B366-429D-A238-D7304DA7D3C1} - {87EE9DA4-DE1E-4448-8324-183C98DCA588} = {87EE9DA4-DE1E-4448-8324-183C98DCA588} {155844C3-EC5F-407F-97A4-A2DDADED9B2F} = {155844C3-EC5F-407F-97A4-A2DDADED9B2F} + {87EE9DA4-DE1E-4448-8324-183C98DCA588} = {87EE9DA4-DE1E-4448-8324-183C98DCA588} + {A3FE0076-B366-429D-A238-D7304DA7D3C1} = {A3FE0076-B366-429D-A238-D7304DA7D3C1} + {202D7A4E-760D-4D0E-AFA1-D7459CED30FF} = {202D7A4E-760D-4D0E-AFA1-D7459CED30FF} + {356EC96D-4C9F-47B5-9083-FC328B87BA94} = {356EC96D-4C9F-47B5-9083-FC328B87BA94} EndProjectSection EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mod_rss", "src\mod\applications\mod_rss\mod_rss.vcproj", "{B69247FA-ECD6-40ED-8E44-5CA6C3BAF9A4}" ProjectSection(ProjectDependencies) = postProject - {202D7A4E-760D-4D0E-AFA1-D7459CED30FF} = {202D7A4E-760D-4D0E-AFA1-D7459CED30FF} {F6C55D93-B927-4483-BB69-15AEF3DD2DFF} = {F6C55D93-B927-4483-BB69-15AEF3DD2DFF} + {202D7A4E-760D-4D0E-AFA1-D7459CED30FF} = {202D7A4E-760D-4D0E-AFA1-D7459CED30FF} EndProjectSection EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mod_conference", "src\mod\applications\mod_conference\mod_conference.vcproj", "{C24FB505-05D7-4319-8485-7540B44C8603}" ProjectSection(ProjectDependencies) = postProject - {202D7A4E-760D-4D0E-AFA1-D7459CED30FF} = {202D7A4E-760D-4D0E-AFA1-D7459CED30FF} {F6C55D93-B927-4483-BB69-15AEF3DD2DFF} = {F6C55D93-B927-4483-BB69-15AEF3DD2DFF} + {202D7A4E-760D-4D0E-AFA1-D7459CED30FF} = {202D7A4E-760D-4D0E-AFA1-D7459CED30FF} EndProjectSection EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mod_dptools", "src\mod\applications\mod_dptools\mod_dptools.vcproj", "{B5881A85-FE70-4F64-8607-2CAAE52669C6}" ProjectSection(ProjectDependencies) = postProject - {202D7A4E-760D-4D0E-AFA1-D7459CED30FF} = {202D7A4E-760D-4D0E-AFA1-D7459CED30FF} {F6C55D93-B927-4483-BB69-15AEF3DD2DFF} = {F6C55D93-B927-4483-BB69-15AEF3DD2DFF} + {202D7A4E-760D-4D0E-AFA1-D7459CED30FF} = {202D7A4E-760D-4D0E-AFA1-D7459CED30FF} EndProjectSection EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mod_event_socket", "src\mod\event_handlers\mod_event_socket\mod_event_socket.vcproj", "{05515420-16DE-4E63-BE73-85BE85BA5142}" ProjectSection(ProjectDependencies) = postProject - {F6C55D93-B927-4483-BB69-15AEF3DD2DFF} = {F6C55D93-B927-4483-BB69-15AEF3DD2DFF} {202D7A4E-760D-4D0E-AFA1-D7459CED30FF} = {202D7A4E-760D-4D0E-AFA1-D7459CED30FF} + {F6C55D93-B927-4483-BB69-15AEF3DD2DFF} = {F6C55D93-B927-4483-BB69-15AEF3DD2DFF} EndProjectSection EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "_Libraries", "_Libraries", "{EB910B0D-F27D-4B62-B67B-DE834C99AC5B}" @@ -215,8 +215,8 @@ EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libdingaling", "libs\libdingaling\libdingaling.vcproj", "{1906D736-08BD-4EE1-924F-B536249B9A54}" ProjectSection(ProjectDependencies) = postProject - {F057DA7F-79E5-4B00-845C-EF446EF055E3} = {F057DA7F-79E5-4B00-845C-EF446EF055E3} {E727E8F6-935D-46FE-8B0E-37834748A0E3} = {E727E8F6-935D-46FE-8B0E-37834748A0E3} + {F057DA7F-79E5-4B00-845C-EF446EF055E3} = {F057DA7F-79E5-4B00-845C-EF446EF055E3} EndProjectSection EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libsrtp", "libs\srtp\libsrtp.vcproj", "{EEF031CB-FED8-451E-A471-91EC8D4F6750}" @@ -241,8 +241,8 @@ EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libaprutil", "libs\win32\apr-util\libaprutil.vcproj", "{F057DA7F-79E5-4B00-845C-EF446EF055E3}" ProjectSection(ProjectDependencies) = postProject - {F6C55D93-B927-4483-BB69-15AEF3DD2DFF} = {F6C55D93-B927-4483-BB69-15AEF3DD2DFF} {101130D1-3EA6-4ED2-B65D-CEB5243A20ED} = {101130D1-3EA6-4ED2-B65D-CEB5243A20ED} + {F6C55D93-B927-4483-BB69-15AEF3DD2DFF} = {F6C55D93-B927-4483-BB69-15AEF3DD2DFF} EndProjectSection EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "_Downloads", "_Downloads", "{C120A020-773F-4EA3-923F-B67AF28B750D}" @@ -260,8 +260,8 @@ EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mDNSResponder static library", "libs\win32\howl\libmDNSResponder.vcproj", "{49C34584-B6DA-448F-83CF-27584DC9FC90}" ProjectSection(ProjectDependencies) = postProject - {5927104D-C14C-4AC8-925C-4AB681762E75} = {5927104D-C14C-4AC8-925C-4AB681762E75} {0D826AF5-0506-4C50-BB8B-7DB019AC21AE} = {0D826AF5-0506-4C50-BB8B-7DB019AC21AE} + {5927104D-C14C-4AC8-925C-4AB681762E75} = {5927104D-C14C-4AC8-925C-4AB681762E75} EndProjectSection EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libsndfile", "libs\win32\libsndfile\libsndfile.vcproj", "{3D0370CA-BED2-4657-A475-32375CBCB6E4}" @@ -281,34 +281,32 @@ EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mod_sofia", "src\mod\endpoints\mod_sofia\mod_sofia.vcproj", "{0DF3ABD0-DDC0-4265-B778-07C66780979B}" ProjectSection(ProjectDependencies) = postProject - {DF018947-0FFF-4EB3-BDEE-441DC81DA7A4} = {DF018947-0FFF-4EB3-BDEE-441DC81DA7A4} - {202D7A4E-760D-4D0E-AFA1-D7459CED30FF} = {202D7A4E-760D-4D0E-AFA1-D7459CED30FF} - {F6C55D93-B927-4483-BB69-15AEF3DD2DFF} = {F6C55D93-B927-4483-BB69-15AEF3DD2DFF} {70A49BC2-7500-41D0-B75D-EDCC5BE987A0} = {70A49BC2-7500-41D0-B75D-EDCC5BE987A0} + {F6C55D93-B927-4483-BB69-15AEF3DD2DFF} = {F6C55D93-B927-4483-BB69-15AEF3DD2DFF} + {202D7A4E-760D-4D0E-AFA1-D7459CED30FF} = {202D7A4E-760D-4D0E-AFA1-D7459CED30FF} + {DF018947-0FFF-4EB3-BDEE-441DC81DA7A4} = {DF018947-0FFF-4EB3-BDEE-441DC81DA7A4} EndProjectSection EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libg726", "libs\codec\g726\libg726.vcproj", "{5A6A281A-AA50-470A-8305-202BDA1CD1BF}" -EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mod_g726", "src\mod\codecs\mod_g726\mod_g726.vcproj", "{486369EB-F150-4B56-BCC8-77B9E18FF5F5}" ProjectSection(ProjectDependencies) = postProject - {5A6A281A-AA50-470A-8305-202BDA1CD1BF} = {5A6A281A-AA50-470A-8305-202BDA1CD1BF} - {202D7A4E-760D-4D0E-AFA1-D7459CED30FF} = {202D7A4E-760D-4D0E-AFA1-D7459CED30FF} + {D71E7338-8D9C-4FE4-A15F-D5CC60202C7C} = {D71E7338-8D9C-4FE4-A15F-D5CC60202C7C} {F6C55D93-B927-4483-BB69-15AEF3DD2DFF} = {F6C55D93-B927-4483-BB69-15AEF3DD2DFF} + {202D7A4E-760D-4D0E-AFA1-D7459CED30FF} = {202D7A4E-760D-4D0E-AFA1-D7459CED30FF} EndProjectSection EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libg7xx", "libs\codec\g7xx\libg7xx.vcproj", "{D71E7338-8D9C-4FE4-A15F-D5CC60202C7C}" EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mod_g722", "src\mod\codecs\mod_g722\mod_g722.vcproj", "{D42518CC-7475-454D-B392-0E132C07D761}" ProjectSection(ProjectDependencies) = postProject - {D71E7338-8D9C-4FE4-A15F-D5CC60202C7C} = {D71E7338-8D9C-4FE4-A15F-D5CC60202C7C} - {202D7A4E-760D-4D0E-AFA1-D7459CED30FF} = {202D7A4E-760D-4D0E-AFA1-D7459CED30FF} {F6C55D93-B927-4483-BB69-15AEF3DD2DFF} = {F6C55D93-B927-4483-BB69-15AEF3DD2DFF} + {202D7A4E-760D-4D0E-AFA1-D7459CED30FF} = {202D7A4E-760D-4D0E-AFA1-D7459CED30FF} + {D71E7338-8D9C-4FE4-A15F-D5CC60202C7C} = {D71E7338-8D9C-4FE4-A15F-D5CC60202C7C} EndProjectSection EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libsofia_sip_ua_static", "libs\win32\sofia\libsofia_sip_ua_static.vcproj", "{70A49BC2-7500-41D0-B75D-EDCC5BE987A0}" ProjectSection(ProjectDependencies) = postProject - {DF018947-0FFF-4EB3-BDEE-441DC81DA7A4} = {DF018947-0FFF-4EB3-BDEE-441DC81DA7A4} {8B3B4C4C-13C2-446C-BEB0-F412CC2CFB9A} = {8B3B4C4C-13C2-446C-BEB0-F412CC2CFB9A} + {DF018947-0FFF-4EB3-BDEE-441DC81DA7A4} = {DF018947-0FFF-4EB3-BDEE-441DC81DA7A4} EndProjectSection EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Download PTHREAD", "libs\win32\Download PTHREAD.vcproj", "{8B3B4C4C-13C2-446C-BEB0-F412CC2CFB9A}" @@ -320,70 +318,70 @@ EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mod_g723_1", "src\mod\codecs\mod_g723_1\mod_g723_1.vcproj", "{FEA1EEF7-876F-48DE-88BF-C0E3E606D758}" ProjectSection(ProjectDependencies) = postProject - {202D7A4E-760D-4D0E-AFA1-D7459CED30FF} = {202D7A4E-760D-4D0E-AFA1-D7459CED30FF} {F6C55D93-B927-4483-BB69-15AEF3DD2DFF} = {F6C55D93-B927-4483-BB69-15AEF3DD2DFF} + {202D7A4E-760D-4D0E-AFA1-D7459CED30FF} = {202D7A4E-760D-4D0E-AFA1-D7459CED30FF} EndProjectSection EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mod_native_file", "src\mod\formats\mod_native_file\mod_native_file.vcproj", "{9254C4B0-6F60-42B6-BB3A-36D63FC001C7}" ProjectSection(ProjectDependencies) = postProject - {202D7A4E-760D-4D0E-AFA1-D7459CED30FF} = {202D7A4E-760D-4D0E-AFA1-D7459CED30FF} {F6C55D93-B927-4483-BB69-15AEF3DD2DFF} = {F6C55D93-B927-4483-BB69-15AEF3DD2DFF} + {202D7A4E-760D-4D0E-AFA1-D7459CED30FF} = {202D7A4E-760D-4D0E-AFA1-D7459CED30FF} EndProjectSection EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mod_spidermonkey_core_db", "src\mod\languages\mod_spidermonkey_core_db\mod_spidermonkey_core_db.vcproj", "{ACFFF684-4D19-4D48-AF12-88EA1D778BDF}" ProjectSection(ProjectDependencies) = postProject - {1AD3F51E-BBB6-4090-BA39-9DFAB1EF1F5F} = {1AD3F51E-BBB6-4090-BA39-9DFAB1EF1F5F} - {202D7A4E-760D-4D0E-AFA1-D7459CED30FF} = {202D7A4E-760D-4D0E-AFA1-D7459CED30FF} - {F6C55D93-B927-4483-BB69-15AEF3DD2DFF} = {F6C55D93-B927-4483-BB69-15AEF3DD2DFF} {204FA0DE-305D-4414-AE2E-F195A23F390D} = {204FA0DE-305D-4414-AE2E-F195A23F390D} + {F6C55D93-B927-4483-BB69-15AEF3DD2DFF} = {F6C55D93-B927-4483-BB69-15AEF3DD2DFF} + {202D7A4E-760D-4D0E-AFA1-D7459CED30FF} = {202D7A4E-760D-4D0E-AFA1-D7459CED30FF} + {1AD3F51E-BBB6-4090-BA39-9DFAB1EF1F5F} = {1AD3F51E-BBB6-4090-BA39-9DFAB1EF1F5F} EndProjectSection EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mod_spidermonkey_teletone", "src\mod\languages\mod_spidermonkey_teletone\mod_spidermonkey_teletone.vcproj", "{8F992C49-6C51-412F-B2A3-34EAB708EB65}" ProjectSection(ProjectDependencies) = postProject - {1AD3F51E-BBB6-4090-BA39-9DFAB1EF1F5F} = {1AD3F51E-BBB6-4090-BA39-9DFAB1EF1F5F} - {202D7A4E-760D-4D0E-AFA1-D7459CED30FF} = {202D7A4E-760D-4D0E-AFA1-D7459CED30FF} - {89385C74-5860-4174-9CAF-A39E7C48909C} = {89385C74-5860-4174-9CAF-A39E7C48909C} - {F6C55D93-B927-4483-BB69-15AEF3DD2DFF} = {F6C55D93-B927-4483-BB69-15AEF3DD2DFF} {204FA0DE-305D-4414-AE2E-F195A23F390D} = {204FA0DE-305D-4414-AE2E-F195A23F390D} + {F6C55D93-B927-4483-BB69-15AEF3DD2DFF} = {F6C55D93-B927-4483-BB69-15AEF3DD2DFF} + {89385C74-5860-4174-9CAF-A39E7C48909C} = {89385C74-5860-4174-9CAF-A39E7C48909C} + {202D7A4E-760D-4D0E-AFA1-D7459CED30FF} = {202D7A4E-760D-4D0E-AFA1-D7459CED30FF} + {1AD3F51E-BBB6-4090-BA39-9DFAB1EF1F5F} = {1AD3F51E-BBB6-4090-BA39-9DFAB1EF1F5F} EndProjectSection EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libudns", "libs\win32\udns\libudns.vcproj", "{4043FC6A-9A30-4577-8AD5-9B233C9575D8}" EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mod_enum", "src\mod\applications\mod_enum\mod_enum.vcproj", "{71A967D5-0E99-4CEF-A587-98836EE6F2EF}" ProjectSection(ProjectDependencies) = postProject - {202D7A4E-760D-4D0E-AFA1-D7459CED30FF} = {202D7A4E-760D-4D0E-AFA1-D7459CED30FF} {4043FC6A-9A30-4577-8AD5-9B233C9575D8} = {4043FC6A-9A30-4577-8AD5-9B233C9575D8} + {202D7A4E-760D-4D0E-AFA1-D7459CED30FF} = {202D7A4E-760D-4D0E-AFA1-D7459CED30FF} EndProjectSection EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mod_spidermonkey_odbc", "src\mod\languages\mod_spidermonkey_odbc\mod_spidermonkey_odbc.vcproj", "{0A6B5EA5-6E9B-4A51-931F-ED25AA87B4DF}" ProjectSection(ProjectDependencies) = postProject - {1AD3F51E-BBB6-4090-BA39-9DFAB1EF1F5F} = {1AD3F51E-BBB6-4090-BA39-9DFAB1EF1F5F} - {202D7A4E-760D-4D0E-AFA1-D7459CED30FF} = {202D7A4E-760D-4D0E-AFA1-D7459CED30FF} - {F6C55D93-B927-4483-BB69-15AEF3DD2DFF} = {F6C55D93-B927-4483-BB69-15AEF3DD2DFF} {204FA0DE-305D-4414-AE2E-F195A23F390D} = {204FA0DE-305D-4414-AE2E-F195A23F390D} + {F6C55D93-B927-4483-BB69-15AEF3DD2DFF} = {F6C55D93-B927-4483-BB69-15AEF3DD2DFF} + {202D7A4E-760D-4D0E-AFA1-D7459CED30FF} = {202D7A4E-760D-4D0E-AFA1-D7459CED30FF} + {1AD3F51E-BBB6-4090-BA39-9DFAB1EF1F5F} = {1AD3F51E-BBB6-4090-BA39-9DFAB1EF1F5F} EndProjectSection EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mod_xml_curl", "src\mod\xml_int\mod_xml_curl\mod_xml_curl.vcproj", "{AB91A099-7690-4ECF-8994-E458F4EA1ED4}" ProjectSection(ProjectDependencies) = postProject - {87EE9DA4-DE1E-4448-8324-183C98DCA588} = {87EE9DA4-DE1E-4448-8324-183C98DCA588} {202D7A4E-760D-4D0E-AFA1-D7459CED30FF} = {202D7A4E-760D-4D0E-AFA1-D7459CED30FF} + {87EE9DA4-DE1E-4448-8324-183C98DCA588} = {87EE9DA4-DE1E-4448-8324-183C98DCA588} EndProjectSection EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "say", "say", "{6CD61A1D-797C-470A-BE08-8C31B68BB336}" EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mod_say_en", "src\mod\say\mod_say_en\mod_say_en.vcproj", "{988CACF7-3FCB-4992-BE69-77872AE67DC8}" ProjectSection(ProjectDependencies) = postProject - {202D7A4E-760D-4D0E-AFA1-D7459CED30FF} = {202D7A4E-760D-4D0E-AFA1-D7459CED30FF} {F6C55D93-B927-4483-BB69-15AEF3DD2DFF} = {F6C55D93-B927-4483-BB69-15AEF3DD2DFF} + {202D7A4E-760D-4D0E-AFA1-D7459CED30FF} = {202D7A4E-760D-4D0E-AFA1-D7459CED30FF} EndProjectSection EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "portaudio", "libs\portaudio\build\msvc\portaudio.vcproj", "{0A18A071-125E-442F-AFF7-A3F68ABECF99}" EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mod_xml_cdr", "src\mod\xml_int\mod_xml_cdr\mod_xml_cdr.vcproj", "{08DAD348-9E0A-4A2E-97F1-F1E7E24A7836}" ProjectSection(ProjectDependencies) = postProject - {F6C55D93-B927-4483-BB69-15AEF3DD2DFF} = {F6C55D93-B927-4483-BB69-15AEF3DD2DFF} - {87EE9DA4-DE1E-4448-8324-183C98DCA588} = {87EE9DA4-DE1E-4448-8324-183C98DCA588} {202D7A4E-760D-4D0E-AFA1-D7459CED30FF} = {202D7A4E-760D-4D0E-AFA1-D7459CED30FF} + {87EE9DA4-DE1E-4448-8324-183C98DCA588} = {87EE9DA4-DE1E-4448-8324-183C98DCA588} + {F6C55D93-B927-4483-BB69-15AEF3DD2DFF} = {F6C55D93-B927-4483-BB69-15AEF3DD2DFF} EndProjectSection EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mod_amr", "src\mod\codecs\mod_amr\mod_amr.vcproj", "{8DEB383C-4091-4F42-A56F-C9E46D552D79}" @@ -456,16 +454,16 @@ EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mrcpcore", "libs\openmrcp\mrcpcore\mrcpcore.vcproj", "{829A9309-3B94-43C0-846B-7EC9D6D35F8B}" ProjectSection(ProjectDependencies) = postProject - {F057DA7F-79E5-4B00-845C-EF446EF055E3} = {F057DA7F-79E5-4B00-845C-EF446EF055E3} - {F6C55D93-B927-4483-BB69-15AEF3DD2DFF} = {F6C55D93-B927-4483-BB69-15AEF3DD2DFF} {AA91F0AC-6562-435E-814C-5C94689FEFA2} = {AA91F0AC-6562-435E-814C-5C94689FEFA2} + {F6C55D93-B927-4483-BB69-15AEF3DD2DFF} = {F6C55D93-B927-4483-BB69-15AEF3DD2DFF} + {F057DA7F-79E5-4B00-845C-EF446EF055E3} = {F057DA7F-79E5-4B00-845C-EF446EF055E3} EndProjectSection EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "rtspcore", "libs\openmrcp\rtspcore\rtspcore.vcproj", "{EB751DC4-87BD-4766-B78D-DFB64BA9F988}" ProjectSection(ProjectDependencies) = postProject - {F6C55D93-B927-4483-BB69-15AEF3DD2DFF} = {F6C55D93-B927-4483-BB69-15AEF3DD2DFF} - {F057DA7F-79E5-4B00-845C-EF446EF055E3} = {F057DA7F-79E5-4B00-845C-EF446EF055E3} {829A9309-3B94-43C0-846B-7EC9D6D35F8B} = {829A9309-3B94-43C0-846B-7EC9D6D35F8B} + {F057DA7F-79E5-4B00-845C-EF446EF055E3} = {F057DA7F-79E5-4B00-845C-EF446EF055E3} + {F6C55D93-B927-4483-BB69-15AEF3DD2DFF} = {F6C55D93-B927-4483-BB69-15AEF3DD2DFF} EndProjectSection EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mrcpmediaframe", "libs\openmrcp\module\mrcpmediaframe\mrcpmediaframe.vcproj", "{9EA22C31-BB7E-4C40-A698-2C6792D1E0C6}" @@ -482,8 +480,8 @@ EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mrcpsofiasip", "libs\openmrcp\module\mrcpsofiasip\mrcpsofiasip.vcproj", "{819C7242-6184-46FE-BC7B-C7E25C0581EE}" ProjectSection(ProjectDependencies) = postProject - {70A49BC2-7500-41D0-B75D-EDCC5BE987A0} = {70A49BC2-7500-41D0-B75D-EDCC5BE987A0} {829A9309-3B94-43C0-846B-7EC9D6D35F8B} = {829A9309-3B94-43C0-846B-7EC9D6D35F8B} + {70A49BC2-7500-41D0-B75D-EDCC5BE987A0} = {70A49BC2-7500-41D0-B75D-EDCC5BE987A0} EndProjectSection EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mrcpv2agent", "libs\openmrcp\module\mrcpv2agent\mrcpv2agent.vcproj", "{FB64EA08-3BC0-48AE-BE4B-74F1024B756E}" @@ -493,26 +491,26 @@ EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libopenmrcpclient", "libs\openmrcp\platform\openmrcpclient\libopenmrcpclient.vcproj", "{A407B661-D7DC-4E30-B268-FFF3296C35E6}" ProjectSection(ProjectDependencies) = postProject - {CF78E84D-8456-44F2-8197-0E0E88D30A3C} = {CF78E84D-8456-44F2-8197-0E0E88D30A3C} - {819C7242-6184-46FE-BC7B-C7E25C0581EE} = {819C7242-6184-46FE-BC7B-C7E25C0581EE} - {9EA22C31-BB7E-4C40-A698-2C6792D1E0C6} = {9EA22C31-BB7E-4C40-A698-2C6792D1E0C6} {FB64EA08-3BC0-48AE-BE4B-74F1024B756E} = {FB64EA08-3BC0-48AE-BE4B-74F1024B756E} + {9EA22C31-BB7E-4C40-A698-2C6792D1E0C6} = {9EA22C31-BB7E-4C40-A698-2C6792D1E0C6} + {819C7242-6184-46FE-BC7B-C7E25C0581EE} = {819C7242-6184-46FE-BC7B-C7E25C0581EE} + {CF78E84D-8456-44F2-8197-0E0E88D30A3C} = {CF78E84D-8456-44F2-8197-0E0E88D30A3C} EndProjectSection EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mod_openmrcp", "src\mod\asr_tts\mod_openmrcp\mod_openmrcp.vcproj", "{E7116F50-2B10-472F-92BD-C8667AA9C1AE}" ProjectSection(ProjectDependencies) = postProject - {70A49BC2-7500-41D0-B75D-EDCC5BE987A0} = {70A49BC2-7500-41D0-B75D-EDCC5BE987A0} - {F6C55D93-B927-4483-BB69-15AEF3DD2DFF} = {F6C55D93-B927-4483-BB69-15AEF3DD2DFF} - {F057DA7F-79E5-4B00-845C-EF446EF055E3} = {F057DA7F-79E5-4B00-845C-EF446EF055E3} - {A407B661-D7DC-4E30-B268-FFF3296C35E6} = {A407B661-D7DC-4E30-B268-FFF3296C35E6} {202D7A4E-760D-4D0E-AFA1-D7459CED30FF} = {202D7A4E-760D-4D0E-AFA1-D7459CED30FF} + {A407B661-D7DC-4E30-B268-FFF3296C35E6} = {A407B661-D7DC-4E30-B268-FFF3296C35E6} + {F057DA7F-79E5-4B00-845C-EF446EF055E3} = {F057DA7F-79E5-4B00-845C-EF446EF055E3} + {F6C55D93-B927-4483-BB69-15AEF3DD2DFF} = {F6C55D93-B927-4483-BB69-15AEF3DD2DFF} + {70A49BC2-7500-41D0-B75D-EDCC5BE987A0} = {70A49BC2-7500-41D0-B75D-EDCC5BE987A0} EndProjectSection EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mod_spidermonkey_socket", "src\mod\languages\mod_spidermonkey_socket\mod_spidermonkey_socket.vcproj", "{028C7278-05D7-4E18-82FE-BE231B844F41}" ProjectSection(ProjectDependencies) = postProject - {204FA0DE-305D-4414-AE2E-F195A23F390D} = {204FA0DE-305D-4414-AE2E-F195A23F390D} - {202D7A4E-760D-4D0E-AFA1-D7459CED30FF} = {202D7A4E-760D-4D0E-AFA1-D7459CED30FF} {1AD3F51E-BBB6-4090-BA39-9DFAB1EF1F5F} = {1AD3F51E-BBB6-4090-BA39-9DFAB1EF1F5F} + {202D7A4E-760D-4D0E-AFA1-D7459CED30FF} = {202D7A4E-760D-4D0E-AFA1-D7459CED30FF} + {204FA0DE-305D-4414-AE2E-F195A23F390D} = {204FA0DE-305D-4414-AE2E-F195A23F390D} EndProjectSection EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mod_voicemail", "src\mod\applications\mod_voicemail\mod_voicemail.vcproj", "{D7F1E3F2-A3F4-474C-8555-15122571AF52}" @@ -877,8 +875,8 @@ EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mod_tone_stream", "src\mod\formats\mod_tone_stream\mod_tone_stream.vcproj", "{1A789A98-71EF-4EBD-8007-FC9ED585D32E}" ProjectSection(ProjectDependencies) = postProject - {202D7A4E-760D-4D0E-AFA1-D7459CED30FF} = {202D7A4E-760D-4D0E-AFA1-D7459CED30FF} {89385C74-5860-4174-9CAF-A39E7C48909C} = {89385C74-5860-4174-9CAF-A39E7C48909C} + {202D7A4E-760D-4D0E-AFA1-D7459CED30FF} = {202D7A4E-760D-4D0E-AFA1-D7459CED30FF} EndProjectSection EndProject Global @@ -1209,12 +1207,6 @@ {0DF3ABD0-DDC0-4265-B778-07C66780979B}.Release|Win32.ActiveCfg = Release|Win32 {0DF3ABD0-DDC0-4265-B778-07C66780979B}.Release|Win32.Build.0 = Release|Win32 {0DF3ABD0-DDC0-4265-B778-07C66780979B}.Release|x64.ActiveCfg = Release|Win32 - {5A6A281A-AA50-470A-8305-202BDA1CD1BF}.Debug|Win32.ActiveCfg = Debug|Win32 - {5A6A281A-AA50-470A-8305-202BDA1CD1BF}.Debug|Win32.Build.0 = Debug|Win32 - {5A6A281A-AA50-470A-8305-202BDA1CD1BF}.Debug|x64.ActiveCfg = Debug|Win32 - {5A6A281A-AA50-470A-8305-202BDA1CD1BF}.Release|Win32.ActiveCfg = Release|Win32 - {5A6A281A-AA50-470A-8305-202BDA1CD1BF}.Release|Win32.Build.0 = Release|Win32 - {5A6A281A-AA50-470A-8305-202BDA1CD1BF}.Release|x64.ActiveCfg = Release|Win32 {486369EB-F150-4B56-BCC8-77B9E18FF5F5}.Debug|Win32.ActiveCfg = Debug|Win32 {486369EB-F150-4B56-BCC8-77B9E18FF5F5}.Debug|Win32.Build.0 = Debug|Win32 {486369EB-F150-4B56-BCC8-77B9E18FF5F5}.Debug|x64.ActiveCfg = Debug|Win32 @@ -1546,7 +1538,6 @@ {356EC96D-4C9F-47B5-9083-FC328B87BA94} = {EB910B0D-F27D-4B62-B67B-DE834C99AC5B} {155844C3-EC5F-407F-97A4-A2DDADED9B2F} = {EB910B0D-F27D-4B62-B67B-DE834C99AC5B} {204FA0DE-305D-4414-AE2E-F195A23F390D} = {EB910B0D-F27D-4B62-B67B-DE834C99AC5B} - {5A6A281A-AA50-470A-8305-202BDA1CD1BF} = {EB910B0D-F27D-4B62-B67B-DE834C99AC5B} {D71E7338-8D9C-4FE4-A15F-D5CC60202C7C} = {EB910B0D-F27D-4B62-B67B-DE834C99AC5B} {70A49BC2-7500-41D0-B75D-EDCC5BE987A0} = {EB910B0D-F27D-4B62-B67B-DE834C99AC5B} {DF018947-0FFF-4EB3-BDEE-441DC81DA7A4} = {EB910B0D-F27D-4B62-B67B-DE834C99AC5B} Modified: freeswitch/trunk/src/mod/applications/mod_expr/mod_expr.vcproj ============================================================================== --- freeswitch/trunk/src/mod/applications/mod_expr/mod_expr.vcproj (original) +++ freeswitch/trunk/src/mod/applications/mod_expr/mod_expr.vcproj Fri Feb 8 13:26:34 2008 @@ -38,6 +38,7 @@ /> <Tool Name="VCCLCompilerTool" + DefaultCharIsUnsigned="true" UsePrecompiledHeader="0" DisableSpecificWarnings="4100;4701" /> @@ -101,6 +102,7 @@ /> <Tool Name="VCCLCompilerTool" + DefaultCharIsUnsigned="true" UsePrecompiledHeader="0" DisableSpecificWarnings="4100;4701" /> Modified: freeswitch/trunk/src/mod/codecs/mod_g726/mod_g726.vcproj ============================================================================== --- freeswitch/trunk/src/mod/codecs/mod_g726/mod_g726.vcproj (original) +++ freeswitch/trunk/src/mod/codecs/mod_g726/mod_g726.vcproj Fri Feb 8 13:26:34 2008 @@ -22,14 +22,62 @@ CharacterSet="2" > <Tool + Name="VCPreBuildEventTool" + /> + <Tool + Name="VCCustomBuildTool" + /> + <Tool + Name="VCXMLDataGeneratorTool" + /> + <Tool + Name="VCWebServiceProxyGeneratorTool" + /> + <Tool + Name="VCMIDLTool" + /> + <Tool Name="VCCLCompilerTool" - AdditionalIncludeDirectories=""$(InputDir)..\..\..\..\libs\codec\g726\src"" + AdditionalIncludeDirectories=""$(InputDir)..\..\..\..\libs\codec\g7xx\src\include"" UsePrecompiledHeader="0" /> <Tool + Name="VCManagedResourceCompilerTool" + /> + <Tool + Name="VCResourceCompilerTool" + /> + <Tool + Name="VCPreLinkEventTool" + /> + <Tool Name="VCLinkerTool" AdditionalLibraryDirectories=""..\..\..\..\libs\codec\g726\$(OutDir)"" /> + <Tool + Name="VCALinkTool" + /> + <Tool + Name="VCManifestTool" + /> + <Tool + Name="VCXDCMakeTool" + /> + <Tool + Name="VCBscMakeTool" + /> + <Tool + Name="VCFxCopTool" + /> + <Tool + Name="VCAppVerifierTool" + /> + <Tool + Name="VCWebDeploymentTool" + /> + <Tool + Name="VCPostBuildEventTool" + /> </Configuration> <Configuration Name="Release|Win32" @@ -38,14 +86,62 @@ CharacterSet="2" > <Tool + Name="VCPreBuildEventTool" + /> + <Tool + Name="VCCustomBuildTool" + /> + <Tool + Name="VCXMLDataGeneratorTool" + /> + <Tool + Name="VCWebServiceProxyGeneratorTool" + /> + <Tool + Name="VCMIDLTool" + /> + <Tool Name="VCCLCompilerTool" - AdditionalIncludeDirectories=""$(InputDir)..\..\..\..\libs\codec\g726\src"" + AdditionalIncludeDirectories=""$(InputDir)..\..\..\..\libs\codec\g7xx\src\include"" UsePrecompiledHeader="0" /> <Tool + Name="VCManagedResourceCompilerTool" + /> + <Tool + Name="VCResourceCompilerTool" + /> + <Tool + Name="VCPreLinkEventTool" + /> + <Tool Name="VCLinkerTool" AdditionalLibraryDirectories=""..\..\..\..\libs\codec\g726\$(OutDir)"" /> + <Tool + Name="VCALinkTool" + /> + <Tool + Name="VCManifestTool" + /> + <Tool + Name="VCXDCMakeTool" + /> + <Tool + Name="VCBscMakeTool" + /> + <Tool + Name="VCFxCopTool" + /> + <Tool + Name="VCAppVerifierTool" + /> + <Tool + Name="VCWebDeploymentTool" + /> + <Tool + Name="VCPostBuildEventTool" + /> </Configuration> </Configurations> <References>

1 0

[commit] r7557 - freeswitch/trunk/src
by Freeswitch SVN 08 Feb '08

08 Feb '08

Author: mikej Date: Fri Feb 8 13:26:11 2008 New Revision: 7557 Modified: freeswitch/trunk/src/switch_ivr_originate.c Log: lower stack allocation Modified: freeswitch/trunk/src/switch_ivr_originate.c ============================================================================== --- freeswitch/trunk/src/switch_ivr_originate.c (original) +++ freeswitch/trunk/src/switch_ivr_originate.c Fri Feb 8 13:26:11 2008 @@ -248,7 +248,7 @@ switch_core_session_message_t *message = NULL; switch_frame_t *read_frame = NULL; switch_status_t status = SWITCH_STATUS_SUCCESS; - uint8_t abuf[SWITCH_RECOMMENDED_BUFFER_SIZE]; + uint8_t *abuf = NULL; int timelimit = 60; const char *var = switch_channel_get_variable(caller_channel, "call_timeout"); switch_time_t start = 0; @@ -290,8 +290,8 @@ switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Raw Codec Activation Success L16@%uhz 1 channel %dms\n", read_codec->implementation->actual_samples_per_second, read_codec->implementation->microseconds_per_frame / 1000); - write_frame.data = abuf; - write_frame.buflen = sizeof(abuf); + write_frame.data = abuf = malloc(SWITCH_RECOMMENDED_BUFFER_SIZE); + write_frame.buflen = SWITCH_RECOMMENDED_BUFFER_SIZE; write_frame.codec = &write_codec; write_frame.datalen = read_codec->implementation->bytes_per_frame; @@ -376,9 +376,9 @@ if (read_frame && !pass) { if (ringback.fh) { - uint8_t fbuf[SWITCH_RECOMMENDED_BUFFER_SIZE]; switch_size_t mlen, olen; unsigned int pos = 0; + uint8_t *fbuf = malloc(SWITCH_RECOMMENDED_BUFFER_SIZE); if (ringback.asis) { mlen = write_frame.codec->implementation->encoded_bytes_per_frame; @@ -400,6 +400,7 @@ } write_frame.data = fbuf; write_frame.datalen = (uint32_t) (ringback.asis ? olen : olen * 2); + switch_safe_free(fbuf); } else if (ringback.audio_buffer) { if ((write_frame.datalen = (uint32_t) switch_buffer_read_loop(ringback.audio_buffer, write_frame.data, @@ -433,6 +434,7 @@ } switch_core_codec_destroy(&write_codec); } + switch_safe_free(abuf); return status; } @@ -467,7 +469,8 @@ int32_t sleep_ms = 1000, try = 0, retries = 1, idx = IDX_NADA; switch_codec_t write_codec = { 0 }; switch_frame_t write_frame = { 0 }; - uint8_t fdata[SWITCH_RECOMMENDED_BUFFER_SIZE], pass = 0; + uint8_t *fdata; + uint8_t pass = 0; char key[80] = SWITCH_BLANK_STRING, file[512] = SWITCH_BLANK_STRING, *odata, *var; switch_call_cause_t reason = SWITCH_CAUSE_UNALLOCATED; uint8_t to = 0; @@ -481,7 +484,7 @@ uint8_t ring_ready = 0; char *loop_data = NULL; - write_frame.data = fdata; + write_frame.data = fdata = malloc(SWITCH_RECOMMENDED_BUFFER_SIZE); *bleg = NULL; odata = strdup(bridgeto); @@ -1033,9 +1036,9 @@ if (ring_ready && read_frame && !pass) { if (ringback.fh) { - uint8_t abuf[SWITCH_RECOMMENDED_BUFFER_SIZE]; switch_size_t mlen, olen; unsigned int pos = 0; + uint8_t *abuf = malloc(SWITCH_RECOMMENDED_BUFFER_SIZE); if (ringback.asis) { mlen = write_frame.codec->implementation->encoded_bytes_per_frame; @@ -1057,6 +1060,7 @@ } write_frame.data = abuf; write_frame.datalen = (uint32_t) (ringback.asis ? olen : olen * 2); + switch_safe_free(abuf); } else if (ringback.audio_buffer) { if ((write_frame.datalen = (uint32_t) switch_buffer_read_loop(ringback.audio_buffer, write_frame.data, @@ -1244,6 +1248,7 @@ if (var_event) { switch_event_destroy(&var_event); } + switch_safe_free(fdata); return status; }

1 0