Skip to content

Commit fa03961

Browse files
authored
Merge pull request #1 from libxengine/develop
V1.0.0.1001
2 parents c09eec5 + 5d5731c commit fa03961

File tree

208 files changed

+119918
-256
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

208 files changed

+119918
-256
lines changed

.gitignore

Lines changed: 0 additions & 52 deletions
This file was deleted.

CHANGELOG

Lines changed: 23 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,23 @@
1+
XEngine_StreamMedia V1.0.0.1001
2+
3+
增加:插件系统
4+
增加:配置模块
5+
增加:数据库模块
6+
增加:帮助模块
7+
增加:协议模块
8+
增加:会话模块
9+
增加:JT1078框架
10+
增加:SDK框架
11+
增加:推流框架
12+
增加:大华SDK插件
13+
14+
added:plugin system
15+
added:configure module
16+
added:database module
17+
added:help module
18+
added:protocol module
19+
added:session module
20+
added:jt1078 app
21+
added:sdk app
22+
added:center app
23+
added:dahua sdk module

CONTRIBUTING.md

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,16 @@
1+
author by:qyt 486179@qq.com
2+
3+
## 贡献准则(Contribution Guidelines)
4+
5+
此服务是一个尝试由社区驱动,你的共享价值将不可估量!
6+
the service is an attempt to be driven by the community, your shared value will be immeasurable!
7+
8+
## 提交代码(Submit code)
9+
10+
想要贡献代码,你需要按照我们的风格来提交代码.
11+
To contribute code, you need to submit code in our style
12+
13+
## 法律声明(Legal Notice)
14+
15+
如果你的提交的请求有依赖其他库,请注意库的版权.你的提交代码将被允许被我们随意复制,分发,删除,修改
16+
If your submitted request depends on other libraries, please pay attention to the copyright of the library. Your submitted code will be allowed to be copied, distributed, deleted, and modified by us at will

COPYRIGHT

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
the open source software depend on the following libraries, please note the copyright
2+
XEngine:https://gitee.com/xyry/libxengine or https://github.com/libxengine/xengine
3+
jsoncpp:https://github.com/open-source-parsers/jsoncpp

LICENSE

Lines changed: 121 additions & 159 deletions
Large diffs are not rendered by default.

README.en.md

Lines changed: 69 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -1,36 +1,81 @@
1+
[中文](README.md) || [English](README.en.md)
12
# XEngine_StreamMedia
3+
This repository has a development and master branch. If you want to use it, please use the master branch
4+
As long as the repository is not in suspended state, we will maintain and develop it all the time, please use it with confidence
25

3-
#### Description
4-
xengine 流媒体服务器
6+
## Introduction
7+
c c++ 流媒体服务器
8+
c c++ streammedia server
9+
This is not a simple streaming media server, but a protocol stream parsing push streaming service, need to be used with the streaming service, his main role is to parse the national standard protocol and other protocols of the streaming media protocol, and then packaged to push the stream to the specified streaming media server
10+
can support JT1078, GB28181 and other protocol streams. Parsing these protocol streams, and then pushing them to a streaming server through RTMP protocol. Users can pull streams through the streaming server.
11+
It is a streaming protocol parsing collection, which can access any protocol devices to our server, and then packaged into RTMP protocol by our server to push the stream to the specified server.
12+
This is a cross-platform simple high-performance network licensing server, provides a complete demo code
513

6-
#### Software Architecture
7-
Software architecture description
14+
## Software feature
15+
A set of concise and high-performance cross-platform streaming media analysis and push streaming services developed and implemented based on libXEngine
16+
1. Support voice intercom
17+
2. Support multiple audio format transcoding
18+
3. Support video recording
19+
4. Support JT1078 protocol parsing and streaming
20+
5. Support the parsing and streaming of the national standard GB28181 protocol
21+
6. Support international ONVIF protocol
22+
7. Support SIP streaming protocol
23+
8. support device manufacturer sdk(dahua,haikang,suobei...and more...)
824

