Skip to content

Commit 7ba59c3

Browse files
duiniuluantanqinchundonglinlinxiaozhihong
authored
Improve the usage of "transcode" in the "full.conf" file. v5.0.162, v6.0.56 (#3596)
--------- Co-authored-by: chundonglinlin <[email protected]> Co-authored-by: john <[email protected]>
1 parent 30c2f50 commit 7ba59c3

File tree

4 files changed

+18
-2
lines changed

4 files changed

+18
-2
lines changed

trunk/conf/full.conf

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2307,6 +2307,7 @@ vhost example.transcode.srs.com {
23072307
# [app] the input stream app.
23082308
# [stream] the input stream name.
23092309
# [engine] the transcode engine name.
2310+
# [param] the input stream query string.
23102311
# we also support datetime variables.
23112312
# [2006], replace this const to current year.
23122313
# [01], replace this const to current month.
@@ -2468,6 +2469,19 @@ vhost copy.transcode.srs.com {
24682469
}
24692470
}
24702471
}
2472+
# forward the input stream query string to output
2473+
vhost param.transcode.srs.com {
2474+
transcode {
2475+
enabled on;
2476+
ffmpeg ./objs/ffmpeg/bin/ffmpeg;
2477+
engine copy {
2478+
enabled on;
2479+
vcodec copy;
2480+
acodec copy;
2481+
output rtmp://127.0.0.1:[port]/[app]/[stream]_[engine][param];
2482+
}
2483+
}
2484+
}
24712485
# transcode all app and stream of vhost
24722486
# the comments, read example.transcode.srs.com
24732487
vhost all.transcode.srs.com {

trunk/doc/CHANGELOG.md

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@ The changelog for SRS.
88

99
## SRS 6.0 Changelog
1010

11+
* v6.0, 2023-06-30, Merge [#3596](https://github.com/ossrs/srs/pull/3596): Improve the usage of "transcode" in the "full.conf" file. v6.0.56 (#3596)
1112
* v6.0, 2023-06-21, Merge [#3551](https://github.com/ossrs/srs/pull/3551): H264: Fix H.264 ISOM reserved bit value. v6.0.55 (#3551)
1213
* v6.0, 2023-06-20, Merge [#3594](https://github.com/ossrs/srs/pull/3594): Docker: Refine the main dockerfile. v6.0.54 (#3592)
1314
* v6.0, 2023-06-20, Merge [#3592](https://github.com/ossrs/srs/pull/3592): Fix Permission Issue in depend.sh for OpenSSL Compilation. v6.0.53 (#3592)
@@ -69,6 +70,7 @@ The changelog for SRS.
6970

7071
## SRS 5.0 Changelog
7172

73+
* v5.0, 2023-06-30, Merge [#3596](https://github.com/ossrs/srs/pull/3596): Improve the usage of "transcode" in the "full.conf" file. v5.0.162 (#3596)
7274
* v5.0, 2023-06-21, Merge [#3551](https://github.com/ossrs/srs/pull/3551): H264: Fix H.264 ISOM reserved bit value. v5.0.161 (#3551)
7375
* v5.0, 2023-06-20, Merge [#3592](https://github.com/ossrs/srs/pull/3592): Fix Permission Issue in depend.sh for OpenSSL Compilation. v5.0.159 (#3592)
7476
* v5.0, 2023-06-20, Merge [#3591](https://github.com/ossrs/srs/pull/3591): Fix crash when process rtcp feedback message. v5.0.159 (#3591)

trunk/src/core/srs_core_version5.hpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,6 @@
99

1010
#define VERSION_MAJOR 5
1111
#define VERSION_MINOR 0
12-
#define VERSION_REVISION 161
12+
#define VERSION_REVISION 162
1313

1414
#endif

trunk/src/core/srs_core_version6.hpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,6 @@
99

1010
#define VERSION_MAJOR 6
1111
#define VERSION_MINOR 0
12-
#define VERSION_REVISION 55
12+
#define VERSION_REVISION 56
1313

1414
#endif

0 commit comments

Comments
 (0)