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=5f02d00e8070a7628d362815cd1b469294857d4a;hb=149e4cc597777f2fcf9a62639afeeb0e168cedb2;hp=a297b0c7923bb9cd5bf598a8eaba021bca2ec0d9;hpb=f6f371ae5f10f32bea570819bff0c736148fe202;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 a297b0c79..5f02d00e8 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 @@ -48,11 +48,13 @@
- + +
@@ -60,11 +62,13 @@
- + +
@@ -158,11 +162,11 @@
- +
A single person? A non-profit? A company?
@@ -170,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 }}
@@ -217,7 +221,7 @@
i.e. 2vCore 2GB RAM, a direct the link to the server you rent, etc.
@@ -239,7 +243,7 @@
APPEARANCE
-
+
Use plugins & themes for more involved changes, or add slight customizations.
@@ -265,8 +269,12 @@
@@ -274,6 +282,22 @@
{{ formErrors.instance.defaultClientRoute }}
+
+ + + +
+ +
+
{{ formErrors.trending.videos.algorithms.default }}
+ + +
+
@@ -347,6 +371,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.
@@ -410,7 +439,7 @@
@@ -462,7 +491,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 @@ -473,7 +502,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 @@ -638,19 +667,12 @@ - - - - - Services - - - -
+
TWITTER
- Optional. If any, provide the Twitter account representing your instance to improve link previews. + Provide the Twitter account representing your instance to improve link previews. + If you don't have a Twitter account, just leave the default value.
@@ -678,7 +700,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. @@ -695,12 +717,33 @@ - - Advanced configuration + + VOD 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 +
+
+ + +
+
+ +
TRANSCODING
@@ -713,128 +756,323 @@ -
- +
+ Transcoding enabled - - If you disable transcoding, many videos from your users will not work! - - -
- - - Allows users to upload .mkv, .mov, .avi and .flv videos. - - -
- -
- - - Allows users to upload audio files that will be merged with the preview file on upload. - - -
+
+ -
- - - 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 - - + + Allows users to upload .mkv, .mov, .avi, .wmv, .flv, .f4v, .3g2, .3gp, .mts, .m2ts, .mxf, or .nut videos. +
- -
- - - 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

- - + +
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.
+
- +
+ +
+ + + +
+ + + +

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

+ + + +
+ + +
+ + +
+ +
+ + +
+ + +
+ + + The original file resolution will be the default target if no option is selected. + + +
+
+
-
+
+ + 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 }}
-
+
+ + new transcoding profiles can be added by PeerTube plugins + + + + {{ item }} + +
+ x264, targeting maximum device compatibility + + + +
{{ formErrors.transcoding.profile }}
+
+ + + +
+
+ + + + + + Live streaming + + + +
+
+
LIVE
+
+ Enable users of your instance to stream live. +
+
+ +
+ + + +
+ + + Allow live streaming + + + +
⚠️ Enabling live streaming requires trust in your users and extra moderation work
+
If enabled, your server needs to accept incoming TCP traffic on port {{ liveRTMPPort }}
+ - + -
- -
+
- -
- + + If the user quota is reached, PeerTube will automatically terminate the live streaming +
+ +
+ +
+ + {form.value['live']['maxInstanceLives'], plural, =1 {live} other {lives}} +
+
+ +
+ +
+ + {form.value['live']['maxUserLives'], plural, =1 {live} other {lives}} +
+
+ +
+ + + +
+ + +
+ +
+
+ +
+
+
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 }}
+
+ +
+ + New live transcoding profiles can be added by PeerTube plugins +
+ +
+
{{ formErrors.live.transcoding.profile }}
+
+ +
-
+ + + + + Advanced configuration + + + +
CACHE
@@ -847,19 +1085,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 }}
 @@ -941,9 +1185,15 @@
- It seems like the configuration is invalid. Please search for potential errors in the different tabs. + + It seems like the configuration is invalid. Please search for potential errors in the different tabs. + + + + You cannot allow live replay if you don't enable transcoding. + - +