Skip to content

Commit

Permalink
browser: notify user for unsupported video
Browse files Browse the repository at this point in the history
detect if video is able to play via checking if any frames are decoded,
in other cases(i.e: file not found or corrupted file) check for the errors in source and video

Signed-off-by: Pranam Lashkari <[email protected]>
Change-Id: I22bfc836a98ec0eb2caa58b89332b2531d69d18f
  • Loading branch information
lpranam committed Sep 8, 2023
1 parent d4dcc9e commit cd37b92
Show file tree
Hide file tree
Showing 2 changed files with 43 additions and 0 deletions.
27 changes: 27 additions & 0 deletions browser/src/layer/vector/SVGGroup.js
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,8 @@
* L.SVGGroup
*/

/* global _ */

L.SVGGroup = L.Layer.extend({

options: {
Expand Down Expand Up @@ -78,6 +80,31 @@ L.SVGGroup = L.Layer.extend({
var point = this._map.latLngToLayerPoint(this._bounds.getNorthWest());
svgLastChild.setAttribute('x', point.x);
svgLastChild.setAttribute('y', point.y);

var video = svgLastChild.getElementsByTagName('video')[0];
var source = svgLastChild.getElementsByTagName('source')[0];
this.checkVideoSupport(video, source);
},

checkVideoSupport: function(video,source) {
var that = this;
var videoWarning = _('Document contains uncompatible video');

video.addEventListener('playing', function() {
window.setTimeout(function() {
if (video.webkitDecodedFrameCount === 0) {
that._map.uiManager.showSnackbar(videoWarning);
}
}, 1000);
});

video.addEventListener('error', function() {
that._map.uiManager.showSnackbar(videoWarning);
});

source.addEventListener('error', function() {
that._map.uiManager.showSnackbar(videoWarning);
});
},

addEmbeddedSVG: function (svgString) {
Expand Down
16 changes: 16 additions & 0 deletions browser/src/map/handler/Map.SlideShow.js
Original file line number Diff line number Diff line change
Expand Up @@ -115,6 +115,22 @@ L.Map.SlideShow = L.Handler.extend({
var separator = (this._slideURL.indexOf('?') === -1) ? '?' : '&';
this._slideShow.src = this._slideURL + separator + 'StartSlideNumber=' + this._startSlideNumber;
this._slideShow.contentWindow.focus();

var that = this;
this._slideShow.addEventListener('load', function() {
var videos = that._slideShow.contentWindow.document.getElementsByTagName('video');
var videoWarning = _('Document contains uncompatible video');
for (var i = 0; i < videos.length; i++) {
if (videos[i].networkState === 3) {
that._map.uiManager.showSnackbar(videoWarning);
break;
}
var source = videos[i].getElementsByTagName('source')[0];
source.addEventListener('error', function() {
that._map.uiManager.showSnackbar(videoWarning);
});
}
});
},

_processSlideshowLinks: function() {
Expand Down

0 comments on commit cd37b92

Please sign in to comment.