Skip to content

Alps 904 - Video quality change #73

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
aberthet-gpsw wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Alps 904 - Video quality change #73

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
be6939f
When requesting quickly a change in the quality of a video, the
aberthet-gpsw May 16, 2017
fa9753e
Fix two bugs when the video was seeking:
aberthet-gpsw May 30, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
55 changes: 33 additions & 22 deletions src/display/video/VideoHTML5.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -930,7 +930,7 @@ FORGE.VideoHTML5.prototype._setRequestIndex = function(index, force)
//If a request is already being proccessed clear it
if (this._requestIndex !== -1 && this._requestIndex !== index)
{
this._clearRequestedVideo();
this._abortRequest();
}

var alreadyRequested = index === this._requestIndex ? true : false;
Expand Down Expand Up @@ -975,7 +975,8 @@ FORGE.VideoHTML5.prototype._setRequestIndex = function(index, force)
this._context = this._viewer.audio.context;

//FOA decoder and binaural renderer
this._decoder = Omnitone.createFOADecoder(this._context, requestedVideo.element, {
this._decoder = Omnitone.createFOADecoder(this._context, requestedVideo.element,
{
channelMap: this._defaultChannelMap
//HRTFSetUrl: 'YOUR_HRTF_SET_URL', //Base URL for the cube HRTF sets.
//postGainDB: 0, //Post-decoding gain compensation in dB.
Expand Down Expand Up @@ -1040,11 +1041,16 @@ FORGE.VideoHTML5.prototype._decoderInitializedError = function()
*/
FORGE.VideoHTML5.prototype._onRequestLoadStart = function()
{
var element = this._getRequestedVideo().element;
var element = this._getRequestedVideo();

if (element !== null)
{
element = element.element;

this.log("_onRequestLoadStart [readyState: " + element.readyState + "]");
element.removeEventListener("loadstart", this._onRequestLoadStartBind, false);
element.addEventListener("loadedmetadata", this._onRequestLoadedMetaDataBind, false);
this.log("_onRequestLoadStart [readyState: " + element.readyState + "]");
element.removeEventListener("loadstart", this._onRequestLoadStartBind, false);
element.addEventListener("loadedmetadata", this._onRequestLoadedMetaDataBind, false);
}
};

/**
Expand Down Expand Up @@ -1215,7 +1221,6 @@ FORGE.VideoHTML5.prototype._onRequestSeekedWhileSync = function()
this.log("_onRequestSeekedWhileSync " + this.currentTime);

var requestIndex = this._requestIndex;
this._abortRequest(false);
this._setRequestIndex(requestIndex);
};

Expand Down Expand Up @@ -1244,7 +1249,7 @@ FORGE.VideoHTML5.prototype._videoSyncTimerLoop = function()
*/
FORGE.VideoHTML5.prototype._requestTimeOutHandler = function()
{
this.log("_requestTimeOutHandler "+this._requestIndex);
this.log("_requestTimeOutHandler " + this._requestIndex);
this._abortRequest(true);
};

Expand Down Expand Up @@ -1548,20 +1553,26 @@ FORGE.VideoHTML5.prototype._clearRequestedVideo = function()
{
//Remove all listeners used for the requested video
var element = video.element;
element.removeEventListener("loadstart", this._onRequestLoadStartBind, false);
element.removeEventListener("loadedmetadata", this._onRequestLoadedMetaDataBind, false);
element.removeEventListener("loadeddata", this._onRequestLoadedDataBind, false);
element.removeEventListener("play", this._onRequestCanPlayBeforeSeekBind, false);
element.removeEventListener("seeked", this._onRequestSeekedBind, false);
if (FORGE.Device.edge === true || FORGE.Device.ie === true)
{
element.removeEventListener("canplaythrough", this._onRequestCanPlayAfterSeekBind, false);
}
else

if (typeof element !== "undefined" && element !== null)
{
element.removeEventListener("canplay", this._onRequestCanPlayAfterSeekBind, false);
element.removeEventListener("loadstart", this._onRequestLoadStartBind, false);
element.removeEventListener("loadedmetadata", this._onRequestLoadedMetaDataBind, false);
element.removeEventListener("loadeddata", this._onRequestLoadedDataBind, false);
element.removeEventListener("play", this._onRequestCanPlayBeforeSeekBind, false);
element.removeEventListener("seeked", this._onRequestSeekedBind, false);

if (FORGE.Device.edge === true || FORGE.Device.ie === true)
{
element.removeEventListener("canplaythrough", this._onRequestCanPlayAfterSeekBind, false);
}
else
{
element.removeEventListener("canplay", this._onRequestCanPlayAfterSeekBind, false);
}

element.removeEventListener("error", this._onRequestErrorBind, false);
}
element.removeEventListener("error", this._onRequestErrorBind, false);

//Destroy the requested video
this._destroyVideo(video);
Expand Down Expand Up @@ -1878,7 +1889,7 @@ FORGE.VideoHTML5.prototype._isAmbisonic = function()
*/
FORGE.VideoHTML5.prototype.update = function()
{
if(this._decoder !== null && this._playing === true)
if (this._decoder !== null && this._playing === true)
{
//Rotate the binaural renderer based on a Three.js camera object.
var m4 = this._viewer.renderer.camera.modelViewInverse;
Expand Down Expand Up @@ -2666,7 +2677,7 @@ Object.defineProperty(FORGE.VideoHTML5.prototype, "muted",
Object.defineProperty(FORGE.VideoHTML5.prototype, "ambisonic",
{
/** @this {FORGE.VideoHTML5} */
get: function ()
get: function()
{
return this._ambisonic;
}
Expand Down