Skip to content

Commit 6e57724

Browse files
authored
fix: ignore crossorigin in cameras by default (#1152)
Signed-off-by: Pedro Lamas <pedrolamas@gmail.com>
1 parent e6194a8 commit 6e57724

File tree

7 files changed

+12
-5
lines changed

7 files changed

+12
-5
lines changed

src/components/widgets/camera/CameraItem.vue

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@
99
:is="cameraComponent"
1010
ref="component-instance"
1111
:camera="camera"
12+
:crossorigin="crossorigin"
1213
class="camera-image"
1314
@raw-camera-url="rawCameraUrl = $event"
1415
@frames-per-second="framesPerSecond = $event"
@@ -68,6 +69,9 @@ export default class CameraItem extends Vue {
6869
@Prop({ type: Boolean, required: false, default: false })
6970
readonly fullscreen!: boolean
7071
72+
@Prop({ type: String })
73+
readonly crossorigin?: 'anonymous' | 'use-credentials' | ''
74+
7175
@Ref('component-instance')
7276
readonly componentInstance!: CameraMixin
7377

src/components/widgets/camera/services/HlsstreamCamera.vue

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
ref="streamingElement"
44
autoplay
55
muted
6-
crossorigin="anonymous"
6+
:crossorigin="crossorigin"
77
:style="cameraStyle"
88
/>
99
</template>

src/components/widgets/camera/services/IpstreamCamera.vue

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
:src="cameraVideoSource"
55
autoplay
66
muted
7-
crossorigin="anonymous"
7+
:crossorigin="crossorigin"
88
:style="cameraStyle"
99
/>
1010
</template>

src/components/widgets/camera/services/MjpegstreamerAdaptiveCamera.vue

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
ref="streamingElement"
44
:src="cameraImageSource"
55
:style="cameraStyle"
6-
crossorigin="anonymous"
6+
:crossorigin="crossorigin"
77
@load="handleImageLoad"
88
>
99
</template>

src/components/widgets/camera/services/MjpegstreamerCamera.vue

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
ref="streamingElement"
44
:src="cameraImageSource"
55
:style="cameraStyle"
6-
crossorigin="anonymous"
6+
:crossorigin="crossorigin"
77
>
88
</template>
99

src/components/widgets/camera/services/WebrtcCamerastreamerCamera.vue

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
autoplay
55
muted
66
:style="cameraStyle"
7-
crossorigin="anonymous"
7+
:crossorigin="crossorigin"
88
/>
99
</template>
1010

src/mixins/camera.ts

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,9 @@ export default class CameraMixin extends Vue {
77
@Prop({ type: Object, required: true })
88
readonly camera!: CameraConfig
99

10+
@Prop({ type: String })
11+
readonly crossorigin?: 'anonymous' | 'use-credentials' | ''
12+
1013
@Ref('streamingElement')
1114
readonly streamingElement!: HTMLImageElement | HTMLIFrameElement | HTMLVideoElement
1215

0 commit comments

Comments
 (0)