Skip to content

Commit

Permalink
Enable rtmp2rtc and rtc2rtmp for docker.conf
Browse files Browse the repository at this point in the history
  • Loading branch information
winlinvip committed Jan 17, 2022
1 parent 5d8b950 commit dc43a11
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 2 deletions.
4 changes: 2 additions & 2 deletions trunk/conf/docker.conf
Original file line number Diff line number Diff line change
Expand Up @@ -31,8 +31,8 @@ vhost __defaultVhost__ {
rtc {
enabled on;
# @see https://github.com/ossrs/srs/wiki/v4_CN_WebRTC#rtmp-to-rtc
rtmp_to_rtc off;
rtmp_to_rtc on;
# @see https://github.com/ossrs/srs/wiki/v4_CN_WebRTC#rtc-to-rtmp
rtc_to_rtmp off;
rtc_to_rtmp on;
}
}
1 change: 1 addition & 0 deletions trunk/doc/CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@ The changelog for SRS.
## SRS 4.0 Changelog

* v4.0, 2022-01-17, Release v4.0-b4, 4.0 beta4, v4.0.230, 144393 lines.
* v4.0, 2022-01-17, Enable rtmp2rtc and rtc2rtmp for docker.conf
* v4.0, 2022-01-17, Support docker image for [droplet](https://hub.docker.com/r/ossrs/droplet). v4.0.230
* v4.0, 2022-01-16, Update README for **Cloud Virtual Machine([CN](https://github.com/ossrs/srs/wiki/v4_CN_Home#cloud-virtual-machine) / [EN](https://github.com/ossrs/srs/wiki/v4_EN_Home#cloud-virtual-machine))**
* v4.0, 2022-01-13, Merge [#2872](https://github.com/ossrs/srs/pull/2872): RTC: fix play rtc judge for config rtc2rtmp on. (#2872). v4.0.229
Expand Down

1 comment on commit dc43a11

@winlinvip
Copy link
Member Author

@winlinvip winlinvip commented on dc43a11 Jan 17, 2022

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

docker.confvm.conf中,都开启了这两个选项,rtmp_to_rtcrtc_to_rtmp,性能会比较低。

只有srs.conf 还是默认不开,这样性能比较高。因为我觉得用srs.conf是从源代码编译的,需要原子化的能力更多些。

Please sign in to comment.