HoshinoKoji/psychojs
1
0
Fork 0
mirror of https://github.com/psychopy/psychojs.git synced 2025-05-10 18:50:54 +00:00
Code Actions Packages Releases Activity

texture instantiation moved back to update method.

Browse Source
This commit is contained in:
lightest 2024-04-03 23:48:29 +01:00
parent 328cb54d53
commit f42d806f76
1 changed files with 13 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
src/visual/MovieStim.js
View File

@ -92,7 +92,6 @@ export class MovieStim extends VisualStim
this._youtubePlayer = undefined; this._youtubePlayer = undefined;
this._ytPlayerIsReady = false; this._ytPlayerIsReady = false;
// movie and movie control:
this._addAttribute( this._addAttribute(
"movie", "movie",
movie, movie,
@ -242,28 +241,29 @@ export class MovieStim extends VisualStim
{ {
htmlVideo = videoResource; htmlVideo = videoResource;
htmlVideo.playsInline = true; htmlVideo.playsInline = true;
this._pixiTextureResource = PIXI.Texture.from(htmlVideo, { resourceOptions: { autoPlay: false } });
// Not using PIXI.Texture.from() on purpose, as it caches both PIXI.Texture and PIXI.BaseTexture.
// As a result of that we can have multiple MovieStim instances using same PIXI.BaseTexture,
// thus changing texture related properties like interpolation, or calling _pixi.destroy(true)
// will affect all MovieStims which happen to share that BaseTexture.
this._pixiTextureResource = new PIXI.Texture(new PIXI.BaseTexture(
this._movie,
{
resourceOptions: { autoPlay: this.autoPlay }
}
));
} }
else if (videoResource instanceof PIXI.Texture) else if (videoResource instanceof PIXI.Texture)
{ {
htmlVideo = videoResource.baseTexture.resource.source; htmlVideo = videoResource.baseTexture.resource.source;
this._pixiTextureResource = videoResource;
} }
else else
{ {
throw `${videoResource.toString()} is not a HTMLVideoElement nor PIXI.Texture!`; throw `${videoResource.toString()} is not a HTMLVideoElement nor PIXI.Texture!`;
} }
// Not using PIXI.Texture.from() on purpose, as it caches both PIXI.Texture and PIXI.BaseTexture.
// As a result of that we can have multiple MovieStim instances using same PIXI.BaseTexture,
// thus changing texture related properties like interpolation, or calling _pixi.destroy(true)
// will affect all MovieStims which happen to share that BaseTexture.
this._pixiTextureResource = new PIXI.Texture(
new PIXI.BaseTexture(
htmlVideo,
{
resourceOptions: { autoPlay: this.autoPlay }
}
)
);
this.psychoJS.logger.debug(`set the movie of MovieStim: ${this._name} as: src= ${htmlVideo.src}, size= ${htmlVideo.videoWidth}x${htmlVideo.videoHeight}, duration= ${htmlVideo.duration}s`); this.psychoJS.logger.debug(`set the movie of MovieStim: ${this._name} as: src= ${htmlVideo.src}, size= ${htmlVideo.videoWidth}x${htmlVideo.videoHeight}, duration= ${htmlVideo.duration}s`);
// ensure we have only one onended listener per HTMLVideoElement, since we can have several // ensure we have only one onended listener per HTMLVideoElement, since we can have several