aboutsummaryrefslogtreecommitdiffhomepage
path: root/shared/models
diff options
context:
space:
mode:
Diffstat (limited to 'shared/models')
-rw-r--r--shared/models/server/custom-config.model.ts3
-rw-r--r--shared/models/server/job.model.ts5
2 files changed, 4 insertions, 4 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 @@
1import { ContextType } from '../activitypub/context' 1import { ContextType } from '../activitypub/context'
2import { VideoState } from '../videos' 2import { VideoState } from '../videos'
3import { VideoStudioTaskCut } from '../videos/studio'
4import { VideoResolution } from '../videos/file/video-resolution.enum' 3import { VideoResolution } from '../videos/file/video-resolution.enum'
4import { VideoStudioTaskCut } from '../videos/studio'
5import { SendEmailOptions } from './emailer.model' 5import { SendEmailOptions } from './emailer.model'
6 6
7export type JobState = 'active' | 'completed' | 'failed' | 'waiting' | 'delayed' | 'paused' 7export 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
145export interface MergeAudioTranscodingPayload extends BaseTranscodingPayload { 142export interface MergeAudioTranscodingPayload extends BaseTranscodingPayload {