X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;f=client%2Fsrc%2Fapp%2F%2Badmin%2Fconfig%2Fedit-custom-config%2Fedit-live-configuration.component.html;h=ae79e54fcdf553f1cc873de5fa9f2ee08fbb1db2;hb=6c1da7937cedbc1d4013cff0686d785247229c52;hp=4b1a55245bc2af50eca437be64ec85dea204d0c9;hpb=5f46d28ccac4a20fcbb12c96a047a84a08e485ae;p=github%2FChocobozzz%2FPeerTube.git

diff --git a/client/src/app/+admin/config/edit-custom-config/edit-live-configuration.component.html b/client/src/app/+admin/config/edit-custom-config/edit-live-configuration.component.html
index 4b1a55245..ae79e54fc 100644
--- a/client/src/app/+admin/config/edit-custom-config/edit-live-configuration.component.html
+++ b/client/src/app/+admin/config/edit-custom-config/edit-live-configuration.component.html
@@ -1,14 +1,14 @@
 <ng-container [formGroup]="form">
 
-  <div class="form-row mt-5">
-    <div class="form-group col-12 col-lg-4 col-xl-3">
+  <div class="row mt-5">
+    <div class="col-12 col-lg-4 col-xl-3">
       <div i18n class="inner-form-title">LIVE</div>
       <div i18n class="inner-form-description">
         Enable users of your instance to stream live.
       </div>
     </div>
 
-    <div class="form-group form-group-right col-12 col-lg-8 col-xl-9">
+    <div class="col-12 col-lg-8 col-xl-9">
 
       <ng-container formGroupName="live">
 
@@ -25,40 +25,60 @@
 
             <ng-container ngProjectAs="extra">
 
-              <div class="form-group" [ngClass]="{ 'disabled-checkbox-extra': !isLiveEnabled() }">
+              <div class="form-group" [ngClass]="getDisabledLiveClass()">
                 <my-peertube-checkbox
                   inputName="liveAllowReplay" formControlName="allowReplay"
                   i18n-labelText labelText="Allow your users to automatically publish a replay of their live"
+                >
+                </my-peertube-checkbox>
+              </div>
+
+              <div class="form-group" formGroupName="latencySetting" [ngClass]="getDisabledLiveClass()">
+                <my-peertube-checkbox
+                  inputName="liveLatencySettingEnabled" formControlName="enabled"
+                  i18n-labelText labelText="Allow your users to change live latency"
                 >
                   <ng-container ngProjectAs="description" i18n>
-                    If the user quota is reached, PeerTube will automatically terminate the live streaming
+                    Small latency disables P2P and high latency can increase P2P ratio
                   </ng-container>
+
                 </my-peertube-checkbox>
               </div>
 
-              <div class="form-group" [ngClass]="{ 'disabled-checkbox-extra': !isLiveEnabled() }">
-                <label i18n for="liveMaxInstanceLives">Max simultaneous lives created on your instance <span class="text-muted">(-1 for "unlimited")</span></label>
+              <div class="form-group" [ngClass]="getDisabledLiveClass()">
+                <label i18n for="liveMaxInstanceLives">Max simultaneous lives created on your instance</label>
+
+                <span class="ms-2 small muted">(-1 for "unlimited")</span>
+
                 <div class="number-with-unit">
                   <input type="number" name="liveMaxInstanceLives" formControlName="maxInstanceLives" />
                   <span i18n>{form.value['live']['maxInstanceLives'], plural, =1 {live} other {lives}}</span>
                 </div>
+
+                <div *ngIf="formErrors.live.maxInstanceLives" class="form-error">{{ formErrors.live.maxInstanceLives }}</div>
               </div>
 
-              <div class="form-group" [ngClass]="{ 'disabled-checkbox-extra': !isLiveEnabled() }">
-                <label i18n for="liveMaxUserLives">Max simultaneous lives created per user <span class="text-muted">(-1 for "unlimited")</span></label>
+              <div class="form-group" [ngClass]="getDisabledLiveClass()">
+                <label i18n for="liveMaxUserLives">Max simultaneous lives created per user</label>
+                <span class="ms-2 small muted">(-1 for "unlimited")</span>
+
                 <div class="number-with-unit">
                   <input type="number" name="liveMaxUserLives" formControlName="maxUserLives" />
                   <span i18n>{form.value['live']['maxUserLives'], plural, =1 {live} other {lives}}</span>
                 </div>
