diff --git a/api/source/mk_common.cpp b/api/source/mk_common.cpp index cc6b7a71..87bea735 100644 --- a/api/source/mk_common.cpp +++ b/api/source/mk_common.cpp @@ -182,7 +182,7 @@ API_EXPORT uint16_t API_CALL mk_http_server_start(uint16_t port, int ssl) { } return http_server[ssl]->getPort(); } catch (std::exception &ex) { - http_server[ssl] = nullptr;; + http_server[ssl] = nullptr; WarnL << ex.what(); 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(); } catch (std::exception &ex) { - rtsp_server[ssl] = nullptr;; + rtsp_server[ssl] = nullptr; WarnL << ex.what(); 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(); } catch (std::exception &ex) { - rtmp_server[ssl] = nullptr;; + rtmp_server[ssl] = nullptr; WarnL << ex.what(); return 0; } @@ -230,7 +230,7 @@ API_EXPORT uint16_t API_CALL mk_rtp_server_start(uint16_t port){ rtpServer->start(port); return rtpServer->getPort(); } catch (std::exception &ex) { - rtpServer = nullptr;; + rtpServer = nullptr; WarnL << ex.what(); return 0; } @@ -331,7 +331,7 @@ API_EXPORT uint16_t API_CALL mk_srt_server_start(uint16_t port) { return srtServer->getPort(); } catch (std::exception &ex) { - srtServer = nullptr;; + srtServer = nullptr; WarnL << ex.what(); return 0; } @@ -347,7 +347,7 @@ API_EXPORT uint16_t API_CALL mk_shell_server_start(uint16_t port){ shell_server->start(port); return shell_server->getPort(); } catch (std::exception &ex) { - shell_server = nullptr;; + shell_server = nullptr; WarnL << ex.what(); return 0; } diff --git a/webrtc/Sdp.cpp b/webrtc/Sdp.cpp index 7d9b99d5..90618c0a 100644 --- a/webrtc/Sdp.cpp +++ b/webrtc/Sdp.cpp @@ -1443,7 +1443,8 @@ void RtcConfigure::RtcTrackConfigure::setDefaultSetting(TrackType type){ {RtpExtType::color_space, RtpDirection::sendrecv}, {RtpExtType::video_content_type, RtpDirection::sendrecv}, {RtpExtType::playout_delay, RtpDirection::sendrecv}, - {RtpExtType::video_orientation, RtpDirection::sendrecv}, + //手机端推webrtc 会带有旋转角度,rtc协议能正常播放 其他协议拉流画面旋转 + //{RtpExtType::video_orientation, RtpDirection::sendrecv}, {RtpExtType::toffset, RtpDirection::sendrecv}, {RtpExtType::framemarking, RtpDirection::sendrecv} };