6 files changed, 19 insertions, 1 deletions

diff --git a/client/src/app/+videos/+video-edit/video-add-components/video-upload.component.ts b/client/src/app/+videos/+video-edit/video-add-components/video-upload.component.ts
index 5655e48da..c4438d777 100644
--- a/client/src/app/+videos/+video-edit/video-add-components/video-upload.component.ts
+++ b/client/src/app/+videos/+video-edit/video-add-components/video-upload.component.ts
@@ -282,7 +282,8 @@ export class VideoUploadComponent extends VideoSend implements OnInit, OnDestroy
 
     this.resumableUploadService.handleFiles(file, {
       ...this.uploadxOptions,
-      metadata
+      metadata,
+      maxChunkSize: this.serverConfig.client.videos.resumableUpload.maxChunkSize
     })
 
     this.isUploadingVideo = true
diff --git a/config/default.yaml b/config/default.yaml
index 898395705..42ce12c18 100644
--- a/config/default.yaml
+++ b/config/default.yaml
@@ -631,6 +631,10 @@ client:
       # By default PeerTube client displays author username
       prefer_author_display_name: false
       display_author_avatar: false
+    resumable_upload:
+      # Max size of upload chunks, e.g. '90MB'
+      # If null, it will be calculated based on network speed
+      max_chunk_size: null
 
   menu:
     login:
diff --git a/config/production.yaml.example b/config/production.yaml.example
index 03afe5841..bb1b4615b 100644
--- a/config/production.yaml.example
+++ b/config/production.yaml.example
@@ -639,6 +639,10 @@ client:
       # By default PeerTube client displays author username
       prefer_author_display_name: false
       display_author_avatar: false
+    resumable_upload:
+      # Max size of upload chunks, e.g. '90MB'
+      # If null, it will be calculated based on network speed
+      max_chunk_size: null
 
   menu:
     login:
diff --git a/server/initializers/config.ts b/server/initializers/config.ts
index 6dcca9b67..3aadd9cbd 100644
--- a/server/initializers/config.ts
+++ b/server/initializers/config.ts
@@ -64,6 +64,9 @@ const CONFIG = {
       MINIATURE: {
         get PREFER_AUTHOR_DISPLAY_NAME () { return config.get<boolean>('client.videos.miniature.prefer_author_display_name') },
         get DISPLAY_AUTHOR_AVATAR () { return config.get<boolean>('client.videos.miniature.display_author_avatar') }
+      },
+      RESUMABLE_UPLOAD: {
+        get MAX_CHUNK_SIZE () { return parseBytes(config.get<number>('client.videos.resumable_upload.max_chunk_size') || 0) }
       }
     },
     MENU: {
diff --git a/server/lib/server-config-manager.ts b/server/lib/server-config-manager.ts
index 744186cfc..b920b73d5 100644
--- a/server/lib/server-config-manager.ts
+++ b/server/lib/server-config-manager.ts
@@ -48,6 +48,9 @@ class ServerConfigManager {
           miniature: {
             displayAuthorAvatar: CONFIG.CLIENT.VIDEOS.MINIATURE.DISPLAY_AUTHOR_AVATAR,
             preferAuthorDisplayName: CONFIG.CLIENT.VIDEOS.MINIATURE.PREFER_AUTHOR_DISPLAY_NAME
+          },
+          resumableUpload: {
+            maxChunkSize: CONFIG.CLIENT.VIDEOS.RESUMABLE_UPLOAD.MAX_CHUNK_SIZE
           }
         },
         menu: {
diff --git a/shared/models/server/server-config.model.ts b/shared/models/server/server-config.model.ts
index d7fbed13c..146bed24b 100644
--- a/shared/models/server/server-config.model.ts
+++ b/shared/models/server/server-config.model.ts
@@ -41,6 +41,9 @@ export interface ServerConfig {
         displayAuthorAvatar: boolean
         preferAuthorDisplayName: boolean
       }
+      resumableUpload: {
+        maxChunkSize: number
+      }
     }
 
     menu: {