OpenCloud
/
riot-web
mirror of https://github.com/vector-im/riot-web
1
0
Fork 0
Code Issues Releases Wiki Activity

Merge pull request #2196 from matrix-org/revert-2176-hs/object-urls-video 

Revert "Use createObjectURL instead of readAsDataURL for videos"
pull/21833/head
David Baker 2018-10-04 20:46:26 +01:00 committed by GitHub
parent a7beb0ba39 2ac951bc65
commit 1ceefd3d1b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 15 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
src/ContentMessages.js
View File

@ -153,17 +153,24 @@ function loadVideoElement(videoFile) {
// Load the file into an html element
const video = document.createElement("video");
// Wait until we have enough data to thumbnail the first frame.
video.onloadeddata = function() {
URL.revokeObjectURL(video.src);
deferred.resolve(video);
const reader = new FileReader();
reader.onload = function(e) {
video.src = e.target.result;
// Once ready, returns its size
// Wait until we have enough data to thumbnail the first frame.
video.onloadeddata = function() {
deferred.resolve(video);
};
video.onerror = function(e) {
deferred.reject(e);
};
};
video.onerror = function(e) {
reader.onerror = function(e) {
deferred.reject(e);
};
reader.readAsDataURL(videoFile);
// We don't use readAsDataURL because massive files and b64 don't mix.
video.src = URL.createObjectURL(videoFile);
return deferred.promise;
}