9 files changed, 245 insertions, 75 deletions

diff --git a/support/doc/api/embeds.md b/support/doc/api/embeds.md
index 1dd1443e7..fd5507e38 100644
--- a/support/doc/api/embeds.md
+++ b/support/doc/api/embeds.md
@@ -52,7 +52,7 @@ player.pause()
 ## Embed URL parameters
 
 You can customize PeerTube player by specifying URL query parameters.
-For example `https://my-instance.example.com/videos/embed/52a10666-3a18-4e73-93da-e8d3c12c305a??start=1s&stop=18s&loop=1&autoplay=1&muted=1&warningTitle=0&controlBar=0&peertubeLink=0&p2p=0`
+For example `https://my-instance.example.com/videos/embed/52a10666-3a18-4e73-93da-e8d3c12c305a?start=1s&stop=18s&loop=1&autoplay=1&muted=1&warningTitle=0&controlBar=0&peertubeLink=0&p2p=0`
 
 ### start
 
@@ -108,6 +108,10 @@ Most web browsers disable video autoplay if the user did not interact with the v
 
 Value must be `0` or `1`.
 
+### playbackRate
+
+Force the default playback rate (`0.75`, `1.5` etc).
+
 ### title
 
 Hide embed title.
@@ -142,7 +146,7 @@ Value must be a valid color (`red` or `rgba(100, 100, 100, 0.5)`).
 
 Force a specific player engine.
 
-Value must be a valid mode (`webtorrent` or `p2p-media-loader`).
+Value must be a valid mode (`web-video` or `p2p-media-loader`).
 
 ### api
 
diff --git a/support/doc/api/openapi.yaml b/support/doc/api/openapi.yaml
index cd50e86a6..2dfad9987 100644
--- a/support/doc/api/openapi.yaml
+++ b/support/doc/api/openapi.yaml
@@ -300,6 +300,8 @@ tags:
   - name: Runner Registration Token
     description: |
       Manage runner registration token
+  - name: Video Passwords
+    description: Operation on video passwords
 
 x-tagGroups:
   - name: Static endpoints
@@ -337,6 +339,7 @@ x-tagGroups:
       - Video Transcoding
       - Live Videos
       - Channels Sync
+      - Video Passwords
   - name: Search
     tags:
       - Search
@@ -363,11 +366,11 @@ x-tagGroups:
       - Runners
 
 paths:
-  '/static/webseed/{filename}':
+  '/static/web-videos/{filename}':
     get:
       tags:
         - Static Video Files
-      summary: Get public WebTorrent video file
+      summary: Get public Web Video file
       parameters:
         - $ref: '#/components/parameters/staticFilename'
       responses:
@@ -375,11 +378,11 @@ paths:
           description: successful operation
         '404':
           description: not found
-  '/static/webseed/private/{filename}':
+  '/static/web-videos/private/{filename}':
     get:
       tags:
         - Static Video Files
-      summary: Get private WebTorrent video file
+      summary: Get private Web Video file
       parameters:
         - $ref: '#/components/parameters/staticFilename'
         - $ref: '#/components/parameters/videoFileToken'
@@ -571,7 +574,7 @@ paths:
         - $ref: '#/components/parameters/include'
         - $ref: '#/components/parameters/privacyOneOf'
         - $ref: '#/components/parameters/hasHLSFiles'
-        - $ref: '#/components/parameters/hasWebtorrentFiles'
+        - $ref: '#/components/parameters/hasWebVideoFiles'
       responses:
         '200':
           description: successful operation
@@ -655,7 +658,7 @@ paths:
         - $ref: '#/components/parameters/include'
         - $ref: '#/components/parameters/privacyOneOf'
         - $ref: '#/components/parameters/hasHLSFiles'
-        - $ref: '#/components/parameters/hasWebtorrentFiles'
+        - $ref: '#/components/parameters/hasWebVideoFiles'
       responses:
         '200':
           description: successful operation
