VNC-151 Enhance video frame rendering by adding positional parameters and strict property checks.

Author: quickiwiki

core/display.js

@@ -799,16 +799,22 @@ export default class Display {
         }
     }
 
-    videoFrameRect(frame) {
-        if (frame.displayWidth === 0 || frame.displayHeight === 0) {
+    videoFrameRect(frame, frame_id, x, y, width, height) {
+        if (frame.displayWidth === 0 || frame.displayHeight === 0 || frame.codedWidth === 0 || frame.codedHeight === 0) {
             return false;
         }
+
         const rect = {
             type: 'video_frame',
             frame,
+            x,
+            y,
+            width,
+            height,
+            frame_id
         };
         // TODO: REMoVE
-        this.drawVideoFrame(frame);
+        // this.drawVideoFrame(frame, x, y, width, height);
 
         this._processRectScreens(rect);
         this._asyncRenderQPush(rect);
@@ -937,16 +943,16 @@ export default class Display {
                 targetCtx.drawImage(img, x, y);
             }
         } catch (error) {
-            Log.Error('Invalid image recieved.'); //KASM-2090
+            Log.Error('Invalid image received.'); //KASM-2090
         }
     }
 
-    drawVideoFrame(videoFrame) {
+    drawVideoFrame(videoFrame, x, y, w, h) {
         try {
             let targetCtx = ((this._enableCanvasBuffer) ? this._drawCtx : this._targetCtx);
-            targetCtx.drawImage(videoFrame, 0, 0, videoFrame.displayWidth, videoFrame.displayHeight, 0, 0, videoFrame.displayWidth, videoFrame.displayHeight);
+            targetCtx.drawImage(videoFrame, x, y, w, h);
         } catch (error) {
-            Log.Error('Invalid video frame recieved.', error);
+            Log.Error('Invalid video frame received.', error);
         }
     }
 
@@ -1101,7 +1107,7 @@ export default class Display {
                     a.img.close();
                     break;
                 case 'video_frame':
-                    this.drawVideoFrame(a.frame);
+                    this.drawVideoFrame(a.frame, pos.x, pos.y, a.frame.codedWidth, a.frame.codedHeight);
                     a.frame.close();
                     break;
                 default:
@@ -1294,7 +1300,7 @@ export default class Display {
 
                 for (let sI = 0; sI < a.screenLocations.length; sI++) {
                     let screenLocation = a.screenLocations[sI];
-                    if (screenLocation.screenIndex == 0) {
+                    if (screenLocation.screenIndex === 0) {
                         switch (a.type) {
                             case 'copy':
                                 this.copyImage(screenLocation.oldX, screenLocation.oldY, screenLocation.x, screenLocation.y, a.width, a.height, a.frame_id, true);
@@ -1321,7 +1327,7 @@ export default class Display {
                                 this.drawImage(a.img, screenLocation.x, screenLocation.y, a.width, a.height);
                                 break;
                             case 'video_frame':
-                                this.drawVideoFrame(a.frame);
+                                this.drawVideoFrame(a.frame, screenLocation.x, screenLocation.y, a.frame.codedWidth, a.frame.codedHeight);
                                 a.frame.close();
                                 break;
                             default: