Skip to content

Commit 7328f30

Browse files
committed
update:docment and readme
1 parent 09c5f0e commit 7328f30

File tree

6 files changed

+24
-8
lines changed

6 files changed

+24
-8
lines changed

README.en.md

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -21,14 +21,15 @@ feature:
2121
5. Support Transparent transmission(planning)
2222
6. Support HTTP API Management interface
2323
7. Support HTTP HOOK(planning)
24+
8. Support for the transfer of all streaming media protocols
2425

2526
Publish Stream:
2627

2728
| ProtocolName | VideoCodec | AudioCodec | Status |
2829
| -------- | --------- | -------- | -------- |
2930
| RTMP | H264,H265 | AAC | Completed |
3031
| SRT | H264,H265 | AAC | Completed |
31-
| WEBRTC | H264,H265 | AAC | Process |
32+
| WEBRTC | H264,H265 | AAC | Not Start |
3233
| GB28181 | H264,H265 | AAC | Not Start |
3334
| JT1078 | H264,H265 | AAC | Completed |
3435
| XStream | H264,H265 | AAC | Completed |
@@ -39,12 +40,12 @@ Play Stream:
3940
| -------- | --------- | -------- | -------- |
4041
| RTMP | H264 | AAC | Completed |
4142
| RTSP | H264 | AAC | Completed |
42-
| TS | H264,H265 | AAC | Process |
43+
| M3U8 | H264,H265 | AAC | Completed |
4344
| SRT | H264,H265 | AAC | Completed |
44-
| WEBRTC | H264,H265 | AAC | Not Start |
45+
| WEBRTC | H264,H265 | AAC | Processing |
4546
| HTTP-FLV | H264 | AAC | Completed |
4647
| XStream | H264,H265 | AAC | Completed |
47-
48+
| TS | H264,H265 | AAC | Completed |
4849

4950
## install
5051

@@ -102,6 +103,7 @@ xstream://127.0.0.1:5601
102103

103104
#### Pull Stream
104105
http://127.0.0.1:5600/api?stream=play&sms=live/qyt&type=flv(http-flv)
106+
http://127.0.0.1:5600/api?stream=play&sms=live/qyt&type=ts
105107
rtsp://127.0.0.1:5600/api?stream=play&sms=live/qyt&type=rtsp
106108
rtmp://127.0.0.1/live/qyt
107109
srt://127.0.0.1:5603?streamid=#!::r=live/qyt,m=request

README.md

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -24,14 +24,15 @@ c c++ streammedia server
2424
5. 支持透传数据(planning)
2525
6. 支持HTTP API管理接口
2626
7. 支持HTTP HOOK(planning)
27+
8. 支持全流媒体协议互转
2728

2829
推流协议:
2930

3031
| 协议名称 | 视频格式 | 音频格式 | 当前状态 |
3132
| -------- | --------- | -------- | -------- |
3233
| RTMP | H264,H265 | AAC | 已完成 |
3334
| SRT | H264,H265 | AAC | 已完成 |
34-
| WEBRTC | H264,H265 | AAC | 进行中 |
35+
| WEBRTC | H264,H265 | AAC | 未开始 |
3536
| GB28181 | H264,H265 | AAC | 未开始 |
3637
| JT1078 | H264,H265 | AAC | 已完成 |
3738
| XStream | H264,H265 | AAC | 已完成 |
@@ -42,11 +43,12 @@ c c++ streammedia server
4243
| -------- | --------- | -------- | -------- |
4344
| RTMP | H264 | AAC | 已完成 |
4445
| RTSP | H264 | AAC | 已完成 |
45-
| TS | H264,H265 | AAC | 进行中 |
46+
| M3U8 | H264,H265 | AAC | 已完成 |
4647
| SRT | H264,H265 | AAC | 已完成 |
47-
| WEBRTC | H264,H265 | AAC | 未开始 |
48+
| WEBRTC | H264,H265 | AAC | 进行中 |
4849
| HTTP-FLV | H264 | AAC | 已完成 |
4950
| XStream | H264,H265 | AAC | 已完成 |
51+
| TS | H264,H265 | AAC | 已完成 |
5052

5153
## 安装教程
5254

@@ -66,7 +68,8 @@ macos执行:./XEngine_LINEnv.sh -i 3
6668
#### Windows
6769

6870
使用VS打开并且编译,你需要优先配置XEngine环境才能使用
69-
还需要libsrt库,通过vcpkg安装
71+
还需要libsrt库,通过vcpkg安装
72+
vcpkg.exe install libsrt:x86-windows libsrt:x64-windows
7073

7174
#### Linux
7275
配置完XEngine后需要安装srt库
@@ -111,6 +114,7 @@ xstream://127.0.0.1:5601
111114

112115
#### 拉流示例
113116
http://127.0.0.1:5600/api?stream=play&sms=live/qyt&type=flv(http-flv)
117+
http://127.0.0.1:5600/api?stream=play&sms=live/qyt&type=ts
114118
rtsp://127.0.0.1:5600/api?stream=play&sms=live/qyt&type=rtsp
115119
rtmp://127.0.0.1/live/qyt
116120
srt://127.0.0.1:5603?streamid=#!::r=live/qyt,m=request

XEngine_Docment/Docment_en.docx

1.73 KB
Binary file not shown.

XEngine_Docment/Docment_zh.docx

1.47 KB
Binary file not shown.

XEngine_Source/XEngine_ModuleHelp/XEngine_ModuleHelp.vcxproj

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -90,6 +90,12 @@
9090
<IncludePath>$(XEngine_Include);../XEngine_ThirdPart/opencc/include;$(IncludePath)</IncludePath>
9191
<LibraryPath>$(XEngine_Lib64);$(LibraryPath)</LibraryPath>
9292
</PropertyGroup>
93+
<PropertyGroup Label="Vcpkg" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
94+
<VcpkgUseStatic>false</VcpkgUseStatic>
95+
</PropertyGroup>
96+
<PropertyGroup Label="Vcpkg" Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
97+
<VcpkgUseStatic>false</VcpkgUseStatic>
98+
</PropertyGroup>
9399
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
94100
<ClCompile>
95101
<WarningLevel>Level3</WarningLevel>
@@ -116,6 +122,7 @@
116122
<ConformanceMode>true</ConformanceMode>
117123
<PrecompiledHeader>Use</PrecompiledHeader>
118124
<PrecompiledHeaderFile>pch.h</PrecompiledHeaderFile>
125+
<RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
119126
</ClCompile>
120127
<Link>
121128
<SubSystem>Windows</SubSystem>

XEngine_Source/XEngine_ServiceApp/XEngine_StreamMediaApp/XEngine_StreamMediaApp.vcxproj

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -86,6 +86,9 @@
8686
<IncludePath>$(XEngine_Include);$(IncludePath)</IncludePath>
8787
<LibraryPath>$(XEngine_Lib64);$(LibraryPath)</LibraryPath>
8888
</PropertyGroup>
89+
<PropertyGroup Label="Vcpkg" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
90+
<VcpkgUseStatic>false</VcpkgUseStatic>
91+
</PropertyGroup>
8992
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
9093
<ClCompile>
9194
<WarningLevel>Level3</WarningLevel>

0 commit comments

Comments
 (0)