Skip to content

E
edx-platform
Commit 626f2896 by muhammad-ammar Committed by Mushtaq Ali
Options

add video poster support 

EDUCATOR-44
parent 763f0051
Showing with 177 additions and 108 deletions
cms/djangoapps/contentstore/views/tests/test_videos.py
...@@ -13,7 +13,7 @@ import ddt ...@@ -13,7 +13,7 @@ import ddt
import pytz import pytz
from django.conf import settings from django.conf import settings
from django.test.utils import override_settings from django.test.utils import override_settings
from edxval.api import create_profile, create_video, get_video_info from edxval.api import create_profile, create_video, get_video_info, get_course_video_image_url
from mock import Mock, patch from mock import Mock, patch
from contentstore.models import VideoUploadConfig from contentstore.models import VideoUploadConfig
......
cms/static/js/views/video_thumbnail.js
...@@ -28,7 +28,7 @@ define( ...@@ -28,7 +28,7 @@ define(
icon: '', icon: '',
text: HtmlUtils.interpolateHtml( text: HtmlUtils.interpolateHtml(
// Translators: This is a 3 part text which tells the image requirements. // Translators: This is a 3 part text which tells the image requirements.
gettext('Image requirements {lineBreak} 1280px by 720px {lineBreak} .jpg | .png | .gif'), gettext('Image requirements: {lineBreak} 1280px by 720px {lineBreak} .jpg, .png, or .gif'),
{ {
lineBreak: HtmlUtils.HTML('<br>') lineBreak: HtmlUtils.HTML('<br>')
} }
...@@ -208,7 +208,10 @@ define( ...@@ -208,7 +208,10 @@ define(
this.$('.thumbnail-action .action-icon'), this.$('.thumbnail-action .action-icon'),
HtmlUtils.HTML(this.actionsInfo[action].icon) HtmlUtils.HTML(this.actionsInfo[action].icon)
); );
this.$('.thumbnail-action .action-text').html(this.actionsInfo[action].text); HtmlUtils.setHtml(
this.$('.thumbnail-action .action-text'),
HtmlUtils.HTML(this.actionsInfo[action].text)
);
this.$('.thumbnail-action .action-text-sr').text(additionalSRText || ''); this.$('.thumbnail-action .action-text-sr').text(additionalSRText || '');
this.$('.thumbnail-wrapper').attr('class', 'thumbnail-wrapper {action}'.replace('{action}', action)); this.$('.thumbnail-wrapper').attr('class', 'thumbnail-wrapper {action}'.replace('{action}', action));
}, },
......
cms/static/sass/views/_video-upload.scss
...@@ -147,6 +147,11 @@ ...@@ -147,6 +147,11 @@
} }
.assets-library { .assets-library {
.js-table-body .video-id-col {
word-break: break-all;
}
.assets-title { .assets-title {
display: inline-block; display: inline-block;
width: flex-grid(5, 9); width: flex-grid(5, 9);
......
common/lib/xmodule/xmodule/js/fixtures/video_hls.html
...@@ -4,7 +4,7 @@ ...@@ -4,7 +4,7 @@
<div <div
id="video_id" id="video_id"
class="video closed" class="video closed"
data-metadata='{"autohideHtml5": "true", "autoplay": "false", "captionDataDir": "", "endTime": "", "generalSpeed": "1.0", "saveStateUrl": "/save_user_state", "savedVideoPosition": "0", "showCaptions": "true", "sources": ["/base/fixtures/hls/hls.m3u8", "/base/fixtures/test.mp4","/base/fixtures/test.webm"], "speed": "1.5", "startTime": "", "streams": "", "sub": "Z5KLxerq05Y", "transcriptAvailableTranslationsUrl": "/transcript/available_translations", "transcriptLanguage": "en", "transcriptLanguages": {"en": "English", "de": "Deutsch", "zh": "普通话"}, "transcriptTranslationUrl": "/transcript/translation/__lang__", "ytApiUrl": "/base/fixtures/youtube_iframe_api.js", "ytImageUrl": "", "ytTestTimeout": "1500", "ytMetadataUrl": "www.googleapis.com/youtube/v3/videos/", "source": ""}' data-metadata='{"autohideHtml5": "true", "autoplay": "false", "captionDataDir": "", "endTime": "", "generalSpeed": "1.0", "saveStateUrl": "/save_user_state", "savedVideoPosition": "0", "showCaptions": "true", "sources": ["/base/fixtures/hls/hls.m3u8", "/base/fixtures/test.mp4","/base/fixtures/test.webm"], "speed": "1.5", "startTime": "", "streams": "", "sub": "Z5KLxerq05Y", "transcriptAvailableTranslationsUrl": "/transcript/available_translations", "transcriptLanguage": "en", "transcriptLanguages": {"en": "English", "de": "Deutsch", "zh": "普通话"}, "transcriptTranslationUrl": "/transcript/translation/__lang__", "ytApiUrl": "/base/fixtures/youtube_iframe_api.js", "ytImageUrl": "", "ytTestTimeout": "1500", "ytMetadataUrl": "www.googleapis.com/youtube/v3/videos/", "source": "", "poster": "/media/video-images/poster.png"}'
> >
<div class="focus_grabber first"></div> <div class="focus_grabber first"></div>
......
common/lib/xmodule/xmodule/js/fixtures/video_html5.html
...@@ -4,7 +4,7 @@ ...@@ -4,7 +4,7 @@
<div <div
id="video_id" id="video_id"
class="video closed" class="video closed"
data-metadata='{"autohideHtml5": "true", "autoplay": "false", "captionDataDir": "", "endTime": "", "generalSpeed": "1.0", "saveStateUrl": "/save_user_state", "savedVideoPosition": "0", "showCaptions": "true", "sources": ["/base/fixtures/test.mp4","/base/fixtures/test.webm","/base/fixtures/test.ogv"], "speed": "1.5", "startTime": "", "streams": "", "sub": "Z5KLxerq05Y", "transcriptAvailableTranslationsUrl": "/transcript/available_translations", "transcriptLanguage": "en", "transcriptLanguages": {"en": "English", "de": "Deutsch", "zh": "普通话"}, "transcriptTranslationUrl": "/transcript/translation/__lang__", "ytApiUrl": "/base/fixtures/youtube_iframe_api.js", "ytImageUrl": "", "ytTestTimeout": "1500", "ytMetadataUrl": "www.googleapis.com/youtube/v3/videos/", "source": "", "html5_sources": ["http://youtu.be/3_yD_cEKoCk.mp4"]}' data-metadata='{"autohideHtml5": "true", "autoplay": "false", "captionDataDir": "", "endTime": "", "generalSpeed": "1.0", "saveStateUrl": "/save_user_state", "savedVideoPosition": "0", "showCaptions": "true", "sources": ["/base/fixtures/test.mp4","/base/fixtures/test.webm","/base/fixtures/test.ogv"], "speed": "1.5", "startTime": "", "streams": "", "sub": "Z5KLxerq05Y", "transcriptAvailableTranslationsUrl": "/transcript/available_translations", "transcriptLanguage": "en", "transcriptLanguages": {"en": "English", "de": "Deutsch", "zh": "普通话"}, "transcriptTranslationUrl": "/transcript/translation/__lang__", "ytApiUrl": "/base/fixtures/youtube_iframe_api.js", "ytImageUrl": "", "ytTestTimeout": "1500", "ytMetadataUrl": "www.googleapis.com/youtube/v3/videos/", "source": "", "html5_sources": ["http://youtu.be/3_yD_cEKoCk.mp4"], "poster": "/media/video-images/poster.png"}'
> >
<div class="focus_grabber first"></div> <div class="focus_grabber first"></div>
......
common/lib/xmodule/xmodule/js/spec/video/html5_video_spec.js
...@@ -4,7 +4,8 @@ ...@@ -4,7 +4,8 @@
var state, var state,
oldOTBD, oldOTBD,
playbackRates = [0.75, 1.0, 1.25, 1.5], playbackRates = [0.75, 1.0, 1.25, 1.5],
describeInfo; describeInfo,
POSTER_URL = '/media/video-images/poster.png';
beforeEach(function() { beforeEach(function() {
oldOTBD = window.onTouchBasedDevice; oldOTBD = window.onTouchBasedDevice;
...@@ -320,6 +321,15 @@ ...@@ -320,6 +321,15 @@
}).done(done); }).done(done);
}); });
}); });
describe('poster', function() {
it('has url in player config', function() {
expect(state.videoPlayer.player.config.poster).toEqual(POSTER_URL);
expect(state.videoPlayer.player.videoEl).toHaveAttrs({
poster: POSTER_URL
});
});
});
}); });
describe('non-hls encoding', function() { describe('non-hls encoding', function() {
...@@ -338,6 +348,28 @@ ...@@ -338,6 +348,28 @@
jasmine.getEnv().describe(describeInfo.description, describeInfo.specDefinitions); jasmine.getEnv().describe(describeInfo.description, describeInfo.specDefinitions);
}); });
it('does not show poster for html5 video if url is not present', function() {
state = jasmine.initializePlayer(
'video_html5.html',
{
poster: null
}
);
expect(state.videoPlayer.player.config.poster).toEqual(null);
expect(state.videoPlayer.player.videoEl).not.toHaveAttr('poster');
});
it('does not show poster for hls video if url is not present', function() {
state = jasmine.initializePlayer(
'video_hls.html',
{
poster: null
}
);
expect(state.videoPlayer.player.config.poster).toEqual(null);
expect(state.videoPlayer.player.videoEl).not.toHaveAttr('poster');
});
it('native controls are used on iPhone', function() { it('native controls are used on iPhone', function() {
window.onTouchBasedDevice.and.returnValue(['iPhone']); window.onTouchBasedDevice.and.returnValue(['iPhone']);
......
common/lib/xmodule/xmodule/js/src/video/02_html5_video.js
...@@ -44,8 +44,11 @@ function(_) { ...@@ -44,8 +44,11 @@ function(_) {
* // video format of the source. Supported * // video format of the source. Supported
* // video formats are: 'mp4', 'webm', and * // video formats are: 'mp4', 'webm', and
* // 'ogg'. * // 'ogg'.
* poster: Video poster URL
* *
* events: { // Object's properties identify the * browserIsSafari: Flag to tell if current browser is Safari
*
* events: { // Object's properties identify the
* // events that the API fires, and the * // events that the API fires, and the
* // functions (event listeners) that the * // functions (event listeners) that the
* // API will call when those events occur. * // API will call when those events occur.
...@@ -320,6 +323,11 @@ function(_) { ...@@ -320,6 +323,11 @@ function(_) {
this.videoEl.prop('controls', true); this.videoEl.prop('controls', true);
} }
// Set video poster
if (this.config.poster) {
this.videoEl.prop('poster', this.config.poster);
}
// Place the <video> element on the page. // Place the <video> element on the page.
this.videoEl.appendTo(el.find('.video-player > div:first-child')); this.videoEl.appendTo(el.find('.video-player > div:first-child'));
}; };
......
common/lib/xmodule/xmodule/js/src/video/03_video_player.js
...@@ -162,6 +162,7 @@ function(HTML5Video, HTML5HLSVideo, Resizer, HLS, _) { ...@@ -162,6 +162,7 @@ function(HTML5Video, HTML5HLSVideo, Resizer, HLS, _) {
commonPlayerConfig = { commonPlayerConfig = {
playerVars: state.videoPlayer.playerVars, playerVars: state.videoPlayer.playerVars,
videoSources: state.config.sources, videoSources: state.config.sources,
poster: state.config.poster,
browserIsSafari: state.browserIsSafari, browserIsSafari: state.browserIsSafari,
events: { events: {
onReady: state.videoPlayer.onReady, onReady: state.videoPlayer.onReady,
......
common/lib/xmodule/xmodule/video_module/video_module.py
...@@ -310,7 +310,10 @@ class VideoModule(VideoFields, VideoTranscriptsMixin, VideoStudentViewHandlers, ...@@ -310,7 +310,10 @@ class VideoModule(VideoFields, VideoTranscriptsMixin, VideoStudentViewHandlers,
'streams': self.youtube_streams, 'streams': self.youtube_streams,
'sub': self.sub, 'sub': self.sub,
'sources': sources, 'sources': sources,
'poster': edxval_api and edxval_api.get_course_video_image_url(
course_id=self.runtime.course_id.for_branch(None),
edx_video_id=self.edx_video_id.strip()
),
# This won't work when we move to data that # This won't work when we move to data that
# isn't on the filesystem # isn't on the filesystem
'captionDataDir': getattr(self, 'data_dir', None), 'captionDataDir': getattr(self, 'data_dir', None),
......
lms/djangoapps/courseware/tests/test_video_mongo.py
...@@ -50,32 +50,33 @@ class TestVideoYouTube(TestVideo): ...@@ -50,32 +50,33 @@ class TestVideoYouTube(TestVideo):
'handout': None, 'handout': None,
'id': self.item_descriptor.location.html_id(), 'id': self.item_descriptor.location.html_id(),
'metadata': json.dumps(OrderedDict({ 'metadata': json.dumps(OrderedDict({
"saveStateUrl": self.item_descriptor.xmodule_runtime.ajax_url + "/save_user_state", 'saveStateUrl': self.item_descriptor.xmodule_runtime.ajax_url + '/save_user_state',
"autoplay": False, 'autoplay': False,
"streams": "0.75:jNCf2gIqpeE,1.00:ZwkTiUPN0mg,1.25:rsq9auxASqI,1.50:kMyNdzVHHgg", 'streams': '0.75:jNCf2gIqpeE,1.00:ZwkTiUPN0mg,1.25:rsq9auxASqI,1.50:kMyNdzVHHgg',
"sub": "a_sub_file.srt.sjson", 'sub': 'a_sub_file.srt.sjson',
"sources": sources, 'sources': sources,
"captionDataDir": None, 'poster': None,
"showCaptions": "true", 'captionDataDir': None,
"generalSpeed": 1.0, 'showCaptions': 'true',
"speed": None, 'generalSpeed': 1.0,
"savedVideoPosition": 0.0, 'speed': None,
"start": 3603.0, 'savedVideoPosition': 0.0,
"end": 3610.0, 'start': 3603.0,
"transcriptLanguage": "en", 'end': 3610.0,
"transcriptLanguages": OrderedDict({"en": "English", "uk": u"Українська"}), 'transcriptLanguage': 'en',
"ytTestTimeout": 1500, 'transcriptLanguages': OrderedDict({'en': 'English', 'uk': u'Українська'}),
"ytApiUrl": "https://www.youtube.com/iframe_api", 'ytTestTimeout': 1500,
"ytMetadataUrl": "https://www.googleapis.com/youtube/v3/videos/", 'ytApiUrl': 'https://www.youtube.com/iframe_api',
"ytKey": None, 'ytMetadataUrl': 'https://www.googleapis.com/youtube/v3/videos/',
"transcriptTranslationUrl": self.item_descriptor.xmodule_runtime.handler_url( 'ytKey': None,
'transcriptTranslationUrl': self.item_descriptor.xmodule_runtime.handler_url(
self.item_descriptor, 'transcript', 'translation/__lang__' self.item_descriptor, 'transcript', 'translation/__lang__'
).rstrip('/?'), ).rstrip('/?'),
"transcriptAvailableTranslationsUrl": self.item_descriptor.xmodule_runtime.handler_url( 'transcriptAvailableTranslationsUrl': self.item_descriptor.xmodule_runtime.handler_url(
self.item_descriptor, 'transcript', 'available_translations' self.item_descriptor, 'transcript', 'available_translations'
).rstrip('/?'), ).rstrip('/?'),
"autohideHtml5": False, 'autohideHtml5': False,
"recordedYoutubeIsAvailable": True, 'recordedYoutubeIsAvailable': True,
})), })),
'track': None, 'track': None,
'transcript_download_format': u'srt', 'transcript_download_format': u'srt',
...@@ -129,32 +130,33 @@ class TestVideoNonYouTube(TestVideo): ...@@ -129,32 +130,33 @@ class TestVideoNonYouTube(TestVideo):
'handout': None, 'handout': None,
'id': self.item_descriptor.location.html_id(), 'id': self.item_descriptor.location.html_id(),
'metadata': json.dumps(OrderedDict({ 'metadata': json.dumps(OrderedDict({
"saveStateUrl": self.item_descriptor.xmodule_runtime.ajax_url + "/save_user_state", 'saveStateUrl': self.item_descriptor.xmodule_runtime.ajax_url + '/save_user_state',
"autoplay": False, 'autoplay': False,
"streams": "1.00:3_yD_cEKoCk", 'streams': '1.00:3_yD_cEKoCk',
"sub": "a_sub_file.srt.sjson", 'sub': 'a_sub_file.srt.sjson',
"sources": sources, 'sources': sources,
"captionDataDir": None, 'poster': None,
"showCaptions": "true", 'captionDataDir': None,
"generalSpeed": 1.0, 'showCaptions': 'true',
"speed": None, 'generalSpeed': 1.0,
"savedVideoPosition": 0.0, 'speed': None,
"start": 3603.0, 'savedVideoPosition': 0.0,
"end": 3610.0, 'start': 3603.0,
"transcriptLanguage": "en", 'end': 3610.0,
"transcriptLanguages": OrderedDict({"en": "English"}), 'transcriptLanguage': 'en',
"ytTestTimeout": 1500, 'transcriptLanguages': OrderedDict({'en': 'English'}),
"ytApiUrl": "https://www.youtube.com/iframe_api", 'ytTestTimeout': 1500,
"ytMetadataUrl": "https://www.googleapis.com/youtube/v3/videos/", 'ytApiUrl': 'https://www.youtube.com/iframe_api',
"ytKey": None, 'ytMetadataUrl': 'https://www.googleapis.com/youtube/v3/videos/',
"transcriptTranslationUrl": self.item_descriptor.xmodule_runtime.handler_url( 'ytKey': None,
'transcriptTranslationUrl': self.item_descriptor.xmodule_runtime.handler_url(
self.item_descriptor, 'transcript', 'translation/__lang__' self.item_descriptor, 'transcript', 'translation/__lang__'
).rstrip('/?'), ).rstrip('/?'),
"transcriptAvailableTranslationsUrl": self.item_descriptor.xmodule_runtime.handler_url( 'transcriptAvailableTranslationsUrl': self.item_descriptor.xmodule_runtime.handler_url(
self.item_descriptor, 'transcript', 'available_translations' self.item_descriptor, 'transcript', 'available_translations'
).rstrip('/?'), ).rstrip('/?'),
"autohideHtml5": False, 'autohideHtml5': False,
"recordedYoutubeIsAvailable": True, 'recordedYoutubeIsAvailable': True,
})), })),
'track': None, 'track': None,
'transcript_download_format': u'srt', 'transcript_download_format': u'srt',
...@@ -185,32 +187,33 @@ class TestGetHtmlMethod(BaseTestXmodule): ...@@ -185,32 +187,33 @@ class TestGetHtmlMethod(BaseTestXmodule):
super(TestGetHtmlMethod, self).setUp() super(TestGetHtmlMethod, self).setUp()
self.setup_course() self.setup_course()
self.default_metadata_dict = OrderedDict({ self.default_metadata_dict = OrderedDict({
"saveStateUrl": "", 'saveStateUrl': '',
"autoplay": settings.FEATURES.get('AUTOPLAY_VIDEOS', True), 'autoplay': settings.FEATURES.get('AUTOPLAY_VIDEOS', True),
"streams": "1.00:3_yD_cEKoCk", 'streams': '1.00:3_yD_cEKoCk',
"sub": "a_sub_file.srt.sjson", 'sub': 'a_sub_file.srt.sjson',
"sources": '[]', 'sources': '[]',
"captionDataDir": None, 'poster': None,
"showCaptions": "true", 'captionDataDir': None,
"generalSpeed": 1.0, 'showCaptions': 'true',
"speed": None, 'generalSpeed': 1.0,
"savedVideoPosition": 0.0, 'speed': None,
"start": 3603.0, 'savedVideoPosition': 0.0,
"end": 3610.0, 'start': 3603.0,
"transcriptLanguage": "en", 'end': 3610.0,
"transcriptLanguages": OrderedDict({"en": "English"}), 'transcriptLanguage': 'en',
"ytTestTimeout": 1500, 'transcriptLanguages': OrderedDict({'en': 'English'}),
"ytApiUrl": "https://www.youtube.com/iframe_api", 'ytTestTimeout': 1500,
"ytMetadataUrl": "https://www.googleapis.com/youtube/v3/videos/", 'ytApiUrl': 'https://www.youtube.com/iframe_api',
"ytKey": None, 'ytMetadataUrl': 'https://www.googleapis.com/youtube/v3/videos/',
"transcriptTranslationUrl": self.item_descriptor.xmodule_runtime.handler_url( 'ytKey': None,
'transcriptTranslationUrl': self.item_descriptor.xmodule_runtime.handler_url(
self.item_descriptor, 'transcript', 'translation/__lang__' self.item_descriptor, 'transcript', 'translation/__lang__'
).rstrip('/?'), ).rstrip('/?'),
"transcriptAvailableTranslationsUrl": self.item_descriptor.xmodule_runtime.handler_url( 'transcriptAvailableTranslationsUrl': self.item_descriptor.xmodule_runtime.handler_url(
self.item_descriptor, 'transcript', 'available_translations' self.item_descriptor, 'transcript', 'available_translations'
).rstrip('/?'), ).rstrip('/?'),
"autohideHtml5": False, 'autohideHtml5': False,
"recordedYoutubeIsAvailable": True, 'recordedYoutubeIsAvailable': True,
}) })
def test_get_html_track(self): def test_get_html_track(self):
...@@ -918,6 +921,19 @@ class TestGetHtmlMethod(BaseTestXmodule): ...@@ -918,6 +921,19 @@ class TestGetHtmlMethod(BaseTestXmodule):
context = self.item_descriptor.render(STUDENT_VIEW).content context = self.item_descriptor.render(STUDENT_VIEW).content
self.assertIn("'download_video_link': None", context) self.assertIn("'download_video_link': None", context)
@patch('xmodule.video_module.video_module.edxval_api.get_course_video_image_url')
def test_poster_image(self, get_course_video_image_url):
"""
Verify that poster image functionality works as expected.
"""
video_xml = '<video display_name="Video" download_video="true" edx_video_id="12345-67890">[]</video>'
get_course_video_image_url.return_value = '/media/video-images/poster.png'
self.initialize_module(data=video_xml)
context = self.item_descriptor.render(STUDENT_VIEW).content
self.assertIn('"poster": "/media/video-images/poster.png"', context)
@attr(shard=1) @attr(shard=1)
class TestVideoCDNRewriting(BaseTestXmodule): class TestVideoCDNRewriting(BaseTestXmodule):
...@@ -1539,13 +1555,13 @@ class TestVideoWithBumper(TestVideo): ...@@ -1539,13 +1555,13 @@ class TestVideoWithBumper(TestVideo):
Test content with rendered bumper metadata. Test content with rendered bumper metadata.
""" """
get_url_for_profiles.return_value = { get_url_for_profiles.return_value = {
"desktop_mp4": "http://test_bumper.mp4", 'desktop_mp4': 'http://test_bumper.mp4',
"desktop_webm": "", 'desktop_webm': '',
} }
get_bumper_settings.return_value = { get_bumper_settings.return_value = {
"video_id": "edx_video_id", 'video_id': 'edx_video_id',
"transcripts": {}, 'transcripts': {},
} }
is_bumper_enabled.return_value = True is_bumper_enabled.return_value = True
...@@ -1557,17 +1573,17 @@ class TestVideoWithBumper(TestVideo): ...@@ -1557,17 +1573,17 @@ class TestVideoWithBumper(TestVideo):
'license': None, 'license': None,
'bumper_metadata': json.dumps(OrderedDict({ 'bumper_metadata': json.dumps(OrderedDict({
'saveStateUrl': self.item_descriptor.xmodule_runtime.ajax_url + '/save_user_state', 'saveStateUrl': self.item_descriptor.xmodule_runtime.ajax_url + '/save_user_state',
"showCaptions": "true", 'showCaptions': 'true',
"sources": ["http://test_bumper.mp4"], 'sources': ['http://test_bumper.mp4'],
'streams': '', 'streams': '',
"transcriptLanguage": "en", 'transcriptLanguage': 'en',
"transcriptLanguages": {"en": "English"}, 'transcriptLanguages': {'en': 'English'},
"transcriptTranslationUrl": video_utils.set_query_parameter( 'transcriptTranslationUrl': video_utils.set_query_parameter(
self.item_descriptor.xmodule_runtime.handler_url( self.item_descriptor.xmodule_runtime.handler_url(
self.item_descriptor, 'transcript', 'translation/__lang__' self.item_descriptor, 'transcript', 'translation/__lang__'
).rstrip('/?'), 'is_bumper', 1 ).rstrip('/?'), 'is_bumper', 1
), ),
"transcriptAvailableTranslationsUrl": video_utils.set_query_parameter( 'transcriptAvailableTranslationsUrl': video_utils.set_query_parameter(
self.item_descriptor.xmodule_runtime.handler_url( self.item_descriptor.xmodule_runtime.handler_url(
self.item_descriptor, 'transcript', 'available_translations' self.item_descriptor, 'transcript', 'available_translations'
).rstrip('/?'), 'is_bumper', 1 ).rstrip('/?'), 'is_bumper', 1
...@@ -1580,32 +1596,33 @@ class TestVideoWithBumper(TestVideo): ...@@ -1580,32 +1596,33 @@ class TestVideoWithBumper(TestVideo):
'handout': None, 'handout': None,
'id': self.item_descriptor.location.html_id(), 'id': self.item_descriptor.location.html_id(),
'metadata': json.dumps(OrderedDict({ 'metadata': json.dumps(OrderedDict({
"saveStateUrl": self.item_descriptor.xmodule_runtime.ajax_url + "/save_user_state", 'saveStateUrl': self.item_descriptor.xmodule_runtime.ajax_url + '/save_user_state',
"autoplay": False, 'autoplay': False,
"streams": "0.75:jNCf2gIqpeE,1.00:ZwkTiUPN0mg,1.25:rsq9auxASqI,1.50:kMyNdzVHHgg", 'streams': '0.75:jNCf2gIqpeE,1.00:ZwkTiUPN0mg,1.25:rsq9auxASqI,1.50:kMyNdzVHHgg',
"sub": "a_sub_file.srt.sjson", 'sub': 'a_sub_file.srt.sjson',
"sources": sources, 'sources': sources,
"captionDataDir": None, 'poster': None,
"showCaptions": "true", 'captionDataDir': None,
"generalSpeed": 1.0, 'showCaptions': 'true',
"speed": None, 'generalSpeed': 1.0,
"savedVideoPosition": 0.0, 'speed': None,
"start": 3603.0, 'savedVideoPosition': 0.0,
"end": 3610.0, 'start': 3603.0,
"transcriptLanguage": "en", 'end': 3610.0,
"transcriptLanguages": OrderedDict({"en": "English", "uk": u"Українська"}), 'transcriptLanguage': 'en',
"ytTestTimeout": 1500, 'transcriptLanguages': OrderedDict({'en': 'English', 'uk': u'Українська'}),
"ytApiUrl": "https://www.youtube.com/iframe_api", 'ytTestTimeout': 1500,
"ytMetadataUrl": "https://www.googleapis.com/youtube/v3/videos/", 'ytApiUrl': 'https://www.youtube.com/iframe_api',
"ytKey": None, 'ytMetadataUrl': 'https://www.googleapis.com/youtube/v3/videos/',
"transcriptTranslationUrl": self.item_descriptor.xmodule_runtime.handler_url( 'ytKey': None,
'transcriptTranslationUrl': self.item_descriptor.xmodule_runtime.handler_url(
self.item_descriptor, 'transcript', 'translation/__lang__' self.item_descriptor, 'transcript', 'translation/__lang__'
).rstrip('/?'), ).rstrip('/?'),
"transcriptAvailableTranslationsUrl": self.item_descriptor.xmodule_runtime.handler_url( 'transcriptAvailableTranslationsUrl': self.item_descriptor.xmodule_runtime.handler_url(
self.item_descriptor, 'transcript', 'available_translations' self.item_descriptor, 'transcript', 'available_translations'
).rstrip('/?'), ).rstrip('/?'),
"autohideHtml5": False, 'autohideHtml5': False,
"recordedYoutubeIsAvailable": True, 'recordedYoutubeIsAvailable': True,
})), })),
'track': None, 'track': None,
'transcript_download_format': u'srt', 'transcript_download_format': u'srt',
...@@ -1614,8 +1631,8 @@ class TestVideoWithBumper(TestVideo): ...@@ -1614,8 +1631,8 @@ class TestVideoWithBumper(TestVideo):
{'display_name': 'Text (.txt) file', 'value': 'txt'} {'display_name': 'Text (.txt) file', 'value': 'txt'}
], ],
'poster': json.dumps(OrderedDict({ 'poster': json.dumps(OrderedDict({
"url": "http://img.youtube.com/vi/ZwkTiUPN0mg/0.jpg", 'url': 'http://img.youtube.com/vi/ZwkTiUPN0mg/0.jpg',
"type": "youtube" 'type': 'youtube'
})) }))
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment