Merge pull request #14 from libxengine/develop

V2.7.0.1001 Merge

Author: xengine-qyt

.github/ISSUE_TEMPLATE/bug_report.md

@@ -0,0 +1,38 @@
+---
+name: Bug report
+about: Create a report to help us improve
+title: ''
+labels: ''
+assignees: ''
+
+---
+
+**Describe the bug**
+A clear and concise description of what the bug is.
+
+**To Reproduce**
+Steps to reproduce the behavior:
+1. Go to '...'
+2. Click on '....'
+3. Scroll down to '....'
+4. See error
+
+**Expected behavior**
+A clear and concise description of what you expected to happen.
+
+**Screenshots**
+If applicable, add screenshots to help explain your problem.
+
+**Desktop (please complete the following information):**
+ - OS: [e.g. iOS]
+ - Browser [e.g. chrome, safari]
+ - Version [e.g. 22]
+
+**Smartphone (please complete the following information):**
+ - Device: [e.g. iPhone6]
+ - OS: [e.g. iOS8.1]
+ - Browser [e.g. stock browser, safari]
+ - Version [e.g. 22]
+
+**Additional context**
+Add any other context about the problem here.

.github/ISSUE_TEMPLATE/feature_request.md

@@ -0,0 +1,20 @@
+---
+name: Feature request
+about: Suggest an idea for this project
+title: ''
+labels: ''
+assignees: ''
+
+---
+
+**Is your feature request related to a problem? Please describe.**
+A clear and concise description of what the problem is. Ex. I'm always frustrated when [...]
+
+**Describe the solution you'd like**
+A clear and concise description of what you want to happen.
+
+**Describe alternatives you've considered**
+A clear and concise description of any alternative solutions or features you've considered.
+
+**Additional context**
+Add any other context or screenshots about the feature request here.

CHANGELOG

@@ -1,3 +1,35 @@
+XEngine_StreamMedia V2.7.0.1001
+
+增加:srtp核心代码文件
+增加:HTTP OPTION 选项支持
+增加:编译选项支持SRT协议开关
+更新匹配:XEngine V8.25
+修改:增加RTC的URL名称支持当HTTPAPI访问时候
+修改:srt的SRTSOCKET类型修改为XSOCKET
+修改:stun端口移动为rtc端口
+修改:dtls握手支持
+修改:dtls和stun和srtp包解析分离支持
+修改:继续优化webrtc的sdp处理和打包协议
+修正:srt服务接受数据异常的问题
+修正:没有处理rtc播放请求的问题
+修正:http 的API请求处理错误
+修正:makefile的宏名称不正确
+
+added:srtp core code file
+added:http option supported
+added:build switch and srt protocol support
+update:match xengine v8.25
+modify:added rtc url name when http api verification
+modify:srt SRTSOCKET type to XSOCKET
+modfy:stun port remove rtc port
+modify:dtls handshakes supported
+modify:dtls and stun and srtp packet judgment handle
+modify:continue to improve the sdp of webrtc
+fixed:srt server caused exceptions when recv message
+fixed:not handle webrtc play request
+fixed:http restful api handle error
+fixed:makefile macro name is incorrect
+=======================================================
 XEngine_StreamMedia V2.6.0.1001
 
 增加:ts拉流支持

CODE_OF_CONDUCT.md

@@ -0,0 +1,128 @@
+# Contributor Covenant Code of Conduct
+
+## Our Pledge
+
+We as members, contributors, and leaders pledge to make participation in our
+community a harassment-free experience for everyone, regardless of age, body
+size, visible or invisible disability, ethnicity, sex characteristics, gender
+identity and expression, level of experience, education, socio-economic status,
+nationality, personal appearance, race, religion, or sexual identity
+and orientation.
+
+We pledge to act and interact in ways that contribute to an open, welcoming,
+diverse, inclusive, and healthy community.
+
+## Our Standards
+
+Examples of behavior that contributes to a positive environment for our
+community include:
+
+* Demonstrating empathy and kindness toward other people
+* Being respectful of differing opinions, viewpoints, and experiences
+* Giving and gracefully accepting constructive feedback
+* Accepting responsibility and apologizing to those affected by our mistakes,
+  and learning from the experience
+* Focusing on what is best not just for us as individuals, but for the
+  overall community
+
+Examples of unacceptable behavior include:
+
+* The use of sexualized language or imagery, and sexual attention or
+  advances of any kind
+* Trolling, insulting or derogatory comments, and personal or political attacks
+* Public or private harassment
+* Publishing others' private information, such as a physical or email
+  address, without their explicit permission
+* Other conduct which could reasonably be considered inappropriate in a
+  professional setting
+
+## Enforcement Responsibilities
+
+Community leaders are responsible for clarifying and enforcing our standards of
+acceptable behavior and will take appropriate and fair corrective action in
+response to any behavior that they deem inappropriate, threatening, offensive,
+or harmful.
+
+Community leaders have the right and responsibility to remove, edit, or reject
+comments, commits, code, wiki edits, issues, and other contributions that are
+not aligned to this Code of Conduct, and will communicate reasons for moderation
+decisions when appropriate.
+
+## Scope
+
+This Code of Conduct applies within all community spaces, and also applies when
+an individual is officially representing the community in public spaces.
+Examples of representing our community include using an official e-mail address,
+posting via an official social media account, or acting as an appointed
+representative at an online or offline event.
+
+## Enforcement
+
+Instances of abusive, harassing, or otherwise unacceptable behavior may be
+reported to the community leaders responsible for enforcement at
+[email protected].
+All complaints will be reviewed and investigated promptly and fairly.
+
+All community leaders are obligated to respect the privacy and security of the
+reporter of any incident.
+
+## Enforcement Guidelines
+
+Community leaders will follow these Community Impact Guidelines in determining
+the consequences for any action they deem in violation of this Code of Conduct:
+
+### 1. Correction
+
+**Community Impact**: Use of inappropriate language or other behavior deemed
+unprofessional or unwelcome in the community.
+
+**Consequence**: A private, written warning from community leaders, providing
+clarity around the nature of the violation and an explanation of why the
+behavior was inappropriate. A public apology may be requested.
+
+### 2. Warning
+
+**Community Impact**: A violation through a single incident or series
+of actions.
+
+**Consequence**: A warning with consequences for continued behavior. No
+interaction with the people involved, including unsolicited interaction with
+those enforcing the Code of Conduct, for a specified period of time. This
+includes avoiding interactions in community spaces as well as external channels
+like social media. Violating these terms may lead to a temporary or
+permanent ban.
+
+### 3. Temporary Ban
+
+**Community Impact**: A serious violation of community standards, including
+sustained inappropriate behavior.
+
+**Consequence**: A temporary ban from any sort of interaction or public
+communication with the community for a specified period of time. No public or
+private interaction with the people involved, including unsolicited interaction
+with those enforcing the Code of Conduct, is allowed during this period.
+Violating these terms may lead to a permanent ban.
+
+### 4. Permanent Ban
+
+**Community Impact**: Demonstrating a pattern of violation of community
+standards, including sustained inappropriate behavior,  harassment of an
+individual, or aggression toward or disparagement of classes of individuals.
+
+**Consequence**: A permanent ban from any sort of public interaction within
+the community.
+
+## Attribution
+
+This Code of Conduct is adapted from the [Contributor Covenant][homepage],
+version 2.0, available at
+https://www.contributor-covenant.org/version/2/0/code_of_conduct.html.
+
+Community Impact Guidelines were inspired by [Mozilla's code of conduct
+enforcement ladder](https://github.com/mozilla/diversity).
+
+[homepage]: https://www.contributor-covenant.org
+
+For answers to common questions about this code of conduct, see the FAQ at
+https://www.contributor-covenant.org/faq. Translations are available at
+https://www.contributor-covenant.org/translations.

README.en.md

@@ -29,7 +29,7 @@ Publish Stream:
 | -------- | --------- | -------- | -------- |
 | RTMP     | H264      | AAC      | Completed   |
 | SRT      | H264,H265 | AAC      | Completed   |
-| WEBRTC   | H264      | AAC      | Not Start   |
+| WEBRTC   | H264      | OPUS     | Not Start   |
 | GB28181  | H264      | AAC      | Not Start   |
 | JT1078   | H264      | AAC      | Completed   |
 | XStream  | H264,H265 | AAC      | Completed   |
@@ -42,7 +42,7 @@ Play Stream:
 | RTSP     | H264      | AAC      | Completed   |
 | M3U8     | H264,H265 | AAC      | Completed   |
 | SRT      | H264,H265 | AAC      | Completed   |
-| WEBRTC   | H264      | AAC      | Processing  |
+| WEBRTC   | H264      | OPUS     | Processing  |
 | HTTP-FLV | H264      | AAC      | Completed   |
 | XStream  | H264,H265 | AAC      | Completed   |
 | TS       | H264,H265 | AAC      | Completed   |
@@ -61,12 +61,12 @@ Linux Exection:sudo ./XEngine_LINEnv.sh -i 3
 Macos Exection:./XEngine_LINEnv.sh -i 3  
 
 #### Windows
-use vs open and complie  
-
+use vs open and complie,you need to install vcpkg and install depend library by vcpkg  
+vcpkg.exe install libsrt:x86-windows libsrt:x64-windows libsrtp:x86-windows libsrtp:x64-windows
 #### Linux
 install srt library after Configure Xengine to Completed  
-ubuntu:sudo apt install libsrt-openssl-dev  
-Rockylinux:sudo dnf install srt-devel  
+ubuntu:sudo apt install libsrt-openssl-dev libsrtp2-dev  
+Rockylinux:sudo dnf install srt-devel srtp2-devel  
 
 Linux use Makefile complie  
 UBUNTU22.04 x64 or RockyLinux 9 x64  
@@ -79,7 +79,7 @@ make FLAGS=CleanAll Clear Complie
 
 #### MacOS
 install srt library after Configure Xengine to Completed  
-brew install libsrt  
+brew install libsrt srtp  
 Linux use Makefile to complie,terminal exection,Requires mac 13 and above 
 
 ##### Compile Command

README.md

@@ -32,7 +32,7 @@ c c++ streammedia server
 | -------- | --------- | -------- | -------- |
 | RTMP     | H264      | AAC      | 已完成   |
 | SRT      | H264,H265 | AAC      | 已完成   |
-| WEBRTC   | H264      | AAC      | 未开始   |
+| WEBRTC   | H264      | OPUS     | 未开始   |
 | GB28181  | H264      | AAC      | 未开始   |
 | JT1078   | H264      | AAC      | 已完成   |
 | XStream  | H264,H265 | AAC      | 已完成   |
@@ -45,7 +45,7 @@ c c++ streammedia server
 | RTSP     | H264      | AAC      | 已完成   |
 | M3U8     | H264,H265 | AAC      | 已完成   |
 | SRT      | H264,H265 | AAC      | 已完成   |
-| WEBRTC   | H264      | AAC      | 进行中   |
+| WEBRTC   | H264      | OPUS     | 进行中   |
 | HTTP-FLV | H264      | AAC      | 已完成   |
 | XStream  | H264,H265 | AAC      | 已完成   |
 | TS       | H264,H265 | AAC      | 已完成   |
@@ -69,12 +69,12 @@ macos执行:./XEngine_LINEnv.sh -i 3
 
 使用VS打开并且编译,你需要优先配置XEngine环境才能使用  
 还需要libsrt库,通过vcpkg安装  
-vcpkg.exe install libsrt:x86-windows libsrt:x64-windows
+vcpkg.exe install libsrt:x86-windows libsrt:x64-windows libsrtp:x86-windows libsrtp:x64-windows
 
 #### Linux
 配置完XEngine后需要安装srt库  
-ubuntu:sudo apt install libsrt-openssl-dev  
-Rockylinux:sudo dnf install srt-devel
+ubuntu:sudo apt install libsrt-openssl-dev libsrtp2-dev  
+Rockylinux:sudo dnf install srt-devel srtp2-devel
 
 Linux使用Makefile编译  
 UBUNTU22.04 或者 RockyLinux 9 x64均可
@@ -88,13 +88,16 @@ make FLAGS=CleanAll 清理编译
 
 #### MacOS
 配置完XEngine后需要安装srt库  
-brew install libsrt  
+brew install libsrt srtp  
 使用makefile编译,控制台运行,需要mac 13以及以上版本
 
 ###### 编译命令
 
 参考Linux
 
+## 视频教程
+你也可以观看视频教程来了解我们的代码框架情况:https://www.bilibili.com/video/BV17F4m1M7Ph
+
 ## 使用说明
 
 1. 切换到MASTER分支

SECURITY.md

@@ -0,0 +1,19 @@
+# Security Policy
+
+## Supported Versions
+
+Use this section to tell people about which versions of your project are
+currently being supported with security updates.
+
+| Version | Supported          |
+| ------- | ------------------ |
+| 2.6.x   | :white_check_mark: |
+| < 2.6   | :x:                |
+
+## Reporting a Vulnerability
+
+Use this section to tell people how to report a vulnerability.
+
+Tell them where to go, how often they can expect to get an update on a
+reported vulnerability, what to expect if the vulnerability is accepted or
+declined, etc.