diff options
author | Chocobozzz <me@florianbigard.com> | 2020-09-17 09:20:52 +0200 |
---|---|---|
committer | Chocobozzz <chocobozzz@cpy.re> | 2020-11-09 15:33:04 +0100 |
commit | c6c0fa6cd8fe8f752463d8982c3dbcd448739c4e (patch) | |
tree | 79304b0152b0a38d33b26e65d4acdad0da4032a7 /config | |
parent | 110d463fece85e87a26aca48a6048ae0017a27b3 (diff) | |
download | PeerTube-c6c0fa6cd8fe8f752463d8982c3dbcd448739c4e.tar.gz PeerTube-c6c0fa6cd8fe8f752463d8982c3dbcd448739c4e.tar.zst PeerTube-c6c0fa6cd8fe8f752463d8982c3dbcd448739c4e.zip |
Live streaming implementation first step
Diffstat (limited to 'config')
-rw-r--r-- | config/default.yaml | 18 | ||||
-rw-r--r-- | config/test.yaml | 54 |
2 files changed, 54 insertions, 18 deletions
diff --git a/config/default.yaml b/config/default.yaml index 0c2d165be..7efaeb5a2 100644 --- a/config/default.yaml +++ b/config/default.yaml | |||
@@ -243,6 +243,24 @@ transcoding: | |||
243 | hls: | 243 | hls: |
244 | enabled: false | 244 | enabled: false |
245 | 245 | ||
246 | live: | ||
247 | enabled: false | ||
248 | |||
249 | rtmp: | ||
250 | port: 1935 | ||
251 | |||
252 | transcoding: | ||
253 | enabled: false | ||
254 | threads: 2 | ||
255 | |||
256 | resolutions: | ||
257 | 240p: false | ||
258 | 360p: false | ||
259 | 480p: false | ||
260 | 720p: false | ||
261 | 1080p: false | ||
262 | 2160p: false | ||
263 | |||
246 | import: | 264 | import: |
247 | # Add ability for your users to import remote videos (from YouTube, torrent...) | 265 | # Add ability for your users to import remote videos (from YouTube, torrent...) |
248 | videos: | 266 | videos: |
diff --git a/config/test.yaml b/config/test.yaml index fb37ff8c7..b9279b5e6 100644 --- a/config/test.yaml +++ b/config/test.yaml | |||
@@ -37,24 +37,24 @@ log: | |||
37 | 37 | ||
38 | contact_form: | 38 | contact_form: |
39 | enabled: true | 39 | enabled: true |
40 | 40 | # | |
41 | redundancy: | 41 | #redundancy: |
42 | videos: | 42 | # videos: |
43 | check_interval: '1 minute' | 43 | # check_interval: '1 minute' |
44 | strategies: | 44 | # strategies: |
45 | - | 45 | # - |
46 | size: '1000MB' | 46 | # size: '1000MB' |
47 | min_lifetime: '10 minutes' | 47 | # min_lifetime: '10 minutes' |
48 | strategy: 'most-views' | 48 | # strategy: 'most-views' |
49 | - | 49 | # - |
50 | size: '1000MB' | 50 | # size: '1000MB' |
51 | min_lifetime: '10 minutes' | 51 | # min_lifetime: '10 minutes' |
52 | strategy: 'trending' | 52 | # strategy: 'trending' |
53 | - | 53 | # - |
54 | size: '1000MB' | 54 | # size: '1000MB' |
55 | min_lifetime: '10 minutes' | 55 | # min_lifetime: '10 minutes' |
56 | strategy: 'recently-added' | 56 | # strategy: 'recently-added' |
57 | min_views: 1 | 57 | # min_views: 1 |
58 | 58 | ||
59 | cache: | 59 | cache: |
60 | previews: | 60 | previews: |
@@ -82,6 +82,24 @@ transcoding: | |||
82 | hls: | 82 | hls: |
83 | enabled: true | 83 | enabled: true |
84 | 84 | ||
85 | live: | ||
86 | enabled: false | ||
87 | |||
88 | rtmp: | ||
89 | port: 1935 | ||
90 | |||
91 | transcoding: | ||
92 | enabled: false | ||
93 | threads: 2 | ||
94 | |||
95 | resolutions: | ||
96 | 240p: false | ||
97 | 360p: false | ||
98 | 480p: false | ||
99 | 720p: false | ||
100 | 1080p: false | ||
101 | 2160p: false | ||
102 | |||
85 | import: | 103 | import: |
86 | videos: | 104 | videos: |
87 | http: | 105 | http: |