Skip to content

Simplify CameraView MJPEG #4213

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
bgoncal wants to merge 6 commits into
base: main
Choose a base branch
from
Open

Simplify CameraView MJPEG #4213

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
76cd30c
Simplify CameraView MPEG
bgoncal Jan 12, 2026
5a80e7a
Update Sources/App/Cameras/CameraPlayer/MJPEG/CameraMJPEGPlayerViewMo…
bgoncal Jan 12, 2026
bd60aed
Apply suggestions from code review
bgoncal Jan 12, 2026
ee8e4e9
Fix thread safety for MainActor property access in MJPEG stream callb…
Copilot Jan 12, 2026
f54bc49
Fix thread safety for hasStarted flag in CameraMJPEGPlayerViewModel (…
Copilot Jan 12, 2026
4c21597
Fix MJPEG stream loading state management (#4214)
Copilot Jan 15, 2026
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
14 changes: 13 additions & 1 deletion HomeAssistant.xcodeproj/project.pbxproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -624,6 +624,7 @@
4210CCEB2F152AD000B71FB9 /* CameraPlayerView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4210CCEA2F152AD000B71FB9 /* CameraPlayerView.swift */; };
4210CCEF2F152ED800B71FB9 /* CameraStreamHLSView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4210CCEE2F152ED800B71FB9 /* CameraStreamHLSView.swift */; };
4210CCF32F1532C400B71FB9 /* CameraMJPEGPlayerView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4210CCF22F1532C400B71FB9 /* CameraMJPEGPlayerView.swift */; };
4210CD092F15768A00B71FB9 /* CameraMJPEGPlayerViewModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4210CD082F15768A00B71FB9 /* CameraMJPEGPlayerViewModel.swift */; };
421155212D3525F500A71630 /* AppIconSelectorView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 421155202D3525F500A71630 /* AppIconSelectorView.swift */; };
421155232D354F3F00A71630 /* AppIcon.swift in Sources */ = {isa = PBXBuildFile; fileRef = 421155222D354F3F00A71630 /* AppIcon.swift */; };
421155252D355C6700A71630 /* WidgetBuilderView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 421155242D355C6700A71630 /* WidgetBuilderView.swift */; };
Expand Down Expand Up @@ -2290,6 +2291,7 @@
4210CCEA2F152AD000B71FB9 /* CameraPlayerView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CameraPlayerView.swift; sourceTree = "<group>"; };
4210CCEE2F152ED800B71FB9 /* CameraStreamHLSView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CameraStreamHLSView.swift; sourceTree = "<group>"; };
4210CCF22F1532C400B71FB9 /* CameraMJPEGPlayerView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CameraMJPEGPlayerView.swift; sourceTree = "<group>"; };
4210CD082F15768A00B71FB9 /* CameraMJPEGPlayerViewModel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CameraMJPEGPlayerViewModel.swift; sourceTree = "<group>"; };
421155202D3525F500A71630 /* AppIconSelectorView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AppIconSelectorView.swift; sourceTree = "<group>"; };
421155222D354F3F00A71630 /* AppIcon.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AppIcon.swift; sourceTree = "<group>"; };
421155242D355C6700A71630 /* WidgetBuilderView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = WidgetBuilderView.swift; sourceTree = "<group>"; };
Expand Down Expand Up @@ -4739,6 +4741,15 @@
path = WebRTC;
sourceTree = "<group>";
};
4210CD0A2F1576B300B71FB9 /* MJPEG */ = {
isa = PBXGroup;
children = (
4210CCF22F1532C400B71FB9 /* CameraMJPEGPlayerView.swift */,
4210CD082F15768A00B71FB9 /* CameraMJPEGPlayerViewModel.swift */,
);
path = MJPEG;
sourceTree = "<group>";
};
4211551F2D3525E800A71630 /* AppIcon */ = {
isa = PBXGroup;
children = (
Expand Down Expand Up @@ -4956,10 +4967,10 @@
425390DC2E05B41F00E24EDD /* CameraPlayer */ = {
isa = PBXGroup;
children = (
4210CD0A2F1576B300B71FB9 /* MJPEG */,
4210CCF72F153BC900B71FB9 /* WebRTC */,
4210CCEA2F152AD000B71FB9 /* CameraPlayerView.swift */,
4210CCEE2F152ED800B71FB9 /* CameraStreamHLSView.swift */,
4210CCF22F1532C400B71FB9 /* CameraMJPEGPlayerView.swift */,
);
path = CameraPlayer;
sourceTree = "<group>";
Expand Down Expand Up @@ -9415,6 +9426,7 @@
1168BF33271809C600DD4D15 /* OnboardingAuthError.swift in Sources */,
4238E8532EB0D41200BDF010 /* ConnectionSecurityLevelBlockView.swift in Sources */,
42F1DA632B4D54CB002729BC /* CarPlayTemplateProvider.swift in Sources */,
4210CD092F15768A00B71FB9 /* CameraMJPEGPlayerViewModel.swift in Sources */,
4206FFBA2DAD58DB0087626C /* ConnectionInfo+WebView.swift in Sources */,
42C0FD0A2DDB2047001016D6 /* AVMetadataObject.ObjectType+HA.swift in Sources */,
);
Expand Down
237 changes: 0 additions & 237 deletions Sources/App/Cameras/CameraPlayer/CameraMJPEGPlayerView.swift
View file
Open in desktop

This file was deleted.

102 changes: 102 additions & 0 deletions Sources/App/Cameras/CameraPlayer/MJPEG/CameraMJPEGPlayerView.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,102 @@
import Shared
import SwiftUI
import UIKit

/// A SwiftUI view for displaying MJPEG camera streams.
@available(iOS 16.0, *)
struct CameraMJPEGPlayerView: View {
@StateObject private var viewModel: CameraMJPEGPlayerViewModel
@Environment(\.dismiss) private var dismiss

private let server: Server
private let cameraEntityId: String
private let cameraName: String?

init(server: Server, cameraEntityId: String, cameraName: String? = nil) {
self.server = server
self.cameraEntityId = cameraEntityId
self.cameraName = cameraName
_viewModel = StateObject(wrappedValue: CameraMJPEGPlayerViewModel(
server: server,
cameraEntityId: cameraEntityId
))
}

var body: some View {
ZStack {
Color.black.edgesIgnoringSafeArea(.all)

if viewModel.errorMessage == nil {
if let uiImage = viewModel.uiImage {
Image(uiImage: uiImage)
.resizable()
.aspectRatio(contentMode: .fit)
.ignoresSafeArea()

} else {
Color.black.ignoresSafeArea()
}
}
VStack {
HStack {
if let cameraName {
Text(cameraName)
.font(.headline)
.foregroundStyle(.white)
.padding(.horizontal)
.padding(.vertical, 8)
.background(.ultraThinMaterial)
.clipShape(Capsule())
}
Spacer()
Button {
dismiss()
} label: {
Image(systemSymbol: .xmark)
.font(.body.weight(.semibold))
.foregroundStyle(.white)
.padding(12)
.background(.ultraThinMaterial)
.clipShape(Circle())
}
}
.padding()
Spacer()
}

if viewModel.isLoading {
ProgressView()
.progressViewStyle(.circular)
.tint(.white)
.scaleEffect(1.5)
}

if let errorMessage = viewModel.errorMessage {
VStack(spacing: 16) {
Image(systemSymbol: .exclamationmarkTriangle)
.font(.largeTitle)
.foregroundStyle(.white)
Text(errorMessage)
.foregroundStyle(.gray)
.multilineTextAlignment(.center)
.padding(.horizontal)
}
}
}
.onAppear { viewModel.start() }
.onDisappear { viewModel.stop() }
.statusBarHidden(true)
.persistentSystemOverlays(.hidden)
}
}

#if DEBUG
@available(iOS 16.0, *)
#Preview {
CameraMJPEGPlayerView(
server: ServerFixture.standard,
cameraEntityId: "camera.front_door",
cameraName: "Front Door"
)
}
#endif
Loading