From b6b8689a1d63a2c0162eafe89007ba102435359f Mon Sep 17 00:00:00 2001 From: Sanborn Hilland Date: Wed, 24 Feb 2016 11:50:10 -0500 Subject: [PATCH] Correct instantiation of HttpVideoSource with no content protection. Passing an empty config object is no longer acceptable because the keySystem property is mandatory on drmConfig objects. Also modified HttpVideoSource constructor comment so that the drmConfig comments are the single source of truth regarding well-formed drmConfig objects. --- app.js | 2 +- lib/player/http_video_source.js | 3 +-- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/app.js b/app.js index f810723fbe..baf2c733e5 100644 --- a/app.js +++ b/app.js @@ -699,7 +699,7 @@ app.loadHttpStream = function() { var subtitlesUrl = document.getElementById('subtitlesUrlInput').value; var config = keySystem ? {'keySystem': keySystem, 'licenseServerUrl': licenseServerUrl} : - {}; + {'keySystem': ''}; app.load_(new shaka.player.HttpVideoSource(mediaUrl, subtitlesUrl, config)); }; diff --git a/lib/player/http_video_source.js b/lib/player/http_video_source.js index 7083d91361..0ca129a1e6 100644 --- a/lib/player/http_video_source.js +++ b/lib/player/http_video_source.js @@ -33,8 +33,7 @@ goog.require('shaka.util.StringUtils'); * Creates an HttpVideoSource. * @param {string} mediaUrl The media URL. * @param {string} textUrl The text URL, or empty string if no subtitles. - * @param {shaka.player.DrmInfo.Config} drmInfoConfig A DrmInfo Config object, - * an empty object indicates unencrypted content. + * @param {shaka.player.DrmInfo.Config} drmInfoConfig A DrmInfo Config object. * @struct * @constructor * @implements {shaka.player.IVideoSource}