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=a6485a4de8118aabb2d8413df7cefb6c27e70468;hpb=543e18726214aa789acecba5615fff1bec83d4cc;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 a6485a4de..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
@@ -419,7 +419,7 @@
                 <div class="form-group" formGroupName="http">
                   <my-peertube-checkbox
                     inputName="importVideosHttpEnabled" formControlName="enabled"
-                    i18n-labelText labelText="Allow import with HTTP URL (i.e. YouTube)"
+                    i18n-labelText labelText="Allow import with HTTP URL (e.g. YouTube)"
                   ></my-peertube-checkbox>
                 </div>
 
@@ -701,7 +701,28 @@
 
       <ng-template ngbNavContent>
 
-        <div class="form-row mt-5"> <!-- transcoding grid -->
+        <div class="form-row mt-4"> <!-- transcoding grid -->
+          <div class="form-group col-12 col-lg-4 col-xl-3"></div>
+          <div class="form-group form-group-right col-12 col-lg-8">
+
+            <div class="callout callout-info">
+              <span i18n>
+                Estimating a server's capacity to transcode and stream videos isn't easy and we can't tune PeerTube automatically.
+              </span>
+              <span i18n>
+                However, you may want to read our guidelines before tweaking the following values.
+              </span>
+
+              <div class="callout-container">
+                <a class="callout-link" target="_blank" rel="noopener noreferrer" href="https://docs.joinpeertube.org/#/admin-configuration?id=transcoding" i18n>Read guidelines</a>
+              </div>
+            </div>
+
+
+          </div>
+        </div>
+
+        <div class="form-row mt-2"> <!-- transcoding grid -->
           <div class="form-group col-12 col-lg-4 col-xl-3">
             <div i18n class="inner-form-title">TRANSCODING</div>
             <div i18n class="inner-form-description">
@@ -714,89 +735,119 @@
 
             <ng-container formGroupName="transcoding">
 
-              <div class="form-group">
-                <my-peertube-checkbox inputName="transcodingEnabled" formControlName="enabled">
+              <div class="form-group mb-0 col-12 col-xl-11">
+                <my-peertube-checkbox inputName="transcodingEnabled" formControlName="enabled" [recommended]="true">
                   <ng-template ptTemplate="label">
                     <ng-container i18n>Transcoding enabled</ng-container>
                   </ng-template>
 
-                  <ng-template ptTemplate="help">
-                    <ng-container i18n>If you disable transcoding, many videos from your users will not work!</ng-container>
-                  </ng-template>
-
                   <ng-container ngProjectAs="extra">
 
-                    <div class="form-group" [ngClass]="{ 'disabled-checkbox-extra': !isTranscodingEnabled() }">
-                      <my-peertube-checkbox
-                        inputName="transcodingAllowAdditionalExtensions" formControlName="allowAdditionalExtensions"
-                        i18n-labelText labelText="Allow additional extensions"
-                      >
-                        <ng-container ngProjectAs="description">
-                          <span i18n>Allows users to upload .mkv, .mov, .avi, .wmv, .flv, .f4v, .3g2, .3gp, .mts, m2ts, .mxf, .nut videos.</span>
-                        </ng-container>
-                      </my-peertube-checkbox>
-                    </div>
-
-                    <div class="form-group" [ngClass]="{ 'disabled-checkbox-extra': !isTranscodingEnabled() }">
-                      <my-peertube-checkbox
-                        inputName="transcodingAllowAudioFiles" formControlName="allowAudioFiles"
-                        i18n-labelText labelText="Allow audio files upload"
-                      >
-                        <ng-container ngProjectAs="description">
-                          <span i18n>Allows users to upload audio files that will be merged with the preview file on upload.</span>
-                        </ng-container>
-                      </my-peertube-checkbox>
-                    </div>
+                    <div class="callout callout-light pt-2 pb-0">
+                      <label i18n>Input formats</label>
 
-                    <ng-container formGroupName="webtorrent">
                       <div class="form-group" [ngClass]="{ 'disabled-checkbox-extra': !isTranscodingEnabled() }">
                         <my-peertube-checkbox
-                          inputName="transcodingWebTorrentEnabled" formControlName="enabled"
-                          i18n-labelText labelText="WebTorrent support enabled"
+                          inputName="transcodingAllowAdditionalExtensions" formControlName="allowAdditionalExtensions"
+                          i18n-labelText labelText="Allow additional extensions"
                         >
-                          <ng-template ptTemplate="help">
-                            <ng-container i18n>
-                              <p>If you also enabled HLS support, it will multiply videos storage by 2</p>
-
-                              <br />
-
-                              <strong>If disabled, breaks federation with PeerTube instances < 2.1</strong>
-                            </ng-container>
-                          </ng-template>
+                          <ng-container ngProjectAs="description">
+                            <span i18n>Allows users to upload .mkv, .mov, .avi, .wmv, .flv, .f4v, .3g2, .3gp, .mts, m2ts, .mxf, or .nut videos.</span>
+                          </ng-container>
                         </my-peertube-checkbox>
                       </div>
