Skip to content

F
freeswitch
提交 a34d97b6 authored 作者: Mike Jerris's avatar Mike Jerris
浏览文件
操作

Merge pull request #1587 in FS/freeswitch from… 

Merge pull request #1587 in FS/freeswitch from ~ANDYWOLK/freeswitch:feature/FS-11394-hardware-encoder-support to master

* commit '0b2f72ff':
  FS-11394: [mod_av] Enable HW acceleration on Windows. Use FFmpeg 3.4.4 instead of libav.
上级 b96b1095 0b2f72ff
全部展开 隐藏空白字符变更
内嵌 并排
正在显示 包含 6078 行增加 和 7 行删除
.gitignore
浏览文件 @ a34d97b6
...@@ -256,3 +256,4 @@ libs/libcodec2-*/ ...@@ -256,3 +256,4 @@ libs/libcodec2-*/
libs/libsilk-*/ libs/libsilk-*/
libs/rabbitmq-c-*/ libs/rabbitmq-c-*/
libs/rabbitmq-c-*.zip libs/rabbitmq-c-*.zip
libs/ffmpeg-*/
Freeswitch.2017.sln
浏览文件 @ a34d97b6
...@@ -564,6 +564,8 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mod_cidlookup", "src\mod\ap ...@@ -564,6 +564,8 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mod_cidlookup", "src\mod\ap
EndProject EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mod_cdr_mongodb", "src\mod\event_handlers\mod_cdr_mongodb\mod_cdr_mongodb.2017.vcxproj", "{4DFF29B4-2976-447D-A8B3-43476451517C}" Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mod_cdr_mongodb", "src\mod\event_handlers\mod_cdr_mongodb\mod_cdr_mongodb.2017.vcxproj", "{4DFF29B4-2976-447D-A8B3-43476451517C}"
EndProject EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ffmpeg", "libs\win32\ffmpeg\ffmpeg.2017.vcxproj", "{BC1FD72E-1CD5-4525-A7F5-17C5740BFDED}"
EndProject
Global Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution GlobalSection(SolutionConfigurationPlatforms) = preSolution
All|Win32 = All|Win32 All|Win32 = All|Win32
...@@ -2567,6 +2569,14 @@ Global ...@@ -2567,6 +2569,14 @@ Global
{4DFF29B4-2976-447D-A8B3-43476451517C}.Release|Win32.Build.0 = Release|Win32 {4DFF29B4-2976-447D-A8B3-43476451517C}.Release|Win32.Build.0 = Release|Win32
{4DFF29B4-2976-447D-A8B3-43476451517C}.Release|x64.ActiveCfg = Release|x64 {4DFF29B4-2976-447D-A8B3-43476451517C}.Release|x64.ActiveCfg = Release|x64
{4DFF29B4-2976-447D-A8B3-43476451517C}.Release|x64.Build.0 = Release|x64 {4DFF29B4-2976-447D-A8B3-43476451517C}.Release|x64.Build.0 = Release|x64
{BC1FD72E-1CD5-4525-A7F5-17C5740BFDED}.All|Win32.ActiveCfg = Release|x64
{BC1FD72E-1CD5-4525-A7F5-17C5740BFDED}.All|Win32.Build.0 = Release|x64
{BC1FD72E-1CD5-4525-A7F5-17C5740BFDED}.All|x64.ActiveCfg = Release|x64
{BC1FD72E-1CD5-4525-A7F5-17C5740BFDED}.All|x64.Build.0 = Release|x64
{BC1FD72E-1CD5-4525-A7F5-17C5740BFDED}.Debug|Win32.ActiveCfg = Debug|x64
{BC1FD72E-1CD5-4525-A7F5-17C5740BFDED}.Debug|x64.ActiveCfg = Debug|x64
{BC1FD72E-1CD5-4525-A7F5-17C5740BFDED}.Release|Win32.ActiveCfg = Release|x64
{BC1FD72E-1CD5-4525-A7F5-17C5740BFDED}.Release|x64.ActiveCfg = Release|x64
EndGlobalSection EndGlobalSection
GlobalSection(SolutionProperties) = preSolution GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE HideSolutionNode = FALSE
...@@ -2771,6 +2781,7 @@ Global ...@@ -2771,6 +2781,7 @@ Global
{40C4E2A2-B49B-496C-96D6-C04B890F7F88} = {E72B5BCB-6462-4D23-B419-3AF1A4AC3D78} {40C4E2A2-B49B-496C-96D6-C04B890F7F88} = {E72B5BCB-6462-4D23-B419-3AF1A4AC3D78}
{0A130A8B-3076-4619-BADF-9E86F621AEEC} = {E72B5BCB-6462-4D23-B419-3AF1A4AC3D78} {0A130A8B-3076-4619-BADF-9E86F621AEEC} = {E72B5BCB-6462-4D23-B419-3AF1A4AC3D78}
{4DFF29B4-2976-447D-A8B3-43476451517C} = {9ADF1E48-2F5C-4ED7-A893-596259FABFE0} {4DFF29B4-2976-447D-A8B3-43476451517C} = {9ADF1E48-2F5C-4ED7-A893-596259FABFE0}
{BC1FD72E-1CD5-4525-A7F5-17C5740BFDED} = {EB910B0D-F27D-4B62-B67B-DE834C99AC5B}
EndGlobalSection EndGlobalSection
GlobalSection(ExtensibilityGlobals) = postSolution GlobalSection(ExtensibilityGlobals) = postSolution
SolutionGuid = {09840DE7-9208-45AA-9667-1A71EE93BD1E} SolutionGuid = {09840DE7-9208-45AA-9667-1A71EE93BD1E}
......
libs/win32/ffmpeg/ffmpeg.2017.vcxproj 0 → 100644
浏览文件 @ a34d97b6
差异被折叠。
src/mod/applications/mod_av/avcodec.c
浏览文件 @ a34d97b6
...@@ -710,8 +710,8 @@ void rtp_callback(struct AVCodecContext *avctx, void *data, int size, int mb_nb) ...@@ -710,8 +710,8 @@ void rtp_callback(struct AVCodecContext *avctx, void *data, int size, int mb_nb)
} }
#endif #endif
const uint8_t *fs_h263_find_resync_marker_reverse(const uint8_t *restrict start, const uint8_t *fs_h263_find_resync_marker_reverse(const uint8_t *av_restrict start,
const uint8_t *restrict end) const uint8_t *av_restrict end)
{ {
const uint8_t *p = end - 1; const uint8_t *p = end - 1;
start += 1; /* Make sure we never return the original start. */ start += 1; /* Make sure we never return the original start. */
......
src/mod/applications/mod_av/mod_av.2017.vcxproj
浏览文件 @ a34d97b6
...@@ -46,7 +46,7 @@ ...@@ -46,7 +46,7 @@
<PlatformToolset>v141</PlatformToolset> <PlatformToolset>v141</PlatformToolset>
</PropertyGroup> </PropertyGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" /> <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
<Import Project="$(SolutionDir)w32\libav.props" /> <Import Project="$(SolutionDir)w32\ffmpeg.props" />
<ImportGroup Label="ExtensionSettings"> <ImportGroup Label="ExtensionSettings">
</ImportGroup> </ImportGroup>
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets"> <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
...@@ -141,9 +141,8 @@ ...@@ -141,9 +141,8 @@
<ClCompile Include="mod_av.c" /> <ClCompile Include="mod_av.c" />
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<ProjectReference Include="..\..\..\..\libs\win32\libav\libav.2017.vcxproj"> <ProjectReference Include="..\..\..\..\libs\win32\ffmpeg\ffmpeg.2017.vcxproj">
<Project>{841C345F-FCC7-4F64-8F54-0281CEABEB01}</Project> <Project>{bc1fd72e-1cd5-4525-a7f5-17c5740bfded}</Project>
<ReferenceOutputAssembly>false</ReferenceOutputAssembly>
</ProjectReference> </ProjectReference>
<ProjectReference Include="..\..\..\..\w32\Library\FreeSwitchCore.2017.vcxproj"> <ProjectReference Include="..\..\..\..\w32\Library\FreeSwitchCore.2017.vcxproj">
<Project>{202d7a4e-760d-4d0e-afa1-d7459ced30ff}</Project> <Project>{202d7a4e-760d-4d0e-afa1-d7459ced30ff}</Project>
......
w32/Setup/Setup.2017.wixproj
浏览文件 @ a34d97b6
...@@ -97,6 +97,14 @@ ...@@ -97,6 +97,14 @@
<RefProjectOutputGroups>Binaries;Content;Satellites</RefProjectOutputGroups> <RefProjectOutputGroups>Binaries;Content;Satellites</RefProjectOutputGroups>
<RefTargetDir>INSTALLFOLDER</RefTargetDir> <RefTargetDir>INSTALLFOLDER</RefTargetDir>
</ProjectReference> </ProjectReference>
<ProjectReference Include="..\..\src\mod\applications\mod_av\mod_av.2017.vcxproj">
<Name>mod_av</Name>
<Project>{7aee504b-23b6-4b05-829e-7cd34855f146}</Project>
<Private>True</Private>
<DoNotHarvest>True</DoNotHarvest>
<RefProjectOutputGroups>Binaries;Content;Satellites</RefProjectOutputGroups>
<RefTargetDir>INSTALLFOLDER</RefTargetDir>
</ProjectReference>
<ProjectReference Include="..\..\src\mod\applications\mod_blacklist\mod_blacklist.2017.vcxproj"> <ProjectReference Include="..\..\src\mod\applications\mod_blacklist\mod_blacklist.2017.vcxproj">
<Name>mod_blacklist</Name> <Name>mod_blacklist</Name>
<Project>{50aac2ce-bfc9-4912-87cc-c6381850d735}</Project> <Project>{50aac2ce-bfc9-4912-87cc-c6381850d735}</Project>
......
w32/download_ffmpeg.props 0 → 100644
浏览文件 @ a34d97b6
<?xml version="1.0" encoding="utf-8"?>
<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<ImportGroup Label="PropertySheets">
<Import Project="downloadpackage.task" Condition=" '$(downloadpackagetask_Imported)' == '' " />
<Import Project="ffmpeg-version.props" Condition=" '$(ffmpegVersionImported)' == '' " />
</ImportGroup>
<PropertyGroup>
<downloadFfmpegPropsImported>true</downloadFfmpegPropsImported>
</PropertyGroup>
<!--
Download Target.
Name must be unique.
By design, targets are executed only once per project.
Usage:
package: URI
expectfileordirectory: Skips the download and extraction if exists
outputfolder: Folder to store a downloaded file.
By default "$(BaseDir)libs", if empty
outputfilename: If not empty, overrides filename from URI.
.exe files don't get extracted
extractto: Folder to extract an archive to
-->
<Target Name="ffmpegDownloadTarget" BeforeTargets="CustomBuild" DependsOnTargets="7za">
<DownloadPackageTask
package="http://files.freeswitch.org/downloads/libs/ffmpeg-$(ffmpegVersion).tar.bz2"
expectfileordirectory="$(BaseDir)libs\ffmpeg-$(ffmpegVersion)\configure"
outputfolder=""
outputfilename=""
extractto="$(BaseDir)libs\"
/>
</Target>
</Project>
w32/ffmpeg-version.props 0 → 100644
浏览文件 @ a34d97b6
<?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<ImportGroup Label="PropertySheets">
<Import Project="basedir.props" Condition=" '$(BaseDirImported)' == ''"/>
</ImportGroup>
<PropertyGroup Label="UserMacros">
<ffmpegVersion>3.4.4</ffmpegVersion>
</PropertyGroup>
<PropertyGroup>
<ffmpegVersionImported>true</ffmpegVersionImported>
</PropertyGroup>
<PropertyGroup />
<ItemDefinitionGroup />
<ItemGroup>
<BuildMacro Include="ffmpegVersion">
<Value>$(ffmpegVersion)</Value>
</BuildMacro>
</ItemGroup>
</Project>
w32/ffmpeg.props 0 → 100644
浏览文件 @ a34d97b6
<?xml version="1.0" encoding="utf-8"?>
<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<ImportGroup Label="PropertySheets">
<Import Project="ffmpeg-version.props" Condition=" '$(ffmpegVersionImported)' == ''"/>
</ImportGroup>
<PropertyGroup>
<ffmpegPropsImported>true</ffmpegPropsImported>
</PropertyGroup>
<PropertyGroup Label="UserMacros">
<ffmpegDir>$(BaseDir)libs\ffmpeg-$(ffmpegVersion)</ffmpegDir>
</PropertyGroup>
<ItemDefinitionGroup>
<ClCompile>
<AdditionalIncludeDirectories>$(ffmpegDir);$(ffmpegDir)\compat\atomics\win32;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<AdditionalIncludeDirectories Condition="'$(Platform)'=='x64'">$(ffmpegDir)\include_x64;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>HAVE_FFMPEG;FFMPEG_STATICLIB;HAVE_AV_CONFIG_H;_ISOC99_SOURCE;_FILE_OFFSET_BITS=64;_LARGEFILE_SOURCE;_USE_MATH_DEFINES;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_WARNINGS;_WIN32_WINNT=0x0502;%(PreprocessorDefinitions)</PreprocessorDefinitions>
</ClCompile>
<Link>
<AdditionalDependencies>Secur32.lib;%(AdditionalDependencies)</AdditionalDependencies>
</Link>
</ItemDefinitionGroup>
</Project>
w32/zlib.props
浏览文件 @ a34d97b6
...@@ -71,7 +71,7 @@ ...@@ -71,7 +71,7 @@
<ItemDefinitionGroup> <ItemDefinitionGroup>
<ClCompile> <ClCompile>
<AdditionalIncludeDirectories>$(SolutionDir)libs\zlib-$(zlibVersion)\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> <AdditionalIncludeDirectories>$(SolutionDir)libs\zlib-$(zlibVersion)\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>HAVE_ZLIB;ZLIB_STATICLIB;%(PreprocessorDefinitions)</PreprocessorDefinitions> <PreprocessorDefinitions>HAVE_ZLIB;ZLIB_STATICLIB;Z_SOLO;%(PreprocessorDefinitions)</PreprocessorDefinitions>
</ClCompile> </ClCompile>
<Link> <Link>
<AdditionalLibraryDirectories>$(SolutionDir)libs\zlib-$(zlibVersion)\binaries\$(Platform)\$(LibraryConfiguration)\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories> <AdditionalLibraryDirectories>$(SolutionDir)libs\zlib-$(zlibVersion)\binaries\$(Platform)\$(LibraryConfiguration)\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
......
Markdown 格式
0% 或
您添加了 0 人 到此讨论。请谨慎行事。
请先完成此评论的编辑！
请 注册 或者 后发表评论