amass/ZLMediaKit
1
0
Fork 0
mirror of https://github.com/ZLMediaKit/ZLMediaKit.git synced 2024-11-22 10:40:05 +08:00
Code Issues Actions 6 Packages Projects Releases Wiki Activity

修复手机推rtc,其他协议拉流画面旋转

Browse Source
This commit is contained in:
Dw9 2022-12-08 21:52:55 +08:00
parent 04422b31b6
commit 9d40c82141
2 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
api/source/mk_common.cpp
View File

@ -182,7 +182,7 @@ API_EXPORT uint16_t API_CALL mk_http_server_start(uint16_t port, int ssl) {
} }
return http_server[ssl]->getPort(); return http_server[ssl]->getPort();
} catch (std::exception &ex) { } catch (std::exception &ex) {
http_server[ssl] = nullptr;; http_server[ssl] = nullptr;
WarnL << ex.what(); WarnL << ex.what();
return 0; return 0;
} }
@ -199,7 +199,7 @@ API_EXPORT uint16_t API_CALL mk_rtsp_server_start(uint16_t port, int ssl) {
} }
return rtsp_server[ssl]->getPort(); return rtsp_server[ssl]->getPort();
} catch (std::exception &ex) { } catch (std::exception &ex) {
rtsp_server[ssl] = nullptr;; rtsp_server[ssl] = nullptr;
WarnL << ex.what(); WarnL << ex.what();
return 0; return 0;
} }
@ -216,7 +216,7 @@ API_EXPORT uint16_t API_CALL mk_rtmp_server_start(uint16_t port, int ssl) {
} }
return rtmp_server[ssl]->getPort(); return rtmp_server[ssl]->getPort();
} catch (std::exception &ex) { } catch (std::exception &ex) {
rtmp_server[ssl] = nullptr;; rtmp_server[ssl] = nullptr;
WarnL << ex.what(); WarnL << ex.what();
return 0; return 0;
} }
@ -230,7 +230,7 @@ API_EXPORT uint16_t API_CALL mk_rtp_server_start(uint16_t port){
rtpServer->start(port); rtpServer->start(port);
return rtpServer->getPort(); return rtpServer->getPort();
} catch (std::exception &ex) { } catch (std::exception &ex) {
rtpServer = nullptr;; rtpServer = nullptr;
WarnL << ex.what(); WarnL << ex.what();
return 0; return 0;
} }
@ -331,7 +331,7 @@ API_EXPORT uint16_t API_CALL mk_srt_server_start(uint16_t port) {
return srtServer->getPort(); return srtServer->getPort();
} catch (std::exception &ex) { } catch (std::exception &ex) {
srtServer = nullptr;; srtServer = nullptr;
WarnL << ex.what(); WarnL << ex.what();
return 0; return 0;
} }
@ -347,7 +347,7 @@ API_EXPORT uint16_t API_CALL mk_shell_server_start(uint16_t port){
shell_server->start<ShellSession>(port); shell_server->start<ShellSession>(port);
return shell_server->getPort(); return shell_server->getPort();
} catch (std::exception &ex) { } catch (std::exception &ex) {
shell_server = nullptr;; shell_server = nullptr;
WarnL << ex.what(); WarnL << ex.what();
return 0; return 0;
} }

3
webrtc/Sdp.cpp
View File

@ -1443,7 +1443,8 @@ void RtcConfigure::RtcTrackConfigure::setDefaultSetting(TrackType type){
{RtpExtType::color_space, RtpDirection::sendrecv}, {RtpExtType::color_space, RtpDirection::sendrecv},
{RtpExtType::video_content_type, RtpDirection::sendrecv}, {RtpExtType::video_content_type, RtpDirection::sendrecv},
{RtpExtType::playout_delay, RtpDirection::sendrecv}, {RtpExtType::playout_delay, RtpDirection::sendrecv},
{RtpExtType::video_orientation, RtpDirection::sendrecv}, //手机端推webrtc 会带有旋转角度，rtc协议能正常播放 其他协议拉流画面旋转
//{RtpExtType::video_orientation, RtpDirection::sendrecv},
{RtpExtType::toffset, RtpDirection::sendrecv}, {RtpExtType::toffset, RtpDirection::sendrecv},
{RtpExtType::framemarking, RtpDirection::sendrecv} {RtpExtType::framemarking, RtpDirection::sendrecv}
}; };