Skip to content

Fix H.264 video snapshot showing dormant MJPEG frame rate #6

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

Merged
scott-tp merged 1 commit into from
Sep 18, 2026
Merged

Fix H.264 video snapshot showing dormant MJPEG frame rate #6

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
45 changes: 24 additions & 21 deletions app/static/js/lib/snapshot-view.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -121,11 +121,12 @@ function firstDefinedNumber(values) {
return null;
}

// TinyPilot exposes different tuning knobs per streaming mode:
// * H.264 -> bitrate (kbps) and frame rate (fps)
// * MJPEG -> quality (0-100) and frame rate (fps)
// Pick the right rows so the expanded panel reflects what the device is
// actually running.
// TinyPilot exposes different tuning knobs per streaming mode (same as the
// device Web UI video settings dialog):
// * H.264 -> bitrate (kbps) and high-performance mode (not MJPEG fps)
// * MJPEG -> frame rate (fps) and quality (0-100)
// Do not surface the other mode's dormant settings — e.g. mjpegFrameRate
// stays populated while streaming H.264 and is not the active frame rate.
function formatVideoTuning(videoSettings, statusSettings) {
const video = videoSettings && typeof videoSettings === 'object' ? videoSettings : {};
const status = statusSettings && typeof statusSettings === 'object' ? statusSettings : {};
Expand All @@ -141,20 +142,12 @@ function formatVideoTuning(videoSettings, statusSettings) {
lines.push(snapshotRow('Streaming mode', modeLabel));
}

const frameRate = firstDefinedNumber([
video.mjpegFrameRate,
video.mjpeg_frame_rate,
video.h264FrameRate,
video.h264_frame_rate,
video.frameRate,
video.framesPerSecond,
status.mjpegFrameRate,
status.h264FrameRate,
status.frameRate,
status.framesPerSecond,
]);

if (modeLabel === 'MJPEG') {
const frameRate = firstDefinedNumber([
video.mjpegFrameRate,
video.mjpeg_frame_rate,
status.mjpegFrameRate,
]);
const quality = firstDefinedNumber([
video.mjpegQuality,
video.mjpeg_quality,
Expand All @@ -171,7 +164,7 @@ function formatVideoTuning(videoSettings, statusSettings) {
return lines;
}

// Default to H.264-style rows when the mode is H.264 or unknown.
// H.264 (canonical) — also used when mode is missing but bitrate is present.
const bitrate = firstDefinedNumber([
video.h264Bitrate,
video.h264_bitrate,
Expand All @@ -182,8 +175,18 @@ function formatVideoTuning(videoSettings, statusSettings) {
if (bitrate !== null) {
lines.push(snapshotRow('Bitrate', `${bitrate} kbps`));
}
if (frameRate !== null) {
lines.push(snapshotRow('Frame rate', `${frameRate} fps`));

let highPerformance = video.h264HighPerformance;
if (highPerformance === undefined) {
highPerformance = video.h264_high_performance;
}
if (highPerformance === undefined) {
highPerformance = status.h264HighPerformance;
}
if (typeof highPerformance === 'boolean') {
lines.push(
snapshotRow('High-performance mode', highPerformance ? 'On' : 'Off'),
);
}
return lines;
}
Expand Down
2 changes: 1 addition & 1 deletion app/templates/index.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<!doctype html>
<html lang="en">
<head>
{% set asset_v = '20260917-01' %}
{% set asset_v = '20260917-02' %}
<meta charset="utf-8">
<meta name="viewport" content="width=device-width, initial-scale=1">
<title>TinyPilot Dashboard</title>
Expand Down
Loading