9-
#### Installation
25+
## install
1026

11-
1. xxxx
12-
2. xxxx
13-
3. xxxx
27+
#### XEngine environment
28+
you have to install xengine before complie,You can refer to its Readme document
29+
GITEE:https://gitee.com/xyry/libxengine
30+
GITHUB:https://github.com/libxengine/xengine
1431

15-
#### Instructions
32+
#### Version requirements
33+
Support WINDOWS 7SP1 and LINUX (UBUNT20.04, CENTOS8) above system
34+
XEngine version requires V7.34 or above
1635

17-
1. xxxx
18-
2. xxxx
19-
3. xxxx
36+
#### Windows
37+
use vs open and complie
2038

21-
#### Contribution
39+
#### Linux
40+
Linux use Makefile complie
41+
UBUNTU20.04 x64 or CENTOS8 x64
2242

23-
1. Fork the repository
24-
2. Create Feat_xxx branch
25-
3. Commit your code
26-
4. Create Pull Request
43+
#### MacOS
44+
Linux use Makefile to complie,terminal exection,Requires mac 12 and above
2745

46+
##### Compile Command
47+
execute command in XEngine_Source path
48+
make complie
49+
make FLAGS=InstallAll Install File
50+
make FLAGS=CleanAll Clear Complie
2851

29-
#### Gitee Feature
52+
## Use
3053