@@ -745,7 +748,7 @@ paths:
         - $ref: '#/components/parameters/include'
         - $ref: '#/components/parameters/privacyOneOf'
         - $ref: '#/components/parameters/hasHLSFiles'
-        - $ref: '#/components/parameters/hasWebtorrentFiles'
+        - $ref: '#/components/parameters/hasWebVideoFiles'
         - $ref: '#/components/parameters/skipCount'
         - $ref: '#/components/parameters/start'
         - $ref: '#/components/parameters/count'
@@ -915,7 +918,7 @@ paths:
           description: >
             Arises when:
               - the emailer is disabled and the instance is open to registrations
-              - webtorrent and hls are disabled with transcoding enabled - you need at least one enabled
+              - web videos and hls are disabled with transcoding enabled - you need at least one enabled
     delete:
       summary: Delete instance runtime configuration
       operationId: delCustomConfig
@@ -1870,7 +1873,7 @@ paths:
         - $ref: '#/components/parameters/include'
         - $ref: '#/components/parameters/privacyOneOf'
         - $ref: '#/components/parameters/hasHLSFiles'
-        - $ref: '#/components/parameters/hasWebtorrentFiles'
+        - $ref: '#/components/parameters/hasWebVideoFiles'
         - $ref: '#/components/parameters/skipCount'
         - $ref: '#/components/parameters/start'
         - $ref: '#/components/parameters/count'
@@ -2359,6 +2362,7 @@ paths:
         - OAuth2: []
       parameters:
         - $ref: '#/components/parameters/idOrUUID'
+        - $ref: '#/components/parameters/videoPasswordHeader'
       responses:
         '200':
           description: successful operation
@@ -2414,7 +2418,7 @@ paths:
         - $ref: '#/components/parameters/include'
         - $ref: '#/components/parameters/privacyOneOf'
         - $ref: '#/components/parameters/hasHLSFiles'
-        - $ref: '#/components/parameters/hasWebtorrentFiles'
+        - $ref: '#/components/parameters/hasWebVideoFiles'
         - $ref: '#/components/parameters/skipCount'
         - $ref: '#/components/parameters/start'
         - $ref: '#/components/parameters/count'
@@ -2578,6 +2582,8 @@ paths:
                   format: date-time
                 scheduleUpdate:
                   $ref: '#/components/schemas/VideoScheduledUpdate'
+                videoPasswords:
+                  $ref: '#/components/schemas/AddVideoPasswords'
             encoding:
               thumbnailfile:
                 contentType: image/jpeg
@@ -2590,6 +2596,7 @@ paths:
         - Video
       parameters:
         - $ref: '#/components/parameters/idOrUUID'
+        - $ref: '#/components/parameters/videoPasswordHeader'
       responses:
         '200':
           description: successful operation
@@ -2597,6 +2604,8 @@ paths:
             application/json:
               schema:
                 $ref: '#/components/schemas/VideoDetails'
+        '403':
+          description: provide a correct password to access this password protected video
     delete:
       summary: Delete a video
       operationId: delVideo
@@ -2618,6 +2627,7 @@ paths:
         - Video
       parameters:
         - $ref: '#/components/parameters/idOrUUID'
+        - $ref: '#/components/parameters/videoPasswordHeader'
       responses:
         '200':
           description: successful operation
@@ -3267,6 +3277,7 @@ paths:
         - Live Videos
       parameters:
         - $ref: '#/components/parameters/idOrUUID'
+        - $ref: '#/components/parameters/videoPasswordHeader'
       responses:
         '200':
           description: successful operation
@@ -3657,6 +3668,27 @@ paths:
                     items:
                       $ref: '#/components/schemas/VideoBlacklist'
 
+  /api/v1/videos/{id}/storyboards:
+    get:
+      summary: List storyboards of a video
+      operationId: listVideoStoryboards
+      tags:
+        - Video
+      parameters:
+        - $ref: '#/components/parameters/idOrUUID'
+      responses:
+        '200':
+          description: successful operation
+          content:
+            application/json:
+              schema:
+                type: object
+                properties:
+                  storyboards:
+                    type: array
+                    items:
+                      $ref: '#/components/schemas/Storyboard'
+
   /api/v1/videos/{id}/captions:
     get:
       summary: List captions of a video
