Skip to content

Commit

Permalink
add mongoose
Browse files Browse the repository at this point in the history
  • Loading branch information
@PHZ76
PHZ76 committed May 20, 2020
1 parent 705f936 commit 48dc47e
Show file tree
Hide file tree
Showing 16 changed files with 22,530 additions and 5,640 deletions.
29 changes: 24 additions & 5 deletions VS2017/rtmp-server.vcxproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,12 @@
</ItemGroup>
<ItemGroup>
<ClCompile Include="..\example\rtmp_server.cpp" />
<ClCompile Include="..\src\3rdpart\mongoose\mongoose.c">
<WarningLevel Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">TurnOffAllWarnings</WarningLevel>
<WarningLevel Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">TurnOffAllWarnings</WarningLevel>
<WarningLevel Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">TurnOffAllWarnings</WarningLevel>
<WarningLevel Condition="'$(Configuration)|$(Platform)'=='Release|x64'">TurnOffAllWarnings</WarningLevel>
</ClCompile>
<ClCompile Include="..\src\net\Acceptor.cpp" />
<ClCompile Include="..\src\net\BufferReader.cpp" />
<ClCompile Include="..\src\net\BufferWriter.cpp" />
Expand All @@ -39,6 +45,7 @@
<ClCompile Include="..\src\net\Timestamp.cpp" />
<ClCompile Include="..\src\xop\amf.cpp" />
<ClCompile Include="..\src\xop\H264Parser.cpp" />
<ClCompile Include="..\src\xop\HttpServer.cpp" />
<ClCompile Include="..\src\xop\RtmpHandshake.cpp" />
<ClCompile Include="..\src\xop\HttpFlvConnection.cpp" />
<ClCompile Include="..\src\xop\HttpFlvServer.cpp" />
Expand All @@ -50,7 +57,7 @@
<ClCompile Include="..\src\xop\RtmpSession.cpp" />
</ItemGroup>
<ItemGroup>
<ClInclude Include="..\src\3rdpart\cpp-httplib\httplib.h" />
<ClInclude Include="..\src\3rdpart\mongoose\mongoose.h" />
<ClInclude Include="..\src\net\Acceptor.h" />
<ClInclude Include="..\src\net\BufferReader.h" />
<ClInclude Include="..\src\net\BufferWriter.h" />
Expand All @@ -75,6 +82,7 @@
<ClInclude Include="..\src\net\Timestamp.h" />
<ClInclude Include="..\src\xop\amf.h" />
<ClInclude Include="..\src\xop\H264Parser.h" />
<ClInclude Include="..\src\xop\HttpServer.h" />
<ClInclude Include="..\src\xop\RtmpHandshake.h" />
<ClInclude Include="..\src\xop\HttpFlvConnection.h" />
<ClInclude Include="..\src\xop\HttpFlvServer.h" />
Expand All @@ -87,6 +95,9 @@
<ClInclude Include="..\src\xop\RtmpServer.h" />
<ClInclude Include="..\src\xop\RtmpSession.h" />
</ItemGroup>
<ItemGroup>
<None Include="..\src\3rdpart\mongoose\LICENSE" />
</ItemGroup>
<PropertyGroup Label="Globals">
<VCProjectVersion>15.0</VCProjectVersion>
<ProjectGuid>{DCFCFB63-6755-4DE0-BE6D-33243469755E}</ProjectGuid>
Expand All @@ -99,26 +110,30 @@
<UseDebugLibraries>true</UseDebugLibraries>
<PlatformToolset>v141</PlatformToolset>
<CharacterSet>MultiByte</CharacterSet>
<SpectreMitigation>false</SpectreMitigation>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
<ConfigurationType>Application</ConfigurationType>
<UseDebugLibraries>false</UseDebugLibraries>
<PlatformToolset>v141</PlatformToolset>
<WholeProgramOptimization>true</WholeProgramOptimization>
<CharacterSet>MultiByte</CharacterSet>
<SpectreMitigation>false</SpectreMitigation>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
<ConfigurationType>Application</ConfigurationType>
<UseDebugLibraries>true</UseDebugLibraries>
<PlatformToolset>v141</PlatformToolset>
<CharacterSet>MultiByte</CharacterSet>
<SpectreMitigation>false</SpectreMitigation>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
<ConfigurationType>Application</ConfigurationType>
<UseDebugLibraries>false</UseDebugLibraries>
<PlatformToolset>v141</PlatformToolset>
<WholeProgramOptimization>true</WholeProgramOptimization>
<CharacterSet>MultiByte</CharacterSet>
<SpectreMitigation>false</SpectreMitigation>
</PropertyGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
<ImportGroup Label="ExtensionSettings">
Expand All @@ -145,7 +160,8 @@
<Optimization>Disabled</Optimization>
<SDLCheck>true</SDLCheck>
<ConformanceMode>true</ConformanceMode>
<AdditionalIncludeDirectories>$(ProjectDir)..\src;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<AdditionalIncludeDirectories>$(ProjectDir)..\src;$(ProjectDir)..\src\3rdpart;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>NOMINMAX;%(PreprocessorDefinitions)</PreprocessorDefinitions>
</ClCompile>
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
Expand All @@ -154,7 +170,8 @@
<Optimization>Disabled</Optimization>
<SDLCheck>true</SDLCheck>
<ConformanceMode>true</ConformanceMode>
<AdditionalIncludeDirectories>$(ProjectDir)..\src;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<AdditionalIncludeDirectories>$(ProjectDir)..\src;$(ProjectDir)..\src\3rdpart;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>NOMINMAX;%(PreprocessorDefinitions)</PreprocessorDefinitions>
</ClCompile>
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
Expand All @@ -165,7 +182,8 @@
<IntrinsicFunctions>true</IntrinsicFunctions>
<SDLCheck>true</SDLCheck>
<ConformanceMode>true</ConformanceMode>
<AdditionalIncludeDirectories>$(ProjectDir)..\src;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<AdditionalIncludeDirectories>$(ProjectDir)..\src;$(ProjectDir)..\src\3rdpart;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>NOMINMAX;%(PreprocessorDefinitions)</PreprocessorDefinitions>
</ClCompile>
<Link>
<EnableCOMDATFolding>true</EnableCOMDATFolding>
Expand All @@ -180,7 +198,8 @@
<IntrinsicFunctions>true</IntrinsicFunctions>
<SDLCheck>true</SDLCheck>
<ConformanceMode>true</ConformanceMode>
<AdditionalIncludeDirectories>$(ProjectDir)..\src;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<AdditionalIncludeDirectories>$(ProjectDir)..\src;$(ProjectDir)..\src\3rdpart;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>NOMINMAX;%(PreprocessorDefinitions)</PreprocessorDefinitions>
</ClCompile>
<Link>
<EnableCOMDATFolding>true</EnableCOMDATFolding>
Expand Down
25 changes: 21 additions & 4 deletions VS2017/rtmp-server.vcxproj.filters
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,8 +19,11 @@
<Filter Include="源文件\xop">
<UniqueIdentifier>{9aef1dd1-2252-4eb1-bce3-05ae4f800d13}</UniqueIdentifier>
</Filter>
<Filter Include="源文件\cpp-httplib">
<UniqueIdentifier>{9f6ccdbd-a573-44a2-8d46-aa8e4f8b9d05}</UniqueIdentifier>
<Filter Include="源文件\3rdpart">
<UniqueIdentifier>{494a1290-e3a8-4611-a3f4-eb64861b11a7}</UniqueIdentifier>
</Filter>
<Filter Include="源文件\3rdpart\mongoose">
<UniqueIdentifier>{9d0017c9-6c53-422e-ba89-29e27f141f0f}</UniqueIdentifier>
</Filter>
</ItemGroup>
<ItemGroup>
Expand Down Expand Up @@ -111,6 +114,12 @@
<ClCompile Include="..\src\xop\RtmpHandshake.cpp">
<Filter>源文件\xop</Filter>
</ClCompile>
<ClCompile Include="..\src\3rdpart\mongoose\mongoose.c">
<Filter>源文件\3rdpart\mongoose</Filter>
</ClCompile>
<ClCompile Include="..\src\xop\HttpServer.cpp">
<Filter>源文件\xop</Filter>
</ClCompile>
</ItemGroup>
<ItemGroup>
<ClInclude Include="..\src\net\Acceptor.h">
Expand Down Expand Up @@ -218,8 +227,16 @@
<ClInclude Include="..\src\xop\RtmpHandshake.h">
<Filter>源文件\xop</Filter>
</ClInclude>
<ClInclude Include="..\src\3rdpart\cpp-httplib\httplib.h">
<Filter>源文件\cpp-httplib</Filter>
<ClInclude Include="..\src\3rdpart\mongoose\mongoose.h">
<Filter>源文件\3rdpart\mongoose</Filter>
</ClInclude>
<ClInclude Include="..\src\xop\HttpServer.h">
<Filter>源文件\xop</Filter>
</ClInclude>
</ItemGroup>
<ItemGroup>
<None Include="..\src\3rdpart\mongoose\LICENSE">
<Filter>源文件\3rdpart\mongoose</Filter>
</None>
</ItemGroup>
</Project>
2 changes: 1 addition & 1 deletion example/rtmp_server.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ int main(int argc, char **argv)

/* http-flv server example */
xop::HttpFlvServer http_flv_server(&event_loop);
http_flv_server.Attach(rtmp_server.get());
http_flv_server.Attach(rtmp_server);
if (!http_flv_server.Start("0.0.0.0", 8080)) {
printf("HTTP FLV Server listen on 8080 failed.\n");
}
Expand Down
22 changes: 0 additions & 22 deletions src/3rdpart/cpp-httplib/LICENSE
View file

This file was deleted.

Loading

0 comments on commit 48dc47e

Please sign in to comment.