diff options
author | Chocobozzz <me@florianbigard.com> | 2019-01-29 08:37:25 +0100 |
---|---|---|
committer | Chocobozzz <chocobozzz@cpy.re> | 2019-02-11 09:13:02 +0100 |
commit | 092092969633bbcf6d4891a083ea497a7d5c3154 (patch) | |
tree | 69e82fe4f60c444cca216830e96afe143a9dac71 /client/src/standalone | |
parent | 4348a27d252a3349bafa7ef4859c0e2cf060c255 (diff) | |
download | PeerTube-092092969633bbcf6d4891a083ea497a7d5c3154.tar.gz PeerTube-092092969633bbcf6d4891a083ea497a7d5c3154.tar.zst PeerTube-092092969633bbcf6d4891a083ea497a7d5c3154.zip |
Add hls support on server
Diffstat (limited to 'client/src/standalone')
-rw-r--r-- | client/src/standalone/videos/embed.ts | 21 |
1 files changed, 15 insertions, 6 deletions
diff --git a/client/src/standalone/videos/embed.ts b/client/src/standalone/videos/embed.ts index 6dd9a3d76..1e58d42d9 100644 --- a/client/src/standalone/videos/embed.ts +++ b/client/src/standalone/videos/embed.ts | |||
@@ -23,7 +23,13 @@ import { peertubeTranslate, ResultList, VideoDetails } from '../../../../shared' | |||
23 | import { PeerTubeResolution } from '../player/definitions' | 23 | import { PeerTubeResolution } from '../player/definitions' |
24 | import { VideoJSCaption } from '../../assets/player/peertube-videojs-typings' | 24 | import { VideoJSCaption } from '../../assets/player/peertube-videojs-typings' |
25 | import { VideoCaption } from '../../../../shared/models/videos/caption/video-caption.model' | 25 | import { VideoCaption } from '../../../../shared/models/videos/caption/video-caption.model' |
26 | import { PeertubePlayerManager, PeertubePlayerManagerOptions, PlayerMode } from '../../assets/player/peertube-player-manager' | 26 | import { |
27 | P2PMediaLoaderOptions, | ||
28 | PeertubePlayerManager, | ||
29 | PeertubePlayerManagerOptions, | ||
30 | PlayerMode | ||
31 | } from '../../assets/player/peertube-player-manager' | ||
32 | import { VideoStreamingPlaylistType } from '../../../../shared/models/videos/video-streaming-playlist.type' | ||
27 | 33 | ||
28 | /** | 34 | /** |
29 | * Embed API exposes control of the embed player to the outside world via | 35 | * Embed API exposes control of the embed player to the outside world via |
@@ -319,13 +325,16 @@ class PeerTubeEmbed { | |||
319 | } | 325 | } |
320 | 326 | ||
321 | if (this.mode === 'p2p-media-loader') { | 327 | if (this.mode === 'p2p-media-loader') { |
328 | const hlsPlaylist = videoInfo.streamingPlaylists.find(p => p.type === VideoStreamingPlaylistType.HLS) | ||
329 | |||
322 | Object.assign(options, { | 330 | Object.assign(options, { |
323 | p2pMediaLoader: { | 331 | p2pMediaLoader: { |
324 | // playlistUrl: 'https://akamai-axtest.akamaized.net/routes/lapd-v1-acceptance/www_c4/Manifest.m3u8' | 332 | playlistUrl: hlsPlaylist.playlistUrl, |
325 | // playlistUrl: 'https://d2zihajmogu5jn.cloudfront.net/bipbop-advanced/bipbop_16x9_variant.m3u8' | 333 | segmentsSha256Url: hlsPlaylist.segmentsSha256Url, |
326 | // trackerAnnounce: [ window.location.origin.replace(/^http/, 'ws') + '/tracker/socket' ], | 334 | redundancyBaseUrls: hlsPlaylist.redundancies.map(r => r.baseUrl), |
327 | playlistUrl: 'https://cdn.theoplayer.com/video/elephants-dream/playlist.m3u8' | 335 | trackerAnnounce: videoInfo.trackerUrls, |
328 | } | 336 | videoFiles: videoInfo.files |
337 | } as P2PMediaLoaderOptions | ||
329 | }) | 338 | }) |
330 | } else { | 339 | } else { |
331 | Object.assign(options, { | 340 | Object.assign(options, { |