-                    </ng-container>
-
-                    <ng-container formGroupName="hls">
+  
                       <div class="form-group" [ngClass]="{ 'disabled-checkbox-extra': !isTranscodingEnabled() }">
                         <my-peertube-checkbox
-                          inputName="transcodingHlsEnabled" formControlName="enabled"
-                          i18n-labelText labelText="HLS with P2P support enabled"
+                          inputName="transcodingAllowAudioFiles" formControlName="allowAudioFiles"
+                          i18n-labelText labelText="Allow audio files upload"
                         >
-                          <ng-template ptTemplate="help">
-                            <ng-container i18n>
-                              <strong>Requires ffmpeg >= 4.1</strong>
-
-                              <p>Generate HLS playlists and fragmented MP4 files resulting in a better playback than with the current default player:</p>
-                              <ul>
-                                <li>Resolution change is smoother</li>
-                                <li>Faster playback in particular with long videos</li>
-                                <li>More stable playback (less bugs/infinite loading)</li>
-                              </ul>
-
-                              <p>If you also enabled WebTorrent support, it will multiply videos storage by 2</p>
-                            </ng-container>
-                          </ng-template>
+                          <ng-container ngProjectAs="description">
+                            <div i18n>Allows users to upload .mp3, .ogg, .wma, .flac, .aac, or .ac3 audio files.</div>
+                            <div i18n>The file will be merged in a still image video with the preview file on upload.</div>
+                          </ng-container>
                         </my-peertube-checkbox>
                       </div>
-                    </ng-container>
+                    </div>
+
+                    <div class="callout callout-light pt-2 mt-2 pb-0">
+                      <label i18n>Output formats</label>
+
+                      <ng-container formGroupName="webtorrent">
+                        <div class="form-group" [ngClass]="{ 'disabled-checkbox-extra': !isTranscodingEnabled() }">
+                          <my-peertube-checkbox
+                            inputName="transcodingWebTorrentEnabled" formControlName="enabled"
+                            i18n-labelText labelText="WebTorrent enabled"
+                          >
+                            <ng-template ptTemplate="help">
+                              <ng-container i18n>
+                                <p>If you also enabled HLS support, it will multiply videos storage by 2</p>
+      
+                                <br />
+      
+                                <strong>If disabled, breaks federation with PeerTube instances < 2.1</strong>
+                              </ng-container>
+                            </ng-template>
+                          </my-peertube-checkbox>
+                        </div>
+                      </ng-container>
+      
+                      <ng-container formGroupName="hls">
+                        <div class="form-group" [ngClass]="{ 'disabled-checkbox-extra': !isTranscodingEnabled() }">
+                          <my-peertube-checkbox
+                            inputName="transcodingHlsEnabled" formControlName="enabled"
+                            i18n-labelText labelText="HLS with P2P support enabled"
+                            [recommended]="true"
+                          >
+                            <ng-template ptTemplate="help">
+                              <ng-container i18n>
+                                <strong>Requires ffmpeg >= 4.1</strong>
+      
+                                <p>Generate HLS playlists and fragmented MP4 files resulting in a better playback than with plain WebTorrent:</p>
+                                <ul>
+                                  <li>Resolution change is smoother</li>
+                                  <li>Faster playback especially with long videos</li>
+                                  <li>More stable playback (less bugs/infinite loading)</li>
+                                </ul>
+      
+                                <p>If you also enabled WebTorrent support, it will multiply videos storage by 2</p>
+                              </ng-container>
+                            </ng-template>
+                          </my-peertube-checkbox>
+                        </div>
+                      </ng-container>
+
+                      <div class="form-group" [ngClass]="{ 'disabled-checkbox-extra': !isTranscodingEnabled() }">
+                        <label i18n>Resolutions to generate per enabled format</label>
+        
+                        <div class="ml-2 mt-2 d-flex flex-column">
+                          <ng-container formGroupName="resolutions">
+                            <div class="form-group" *ngFor="let resolution of resolutions">
+                              <my-peertube-checkbox
+                                [inputName]="getResolutionKey(resolution.id)" [formControlName]="resolution.id"
+                                labelText="{{ resolution.label }}"
+                              >
+                                <ng-template *ngIf="resolution.description" ptTemplate="help">
+                                  <div [innerHTML]="resolution.description"></div>
+                                </ng-template>
+                              </my-peertube-checkbox>
+                            </div>
+                          </ng-container>
+                        </div>
+                      </div>
+                    </div>
 
                   </ng-container>
                 </my-peertube-checkbox>
               </div>
 
