Skip to content

bytesToURI:URL.createObjectURL issue #2

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
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

bytesToURI:URL.createObjectURL issue #2

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
42 changes: 21 additions & 21 deletions lib/rasterEngine.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -65,30 +65,30 @@ wdi.RasterEngine = $.spcExtend(wdi.EventObject.prototype, {
var img = wdi.GlobalPool.create('Image'); //auto-release pool
wdi.ExecutionControl.sync = true;
var url;
img.onload = function() {
URL.revokeObjectURL(url);
var box = stream.computedBox;
// we only rotate the stream if spice tells us so through the TOP_DOWN flag mask
if (!(stream.flags & wdi.SpiceStreamFlags.SPICE_STREAM_FLAGS_TOP_DOWN)) {
var offsetX = box.x + (this.width/2);
var offsetY = box.y + (this.height/2);
context.save();
context.translate(offsetX, offsetY);
context.rotate(Math.PI);
context.scale(-1,1);
context.drawImage(this, box.x-offsetX, box.y-offsetY, box.width, box.height);
context.restore();
} else {
context.drawImage(this, box.x, box.y, box.width, box.height);
}
};

img.onerror = function() {
URL.revokeObjectURL(url)
};

url = wdi.SpiceObject.bytesToURI(imageData);
img.src = url;
//bytesToURI return Promise
wdi.SpiceObject.bytesToURI(imageData).then(res=>{
img.onload = function() {
URL.revokeObjectURL(url);
var box = stream.computedBox;
// we only rotate the stream if spice tells us so through the TOP_DOWN flag mask
if (!(stream.flags & wdi.SpiceStreamFlags.SPICE_STREAM_FLAGS_TOP_DOWN)) {
var offsetX = box.x + (this.width/2);
var offsetY = box.y + (this.height/2);
context.save();
context.translate(offsetX, offsetY);
context.rotate(Math.PI);
context.scale(-1,1);
context.drawImage(this, box.x-offsetX, box.y-offsetY, box.width, box.height);
context.restore();
} else {
context.drawImage(this, box.x, box.y, box.width, box.height);
}
};
img.src = res;
});
},

handleStreamClip: function(spiceMessage) {
Expand Down
16 changes: 15 additions & 1 deletion spiceobjects/spiceobjects.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,21 @@ wdi.SpiceObject = {

bytesToURI: function (data) {
var blob = new Blob([data], {type: "image/jpeg"});
return URL.createObjectURL(blob);
/**
* reason: The performance of 'URL.createObjectURL' is better than 'reader.readAsDataURL' ,
* but 'URL.createObjectURL' will download picture in memory and it can not be cleared.
* 'reader.readAsDataURL' will generate base64 code and auto GC.If we use 'URL.createObjectURL' here,
* When the remote desktop is running long time and image chaning always,it will be out of memory.
*
*/
return new Promise((resolve, reject) => {
const reader = new FileReader();
reader.readAsDataURL(blob);
reader.onload=function(){
resolve(reader.result);
};
})
// return URL.createObjectURL(blob);
},

bytesToStringBE: function (bytes, nbytes) {
Expand Down