@@ -3665,6 +3697,7 @@ paths:
         - Video Captions
       parameters:
         - $ref: '#/components/parameters/idOrUUID'
+        - $ref: '#/components/parameters/videoPasswordHeader'
       responses:
         '200':
           description: successful operation
@@ -3728,6 +3761,70 @@ paths:
         '404':
           description: video or language or caption for that language not found
 
+  /api/v1/videos/{id}/passwords:
+    get:
+      summary: List video passwords
+      security:
+        - OAuth2:
+          - user
+      tags:
+        - Video Passwords
+      parameters:
+        - $ref: '#/components/parameters/idOrUUID'
+        - $ref: '#/components/parameters/start'
+        - $ref: '#/components/parameters/count'
+        - $ref: '#/components/parameters/sort'
+      responses:
+        '204':
+          description: successful operation
+          content:
+            application/json:
+              schema:
+                $ref: '#/components/schemas/VideoPasswordList'
+        '400':
+          description: video is not password protected
+    put:
+      summary: Update video passwords
+      security:
+        - OAuth2:
+          - user
+      tags:
+        - Video Passwords
+      parameters:
+        - $ref: '#/components/parameters/idOrUUID'
+      requestBody:
+        content:
+          application/json:
+            schema:
+              type: object
+              properties:
+                passwords:
+                  $ref: '#/components/schemas/AddVideoPasswords'
+      responses:
+        '204':
+          description: successful operation
+        '400':
+          description: video is not password protected
+
+  /api/v1/videos/{id}/passwords/{videoPasswordId}:
+    delete:
+      summary: Delete a video password
+      security:
+        - OAuth2:
+          - user
+      tags:
+        - Video Passwords
+      parameters:
+        - $ref: '#/components/parameters/idOrUUID'
+        - $ref: '#/components/parameters/videoPasswordId'
+      responses:
+        '204':
+          description: successful operation
+        '403':
+          description: cannot delete the last password of the protected video
+        '400':
+          description: video is not password protected
+
   /api/v1/video-channels:
     get:
       summary: List video channels
@@ -3836,7 +3933,7 @@ paths:
         - $ref: '#/components/parameters/include'
         - $ref: '#/components/parameters/privacyOneOf'
         - $ref: '#/components/parameters/hasHLSFiles'
-        - $ref: '#/components/parameters/hasWebtorrentFiles'
+        - $ref: '#/components/parameters/hasWebVideoFiles'
         - $ref: '#/components/parameters/skipCount'
         - $ref: '#/components/parameters/start'
         - $ref: '#/components/parameters/count'
@@ -4554,6 +4651,7 @@ paths:
         - $ref: '#/components/parameters/start'
         - $ref: '#/components/parameters/count'
         - $ref: '#/components/parameters/commentsSort'
+        - $ref: '#/components/parameters/videoPasswordHeader'
       responses:
         '200':
           description: successful operation
@@ -4600,6 +4698,7 @@ paths:
       parameters:
         - $ref: '#/components/parameters/idOrUUID'
         - $ref: '#/components/parameters/threadId'
+        - $ref: '#/components/parameters/videoPasswordHeader'
       responses:
         '200':
           description: successful operation
@@ -4618,6 +4717,7 @@ paths:
       parameters:
         - $ref: '#/components/parameters/idOrUUID'
         - $ref: '#/components/parameters/commentId'
+        - $ref: '#/components/parameters/videoPasswordHeader'
       responses:
         '200':
           description: successful operation
@@ -4668,6 +4768,7 @@ paths:
         - Video Rates
       parameters:
         - $ref: '#/components/parameters/idOrUUID'
+        - $ref: '#/components/parameters/videoPasswordHeader'
       requestBody:
         content:
           application/json:
@@ -4703,15 +4804,15 @@ paths:
           description: successful operation
         '404':
           description: video does not exist
