Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
10 changes: 10 additions & 0 deletions trame_rca/protocol.py
Original file line number Diff line number Diff line change
Expand Up @@ -71,3 +71,13 @@ def on_interaction(self, area_name, origin, event):
adapter.on_interaction(origin, event)
else:
print(f"No area {area_name} available for event")

@exportRpc("trame.rca.ack_id")
def on_ack_id(self, area_name, ack_id):
# if ack_id is sent with a frame, it is echoed back to the
# adapter when the frame is received.
adapter = self._area_adapters.get(area_name, None)
if adapter:
adapter.on_ack_id(ack_id)
else:
print(f"No area {area_name} available for event")
3 changes: 2 additions & 1 deletion vue-components/src/components/DisplayArea.js
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,8 @@ export default {
<image-display-area v-if="display === 'image'" :name="name" :origin="origin" :poolSize="4" />
<media-source-display-area v-if="display === 'media-source'" :name="name" :origin="origin" />
<video-decoder-display-area v-if="display === 'video-decoder'" :name="name" :origin="origin" />
<raw-image-display-area v-if="display === 'raw-image'" :name="name" :origin="origin" />
<raw-image-display-area v-if="display === 'raw-image'" :name="name" :origin="origin"
@user_data="(d) => $emit('user_data', d)"/>
</div>
`,
};
25 changes: 21 additions & 4 deletions vue-components/src/components/RawImageDisplayArea.js
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
const { inject } = window.Vue;

export default {
props: {
name: {
Expand Down Expand Up @@ -29,18 +31,21 @@ export default {
},
},
mounted() {
const trame = inject('trame');

this.wslinkSubscription = null;
const canvas = this.$el;
const ctx = canvas.getContext('2d');
this.onImage = async ([{ name, meta, content }]) => {
if (this.name === name) {
let imageData = null;
if (meta.type.includes('image/rgb24')) {
const data = content.buffer
? content
: new Uint8Array(await content.arrayBuffer());
canvas.width = meta.w;
canvas.height = meta.h;
const imageData = ctx.createImageData(meta.w, meta.h);
imageData = ctx.createImageData(meta.w, meta.h);
const pixels = imageData.data;
let iRGB = 0;
let iRGBA = 0;
Expand All @@ -50,16 +55,28 @@ export default {
pixels[iRGBA++] = data[iRGB++];
pixels[iRGBA++] = 255;
}
ctx.putImageData(imageData, 0, 0);
this.hasContent = true;
} else if (meta.type.includes('image/rgba32')) {
const data = new Uint8ClampedArray(
content.buffer ? content : await content.arrayBuffer()
);
canvas.width = meta.w;
canvas.height = meta.h;
const imageData = new ImageData(data, meta.w, meta.h);
imageData = new ImageData(data, meta.w, meta.h);
}
if (imageData) {
ctx.putImageData(imageData, 0, 0);
// if the frame sender provided an ack_id, send back to the server
// so they know this frame has been processed
if (meta['ack_id'] !== undefined) {
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

meta.ack_id !== undefined

trame.client
.getConnection()
.getSession()
.call('trame.rca.ack_id', [this.name, meta['ack_id']]);
}
// if the frame sender provide user_data, emit as a client event
if (meta['user_data'] !== undefined) {
this.$emit('user_data', meta['user_data']);
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

this.$emit('user-data', meta.user_data);

}
this.hasContent = true;
} else {
this.hasContent = false;
Expand Down