diff options
author | Chocobozzz <me@florianbigard.com> | 2022-08-05 10:36:19 +0200 |
---|---|---|
committer | Chocobozzz <me@florianbigard.com> | 2022-08-09 09:18:07 +0200 |
commit | 84cae54e7a2595bea0c3ea106a4d111fd11a4ec6 (patch) | |
tree | 03fe73edf049ce60df6bbc34dcfb2031c07ea59c /shared | |
parent | 7e0f50d6e0c7dc583d40e196c283eb20dc386ae6 (diff) | |
download | PeerTube-84cae54e7a2595bea0c3ea106a4d111fd11a4ec6.tar.gz PeerTube-84cae54e7a2595bea0c3ea106a4d111fd11a4ec6.tar.zst PeerTube-84cae54e7a2595bea0c3ea106a4d111fd11a4ec6.zip |
Add option to not transcode original resolution
Diffstat (limited to 'shared')
-rw-r--r-- | shared/models/server/custom-config.model.ts | 3 | ||||
-rw-r--r-- | shared/models/server/job.model.ts | 5 | ||||
-rw-r--r-- | shared/server-commands/server/config-command.ts | 4 |
3 files changed, 7 insertions, 5 deletions
diff --git a/shared/models/server/custom-config.model.ts b/shared/models/server/custom-config.model.ts index ab83ed497..bb9c7cef1 100644 --- a/shared/models/server/custom-config.model.ts +++ b/shared/models/server/custom-config.model.ts | |||
@@ -117,6 +117,8 @@ export interface CustomConfig { | |||
117 | 117 | ||
118 | resolutions: ConfigResolutions & { '0p': boolean } | 118 | resolutions: ConfigResolutions & { '0p': boolean } |
119 | 119 | ||
120 | alwaysTranscodeOriginalResolution: boolean | ||
121 | |||
120 | webtorrent: { | 122 | webtorrent: { |
121 | enabled: boolean | 123 | enabled: boolean |
122 | } | 124 | } |
@@ -144,6 +146,7 @@ export interface CustomConfig { | |||
144 | threads: number | 146 | threads: number |
145 | profile: string | 147 | profile: string |
146 | resolutions: ConfigResolutions | 148 | resolutions: ConfigResolutions |
149 | alwaysTranscodeOriginalResolution: boolean | ||
147 | } | 150 | } |
148 | } | 151 | } |
149 | 152 | ||
diff --git a/shared/models/server/job.model.ts b/shared/models/server/job.model.ts index 4633ab769..ac10ea964 100644 --- a/shared/models/server/job.model.ts +++ b/shared/models/server/job.model.ts | |||
@@ -1,7 +1,7 @@ | |||
1 | import { ContextType } from '../activitypub/context' | 1 | import { ContextType } from '../activitypub/context' |
2 | import { VideoState } from '../videos' | 2 | import { VideoState } from '../videos' |
3 | import { VideoStudioTaskCut } from '../videos/studio' | ||
4 | import { VideoResolution } from '../videos/file/video-resolution.enum' | 3 | import { VideoResolution } from '../videos/file/video-resolution.enum' |
4 | import { VideoStudioTaskCut } from '../videos/studio' | ||
5 | import { SendEmailOptions } from './emailer.model' | 5 | import { SendEmailOptions } from './emailer.model' |
6 | 6 | ||
7 | export type JobState = 'active' | 'completed' | 'failed' | 'waiting' | 'delayed' | 'paused' | 7 | export type JobState = 'active' | 'completed' | 'failed' | 'waiting' | 'delayed' | 'paused' |
@@ -126,7 +126,6 @@ export interface HLSTranscodingPayload extends BaseTranscodingPayload { | |||
126 | copyCodecs: boolean | 126 | copyCodecs: boolean |
127 | 127 | ||
128 | hasAudio: boolean | 128 | hasAudio: boolean |
129 | isPortraitMode?: boolean | ||
130 | 129 | ||
131 | autoDeleteWebTorrentIfNeeded: boolean | 130 | autoDeleteWebTorrentIfNeeded: boolean |
132 | isMaxQuality: boolean | 131 | isMaxQuality: boolean |
@@ -138,8 +137,6 @@ export interface NewWebTorrentResolutionTranscodingPayload extends BaseTranscodi | |||
138 | 137 | ||
139 | hasAudio: boolean | 138 | hasAudio: boolean |
140 | createHLSIfNeeded: boolean | 139 | createHLSIfNeeded: boolean |
141 | |||
142 | isPortraitMode?: boolean | ||
143 | } | 140 | } |
144 | 141 | ||
145 | export interface MergeAudioTranscodingPayload extends BaseTranscodingPayload { | 142 | export interface MergeAudioTranscodingPayload extends BaseTranscodingPayload { |
diff --git a/shared/server-commands/server/config-command.ts b/shared/server-commands/server/config-command.ts index 3803aaf95..8ab750983 100644 --- a/shared/server-commands/server/config-command.ts +++ b/shared/server-commands/server/config-command.ts | |||
@@ -310,6 +310,7 @@ export class ConfigCommand extends AbstractCommand { | |||
310 | '1440p': false, | 310 | '1440p': false, |
311 | '2160p': false | 311 | '2160p': false |
312 | }, | 312 | }, |
313 | alwaysTranscodeOriginalResolution: true, | ||
313 | webtorrent: { | 314 | webtorrent: { |
314 | enabled: true | 315 | enabled: true |
315 | }, | 316 | }, |
@@ -339,7 +340,8 @@ export class ConfigCommand extends AbstractCommand { | |||
339 | '1080p': true, | 340 | '1080p': true, |
340 | '1440p': true, | 341 | '1440p': true, |
341 | '2160p': true | 342 | '2160p': true |
342 | } | 343 | }, |
344 | alwaysTranscodeOriginalResolution: true | ||
343 | } | 345 | } |
344 | }, | 346 | }, |
345 | videoStudio: { | 347 | videoStudio: { |