-  '/api/v1/videos/{id}/webtorrent':
+  '/api/v1/videos/{id}/web-videos':
     delete:
-      summary: Delete video WebTorrent files
+      summary: Delete video Web Video files
       security:
         - OAuth2:
           - admin
       tags:
         - Video Files
-      operationId: delVideoWebTorrent
+      operationId: delVideoWebVideos
       parameters:
         - $ref: '#/components/parameters/idOrUUID'
       responses:
@@ -4741,7 +4842,7 @@ paths:
                     type: string
                     enum:
                       - hls
-                      - webtorrent
+                      - web-video
                 required:
                   - transcodingType
       responses:
@@ -4779,7 +4880,7 @@ paths:
         - $ref: '#/components/parameters/privacyOneOf'
         - $ref: '#/components/parameters/uuids'
         - $ref: '#/components/parameters/hasHLSFiles'
-        - $ref: '#/components/parameters/hasWebtorrentFiles'
+        - $ref: '#/components/parameters/hasWebVideoFiles'
         - $ref: '#/components/parameters/skipCount'
         - $ref: '#/components/parameters/start'
         - $ref: '#/components/parameters/count'
@@ -6370,13 +6471,13 @@ components:
       schema:
         type: boolean
       description: '**PeerTube >= 4.0** Display only videos that have HLS files'
-    hasWebtorrentFiles:
-      name: hasWebtorrentFiles
+    hasWebVideoFiles:
+      name: hasWebVideoFiles
       in: query
       required: false
       schema:
         type: boolean
-      description: '**PeerTube >= 4.0** Display only videos that have WebTorrent files'
+      description: '**PeerTube >= 4.0** Display only videos that have Web Video files'
     privacyOneOf:
       name: privacyOneOf
       in: query
@@ -6525,7 +6626,20 @@ components:
       required: true
       schema:
         $ref: '#/components/schemas/UUIDv4'
-
+    videoPasswordId:
+      name: videoPasswordId
+      in: path
+      required: true
+      description: The video password id
+      schema:
+        $ref: '#/components/schemas/id'
+    videoPasswordHeader:
+      name: x-peertube-video-password
+      description: Required on password protected video
+      in: header
+      required: false
+      schema:
+        type: string
   securitySchemes:
     OAuth2:
       description: |
@@ -7015,7 +7129,7 @@ components:
           maxLength: 120
         thumbnailPath:
           type: string
-          example: /static/thumbnails/a65bc12f-9383-462e-81ae-8207e8b434ee.jpg
+          example: /lazy-static/thumbnails/a65bc12f-9383-462e-81ae-8207e8b434ee.jpg
         previewPath:
           type: string
           example: /lazy-static/previews/a65bc12f-9383-462e-81ae-8207e8b434ee.jpg
@@ -7108,7 +7222,7 @@ components:
               items:
                 $ref: '#/components/schemas/VideoFile'
               description: |
-                WebTorrent/raw video files. If WebTorrent is disabled on the server:
+                Web compatible video files. If Web Video is disabled on the server:
 
                 - field will be empty
                 - video files will be found in `streamingPlaylists[].files` field
@@ -7416,6 +7530,20 @@ components:
           type: array
           items:
             $ref: '#/components/schemas/VideoCommentThreadTree'
+    Storyboard:
+      properties:
+        storyboardPath:
+          type: string
+        totalHeight:
+          type: integer
+        totalWidth:
+          type: integer
+        spriteHeight:
+          type: integer
+        spriteWidth:
+          type: integer
+        spriteDuration:
+          type: integer
     VideoCaption:
       properties:
         language:
@@ -7640,7 +7768,7 @@ components:
               properties:
                 enabled:
                   type: boolean
-            webtorrent:
+            web_videos:
               type: object
               properties:
                 enabled:
@@ -8006,15 +8134,15 @@ components:
                   type: boolean
                 2160p:
                   type: boolean
-            webtorrent:
+            web_videos:
               type: object
