Branch cumulative commit #3446
Open
Branch cumulative commit #3446
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
xia-chu
reviewed
Apr 7, 2024
| * @param stream_id 该端口绑定的流id | ||
| * @return | ||
| */ | ||
| API_EXPORT mk_rtp_server API_CALL mk_rtp_server_create(uint16_t port, int tcp_mode, const char *stream_id); | ||
| API_EXPORT mk_rtp_server API_CALL mk_rtp_server_create(uint16_t port, int tcp_mode, const char *app_name, const char *stream_id); |
There was a problem hiding this comment.
建议新增mk_rtp_server_create2接口 保持api兼容
xia-chu
reviewed
Apr 7, 2024
| @@ -302,6 +302,8 @@ void RtspUrl::setup(bool is_ssl, const string &url, const string &user, const st | |||
| } | |||
|
|
|||
| static void inline checkHost(std::string &host) { | |||
| if (host.size() == 0) | |||
xia-chu
reviewed
Apr 7, 2024
| #else | ||
| #include <iconv.h> | ||
| // 将 GB2312 编码的字符串转换为 UTF-8 编码 | ||
| char *gb2312_to_utf8(const char *gb2312_string) { |
xia-chu
reviewed
Apr 7, 2024
| @@ -63,6 +63,8 @@ void MP4Demuxer::onVideoTrack(uint32_t track, uint8_t object, int width, int hei | |||
| } | |||
| video->setIndex(track); | |||
| _tracks.emplace(track, video); | |||
| if (_on_track_callback) | |||
xia-chu
reviewed
Apr 7, 2024
| @@ -75,6 +77,8 @@ void MP4Demuxer::onAudioTrack(uint32_t track, uint8_t object, int channel_count, | |||
| } | |||
| audio->setIndex(track); | |||
| _tracks.emplace(track, audio); | |||
| if (_on_track_callback) | |||
xia-chu
reviewed
Apr 7, 2024
| _rtcp_sock = std::move(rtcp_sock); | ||
| _app_name = app_name; |
xia-chu
reviewed
Apr 7, 2024
| @@ -119,6 +120,10 @@ class RtcpHelper: public std::enable_shared_from_this<RtcpHelper> { | |||
| } | |||
| } | |||
|
|
|||
| string getAppName() { return _app_name; } | |||
There was a problem hiding this comment.
可以改成 const std::string& getAppName() const
xia-chu
reviewed
Apr 7, 2024
| @@ -119,6 +120,10 @@ class RtcpHelper: public std::enable_shared_from_this<RtcpHelper> { | |||
| } | |||
| } | |||
|
|
|||
| string getAppName() { return _app_name; } | |||
|
|
|||
| string getStreamId() { return _stream_id; } | |||
There was a problem hiding this comment.
可以改成 const std::string& getStreamId() const
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
集成使用ZLM时，修复几处潜在崩溃BUG，添加rtp server自定义app，完善字符串转码支持windos和linux