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.ts4
-rw-r--r--client/src/app/+admin/config/edit-custom-config/edit-live-configuration.component.html15
-rw-r--r--client/src/app/+admin/config/edit-custom-config/edit-vod-transcoding.component.html8
3 files changed, 22 insertions, 5 deletions
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 eb892bbfd..ce01f8b59 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
@@ -175,6 +175,7 @@ export class EditCustomConfigComponent extends FormReactive implements OnInit {
175 profile: null, 175 profile: null,
176 concurrency: CONCURRENCY_VALIDATOR, 176 concurrency: CONCURRENCY_VALIDATOR,
177 resolutions: {}, 177 resolutions: {},
178 alwaysTranscodeOriginalResolution: null,
178 hls: { 179 hls: {
179 enabled: null 180 enabled: null
180 }, 181 },
@@ -197,7 +198,8 @@ export class EditCustomConfigComponent extends FormReactive implements OnInit {
197 enabled: null, 198 enabled: null,
198 threads: TRANSCODING_THREADS_VALIDATOR, 199 threads: TRANSCODING_THREADS_VALIDATOR,
199 profile: null, 200 profile: null,
200 resolutions: {} 201 resolutions: {},
202 alwaysTranscodeOriginalResolution: null
201 } 203 }
202 }, 204 },
203 videoStudio: { 205 videoStudio: {
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 ae79e54fc..c90c34c80 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
@@ -41,7 +41,6 @@
41 <ng-container ngProjectAs="description" i18n> 41 <ng-container ngProjectAs="description" i18n>
42 Small latency disables P2P and high latency can increase P2P ratio 42 Small latency disables P2P and high latency can increase P2P ratio
43 </ng-container> 43 </ng-container>
44
45 </my-peertube-checkbox> 44 </my-peertube-checkbox>
46 </div> 45 </div>
47 46
@@ -115,8 +114,8 @@
115 <label i18n for="liveTranscodingThreads">Live resolutions to generate</label> 114 <label i18n for="liveTranscodingThreads">Live resolutions to generate</label>
116 115
117 <div class="ms-2 mt-2 d-flex flex-column"> 116 <div class="ms-2 mt-2 d-flex flex-column">
118 <ng-container formGroupName="resolutions">
119 117
118 <ng-container formGroupName="resolutions">
120 <div class="form-group" *ngFor="let resolution of liveResolutions"> 119 <div class="form-group" *ngFor="let resolution of liveResolutions">
121 <my-peertube-checkbox 120 <my-peertube-checkbox
122 [inputName]="getResolutionKey(resolution.id)" [formControlName]="resolution.id" 121 [inputName]="getResolutionKey(resolution.id)" [formControlName]="resolution.id"
@@ -127,8 +126,18 @@
127 </ng-template> 126 </ng-template>
128 </my-peertube-checkbox> 127 </my-peertube-checkbox>
129 </div> 128 </div>
130
131 </ng-container> 129 </ng-container>
130
131 <div class="form-group">
132 <my-peertube-checkbox
133 inputName="transcodingAlwaysTranscodeOriginalResolution" formControlName="alwaysTranscodeOriginalResolution"
134 i18n-labelText labelText="Also transcode original resolution"
135 >
136 <ng-container i18n ngProjectAs="description">
137 Even if it's above your maximum enabled resolution
138 </ng-container>
139 </my-peertube-checkbox>
140 </div>
132 </div> 141 </div>
133 </div> 142 </div>
134 143
diff --git a/client/src/app/+admin/config/edit-custom-config/edit-vod-transcoding.component.html b/client/src/app/+admin/config/edit-custom-config/edit-vod-transcoding.component.html
index 66e421b16..5a67b8e3b 100644
--- a/client/src/app/+admin/config/edit-custom-config/edit-vod-transcoding.component.html
+++ b/client/src/app/+admin/config/edit-custom-config/edit-vod-transcoding.component.html
@@ -111,7 +111,13 @@
111 <label i18n>Resolutions to generate per enabled format</label> 111 <label i18n>Resolutions to generate per enabled format</label>
112 112
113 <div class="ms-2 d-flex flex-column"> 113 <div class="ms-2 d-flex flex-column">
114 <span class="mb-3 small muted" i18n> 114 <my-peertube-checkbox
115 inputName="transcodingAlwaysTranscodeOriginalResolution" formControlName="alwaysTranscodeOriginalResolution"
116 i18n-labelText labelText="Always transcode original resolution"
117 >
118 </my-peertube-checkbox>
119
120 <span class="mt-3 mb-2 small muted" i18n>
115 The original file resolution will be the default target if no option is selected. 121 The original file resolution will be the default target if no option is selected.
116 </span> 122 </span>
117 123