-              description: WebTorrent-specific settings
+              description: Web Video specific settings
               properties:
                 enabled:
                   type: boolean
             hls:
               type: object
-              description: HLS-specific settings
+              description: HLS specific settings
               properties:
                 enabled:
                   type: boolean
@@ -8228,6 +8356,8 @@ components:
           description: Video preview file
           type: string
           format: binary
+        videoPasswords:
+          $ref: '#/components/schemas/AddVideoPasswords'
       required:
         - channelId
         - name
@@ -9391,7 +9521,7 @@ components:
           type: string
           enum:
             - 'p2p-media-loader'
-            - 'webtorrent'
+            - 'web-video'
         resolution:
           type: number
           description: Current player video resolution
@@ -9616,6 +9746,29 @@ components:
             privatePayload:
               type: object
 
+    VideoPassword:
+      properties:
+        id:
+          $ref: '#/components/schemas/id'
+        password:
+          type: string
+          minLength: 2
+        videoId:
+          $ref: '#/components/schemas/id'
+    VideoPasswordList:
+      properties:
+        total:
+          type: integer
+          example: 1
+        data:
+          type: array
+          items:
+              $ref: '#/components/schemas/VideoPassword'
+    AddVideoPasswords:
+      type: array
+      items:
+        $ref: "#/components/schemas/VideoPassword/properties/password"
+      uniqueItems: true
   callbacks:
     searchIndex:
       'https://search.example.org/api/v1/search/videos':
diff --git a/support/doc/development/lib.md b/support/doc/development/lib.md
index 3cccaf3d0..25fe3068e 100644
--- a/support/doc/development/lib.md
+++ b/support/doc/development/lib.md
@@ -5,7 +5,7 @@
 ### Build & Publish
 
 ```
-cd client/src/standalone/player/
+cd client/src/standalone/embed-player-api/
 npm run build
 npm publish --access=public
 ```
diff --git a/support/doc/development/release.md b/support/doc/development/release.md
index c4935524c..81e35c58d 100644
--- a/support/doc/development/release.md
+++ b/support/doc/development/release.md
@@ -28,9 +28,11 @@ NODE_APP_INSTANCE=6 NODE_ENV=test node dist/server --benchmark-startup
 
 ## @peertube/embed-api
 
+At the root of PeerTube:
+
 ```
-cd client/src/standalone/player
+cd client/src/standalone/embed-player-api
 npm version patch
-npm run build
-npm publish --access=public
+cd ../../../../
+npm run release-embed-api
 ```
diff --git a/support/doc/development/tests.md b/support/doc/development/tests.md
index e3a65c35f..1c2589c8a 100644
--- a/support/doc/development/tests.md
+++ b/support/doc/development/tests.md
@@ -71,6 +71,7 @@ Some env variables can be defined to disable/enable some tests:
  * `ENABLE_OBJECT_STORAGE_TESTS=true`: enable object storage tests (needs `chocobozzz/s3-ninja` container first)
  * `AKISMET_KEY`: specify an Akismet key to test akismet external PeerTube plugin
  * `OBJECT_STORAGE_SCALEWAY_KEY_ID` and `OBJECT_STORAGE_SCALEWAY_ACCESS_KEY`: specify Scaleway API keys to test object storage ACL (not supported by our `chocobozzz/s3-ninja` container)
+ * `ENABLE_FFMPEG_THUMBNAIL_PIXEL_COMPARISON_TESTS=true`: enable pixel comparison on images generated by ffmpeg. Disabled by default because a custom ffmpeg version may fails the tests
 
 
 ### Debug server logs
diff --git a/support/doc/tools.md b/support/doc/tools.md
index 39f5ab787..2b3ebf159 100644
--- a/support/doc/tools.md
+++ b/support/doc/tools.md
@@ -227,7 +227,7 @@ docker-compose exec -u peertube peertube npm run regenerate-thumbnails
 
 ### create-import-video-file-job.js
 