31-
1. You can use Readme\_XXX.md to support different languages, such as Readme\_en.md, Readme\_zh.md
32-
2. Gitee blog [blog.gitee.com](https://blog.gitee.com)
33-
3. Explore open source project [https://gitee.com/explore](https://gitee.com/explore)
34-
4. The most valuable open source project [GVP](https://gitee.com/gvp)
35-
5. The manual of Gitee [https://gitee.com/help](https://gitee.com/help)
36-
6. The most popular members [https://gitee.com/gitee-stars/](https://gitee.com/gitee-stars/)
54+
1. Switch to the MASTER branch
55+
2. download code
56+
3. complie
57+
4. install
58+
5. run XEngine_CenterApp.exe,and running XEngine_SDKApp.exe or XEngine_JT1078App.exe,linux can be set parament -d 1 command
59+
6. use APPClient push stream
60+
7. use vlc play
61+
62+
## Dir Struct
63+
- XEngine_Docment Docment Dir Struct
64+
- XEngine_Release Install Dir Struct
65+
- XEngine_Source Source Dir
66+
- XEngine_APPClient Client Example Code
67+
- XEngine_SQLFile Sql File
68+
69+
## Participate in contribution
70+
71+
1. Fork this code
72+
2. Create new Feat_xxx branch
73+
3. Submit the code
74+
4. New Pull Request
75+
76+
## Follow us
77+
If you think this software is helpful to you, please give us a START
78+
79+
## post issues
80+
81+
if you have eny quest.post issues...

README.md

Lines changed: 65 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -1,37 +1,81 @@
1+
[中文](README.md) || [English](README.en.md)
12
# XEngine_StreamMedia
3+
本仓库有开发和主分支,如果要使用,请使用master分支下的代码
4+
只要仓库不是在暂停状态,那么就会有人一直维护和开发,请放心使用
25

3-
#### 介绍
4-
xengine 流媒体服务器
6+
## 介绍
7+
c c++ 流媒体服务器
8+
c c++ streammedia server
9+
这不是一个单纯的流媒体服务器,而是一个协议流解析推流服务,需要配合流媒体服务使用,他的主要作用是解析国标协议和其他协议的流媒体协议,然后打包推流到指定流媒体服务器上
10+
可以支持JT1078,GB28181等协议流.解析这些协议流,然后通过RTMP协议推流到一个流媒体服务器上面.用户可以通过流媒体服务器拉流
11+
他是一个流媒体协议解析集合,可以接入任何协议的设备到我们的服务器,然后通过我们服务器解析打包成RTMP协议推流到指定服务器上面
12+
这是一个跨平台简单高性能网络授权服务器,提供了完整的演示代码
513

6-
#### 软件架构
7-
软件架构说明
14+
## 软件架构
15+
基于libXEngine开发并实现的一套简洁高性能跨平台流媒体解析推流服务
16+
软件特性:
17+
1. 支持语音对讲
18+
2. 支持多种音频格式转码
19+
3. 支持录像
20+
4. 支持JT1078协议解析和推流
21+
5. 支持国标GB28181协议的解析和推流
22+
6. 支持国际ONVIF协议
23+
7. 支持SIP流协议
24+
8. 支持设备厂商SDK(dahua,haikang,suobei等等)
825

26+
## 安装教程
927

10-
#### 安装教程
28+
#### XEngine环境
29+
在编译之前必须安装XEngine,可以参考其Readme文档
30+
GITEE:https://gitee.com/xyry/libxengine
31+
GITHUB:https://github.com/libxengine/xengine
1132

12-
1. xxxx
13-
2. xxxx
14-
3. xxxx
33+
#### 版本需求
34+
支持WINDOWS 7SP1和LINUX(UBUNT20.04,CENTOS8)以上系统
35+
XEngine版本需要V7.34或者以上版本
1536

16-
#### 使用说明
37+
#### Windows
38+
使用VS打开并且编译,你需要优先配置XEngine环境才能使用
1739

18-
1. xxxx
19-
2. xxxx
20-
3. xxxx
40+
#### Linux
41+
Linux使用Makefile编译
42+
UBUNTU20.04 x64或者CENTOS8 x64均可
2143

22-
#### 参与贡献
44+
#### MacOS
45+
使用makefile编译,控制台运行,需要mac 12以及以上版本
46+
47+
###### 编译命令
48+
在XEngine_Source目录下执行命令
49+
make 编译
50+
make FLAGS=InstallAll 安装库程序
51+
make FLAGS=CleanAll 清理编译
52+
53+
## 使用说明
54+
55+
1. 切换到MASTER分支
56+
2. 下载代码
57+
3. 编译
58+
4. 安装
59+
5. 运行XEngine_CenterApp.exe,在运行XEngine_SDKApp.exe或者XEngine_JT1078App.exe,linux可以使用 -d 1 命令在后台运行
60+
6. 使用APPClient中的推流例子推流
61+
7. 使用VLC等工具播放
62+
63+
## 目录结构
64+
- XEngine_Docment 文档目录结构
65+
- XEngine_Release 安装目录结构
66+
- XEngine_Source 源代目录结构
67+
- XEngine_APPClient 客户端演示代码
68+
- XEngine_SQLFile 数据库脚本文件
69+
70+
## 参与贡献
2371

2472
1. Fork 本仓库
2573
2. 新建 Feat_xxx 分支
2674
3. 提交代码
2775
4. 新建 Pull Request
2876

77+
## 关注我们
78+
如果你觉得这个软件对你有帮助,请你给我们一个START吧
2979

30-
#### 特技
31-
32-
1. 使用 Readme\_XXX.md 来支持不同的语言,例如 Readme\_en.md, Readme\_zh.md
33-
2. Gitee 官方博客 [blog.gitee.com](https://blog.gitee.com)
34-
3. 你可以 [https://gitee.com/explore](https://gitee.com/explore) 这个地址来了解 Gitee 上的优秀开源项目
35-
4. [GVP](https://gitee.com/gvp) 全称是 Gitee 最有价值开源项目,是综合评定出的优秀开源项目
36-
5. Gitee 官方提供的使用手册 [https://gitee.com/help](https://gitee.com/help)
37-
6. Gitee 封面人物是一档用来展示 Gitee 会员风采的栏目 [https://gitee.com/gitee-stars/](https://gitee.com/gitee-stars/)
80+
## 提交问题
81+
如果你有问题或者发现程序有BUG和意见,可以在issues中提交

XEngine_APPClient/VSCopy-x86.bat

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,16 @@
1+
copy /y "%XEngine_Lib32%\XEngine_BaseLib\XEngine_BaseLib.dll" "./"
2+
copy /y "%XEngine_Lib32%\XEngine_Core\XEngine_OPenSsl.dll" "./"
3+
copy /y "%XEngine_Lib32%\XEngine_Client\XClient_Socket.dll" "./"
4+
copy /y "%XEngine_Lib32%\XEngine_AVCoder\XEngine_AVHelp.dll" "./"
5+
6+
copy /y "%XEngine_Lib32%\XEngine_LibEx\AVCodec\avcodec-58.dll" "./"
7+
copy /y "%XEngine_Lib32%\XEngine_LibEx\AVCodec\avdevice-58.dll" "./"
8+
copy /y "%XEngine_Lib32%\XEngine_LibEx\AVCodec\avfilter-7.dll" "./"
9+
copy /y "%XEngine_Lib32%\XEngine_LibEx\AVCodec\avformat-58.dll" "./"
10+
copy /y "%XEngine_Lib32%\XEngine_LibEx\AVCodec\avutil-56.dll" "./"
11+
copy /y "%XEngine_Lib32%\XEngine_LibEx\AVCodec\postproc-55.dll" "./"
12+
copy /y "%XEngine_Lib32%\XEngine_LibEx\AVCodec\swresample-3.dll" "./"
13+
copy /y "%XEngine_Lib32%\XEngine_LibEx\AVCodec\swscale-5.dll" "./"
14+
15+
copy /y "%XEngine_Lib32%\XEngine_LibEx\libcrypto-3.dll" "./"
16+
copy /y "%XEngine_Lib32%\XEngine_LibEx\libssl-3.dll" "./"
Lines changed: 31 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,31 @@
1+
2+
Microsoft Visual Studio Solution File, Format Version 12.00
3+
# Visual Studio Version 17
4+
VisualStudioVersion = 17.1.32328.378
5+
MinimumVisualStudioVersion = 10.0.40219.1
6+
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "XEngine_APPJT1078", "XEngine_APPJT1078\XEngine_APPJT1078.vcxproj", "{02EFC90F-2105-4681-BCFC-9B16D20AB235}"
7+
EndProject
8+
Global
9+
GlobalSection(SolutionConfigurationPlatforms) = preSolution
10+
Debug|x64 = Debug|x64
11+
Debug|x86 = Debug|x86
12+
Release|x64 = Release|x64
13+
Release|x86 = Release|x86
14+
EndGlobalSection
15+
GlobalSection(ProjectConfigurationPlatforms) = postSolution
16+
{02EFC90F-2105-4681-BCFC-9B16D20AB235}.Debug|x64.ActiveCfg = Debug|x64
17+
{02EFC90F-2105-4681-BCFC-9B16D20AB235}.Debug|x64.Build.0 = Debug|x64
18+
{02EFC90F-2105-4681-BCFC-9B16D20AB235}.Debug|x86.ActiveCfg = Debug|Win32
19+
{02EFC90F-2105-4681-BCFC-9B16D20AB235}.Debug|x86.Build.0 = Debug|Win32
20+
{02EFC90F-2105-4681-BCFC-9B16D20AB235}.Release|x64.ActiveCfg = Release|x64
21+
{02EFC90F-2105-4681-BCFC-9B16D20AB235}.Release|x64.Build.0 = Release|x64
22+
{02EFC90F-2105-4681-BCFC-9B16D20AB235}.Release|x86.ActiveCfg = Release|Win32
23+
{02EFC90F-2105-4681-BCFC-9B16D20AB235}.Release|x86.Build.0 = Release|Win32
24+
EndGlobalSection
25+
GlobalSection(SolutionProperties) = preSolution
26+
HideSolutionNode = FALSE
27+
EndGlobalSection
28+
GlobalSection(ExtensibilityGlobals) = postSolution
29+
SolutionGuid = {CC8142BD-8426-4A48-94DD-7560D3BA8C15}
30+
EndGlobalSection
31+
EndGlobal
107 KB
Binary file not shown.

0 commit comments

Comments
 (0)