-              <div class="form-group" [ngClass]="{ 'disabled-checkbox-extra': !isTranscodingEnabled() }">
+              <div class="form-group mt-4" [ngClass]="{ 'disabled-checkbox-extra': !isTranscodingEnabled() }">
                 <label i18n for="transcodingThreads">Transcoding threads</label>
+                <span class="text-muted ml-1">
+                  <ng-container *ngIf="getTotalTranscodingThreads().atMost" i18n>will claim at most {{ getTotalTranscodingThreads().value }} {{ getTotalTranscodingThreads().unit }} with live transcoding</ng-container>
+                  <ng-container *ngIf="!getTotalTranscodingThreads().atMost" i18n>will claim at least {{ getTotalTranscodingThreads().value }} {{ getTotalTranscodingThreads().unit }} with live transcoding</ng-container>
+                </span>
+
                 <div class="peertube-select-container">
                   <select id="transcodingThreads" formControlName="threads" class="form-control">
                     <option *ngFor="let transcodingThreadOption of transcodingThreadOptions" [value]="transcodingThreadOption.value">
@@ -807,27 +858,6 @@
                 <div *ngIf="formErrors.transcoding.threads" class="form-error">{{ formErrors.transcoding.threads }}</div>
               </div>
 
-              <div class="form-group" [ngClass]="{ 'disabled-checkbox-extra': !isTranscodingEnabled() }">
-
-                <label i18n>Resolutions to generate</label>
-
-                <div class="ml-2 mt-2 d-flex flex-column">
-                  <ng-container formGroupName="resolutions">
-                    <div class="form-group" *ngFor="let resolution of resolutions">
-                      <my-peertube-checkbox
-                        [inputName]="getResolutionKey(resolution.id)" [formControlName]="resolution.id"
-                        labelText="{{resolution.label}}"
-                      >
-                        <ng-template *ngIf="resolution.description" ptTemplate="help">
-                          <div [innerHTML]="resolution.description"></div>
-                        </ng-template>
-                      </my-peertube-checkbox>
-                    </div>
-                  </ng-container>
-                </div>
-
-              </div>
-
             </ng-container>
 
           </div>
@@ -877,7 +907,7 @@
                     </div>
 
                     <div class="form-group" [ngClass]="{ 'disabled-checkbox-extra': !isLiveEnabled() }">
-                      <label i18n for="liveMaxInstanceLives">Max lives created on your instance (-1 for "unlimited")</label>
+                      <label i18n for="liveMaxInstanceLives">Max simultaneous lives created on your instance <span class="text-muted">(-1 for "unlimited")</span></label>
                       <div class="number-with-unit">
                         <input type="number" name="liveMaxInstanceLives" formControlName="maxInstanceLives" />
                         <span i18n>{form.value['live']['maxInstanceLives'], plural, =1 {live} other {lives}}</span>
@@ -885,7 +915,7 @@
                     </div>
 
                     <div class="form-group" [ngClass]="{ 'disabled-checkbox-extra': !isLiveEnabled() }">
-                      <label i18n for="liveMaxUserLives">Max lives created per user (-1 for "unlimited")</label>
+                      <label i18n for="liveMaxUserLives">Max simultaneous lives created per user <span class="text-muted">(-1 for "unlimited")</span></label>
                       <div class="number-with-unit">
                         <input type="number" name="liveMaxUserLives" formControlName="maxUserLives" />
                         <span i18n>{form.value['live']['maxUserLives'], plural, =1 {live} other {lives}}</span>
@@ -904,54 +934,75 @@
                       </div>
                     </div>
 
-                    <ng-container formGroupName="transcoding">
+                  </ng-container>
+                </my-peertube-checkbox>
+              </div>
+            </ng-container>
+          </div>
+        </div>
+
+        <div class="form-row"> <!-- transcoding live streams grid -->
+          <div class="form-group col-12 col-lg-4 col-xl-3">
+            <div i18n class="inner-form-title">TRANSCODING</div>
+            <div i18n class="inner-form-description">
+              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.
+            </div>
+          </div>
+
+          <div class="form-group form-group-right col-12 col-lg-8 col-xl-9">
+
+            <ng-container formGroupName="live">
+              <ng-container formGroupName="transcoding">
+
+                <div class="form-group" [ngClass]="{ 'disabled-checkbox-extra': !isLiveEnabled() }">
+                  <my-peertube-checkbox
+                    inputName="liveTranscodingEnabled" formControlName="enabled"
+                  >
+                    <ng-template ptTemplate="label">
+                      <ng-container i18n>Transcoding enabled for live streams</ng-container>
+                    </ng-template>
+                  </my-peertube-checkbox>
+                </div>
 
