aboutsummaryrefslogtreecommitdiffhomepage
path: root/client/src
diff options
context:
space:
mode:
Diffstat (limited to 'client/src')
-rw-r--r--client/src/app/+admin/config/edit-custom-config/edit-custom-config.component.html22
-rw-r--r--client/src/app/+admin/config/edit-custom-config/edit-custom-config.component.ts5
2 files changed, 26 insertions, 1 deletions
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 5e7ab03cd..e057e394e 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
@@ -491,6 +491,28 @@
491 </my-peertube-checkbox> 491 </my-peertube-checkbox>
492 </div> 492 </div>
493 493
494 <ng-container formGroupName="hls">
495 <div class="form-group" >
496 <my-peertube-checkbox
497 inputName="transcodingHlsEnabled" formControlName="enabled"
498 i18n-labelText labelText="HLS support enabled"
499 >
500 <ng-template ptTemplate="help">
501 <ng-container i18n>
502 <strong>Requires ffmpeg >= 4.1 and multiplies videos storage by 2!</strong>
503
504 <p>Generate HLS playlists and fragmented MP4 files resulting in a better playback than with the current default player:</p>
505 <ul>
506 <li>Resolution change is smoother</li>
507 <li>Faster playback in particular with long videos</li>
508 <li>More stable playback (less bugs/infinite loading)</li>
509 </ul>
510 </ng-container>
511 </ng-template>
512 </my-peertube-checkbox>
513 </div>
514 </ng-container>
515
494 <div class="form-group"> 516 <div class="form-group">
495 <label i18n for="transcodingThreads">Transcoding threads</label> 517 <label i18n for="transcodingThreads">Transcoding threads</label>
496 <div class="peertube-select-container"> 518 <div class="peertube-select-container">
diff --git a/client/src/app/+admin/config/edit-custom-config/edit-custom-config.component.ts b/client/src/app/+admin/config/edit-custom-config/edit-custom-config.component.ts
index 0a69f3481..f3fb849bb 100644
--- a/client/src/app/+admin/config/edit-custom-config/edit-custom-config.component.ts
+++ b/client/src/app/+admin/config/edit-custom-config/edit-custom-config.component.ts
@@ -166,7 +166,10 @@ export class EditCustomConfigComponent extends FormReactive implements OnInit {
166 threads: this.customConfigValidatorsService.TRANSCODING_THREADS, 166 threads: this.customConfigValidatorsService.TRANSCODING_THREADS,
167 allowAdditionalExtensions: null, 167 allowAdditionalExtensions: null,
168 allowAudioFiles: null, 168 allowAudioFiles: null,
169 resolutions: {} 169 resolutions: {},
170 hls: {
171 enabled: null
172 }
170 }, 173 },
171 autoBlacklist: { 174 autoBlacklist: {
172 videos: { 175 videos: {