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
3 changes: 2 additions & 1 deletion ui/src/NumberField.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@ export const NumberField = ({
value,
min,
onChange,
helperText,
...props
}: NumberFieldProps & Omit<TextFieldProps, 'value' | 'onChange'>) => {
const [stringValue, setStringValue] = React.useState<string>(value.toString());
Expand All @@ -20,7 +21,7 @@ export const NumberField = ({
<TextField
value={stringValue}
type="number"
helperText={error}
helperText={error || helperText}
error={error !== ''}
onChange={(event) => {
setStringValue(event.target.value);
Expand Down
20 changes: 19 additions & 1 deletion ui/src/SettingDialog.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ export const SettingDialog = ({open, setOpen, updateName, saveSettings}: Setting
setOpen(false);
};

const {name, preferCodec, displayMode, framerate} = settingsInput;
const {name, preferCodec, displayMode, framerate, width, height} = settingsInput;

return (
<Dialog open={open} onClose={() => setOpen(false)} maxWidth={'xs'} fullWidth>
Expand Down Expand Up @@ -111,6 +111,24 @@ export const SettingDialog = ({open, setOpen, updateName, saveSettings}: Setting
fullWidth
/>
</Box>
<Box sx={{paddingTop: 1, display: 'flex', gap: 1}}>
<NumberField
label="Max Width (px)"
helperText="0 = unlimited"
min={0}
onChange={(width) => setSettingsInput((c) => ({...c, width}))}
value={width}
fullWidth
/>
<NumberField
label="Max Height (px)"
helperText="0 = unlimited"
min={0}
onChange={(height) => setSettingsInput((c) => ({...c, height}))}
value={height}
fullWidth
/>
</Box>
</form>
</DialogContent>
<DialogActions>
Expand Down
6 changes: 6 additions & 0 deletions ui/src/settings.ts
Original file line number Diff line number Diff line change
Expand Up @@ -38,6 +38,8 @@ export interface Settings {
displayMode: VideoDisplayMode;
preferCodec?: PreferredCodec;
framerate: number;
width: number;
height: number;
}
export interface PreferredCodec {
mimeType: string;
Expand All @@ -59,6 +61,8 @@ export const loadSettings = (): Settings => {
const defaults: Settings = {
displayMode: VideoDisplayMode.FitToWindow,
framerate: 30,
width: 0,
height: 0,
};

if (settings && typeof settings === 'object') {
Expand All @@ -69,6 +73,8 @@ export const loadSettings = (): Settings => {
Object.values(VideoDisplayMode).find((mode) => mode === settings.displayMode) ??
defaults.displayMode,
preferCodec: settings.preferCodec ?? CodecDefault,
width: settings.width ?? defaults.width,
height: settings.height ?? defaults.height,
};
}
return defaults;
Expand Down
7 changes: 6 additions & 1 deletion ui/src/useRoom.ts
Original file line number Diff line number Diff line change
Expand Up @@ -327,8 +327,13 @@ export const useRoom = (config: UIConfig): UseRoom => {
return;
}
try {
const {framerate, width, height} = loadSettings();
stream.current = await navigator.mediaDevices.getDisplayMedia({
video: {frameRate: loadSettings().framerate},
video: {
frameRate: framerate,
...(width > 0 && {width: {max: width}}),
...(height > 0 && {height: {max: height}}),
},
audio: {
echoCancellation: false,
autoGainControl: false,
Expand Down
Loading