Skip to content

ActivityPub-federated video streaming platform using P2P directly in your web browser

Remove useless help for live transcoding

Chocobozzz3ea32ba891c0
diff --git a/client/src/app/+admin/config/pages/admin-config-live.component.ts b/client/src/app/+admin/config/pages/admin-config-live.component.ts
index 5bfc83115f..086169cc7c 100644
--- a/client/src/app/+admin/config/pages/admin-config-live.component.ts
+++ b/client/src/app/+admin/config/pages/admin-config-live.component.ts
@@ -107,7 +107,7 @@ export class AdminConfigLiveComponent implements OnInit, OnDestroy, CanComponent
{ id: 1000 * 3600 * 10, label: $localize`10 hours` }
]
- this.liveResolutions = this.adminConfigService.transcodingResolutionOptions
+ this.liveResolutions = this.adminConfigService.getTranscodingOptions('live')
this.transcodingProfiles = this.adminConfigService.buildTranscodingProfiles(
this.server.getHTMLConfig().live.transcoding.availableProfiles
)
@@ -143,7 +143,7 @@ export class AdminConfigLiveComponent implements OnInit, OnDestroy, CanComponent
enabled: null,
threads: TRANSCODING_THREADS_VALIDATOR,
profile: null,
- resolutions: this.adminConfigService.buildFormResolutions(),
+ resolutions: this.adminConfigService.buildFormResolutions('live'),
alwaysTranscodeOriginalResolution: null,
remoteRunners: {
enabled: null
diff --git a/client/src/app/+admin/config/pages/admin-config-vod.component.ts b/client/src/app/+admin/config/pages/admin-config-vod.component.ts
index e817dad674..1a5f14037a 100644
--- a/client/src/app/+admin/config/pages/admin-config-vod.component.ts
+++ b/client/src/app/+admin/config/pages/admin-config-vod.component.ts
@@ -112,7 +112,7 @@ export class AdminConfigVODComponent implements OnInit, OnDestroy, CanComponentD
this.customConfig = this.route.parent.snapshot.data['customConfig']
this.transcodingThreadOptions = this.configService.transcodingThreadOptions
- this.resolutions = this.adminConfigService.transcodingResolutionOptions
+ this.resolutions = this.adminConfigService.getTranscodingOptions('vod')
this.additionalVideoExtensions = serverConfig.video.file.extensions.join(' ')
this.transcodingProfiles = this.adminConfigService.buildTranscodingProfiles(serverConfig.transcoding.availableProfiles)
@@ -156,7 +156,7 @@ export class AdminConfigVODComponent implements OnInit, OnDestroy, CanComponentD
max: TRANSCODING_MAX_FPS_VALIDATOR
},
- resolutions: this.adminConfigService.buildFormResolutions(),
+ resolutions: this.adminConfigService.buildFormResolutions('vod'),
alwaysTranscodeOriginalResolution: null,
remoteRunners: {
diff --git a/client/src/app/shared/shared-admin/admin-config.service.ts b/client/src/app/shared/shared-admin/admin-config.service.ts
index eff9d0fba8..922bc5d137 100644
--- a/client/src/app/shared/shared-admin/admin-config.service.ts
+++ b/client/src/app/shared/shared-admin/admin-config.service.ts
@@ -35,7 +35,6 @@ export class AdminConfigService {
private static BASE_APPLICATION_URL = environment.apiUrl + '/api/v1/config'
transcodingThreadOptions: SelectOptionsItem[] = []
- transcodingResolutionOptions: ResolutionOption[] = []
constructor () {
this.transcodingThreadOptions = [
@@ -48,13 +47,18 @@ export class AdminConfigService {
{ id: 16, label: '16' },
{ id: 32, label: '32' }
]
+ }
+
+ // ---------------------------------------------------------------------------
- this.transcodingResolutionOptions = [
+ getTranscodingOptions (type: 'live' | 'vod'): ResolutionOption[] {
+ return [
{
id: '0p',
label: $localize`Audio-only`,
- description:
- $localize`"Split audio and video" must be enabled for the PeerTube player to propose an "Audio only" resolution to users`
+ description: type === 'vod'
+ ? $localize`"Split audio and video" must be enabled for the PeerTube player to propose an "Audio only" resolution to users`
+ : undefined
},
{
id: '144p',
@@ -141,10 +145,10 @@ export class AdminConfigService {
// ---------------------------------------------------------------------------
- buildFormResolutions () {
+ buildFormResolutions (type: 'live' | 'vod') {
const formResolutions = {} as Record<keyof FormResolutions, BuildFormValidator>
- for (const resolution of this.transcodingResolutionOptions) {
+ for (const resolution of this.getTranscodingOptions(type)) {
formResolutions[resolution.id] = null
}
diff --git a/client/src/app/shared/shared-video-miniature/video-filters.model.ts b/client/src/app/shared/shared-video-miniature/video-filters.model.ts
index 36576743d4..28e987d369 100644
--- a/client/src/app/shared/shared-video-miniature/video-filters.model.ts
+++ b/client/src/app/shared/shared-video-miniature/video-filters.model.ts
@@ -95,9 +95,6 @@ export class VideoFilters {
if (noChanges) return
- console.log(currentFormObjectString)
- console.log(this.oldFormObjectString)
-
this.oldFormObjectString = currentFormObjectString
for (const cb of this.onChangeCallbacks) {