-You can use this script to import a video file to replace an already uploaded file or to add a new webtorrent resolution to a video. PeerTube needs to be running.
+You can use this script to import a video file to replace an already uploaded file or to add a new web compatible resolution to a video. PeerTube needs to be running.
 You can then create a transcoding job using the web interface if you need to optimize your file or create an HLS version of it.
 
 ```bash
@@ -268,6 +268,35 @@ cd /var/www/peertube-docker
 docker-compose exec -u peertube peertube npm run create-move-video-storage-job -- --to-object-storage --all-videos
 ```
 
+<!-- TODO: uncomment when PeerTube 6 is released
+### create-generate-storyboard-job
+
+**PeerTube >= 6.0**
+
+Use this script to generate storyboard of a specific video:
+
+```bash
+# Basic installation
+cd /var/www/peertube/peertube-latest
+sudo -u peertube NODE_CONFIG_DIR=/var/www/peertube/config NODE_ENV=production npm run create-generate-storyboard-job -- -v [videoUUID]
+
+# Docker installation
+cd /var/www/peertube-docker
+docker-compose exec -u peertube peertube npm run create-generate-storyboard-job -- -v [videoUUID]
+```
+
+The script can also generate all missing storyboards of local videos:
+
+```bash
+# Basic installation
+cd /var/www/peertube/peertube-latest
+sudo -u peertube NODE_CONFIG_DIR=/var/www/peertube/config NODE_ENV=production npm run create-generate-storyboard-job -- --all-videos
+
+# Docker installation
+cd /var/www/peertube-docker
+docker-compose exec -u peertube peertube npm run create-generate-storyboard-job -- --all-videos
+```
+-->
 
 ### prune-storage.js
 
@@ -357,6 +386,15 @@ PeerTube >= 5.2 supports VOD or Live transcoding by a remote PeerTube runner.
 
 ### Installation
 
+Ensure you have `ffmpeg` and `ffprobe` installed on your system:
+
+```bash
+ffprobe -version # Should be >= 4.3
+ffmpeg -version # Should be >= 4.3
+```
+
+Then install the CLI:
+
 ```bash
 sudo npm install -g @peertube/peertube-runner
 ```
@@ -385,7 +423,7 @@ peertube-runner server
 
 ### Register
 
