feat: Support for vtt (#13)

videojs · Dec 11, 2017 · 96fc406 · 96fc406
1 parent 42fc42e
commit 96fc406
Show file tree

Hide file tree

Showing 3 changed files with 25 additions and 12 deletions.
diff --git a/src/toM3u8.js b/src/toM3u8.js
@@ -15,6 +15,14 @@ export const formatAudioPlaylist = ({ attributes, segments }) => {
 };
 
 export const formatVttPlaylist = ({ attributes, segments }) => {
+ if (segments === undefined) {
+ segments = [{
+ uri: attributes.url,
+ timeline: attributes.periodIndex,
+ resolvedUri: attributes.url || '',
+ duration: attributes.sourceDuration
+ }];
+ }
  return {
  attributes: {
  NAME: attributes.id,
@@ -86,6 +94,7 @@ export const formatVideoPlaylist = ({ attributes, segments }) => {
  attributes: {
  NAME: attributes.id,
  AUDIO: 'audio',
+ SUBTITLES: 'subs',
  RESOLUTION: {
  width: parseInt(attributes.width, 10),
  height: parseInt(attributes.height, 10)
@@ -141,8 +150,7 @@ export const toM3u8 = dashPlaylists => {
  master.mediaGroups.AUDIO.audio = organizeAudioPlaylists(audioPlaylists);
  }
 
- // TODO: vtt playlists not yet supported
- if (vttPlaylists.length && false) {
+ if (vttPlaylists.length) {
  master.mediaGroups.SUBTITLES.subs = organizeVttPlaylists(vttPlaylists);
  }
 

diff --git a/test/manifests/maat_vtt_segmentTemplate.js b/test/manifests/maat_vtt_segmentTemplate.js
@@ -101,9 +101,6 @@ export const parsedManifest = {
  }
  },
  ['CLOSED-CAPTIONS']: {},
- // Subtitles feature is turned off
- SUBTITLES: {},
- /*
  SUBTITLES: {
  subs: {
  en: {
@@ -118,7 +115,12 @@ export const parsedManifest = {
  },
  endList: true,
  resolvedUri: 'https://example.com/en.vtt',
- segments: undefined,
+ segments: [{
+ duration: 6,
+ resolvedUri: 'https://example.com/en.vtt',
+ timeline: 0,
+ uri: 'https://example.com/en.vtt'
+ }],
  timeline: 0,
  uri: ''
  }],
@@ -136,20 +138,25 @@ export const parsedManifest = {
  },
  endList: true,
  resolvedUri: 'https://example.com/es.vtt',
- segments: undefined,
+ segments: [{
+ duration: 6,
+ resolvedUri: 'https://example.com/es.vtt',
+ timeline: 0,
+ uri: 'https://example.com/es.vtt'
+ }],
  timeline: 0,
  uri: ''
  }],
  uri: ''
  }
  }
  },
- */
  VIDEO: {}
  },
  playlists: [{
  attributes: {
  AUDIO: 'audio',
+ SUBTITLES: 'subs',
  BANDWIDTH: 449000,
  CODECS: 'avc1.420015',
  NAME: '482',
@@ -194,6 +201,7 @@ export const parsedManifest = {
  }, {
  attributes: {
  AUDIO: 'audio',
+ SUBTITLES: 'subs',
  BANDWIDTH: 3971000,
  CODECS: 'avc1.64001e',
  NAME: '720',

diff --git a/test/toM3u8.test.js b/test/toM3u8.test.js
@@ -88,9 +88,6 @@ QUnit.test('playlists', function(assert) {
  }
  },
  ['CLOSED-CAPTIONS']: {},
- // Subtitles feature is turned off
- SUBTITLES: {},
- /*
  SUBTITLES: {
  subs: {
  text: {
@@ -113,12 +110,12 @@ QUnit.test('playlists', function(assert) {
  }
  }
  },
- */
  VIDEO: {}
  },
  playlists: [{
  attributes: {
  AUDIO: 'audio',
+ SUBTITLES: 'subs',
  BANDWIDTH: 10000,
  CODECS: 'foo;bar',
  NAME: '1',