Fix image source performance regression #5845
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
mollymerp
approved these changes
Dec 12, 2017
src/source/image_source.js
Outdated
| @@ -207,7 +201,7 @@ class ImageSource extends Evented implements Source { | |||
| this.texture.bind(gl.LINEAR, gl.CLAMP_TO_EDGE); | |||
| } else if (resize) { | |||
| this.texture.update(image); | |||
| } else if (image instanceof window.HTMLVideoElement || image instanceof window.ImageData || image instanceof window.HTMLCanvasElement) { | |||
| } else if (image instanceof window.HTMLVideoElement || image instanceof window.HTMLCanvasElement) { | |||
There was a problem hiding this comment.
per your comment, should we also check if animate: true for CanvasSource in this conditional?
There was a problem hiding this comment.
Good call, added a fix for that as well.
lbud
approved these changes
Dec 12, 2017
jfirebaugh
commented
Dec 12, 2017
src/source/canvas_source.js
Outdated
| @@ -135,6 +135,8 @@ class CanvasSource extends ImageSource { | |||
|
|
|||
| if (Object.keys(this.tiles).length === 0) return; // not enough data for current position | |||
|
|
|||
| if (!this._playing && this.texture) return; // Already prepared the static image | |||
There was a problem hiding this comment.
Hmm, actually, this is wrong -- _prepareImage needs to be called if the coordinates have changed, to re-initialize boundsBuffer.
Static image sources were getting the image texture uploaded on every frame, as were paused canvas and video sources.
|
Ok, I took a different approach (inlining |
lbud
approved these changes
Dec 14, 2017
Merged
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Fixes #5752. Static image sources were getting the image texture uploaded on every frame. It's unclear to me why the
instanceof window.ImageDatacondition was included in_prepareImage--gl.texSubImage2Dshould be needed only for video and animated canvas sources. Does anyone know?I manually tested: