From f5755a17e768609574844e352711c0a5d7d2fe19 Mon Sep 17 00:00:00 2001 From: ziyue <1213642868@qq.com> Date: Mon, 2 Jan 2023 12:04:06 +0800 Subject: [PATCH] =?UTF-8?q?=E5=90=88=E5=B9=B6=20#2183?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- 3rdpart/media-server | 2 +- AUTHORS | 3 ++- README.md | 3 ++- src/Rtsp/RtspSession.h | 2 ++ 4 files changed, 7 insertions(+), 3 deletions(-) diff --git a/3rdpart/media-server b/3rdpart/media-server index 357ef885..51e08ea0 160000 --- a/3rdpart/media-server +++ b/3rdpart/media-server @@ -1 +1 @@ -Subproject commit 357ef885afa5112c8cb873eab21d94d26744c0ab +Subproject commit 51e08ea0cc366ed772e5690f874cebbbeebe591e diff --git a/AUTHORS b/AUTHORS index 26979240..85f82479 100644 --- a/AUTHORS +++ b/AUTHORS @@ -64,4 +64,5 @@ WuPeng [custompal](https://github.com/custompal) [PioLing](https://github.com/PioLing) [KevinZang](https://github.com/ZSC714725) -[gongluck](https://github.com/gongluck) \ No newline at end of file +[gongluck](https://github.com/gongluck) +[a-ucontrol](https://github.com/a-ucontrol) \ No newline at end of file diff --git a/README.md b/README.md index 87abb057..e88fbc33 100644 --- a/README.md +++ b/README.md @@ -80,7 +80,7 @@ - fMP4 - 支持http[s]-fmp4直播 - 支持ws[s]-fmp4直播 - - 支持H264/H265/AAC/G711/OPUS编码 + - 支持H264/H265/AAC/G711/OPUS/MJPEG编码 - HTTP[S]与WebSocket - 服务器支持`目录索引生成`,`文件下载`,`表单提交请求` @@ -290,6 +290,7 @@ bash build_docker_images.sh [PioLing](https://github.com/PioLing) [KevinZang](https://github.com/ZSC714725) [gongluck](https://github.com/gongluck) +[a-ucontrol](https://github.com/a-ucontrol) ## 使用案例 diff --git a/src/Rtsp/RtspSession.h b/src/Rtsp/RtspSession.h index e6831b7a..4b476dd0 100644 --- a/src/Rtsp/RtspSession.h +++ b/src/Rtsp/RtspSession.h @@ -74,6 +74,8 @@ protected: //回复客户端 virtual bool sendRtspResponse(const std::string &res_code, const StrCaseMap &header = StrCaseMap(), const std::string &sdp = "", const char *protocol = "RTSP/1.0"); + +protected: //url解析后保存的相关信息 MediaInfo _media_info;