-Then, you can register the runner on a new PeerTube instance so the runner can process its transcoding job:
+Then, you can register the runner to process transcoding job of a remote PeerTube instance:
 
 ```bash
 peertube-runner register --url http://peertube.example.com --registration-token ptrrt-... --runner-name my-runner-name
diff --git a/support/docker/production/config/custom-environment-variables.yaml b/support/docker/production/config/custom-environment-variables.yaml
index 8fff54229..0058cbd64 100644
--- a/support/docker/production/config/custom-environment-variables.yaml
+++ b/support/docker/production/config/custom-environment-variables.yaml
@@ -1,7 +1,7 @@
-# 
+#
 # This file will be read by node-config
 # See https://github.com/node-config/node-config/wiki/Environment-Variables#custom-environment-variables
-# 
+#
 
 webserver:
   hostname: "PEERTUBE_WEBSERVER_HOSTNAME"
@@ -86,10 +86,10 @@ object_storage:
     base_url: "PEERTUBE_OBJECT_STORAGE_STREAMING_PLAYLISTS_BASE_URL"
     upload_acl: "PEERTUBE_OBJECT_STORAGE_UPLOAD_ACL"
 
-  videos:
-    bucket_name: "PEERTUBE_OBJECT_STORAGE_VIDEOS_BUCKET_NAME"
-    prefix: "PEERTUBE_OBJECT_STORAGE_VIDEOS_PREFIX"
-    base_url: "PEERTUBE_OBJECT_STORAGE_VIDEOS_BASE_URL"
+  web_videos:
+    bucket_name: "PEERTUBE_OBJECT_STORAGE_WEB_VIDEOS_BUCKET_NAME"
+    prefix: "PEERTUBE_OBJECT_STORAGE_WEB_VIDEOS_PREFIX"
+    base_url: "PEERTUBE_OBJECT_STORAGE_WEB_VIDEOS_BASE_URL"
 
 webadmin:
   configuration:
@@ -177,9 +177,9 @@ transcoding:
     2160p:
       __name: "PEERTUBE_TRANSCODING_2160P"
       __format: "json"
-  webtorrent:
+  web_videos:
     enabled:
-      __name: "PEERTUBE_TRANSCODING_WEBTORRENT_ENABLED"
+      __name: "PEERTUBE_TRANSCODING_WEB_VIDEOS_ENABLED"
       __format: "json"
   hls:
     enabled:
diff --git a/support/docker/production/config/production.yaml b/support/docker/production/config/production.yaml
index e3f6247d8..9c9581e40 100644
--- a/support/docker/production/config/production.yaml
+++ b/support/docker/production/config/production.yaml
@@ -47,7 +47,7 @@ storage:
   tmp_persistent: '../data/tmp-persistent/' # As tmp but the directory is not cleaned up between PeerTube restarts
   bin: '../data/bin/'
   avatars: '../data/avatars/'
-  videos: '../data/videos/'
+  web_videos: '../data/web-videos/'
   streaming_playlists: '../data/streaming-playlists'
   redundancy: '../data/redundancy/'
   logs: '../data/logs/'
diff --git a/support/nginx/peertube b/support/nginx/peertube
index 05a59c072..822f6f9ac 100644
--- a/support/nginx/peertube
+++ b/support/nginx/peertube
@@ -199,29 +199,7 @@ server {
     alias /var/www/peertube/peertube-latest/client/dist/$1;
   }
 
-  # Bypass PeerTube for performance reasons. Optional.
-  location ~ ^/static/(thumbnails|avatars)/ {
-    if ($request_method = 'OPTIONS') {
-      add_header Access-Control-Allow-Origin  '*';
-      add_header Access-Control-Allow-Methods 'GET, OPTIONS';
-      add_header Access-Control-Allow-Headers 'Range,DNT,X-CustomHeader,Keep-Alive,User-Agent,X-Requested-With,If-Modified-Since,Cache-Control,Content-Type';
-      add_header Access-Control-Max-Age       1728000; # Preflight request can be cached 20 days
-      add_header Content-Type                 'text/plain charset=UTF-8';
-      add_header Content-Length               0;
-      return 204;
-    }
-
-    add_header Access-Control-Allow-Origin    '*';
-    add_header Access-Control-Allow-Methods   'GET, OPTIONS';
-    add_header Access-Control-Allow-Headers   'Range,DNT,X-CustomHeader,Keep-Alive,User-Agent,X-Requested-With,If-Modified-Since,Cache-Control,Content-Type';
-    add_header Cache-Control                  "public, max-age=7200"; # Cache response 2 hours
-
-    rewrite ^/static/(.*)$ /$1 break;
-
-    try_files $uri @api;
-  }
-
-  location ~ ^(/static/(webseed|streaming-playlists)/private/)|^/download {
+  location ~ ^(/static/(webseed|web-videos|streaming-playlists)/private/)|^/download {
     # We can't rate limit a try_files directive, so we need to duplicate @api
 
     proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
@@ -234,16 +212,10 @@ server {
   }
 
   # Bypass PeerTube for performance reasons. Optional.
-  location ~ ^/static/(webseed|redundancy|streaming-playlists)/ {
+  location ~ ^/static/(webseed|web-videos|redundancy|streaming-playlists)/ {
     limit_rate_after            5M;
 
-    # Clients usually have 4 simultaneous webseed connections, so the real limit is 3MB/s per client
-    set $peertube_limit_rate    800k;
-
-    # Increase rate limit in HLS mode, because we don't have multiple simultaneous connections
-    if ($request_uri ~ -fragmented.mp4$) {
-      set $peertube_limit_rate  5M;
-    }
+    set $peertube_limit_rate  5M;
 
     # Use this line with nginx >= 1.17.0
     limit_rate $peertube_limit_rate;