+
+                <div *ngIf="formErrors.live.maxUserLives" class="form-error">{{ formErrors.live.maxUserLives }}</div>
               </div>
 
-              <div class="form-group" [ngClass]="{ 'disabled-checkbox-extra': !isLiveEnabled() }">
+              <div class="form-group" [ngClass]="getDisabledLiveClass()">
                 <label i18n for="liveMaxDuration">Max live duration</label>
 
                 <my-select-options
                   labelForId="liveMaxDuration" [items]="liveMaxDurationOptions" formControlName="maxDuration"
                   bindLabel="label" bindValue="value" [clearable]="false" [searchable]="true"
                 ></my-select-options>
+
+                <div *ngIf="formErrors.live.maxDuration" class="form-error">{{ formErrors.live.maxDuration }}</div>
               </div>
 
             </ng-container>
@@ -68,20 +88,20 @@
     </div>
   </div>
 
-  <div class="form-row"> <!-- transcoding live streams grid -->
-    <div class="form-group col-12 col-lg-4 col-xl-3">
+  <div class="row"> <!-- transcoding live streams grid -->
+    <div class="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">
+    <div class="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() }">
+          <div class="form-group" [ngClass]="getDisabledLiveClass()">
             <my-peertube-checkbox
               inputName="liveTranscodingEnabled" formControlName="enabled"
             >
@@ -91,11 +111,12 @@
             </my-peertube-checkbox>
           </div>
 
-          <div class="form-group" [ngClass]="{ 'disabled-checkbox-extra': !isLiveEnabled() || !isLiveTranscodingEnabled() }">
+          <div class="form-group" [ngClass]="getDisabledLiveTranscodingClass()">
             <label i18n for="liveTranscodingThreads">Live resolutions to generate</label>
 
-            <div class="ml-2 mt-2 d-flex flex-column">
+            <div class="ms-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"
@@ -106,15 +127,22 @@
                     </ng-template>
                   </my-peertube-checkbox>
                 </div>
+
               </ng-container>
             </div>
           </div>
 
-          <div class="form-group" [ngClass]="{ 'disabled-checkbox-extra': !isLiveEnabled() || !isLiveTranscodingEnabled() }">
+          <div class="form-group" [ngClass]="getDisabledLiveTranscodingClass()">
             <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 class="small muted ms-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>
 
             <my-select-custom-value
@@ -126,24 +154,18 @@
             <div *ngIf="formErrors.live.transcoding.threads" class="form-error">{{ formErrors.live.transcoding.threads }}</div>
           </div>
 
-          <div class="form-group mt-4" [ngClass]="{ 'disabled-checkbox-extra': !isLiveEnabled() || !isLiveTranscodingEnabled() }">
+          <div class="form-group mt-4" [ngClass]="getDisabledLiveTranscodingClass()">
             <label i18n for="liveTranscodingProfile">Live transcoding profile</label>
-            <span class="text-muted ml-1" i18n>new live transcoding profiles can be added by PeerTube plugins</span>
+            <span class="small muted ms-1" i18n>new live transcoding profiles can be added by PeerTube plugins</span>
 
             <my-select-options
               id="liveTranscodingProfile"
               formControlName="profile"
-              [items]="getAvailableTranscodingProfile()"
+              [items]="transcodingProfiles"
               [clearable]="false"
             >
-              <ng-template ng-option-tmp let-item="item" let-index="index">
-                {{ item }}
-                <ng-container *ngIf="item === 'default'">
-                  <br>
-                  <span class="text-muted" i18n>x264, targeting maximum device compatibility</span>
-                </ng-container>
-              </ng-template>
             </my-select-options>
+
             <div *ngIf="formErrors.live.transcoding.profile" class="form-error">{{ formErrors.live.transcoding.profile }}</div>
           </div>