diff --git a/trunk/conf/full.conf b/trunk/conf/full.conf index 352f039203..e68faecbb2 100644 --- a/trunk/conf/full.conf +++ b/trunk/conf/full.conf @@ -2307,6 +2307,7 @@ vhost example.transcode.srs.com { # [app] the input stream app. # [stream] the input stream name. # [engine] the transcode engine name. + # [param] the input stream query string. # we also support datetime variables. # [2006], replace this const to current year. # [01], replace this const to current month. @@ -2468,6 +2469,19 @@ vhost copy.transcode.srs.com { } } } +# forward the input stream query string to output +vhost param.transcode.srs.com { + transcode { + enabled on; + ffmpeg ./objs/ffmpeg/bin/ffmpeg; + engine copy { + enabled on; + vcodec copy; + acodec copy; + output rtmp://127.0.0.1:[port]/[app]/[stream]_[engine][param]; + } + } +} # transcode all app and stream of vhost # the comments, read example.transcode.srs.com vhost all.transcode.srs.com { diff --git a/trunk/doc/CHANGELOG.md b/trunk/doc/CHANGELOG.md index e119cb2a5f..39765c70ed 100644 --- a/trunk/doc/CHANGELOG.md +++ b/trunk/doc/CHANGELOG.md @@ -8,6 +8,7 @@ The changelog for SRS. ## SRS 6.0 Changelog +* 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) * 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) * v6.0, 2023-06-20, Merge [#3594](https://github.com/ossrs/srs/pull/3594): Docker: Refine the main dockerfile. v6.0.54 (#3592) * 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. ## SRS 5.0 Changelog +* 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) * 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) * 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) * 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) diff --git a/trunk/src/core/srs_core_version5.hpp b/trunk/src/core/srs_core_version5.hpp index 38115ffe96..2617eab4df 100644 --- a/trunk/src/core/srs_core_version5.hpp +++ b/trunk/src/core/srs_core_version5.hpp @@ -9,6 +9,6 @@ #define VERSION_MAJOR 5 #define VERSION_MINOR 0 -#define VERSION_REVISION 161 +#define VERSION_REVISION 162 #endif diff --git a/trunk/src/core/srs_core_version6.hpp b/trunk/src/core/srs_core_version6.hpp index 4afe897347..3faef30fde 100644 --- a/trunk/src/core/srs_core_version6.hpp +++ b/trunk/src/core/srs_core_version6.hpp @@ -9,6 +9,6 @@ #define VERSION_MAJOR 6 #define VERSION_MINOR 0 -#define VERSION_REVISION 55 +#define VERSION_REVISION 56 #endif