X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;f=client%2Fsrc%2Fapp%2F%2Badmin%2Fconfig%2Fedit-custom-config%2Fedit-custom-config.component.html;h=e2f3a196e24864656b205f166d869ce39e57aa95;hb=728a1236aece26bce6452c440cf85622548afab9;hp=2f3202e06d10e3a3984bae5754a7a0962d9aadd2;hpb=fb7194043d0486ce0a6a40b2ffbdf32878c33a6f;p=github%2FChocobozzz%2FPeerTube.git diff --git a/client/src/app/+admin/config/edit-custom-config/edit-custom-config.component.html b/client/src/app/+admin/config/edit-custom-config/edit-custom-config.component.html index 2f3202e06..e2f3a196e 100644 --- a/client/src/app/+admin/config/edit-custom-config/edit-custom-config.component.html +++ b/client/src/app/+admin/config/edit-custom-config/edit-custom-config.component.html @@ -162,11 +162,11 @@
- +
A single person? A non-profit? A company?
@@ -174,35 +174,35 @@
- +
To share your personal videos? To open registrations and allow people to upload what they want?
- + >
{{ formErrors.instance.creationReason }}
- +
It's important to know for users who want to register on your instance
- + >
{{ formErrors.instance.maintenanceLifetime }}
- +
With your own funds? With user donations? Advertising?
- + >
{{ formErrors.instance.businessModel }}
@@ -221,7 +221,7 @@
i.e. 2vCore 2GB RAM, a direct the link to the server you rent, etc.
@@ -243,7 +243,7 @@
APPEARANCE
-
+
Use plugins & themes for more involved changes, or add slight customizations.
@@ -351,6 +351,8 @@ > ⚠️ This functionality requires a lot of attention and extra moderation. + + - +
+ + {form.value['signup']['limit'], plural, =1 {user} other {users}} +
{{ formErrors.signup.limit }}
Signup won't be limited to a fixed number of users.
@@ -414,7 +419,7 @@
@@ -466,7 +471,7 @@ i18n-labelText labelText="Allow users to do remote URI/handle search" > - Allow your users to look up remote videos/actors by their URI, that may not be federated with your instance + Allow your users to look up remote videos/actors that may not be federated with your instance
@@ -477,7 +482,7 @@ i18n-labelText labelText="Allow anonymous to do remote URI/handle search" > - Allow anonymous users to look up remote videos/actors by their URI, that may not be federated with your instance + Allow anonymous users to look up remote videos/actors that may not be federated with your instance
@@ -642,15 +647,7 @@ - - - - - Services - - - -
+
TWITTER
@@ -682,7 +679,7 @@ If your instance is explicitly allowed by Twitter, a video player will be embedded in the Twitter feed on PeerTube video share.
- If the instance is not, we use an image link card that will redirect on your PeerTube instance.

+ If the instance is not, we use an image link card that will redirect to your PeerTube instance.

