diff options
Diffstat (limited to 'shared/models/videos/transcoding')
-rw-r--r-- | shared/models/videos/transcoding/video-transcoding-fps.model.ts | 1 | ||||
-rw-r--r-- | shared/models/videos/transcoding/video-transcoding.model.ts | 7 |
2 files changed, 6 insertions, 2 deletions
diff --git a/shared/models/videos/transcoding/video-transcoding-fps.model.ts b/shared/models/videos/transcoding/video-transcoding-fps.model.ts index 25fc1c2da..9a330ac94 100644 --- a/shared/models/videos/transcoding/video-transcoding-fps.model.ts +++ b/shared/models/videos/transcoding/video-transcoding-fps.model.ts | |||
@@ -2,6 +2,7 @@ export type VideoTranscodingFPS = { | |||
2 | MIN: number | 2 | MIN: number |
3 | STANDARD: number[] | 3 | STANDARD: number[] |
4 | HD_STANDARD: number[] | 4 | HD_STANDARD: number[] |
5 | AUDIO_MERGE: number | ||
5 | AVERAGE: number | 6 | AVERAGE: number |
6 | MAX: number | 7 | MAX: number |
7 | KEEP_ORIGIN_FPS_RESOLUTION_MIN: number | 8 | KEEP_ORIGIN_FPS_RESOLUTION_MIN: number |
diff --git a/shared/models/videos/transcoding/video-transcoding.model.ts b/shared/models/videos/transcoding/video-transcoding.model.ts index 3a7fb6472..91eacf8dc 100644 --- a/shared/models/videos/transcoding/video-transcoding.model.ts +++ b/shared/models/videos/transcoding/video-transcoding.model.ts | |||
@@ -7,8 +7,11 @@ export type EncoderOptionsBuilderParams = { | |||
7 | 7 | ||
8 | resolution: VideoResolution | 8 | resolution: VideoResolution |
9 | 9 | ||
10 | // Could be null for "merge audio" transcoding | 10 | // If PeerTube applies a filter, transcoding profile must not copy input stream |
11 | fps?: number | 11 | canCopyAudio: boolean |
12 | canCopyVideo: boolean | ||
13 | |||
14 | fps: number | ||
12 | 15 | ||
13 | // Could be undefined if we could not get input bitrate (some RTMP streams for example) | 16 | // Could be undefined if we could not get input bitrate (some RTMP streams for example) |
14 | inputBitrate: number | 17 | inputBitrate: number |