From 1896bca09e088b0da9d5e845407ecebae330618c Mon Sep 17 00:00:00 2001 From: Chocobozzz Date: Thu, 28 Jan 2021 15:52:44 +0100 Subject: Support transcoding options/encoders by plugins --- config/default.yaml | 14 ++++++++++++++ config/production.yaml.example | 16 +++++++++++++++- 2 files changed, 29 insertions(+), 1 deletion(-) (limited to 'config') diff --git a/config/default.yaml b/config/default.yaml index b9e382fa7..283e0ab93 100644 --- a/config/default.yaml +++ b/config/default.yaml @@ -223,11 +223,20 @@ user: # Please, do not disable transcoding since many uploaded videos will not work transcoding: enabled: true + # Allow your users to upload .mkv, .mov, .avi, .wmv, .flv, .f4v, .3g2, .3gp, .mts, m2ts, .mxf, .nut videos allow_additional_extensions: true + # If a user uploads an audio file, PeerTube will create a video by merging the preview file and the audio file allow_audio_files: true + threads: 1 + + # Choose the transcoding profile + # New profiles can be added by plugins + # Available in core PeerTube: 'default' + profile: 'default' + resolutions: # Only created if the original video has a higher resolution, uses more storage! 0p: false # audio-only (creates mp4 without video stream, always created when enabled) 240p: false @@ -283,6 +292,11 @@ live: enabled: true threads: 2 + # Choose the transcoding profile + # New profiles can be added by plugins + # Available in core PeerTube: 'default' + profile: 'default' + resolutions: 240p: false 360p: false diff --git a/config/production.yaml.example b/config/production.yaml.example index b616c6ced..66c981dd5 100644 --- a/config/production.yaml.example +++ b/config/production.yaml.example @@ -236,11 +236,20 @@ user: # Please, do not disable transcoding since many uploaded videos will not work transcoding: enabled: true + # Allow your users to upload .mkv, .mov, .avi, .wmv, .flv, .f4v, .3g2, .3gp, .mts, m2ts, .mxf, .nut videos allow_additional_extensions: true + # If a user uploads an audio file, PeerTube will create a video by merging the preview file and the audio file allow_audio_files: true + threads: 1 + + # Choose the transcoding profile + # New profiles can be added by plugins + # Available in core PeerTube: 'default' + profile: 'default' + resolutions: # Only created if the original video has a higher resolution, uses more storage! 0p: false # audio-only (creates mp4 without video stream, always created when enabled) 240p: false @@ -270,7 +279,7 @@ live: enabled: false # Limit lives duration - # Set null to disable duration limit + # -1 == unlimited max_duration: -1 # For example: '5 hours' # Limit max number of live videos created on your instance @@ -296,6 +305,11 @@ live: enabled: true threads: 2 + # Choose the transcoding profile + # New profiles can be added by plugins + # Available in core PeerTube: 'default' + profile: 'default' + resolutions: 240p: false 360p: false -- cgit v1.2.3