Skip to content

axoverlay: take stream rotation into account #369

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
johan-hultberg-work merged 1 commit into from
Apr 25, 2025
Merged

axoverlay: take stream rotation into account #369

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
31 changes: 22 additions & 9 deletions axoverlay/app/axoverlay.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -212,11 +212,23 @@ static void adjustment_cb(gint id,
(void)overlay_y;
(void)user_data;

syslog(LOG_INFO, "Adjust callback for overlay: %i x %i", *overlay_width, *overlay_height);
syslog(LOG_INFO, "Adjust callback for stream: %i x %i", stream->width, stream->height);

/* Set overlay resolution in case of rotation */
*overlay_width = stream->width;
*overlay_height = stream->height;
if (stream->rotation == 90 || stream->rotation == 270) {
*overlay_width = stream->height;
*overlay_height = stream->width;
}

syslog(LOG_INFO,
"Stream or rotation changed, overlay resolution is now: %i x %i",
*overlay_width,
*overlay_height);
syslog(LOG_INFO,
"Stream or rotation changed, stream resolution is now: %i x %i",
stream->width,
stream->height);
syslog(LOG_INFO, "Stream or rotation changed, rotation angle is now: %i", stream->rotation);
}

/**
Expand Down Expand Up @@ -256,29 +268,30 @@ static void render_overlay_cb(gpointer rendering_context,
syslog(LOG_INFO, "Render callback for camera: %i", stream->camera);
syslog(LOG_INFO, "Render callback for overlay: %i x %i", overlay_width, overlay_height);
syslog(LOG_INFO, "Render callback for stream: %i x %i", stream->width, stream->height);
syslog(LOG_INFO, "Render callback for rotation: %i", stream->rotation);

if (id == overlay_id) {
// Clear background by drawing a "filled" rectangle
val = index2cairo(0);
cairo_set_source_rgba(rendering_context, val, val, val, val);
cairo_set_operator(rendering_context, CAIRO_OPERATOR_SOURCE);
cairo_rectangle(rendering_context, 0, 0, stream->width, stream->height);
cairo_rectangle(rendering_context, 0, 0, overlay_width, overlay_height);
cairo_fill(rendering_context);

// Draw a top rectangle in toggling color
draw_rectangle(rendering_context, 0, 0, stream->width, stream->height / 4, top_color, 9.6);
draw_rectangle(rendering_context, 0, 0, overlay_width, overlay_height / 4, top_color, 9.6);

// Draw a bottom rectangle in toggling color
draw_rectangle(rendering_context,
0,
stream->height * 3 / 4,
stream->width,
stream->height,
overlay_height * 3 / 4,
overlay_width,
overlay_height,
bottom_color,
2.0);
} else if (id == overlay_id_text) {
// Show text in black
draw_text(rendering_context, stream->width / 2, stream->height / 2);
draw_text(rendering_context, overlay_width / 2, overlay_height / 2);
} else {
syslog(LOG_INFO, "Unknown overlay id!");
}
Expand Down