Skip to content

Commit

Permalink
SRT: use default streamid when empty (#3202)
Browse files Browse the repository at this point in the history
* SRT: use default streamid when empty

* Fix #3198: SRT: Support PUSH SRT by IP and optional port. v5.0.76

Co-authored-by: winlin <winlin@vip.126.com>
  • Loading branch information
xiaozhihong and winlinvip authored Oct 9, 2022
1 parent c12dede commit f1be2eb
Show file tree
Hide file tree
Showing 3 changed files with 5 additions and 3 deletions.
1 change: 1 addition & 0 deletions trunk/doc/CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@ The changelog for SRS.

## SRS 5.0 Changelog

* v5.0, 2022-10-09, Fix [#3198](https://github.com/ossrs/srs/issues/3198): SRT: Support PUSH SRT by IP and optional port. v5.0.76
* v5.0, 2022-10-06, GB28181: Support GB28181-2016 protocol. v5.0.74
* v5.0, 2022-10-05, HTTP: Skip body and left message by upgrade. v5.0.73
* v5.0, 2022-10-02, ST: Support set context id while thread running. v5.0.72
Expand Down
5 changes: 3 additions & 2 deletions trunk/src/app/srs_app_srt_conn.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -256,9 +256,10 @@ srs_error_t SrsMpegtsSrtConn::do_cycle()
return srs_error_wrap(err, "get srt streamid");
}

// Must have streamid, because srt ts packet will convert to rtmp or rtc.
// If streamid empty, using default streamid instead.
if (streamid.empty()) {
return srs_error_new(ERROR_SRT_CONN, "empty srt streamid");
streamid = "#!::r=live/livestream,m=publish";
srs_warn("srt get empty streamid, using default steramid %s instead", streamid.c_str());
}

// Detect streamid of srt to request.
Expand Down
2 changes: 1 addition & 1 deletion trunk/src/core/srs_core_version5.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,6 @@

#define VERSION_MAJOR 5
#define VERSION_MINOR 0
#define VERSION_REVISION 75
#define VERSION_REVISION 76

#endif

0 comments on commit f1be2eb

Please sign in to comment.