Skip to content

Transcode: Bugfix: Fix loop transcoding with host. #3516. v6.0.168 v7.0.41 #4325

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
winlinvip merged 7 commits into from
Jun 4, 2025
Merged

Transcode: Bugfix: Fix loop transcoding with host. #3516. v6.0.168 v7.0.41 #4325

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
e464d9b
fix bug: #3516
duiniuluantanqin Apr 16, 2025
fdafeab
Merge branch 'develop' into fix-bug-isue-3516
duiniuluantanqin Apr 17, 2025
d907844
Merge branch 'develop' into fix-bug-isue-3516
duiniuluantanqin Apr 26, 2025
331ed7e
Merge branch 'develop' into fix-bug-isue-3516
duiniuluantanqin May 9, 2025
d57468a
Merge branch 'develop' into fix-bug-isue-3516
duiniuluantanqin May 29, 2025
fabd910
Merge branch 'develop' into pr-fix-bug-isue-3516
winlinvip Jun 4, 2025
11eab13
Update release to v6.0.168 v7.0.41
winlinvip Jun 4, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions trunk/doc/CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@ The changelog for SRS.
<a name="v7-changes"></a>

## SRS 7.0 Changelog
* v7.0, 2025-06-04, Merge [#4325](https://github.com/ossrs/srs/pull/4325): fix bug: loop transcoding #3516. v7.0.41 (#4325)
* v7.0, 2025-06-04, Merge [#4341](https://github.com/ossrs/srs/pull/4341): Update the release in the README for consistent. v7.0.40 (#4341)
* v7.0, 2025-06-04, Merge [#4368](https://github.com/ossrs/srs/pull/4368): Update the codename for version 7.0 to "Kai". v7.0.39 (#4368)
* v7.0, 2025-06-01, Merge [#4366](https://github.com/ossrs/srs/pull/4366): Script: Use clang-format to unify the coding style. v7.0.38 (#4366)
Expand Down Expand Up @@ -51,6 +52,7 @@ The changelog for SRS.
<a name="v6-changes"></a>

## SRS 6.0 Changelog
* v6.0, 2025-06-04, Merge [#4325](https://github.com/ossrs/srs/pull/4325): fix bug: loop transcoding #3516. v6.0.168 (#4325)
* v6.0, 2025-05-29, Merge [#4356](https://github.com/ossrs/srs/pull/4356): RTMP: Use extended timestamp as delta when chunk fmt=1/2. v6.0.167 (#4356)
* v6.0, 2025-03-21, Merge [#4303](https://github.com/ossrs/srs/pull/4303): replace values with enums. v6.0.165 (#4303)
* v6.0, 2025-03-20, Merge [#4305](https://github.com/ossrs/srs/pull/4305): free sample to prevent memory leak. v6.0.164 (#4305)
Expand Down
8 changes: 4 additions & 4 deletions trunk/src/app/srs_app_encoder.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -247,11 +247,11 @@ srs_error_t SrsEncoder::initialize_ffmpeg(SrsFFMPEG* ffmpeg, SrsRequest* req, Sr
input += srs_int2str(req->port);
input += "/";
input += req->app;
input += "?vhost=";
input += req->vhost;
input += "/";
input += req->stream;

input += "?vhost=";
input += req->vhost;

// stream name: vhost/app/stream for print
input_stream_name = req->vhost;
input_stream_name += "/";
Expand Down Expand Up @@ -288,7 +288,7 @@ srs_error_t SrsEncoder::initialize_ffmpeg(SrsFFMPEG* ffmpeg, SrsRequest* req, Sr
}
log_file += ".log";
}

// important: loop check, donot transcode again.
std::vector<std::string>::iterator it;
it = std::find(_transcoded_url.begin(), _transcoded_url.end(), input);
Expand Down
2 changes: 1 addition & 1 deletion trunk/src/core/srs_core_version6.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,6 @@

#define VERSION_MAJOR 6
#define VERSION_MINOR 0
#define VERSION_REVISION 167
#define VERSION_REVISION 168

#endif
2 changes: 1 addition & 1 deletion trunk/src/core/srs_core_version7.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,6 @@

#define VERSION_MAJOR 7
#define VERSION_MINOR 0
#define VERSION_REVISION 40
#define VERSION_REVISION 41

#endif
Loading