mirror of
https://github.com/J3vb/OwnCord.git
synced 2026-09-03 03:50:00 +03:00
Screen share frame rate was hardcoded per quality (5/15/30). Add a "Screen Share FPS" setting (30 default / 60 / 120) next to Stream Quality: - 30 keeps the existing per-quality caps unchanged - 60/120 override the capture constraints and publish maxFramerate for all qualities, with bitrate scaled 1.5x/2x to keep the image sharp - "source" quality (no fixed resolution) applies the fps to the live capture track via applyConstraints, best-effort Actual delivered fps still depends on what the capture source and display can sustain. Closes #115 Co-Authored-By: Claude Fable 5 <noreply@anthropic.com> Claude-Session: https://claude.ai/code/session_01LwtnpHAoSFr1ZibQgQkNQK
118 lines
3.8 KiB
TypeScript
118 lines
3.8 KiB
TypeScript
import { describe, it, expect, vi, beforeEach } from "vitest";
|
|
|
|
const { mockLoadPref } = vi.hoisted(() => ({
|
|
mockLoadPref: vi.fn((_key: string, defaultVal: unknown) => defaultVal),
|
|
}));
|
|
|
|
vi.mock("@components/settings/helpers", () => ({
|
|
loadPref: (key: string, defaultVal: unknown) => mockLoadPref(key, defaultVal),
|
|
savePref: vi.fn(),
|
|
}));
|
|
|
|
vi.mock("@lib/logger", () => ({
|
|
createLogger: () => ({
|
|
debug: vi.fn(),
|
|
info: vi.fn(),
|
|
warn: vi.fn(),
|
|
error: vi.fn(),
|
|
}),
|
|
}));
|
|
|
|
vi.mock("@stores/voice.store", () => ({
|
|
setLocalCamera: vi.fn(),
|
|
setLocalScreenshare: vi.fn(),
|
|
}));
|
|
|
|
import {
|
|
getScreenShareFps,
|
|
getEffectiveScreenShareFps,
|
|
getScreenShareMaxBitrate,
|
|
getScreenShareCaptureOptions,
|
|
SCREENSHARE_PRESETS,
|
|
SCREENSHARE_PUBLISH_BITRATES,
|
|
type StreamQuality,
|
|
} from "@lib/screenShare";
|
|
|
|
describe("screen share FPS", () => {
|
|
beforeEach(() => {
|
|
mockLoadPref.mockReset();
|
|
mockLoadPref.mockImplementation((_key: string, defaultVal: unknown) => defaultVal);
|
|
});
|
|
|
|
describe("getScreenShareFps", () => {
|
|
it("defaults to 30", () => {
|
|
expect(getScreenShareFps()).toBe(30);
|
|
});
|
|
|
|
it("accepts 60 and 120", () => {
|
|
mockLoadPref.mockReturnValue(60);
|
|
expect(getScreenShareFps()).toBe(60);
|
|
mockLoadPref.mockReturnValue(120);
|
|
expect(getScreenShareFps()).toBe(120);
|
|
});
|
|
|
|
it("falls back to 30 on garbage values", () => {
|
|
for (const garbage of [45, 0, -1, "60", null, undefined, NaN]) {
|
|
mockLoadPref.mockReturnValue(garbage);
|
|
expect(getScreenShareFps()).toBe(30);
|
|
}
|
|
});
|
|
});
|
|
|
|
describe("getEffectiveScreenShareFps", () => {
|
|
it("keeps historical per-quality caps at the default 30", () => {
|
|
expect(getEffectiveScreenShareFps("low", 30)).toBe(5);
|
|
expect(getEffectiveScreenShareFps("medium", 30)).toBe(15);
|
|
expect(getEffectiveScreenShareFps("high", 30)).toBe(30);
|
|
expect(getEffectiveScreenShareFps("source", 30)).toBe(30);
|
|
});
|
|
|
|
it("applies explicit 60/120 overrides to every quality", () => {
|
|
const qualities: StreamQuality[] = ["low", "medium", "high", "source"];
|
|
for (const q of qualities) {
|
|
expect(getEffectiveScreenShareFps(q, 60)).toBe(60);
|
|
expect(getEffectiveScreenShareFps(q, 120)).toBe(120);
|
|
}
|
|
});
|
|
});
|
|
|
|
describe("getScreenShareMaxBitrate", () => {
|
|
it("returns the base bitrate at 30 fps", () => {
|
|
expect(getScreenShareMaxBitrate("high", 30)).toBe(SCREENSHARE_PUBLISH_BITRATES.high);
|
|
});
|
|
|
|
it("scales bitrate up for 60 and 120 fps", () => {
|
|
expect(getScreenShareMaxBitrate("high", 60)).toBe(SCREENSHARE_PUBLISH_BITRATES.high * 1.5);
|
|
expect(getScreenShareMaxBitrate("source", 120)).toBe(
|
|
SCREENSHARE_PUBLISH_BITRATES.source * 2,
|
|
);
|
|
});
|
|
});
|
|
|
|
describe("getScreenShareCaptureOptions", () => {
|
|
it("injects frameRate into presets that have a resolution", () => {
|
|
const opts = getScreenShareCaptureOptions("high", 60);
|
|
expect(opts.resolution?.frameRate).toBe(60);
|
|
expect(opts.resolution?.width).toBe(SCREENSHARE_PRESETS.high.resolution?.width);
|
|
expect(opts.audio).toBe(true);
|
|
});
|
|
|
|
it("keeps the per-quality fps at the default setting", () => {
|
|
expect(getScreenShareCaptureOptions("low", 30).resolution?.frameRate).toBe(5);
|
|
expect(getScreenShareCaptureOptions("medium", 30).resolution?.frameRate).toBe(15);
|
|
});
|
|
|
|
it("returns the source preset unchanged (no resolution to constrain)", () => {
|
|
const opts = getScreenShareCaptureOptions("source", 120);
|
|
expect(opts).toBe(SCREENSHARE_PRESETS.source);
|
|
expect(opts.resolution).toBeUndefined();
|
|
});
|
|
|
|
it("does not mutate the shared presets", () => {
|
|
const before = SCREENSHARE_PRESETS.high.resolution?.frameRate;
|
|
getScreenShareCaptureOptions("high", 120);
|
|
expect(SCREENSHARE_PRESETS.high.resolution?.frameRate).toBe(before);
|
|
});
|
|
});
|
|
});
|