-                      <div class="form-group" [ngClass]="{ 'disabled-checkbox-extra': !isLiveEnabled() }">
+                <div class="form-group" [ngClass]="{ 'disabled-checkbox-extra': !isLiveEnabled() || !isLiveTranscodingEnabled() }">
+                  <label i18n for="liveTranscodingThreads">Live resolutions to generate</label>
+
+                  <div class="ml-2 mt-2 d-flex flex-column">
+                    <ng-container formGroupName="resolutions">
+                      <div class="form-group" *ngFor="let resolution of liveResolutions">
                         <my-peertube-checkbox
-                          inputName="liveTranscodingEnabled" formControlName="enabled"
-                          i18n-labelText labelText="Enable live transcoding"
+                          [inputName]="getResolutionKey(resolution.id)" [formControlName]="resolution.id"
+                          labelText="{{resolution.label}}"
                         >
-                          <ng-container ngProjectAs="description" i18n>
-                            Requires a lot of CPU!
-                          </ng-container>
+                          <ng-template *ngIf="resolution.description" ptTemplate="help">
+                            <div [innerHTML]="resolution.description"></div>
+                          </ng-template>
                         </my-peertube-checkbox>
                       </div>
+                    </ng-container>
+                  </div>
+                </div>
 
-                      <div class="form-group" [ngClass]="{ 'disabled-checkbox-extra': !isLiveEnabled() || !isLiveTranscodingEnabled() }">
-                        <label i18n for="liveTranscodingThreads">Live transcoding threads</label>
-                        <div class="peertube-select-container">
-                          <select id="liveTranscodingThreads" formControlName="threads" class="form-control">
-                            <option *ngFor="let transcodingThreadOption of transcodingThreadOptions" [value]="transcodingThreadOption.value">
-                              {{ transcodingThreadOption.label }} {transcodingThreadOption.value, plural, =0 {} =1 {thread} other {threads}}
-                            </option>
-                          </select>
-                        </div>
-                        <div *ngIf="formErrors.live.transcoding.threads" class="form-error">{{ formErrors.live.transcoding.threads }}</div>
-                      </div>
-
-                      <div class="form-group" [ngClass]="{ 'disabled-checkbox-extra': !isLiveEnabled() || !isLiveTranscodingEnabled() }">
-                        <label i18n for="liveTranscodingThreads">Live resolutions to generate</label>
+                <div class="form-group" [ngClass]="{ 'disabled-checkbox-extra': !isLiveEnabled() || !isLiveTranscodingEnabled() }">
+                  <label i18n for="liveTranscodingThreads">Live transcoding threads</label>
+                  <span class="text-muted ml-1">
+                    <ng-container *ngIf="getTotalTranscodingThreads().atMost" i18n>will claim at most {{ getTotalTranscodingThreads().value }} {{ getTotalTranscodingThreads().unit }} with VOD transcoding</ng-container>
+                    <ng-container *ngIf="!getTotalTranscodingThreads().atMost" i18n>will claim at least {{ getTotalTranscodingThreads().value }} {{ getTotalTranscodingThreads().unit }} with VOD transcoding</ng-container>
+                  </span>
+
+                  <div class="peertube-select-container">
+                    <select id="liveTranscodingThreads" formControlName="threads" class="form-control">
+                      <option *ngFor="let transcodingThreadOption of transcodingThreadOptions" [value]="transcodingThreadOption.value">
+                        {{ transcodingThreadOption.label }} {transcodingThreadOption.value, plural, =0 {} =1 {thread} other {threads}}
+                      </option>
+                    </select>
+                  </div>
+                  <div *ngIf="formErrors.live.transcoding.threads" class="form-error">{{ formErrors.live.transcoding.threads }}</div>
+                </div>
 
-                        <div class="ml-2 mt-2 d-flex flex-column">
-                          <ng-container formGroupName="resolutions">
-                            <div class="form-group" *ngFor="let resolution of liveResolutions">
-                              <my-peertube-checkbox
-                                [inputName]="getResolutionKey(resolution.id)" [formControlName]="resolution.id"
-                                labelText="{{resolution.label}}"
-                              >
-                                <ng-template *ngIf="resolution.description" ptTemplate="help">
-                                  <div [innerHTML]="resolution.description"></div>
-                                </ng-template>
-                              </my-peertube-checkbox>
-                            </div>
-                          </ng-container>
-                        </div>
-                      </div>
-                    </ng-container>
-                  </ng-container>
-                </my-peertube-checkbox>
-              </div>
+              </ng-container>
             </ng-container>
+
           </div>
         </div>
 
@@ -963,7 +1014,7 @@
 
       <ng-template ngbNavContent>
 
-        <div class="form-row mt-4"> <!-- cache grid -->
+        <div class="form-row mt-5"> <!-- cache grid -->
           <div class="form-group col-12 col-lg-4 col-xl-3">
             <div i18n class="inner-form-title">CACHE</div>
             <div i18n class="inner-form-description">