Check this checkbox, save the configuration and test with a video URL of your instance (https://example.com/videos/watch/blabla) on https://cards-dev.twitter.com/validator to see if you instance is allowed. @@ -699,91 +696,136 @@ -
- Live streaming + + Transcoding -
+
+
+
+ +
+ + Estimating a server's capacity to transcode and stream videos isn't easy and we can't tune PeerTube automatically. + + + However, you may want to read our guidelines before tweaking the following values. + + +
+ Read guidelines +
+
+ + +
+
+ +
-
LIVE
+
TRANSCODING
- Add ability for your users to do live streaming on your instance. + Process uploaded videos so that they are in a streamable form that any device can play. Though costly in + resources, this is a critical part of PeerTube, so tread carefully.
- + -
- +
+ - Allow live streaming + Transcoding enabled - - ⚠️ Enabling live streaming requires trust in your users and extra moderation work - - -
- - - If the user quota is reached, PeerTube will automatically terminate the live streaming - - -
+
+ -
- -
- +
+ + + Allows users to upload .mkv, .mov, .avi, .wmv, .flv, .f4v, .3g2, .3gp, .mts, m2ts, .mxf, or .nut videos. + +
-
- - - -
+ +
- - Requires a lot of CPU! + +
Allows users to upload .mp3, .ogg, .wma, .flac, .aac, or .ac3 audio files.
+
The file will be merged in a still image video with the preview file on upload.
+
-
- -
- -
-
{{ formErrors.live.transcoding.threads }}
-
+
+ -
- + +
+ + + +

If you also enabled HLS support, it will multiply videos storage by 2

+ +
+ + If disabled, breaks federation with PeerTube instances < 2.1 + + + +
+ + + +
+ + + + Requires ffmpeg >= 4.1 + +

Generate HLS playlists and fragmented MP4 files resulting in a better playback than with plain WebTorrent:

+
    +
  • Resolution change is smoother
    • +
  • Faster playback especially with long videos
    • +
  • More stable playback (less bugs/infinite loading)
    • +
+ +

If you also enabled WebTorrent support, it will multiply videos storage by 2

+ + + +
+ +
+ +
-
+
@@ -793,157 +835,186 @@
- +
+
+ +
+ + + will claim at most {{ getTotalTranscodingThreads().value }} {{ getTotalTranscodingThreads().unit }} with live transcoding + will claim at least {{ getTotalTranscodingThreads().value }} {{ getTotalTranscodingThreads().unit }} with live transcoding + + +
+ +
+
{{ formErrors.transcoding.threads }}
+
+ +
-
+ - - Advanced configuration + + Live streaming -
+
-
TRANSCODING
+
LIVE
- Process uploaded videos so that they are in a streamable form that any device can play. Though costly in - resources, this is a critical part of PeerTube, so tread carefully. + Enable users of your instance to stream live.
- +
- + - Transcoding enabled + Allow live streaming - - If you disable transcoding, many videos from your users will not work! - + + ⚠️ Enabling live streaming requires trust in your users and extra moderation work + -
+
- - Allows users to upload .mkv, .mov, .avi, .wmv, .flv, .f4v, .3g2, .3gp, .mts, m2ts, .mxf, .nut videos. + + If the user quota is reached, PeerTube will automatically terminate the live streaming
-
- - - Allows users to upload audio files that will be merged with the preview file on upload. - - +
+ +
+ + {form.value['live']['maxInstanceLives'], plural, =1 {live} other {lives}} +
- -
- - - - Experimental, we suggest you to not disable webtorrent support for now - -

If you also enabled HLS support, it will multiply videos storage by 2

- -
- - If disabled, breaks federation with PeerTube instances < 2.1 - - - +
+ +
+ + {form.value['live']['maxUserLives'], plural, =1 {live} other {lives}}
- +
- -
- - - - Requires ffmpeg >= 4.1 - -

Generate HLS playlists and fragmented MP4 files resulting in a better playback than with the current default player:

-
    -
  • Resolution change is smoother
    • -
  • Faster playback in particular with long videos
    • -
  • More stable playback (less bugs/infinite loading)
    • -
- -

If you also enabled WebTorrent support, it will multiply videos storage by 2

- - - +
+ +
+
- +
+ +
+
-
- -
- -
-
{{ formErrors.transcoding.threads }}
-
+
+
+
TRANSCODING
+
+ Same as VOD transcoding, transcoding live streams so that they are in a streamable form that any device can play. Requires a beefy CPU, and then some. +
+
-
+
- + + -
- -
- - -
- - -
- +
+ + + Transcoding enabled for live streams + +
-
+
+ +
+ +
+ + +
+ + +
+ +
+
+ +
+ + + will claim at most {{ getTotalTranscodingThreads().value }} {{ getTotalTranscodingThreads().unit }} with VOD transcoding + will claim at least {{ getTotalTranscodingThreads().value }} {{ getTotalTranscodingThreads().unit }} with VOD transcoding + + +
+ +
+
{{ formErrors.live.transcoding.threads }}
+
+ +
-
+ + + + + Advanced configuration + + + +
CACHE
@@ -956,19 +1027,25 @@
- +
+ + {form.value['cache']['previews']['size'], plural, =1 {cached image} other {cached images}} +
{{ formErrors.cache.previews.size }}
- +
+ + {form.value['cache']['captions']['size'], plural, =1 {cached image} other {cached images}} +
{{ formErrors.cache.captions.size }}