Skip to content
Merged
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
1 change: 1 addition & 0 deletions src/components/settings/cameras/CameraConfigDialog.vue
Original file line number Diff line number Diff line change
Expand Up @@ -79,6 +79,7 @@
:items="[
{ text: $t('app.setting.camera_type_options.mjpegadaptive'), value: 'mjpegstreamer-adaptive' },
{ text: $t('app.setting.camera_type_options.mjpegstream'), value: 'mjpegstreamer' },
{ text: $t('app.setting.camera_type_options.uv4l_mjpeg_stream'), value: 'uv4l-mjpeg' },
{ text: $t('app.setting.camera_type_options.hlsstream'), value: 'hlsstream' },
{ text: $t('app.setting.camera_type_options.webrtc_camera_streamer'), value: 'webrtc-camerastreamer' },
{ text: $t('app.setting.camera_type_options.webrtc_go2rtc'), value: 'webrtc-go2rtc' },
Expand Down
12 changes: 9 additions & 3 deletions src/components/widgets/camera/CameraItem.vue
Original file line number Diff line number Diff line change
Expand Up @@ -112,7 +112,7 @@

<script lang="ts">
import { Component, Vue, Prop, Watch, Ref } from 'vue-property-decorator'
import type { WebcamConfig } from '@/store/webcams/types'
import type { WebcamConfig, WebcamService } from '@/store/webcams/types'
import type { CameraFullscreenAction } from '@/store/config/types'
import { CameraComponents } from '@/dynamicImports'
import CameraMixin from '@/mixins/camera'
Expand Down Expand Up @@ -157,8 +157,14 @@ export default class CameraItem extends Vue {
}

get cameraComponent () {
if (this.camera.service) {
const componentName = `${startCase(this.camera.service).replace(/ /g, '')}Camera`
const cameraService: Exclude<WebcamService, 'uv4l-mjpeg'> | undefined = (
this.camera.service === 'uv4l-mjpeg'
? 'mjpegstreamer'
: this.camera.service
)

if (cameraService) {
const componentName = `${startCase(cameraService).replace(/ /g, '')}Camera`

if (componentName in CameraComponents) {
return CameraComponents[componentName]
Expand Down
1 change: 1 addition & 0 deletions src/locales/en.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -578,6 +578,7 @@ app:
webrtc_camera_streamer: WebRTC (camera-streamer)
video: IP Camera
iframe: HTTP page
uv4l_mjpeg_stream: UV4L-MJPEG Stream
webrtc_go2rtc: WebRTC (go2rtc)
webrtc_mediamtx: WebRTC (MediaMTX)
camera_rotate_options:
Expand Down
2 changes: 1 addition & 1 deletion src/store/webcams/types.ts
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ export interface WebcamConfig extends NewWebcamConfig {
source: WebcamSource;
}

export type WebcamService = 'mjpegstreamer' | 'mjpegstreamer-adaptive' | 'ipstream' | 'iframe' | 'hlsstream' | 'webrtc-camerastreamer' | 'webrtc-go2rtc' | 'webrtc-mediamtx' | 'device'
export type WebcamService = 'mjpegstreamer' | 'mjpegstreamer-adaptive' | 'ipstream' | 'iframe' | 'hlsstream' | 'webrtc-camerastreamer' | 'webrtc-go2rtc' | 'webrtc-mediamtx' | 'uv4l-mjpeg' | 'device'

export type WebcamRotation = 0 | 90 | 180 | 270

Expand Down
Loading