feat: Add video scaling via --video-scale CLI arg and gsmenu slider (#103)

* video resize via CRTC scaling

* added setting video scale parameter through agradd
through arg

* added video scale factor slider to gsmenu

* move video_scale_factor variable into main function

---------

Co-authored-by: Dmtry Antonov <[email protected]>

Author: DmtryJS

debian/manpage.md

@@ -81,6 +81,8 @@ pixelpilot-rk - OpenIPC video display client for wfb-ng
 
     --video-plane-id       - Override default drm plane used for video by plane-id
 
+    --video-scale <factor> - Scale video output size (0.5 <= factor <= 1.0) (Default: 1.0)
+
     --osd-plane-id         - Override default drm plane used for osd by plane-id
 
     --disable-vsync        - Disable VSYNC commits
@@ -163,6 +165,9 @@ a complete description, see the **info**(1) files.
 **--video-plane-id**
 : Override default drm plane used for video by plane-id
 
+**--video-scale \<factor\>**
+: Scale video output size (0.5 <= factor <= 1.0) (Default: 1.0)
+
 **--osd-plane-id**
 : Override default drm plane used for osd by plane-id
 

debian/pixelpilot-rk.pixelpilot.default

@@ -4,6 +4,7 @@
 CONFIG=/etc/pixelpilot/pixelpilot.yaml
 OSD_PATH=/etc/pixelpilot/config_osd.json
 SCREEN_MODE=1920x1080@60
+VIDEO_SCALE=1.0
 DVR_FPS=60
 DVR_PATH=/var/dvr
 DVR_TEMPLATE=record_%Y-%m-%d_%H-%M-%S.mp4

debian/pixelpilot-rk.pixelpilot.service

@@ -6,7 +6,7 @@ After=wifibroadcast.service
 [Service]
 Type=simple
 EnvironmentFile=/etc/default/pixelpilot
-ExecStart=/usr/bin/pixelpilot --osd --osd-custom-message --osd-config ${OSD_PATH} --screen-mode ${SCREEN_MODE} --dvr-framerate ${DVR_FPS} --dvr-fmp4 --dvr-sequenced-files --dvr-template ${DVR_PATH}/${DVR_TEMPLATE} --config ${CONFIG} $EXTRA_OPTS
+ExecStart=/usr/bin/pixelpilot --osd --osd-custom-message --osd-config ${OSD_PATH} --screen-mode ${SCREEN_MODE} --video-scale ${VIDEO_SCALE} --dvr-framerate ${DVR_FPS} --dvr-fmp4 --dvr-sequenced-files --dvr-template ${DVR_PATH}/${DVR_TEMPLATE} --config ${CONFIG} $EXTRA_OPTS
 Restart=always
 # Sleep between 3 and 10 seconds between restart attempts; it will keep restarting forever
 RestartSec=3

gsmenu.sh

@@ -566,6 +566,9 @@ case "$@" in
     "values gs wfbng txpower")
         echo -n -e "1\n100"
         ;;
+    "values gs system video_scale")
+        echo -n 0.5 1.0
+        ;;
     "values gs system resolution")
         drm_info -j /dev/dri/card0 2>/dev/null | jq -r '."/dev/dri/card0".connectors[1].modes[] | select(.name | contains("i") | not) | .name + "@" + (.vrefresh|tostring)' | sort | uniq  | sed -z '$ s/\n$//'
         ;;
@@ -606,6 +609,12 @@ case "$@" in
             : #noop
         fi
         ;;
+    "get gs system video_scale")
+        grep "^video_scale =" /config/setup.txt | cut -d '=' -f2 | xargs
+        ;;
+    "set gs system video_scale"*)
+        sed -i "s/^video_scale =.*/video_scale = $5/" /config/setup.txt
+        ;;
     "get gs wifi hotspot")
         nmcli connection show --active | grep -q "Hotspot" && echo 1 || echo 0
         ;;

src/drm.c

@@ -441,13 +441,14 @@ void modeset_output_destroy(int fd, struct modeset_output *out)
 	free(out);
 }
 
-struct modeset_output *modeset_output_create(int fd, drmModeRes *res, drmModeConnector *conn, uint16_t mode_width, uint16_t mode_height, uint32_t mode_vrefresh, uint32_t video_plane_id, uint32_t osd_plane_id)
+struct modeset_output *modeset_output_create(int fd, drmModeRes *res, drmModeConnector *conn, uint16_t mode_width, uint16_t mode_height, uint32_t mode_vrefresh, uint32_t video_plane_id, uint32_t osd_plane_id, float video_scale_factor)
 {
 	int ret;
 	struct modeset_output *out;
 
 	out = malloc(sizeof(*out));
 	memset(out, 0, sizeof(*out));
+	out->video_scale_factor = video_scale_factor;
 	out->connector.id = conn->connector_id;
 
 	if (conn->connection != DRM_MODE_CONNECTED) {
@@ -587,7 +588,7 @@ void *modeset_print_modes(int fd)
 
 }
 
-struct modeset_output *modeset_prepare(int fd, uint16_t mode_width, uint16_t mode_height, uint32_t mode_vrefresh, uint32_t video_plane_id, uint32_t osd_plane_id)
+struct modeset_output *modeset_prepare(int fd, uint16_t mode_width, uint16_t mode_height, uint32_t mode_vrefresh, uint32_t video_plane_id, uint32_t osd_plane_id, float video_scale_factor)
 {
 	drmModeRes *res;
 	drmModeConnector *conn;
@@ -609,7 +610,7 @@ struct modeset_output *modeset_prepare(int fd, uint16_t mode_width, uint16_t mod
 			continue;
 		}
 
-		out = modeset_output_create(fd, res, conn, mode_width, mode_height, mode_vrefresh, video_plane_id, osd_plane_id);
+		out = modeset_output_create(fd, res, conn, mode_width, mode_height, mode_vrefresh, video_plane_id, osd_plane_id, video_scale_factor);
 		drmModeFreeConnector(conn);
 		if (out) {
 			drmModeFreeResources(res);
@@ -671,16 +672,22 @@ int modeset_atomic_prepare_commit(int fd, struct modeset_output *out, drmModeAto
 	if (set_drm_object_property(req, plane, "SRC_H", height << 16) < 0)
 		return -1;
 
-	uint32_t crtcw =  out->video_crtc_width;
-	uint32_t crtch = out->video_crtc_height;
-	float video_ratio = (float)width/height;
-	if (crtcw / video_ratio > crtch) {
-		crtcw = crtch * video_ratio;
-		crtch = crtch;
+	uint32_t orig_crtcw = out->video_crtc_width;
+	uint32_t orig_crtch = out->video_crtc_height;
+	float video_ratio = (float)width / height;
+	if (orig_crtcw / video_ratio > orig_crtch) {
+		orig_crtcw = orig_crtch * video_ratio;
+		orig_crtch = orig_crtch;
 	} else {
-		crtcw = crtcw;
-		crtch = crtcw / video_ratio;
+		orig_crtcw = orig_crtcw;
+		orig_crtch = orig_crtcw / video_ratio;
 	}
+
+	
+	float scale_factor = out->video_scale_factor;
+	uint32_t crtcw = (uint32_t)(orig_crtcw * scale_factor);
+	uint32_t crtch = (uint32_t)(orig_crtch * scale_factor);
+
 	int crtcx = (out->video_crtc_width - crtcw) / 2;
 	int crtcy = (out->video_crtc_height - crtch) / 2;
 	if (set_drm_object_property(req, plane, "CRTC_X", crtcx) < 0)

src/drm.h

@@ -66,6 +66,7 @@ struct modeset_output {
 	uint32_t video_frm_height;
 	int video_fb_x, video_fb_y, video_fb_width, video_fb_height;
 	int video_fb_id;
+	float video_scale_factor;
 
     // Used to calculate latency
     uint64_t decoding_pts;
@@ -103,9 +104,9 @@ int modeset_setup_framebuffers(int fd, drmModeConnector *conn, struct modeset_ou
 
 void modeset_output_destroy(int fd, struct modeset_output *out);
 
-struct modeset_output *modeset_output_create(int fd, drmModeRes *res, drmModeConnector *conn, uint16_t mode_width, uint16_t mode_height, uint32_t mode_vrefresh, uint32_t video_plane_id, uint32_t osd_plane_id);
+struct modeset_output *modeset_output_create(int fd, drmModeRes *res, drmModeConnector *conn, uint16_t mode_width, uint16_t mode_height, uint32_t mode_vrefresh, uint32_t video_plane_id, uint32_t osd_plane_id, float video_scale_factor);
 
-struct modeset_output *modeset_prepare(int fd, uint16_t mode_width, uint16_t mode_height, uint32_t mode_vrefresh, uint32_t video_plane_id, uint32_t osd_plane_id);
+struct modeset_output *modeset_prepare(int fd, uint16_t mode_width, uint16_t mode_height, uint32_t mode_vrefresh, uint32_t video_plane_id, uint32_t osd_plane_id, float video_scale_factor);
 
 void *modeset_print_modes(int fd);
 

src/gsmenu/gs_system.c

@@ -14,6 +14,7 @@ lv_obj_t * resolution;
 lv_obj_t * rec_enabled;
 lv_obj_t * rec_fps;
 lv_obj_t * vsync_disabled;
+lv_obj_t * video_scale;
 
 typedef struct Dvr* Dvr; // Forward declaration
 void dvr_start_recording(Dvr* dvr);
@@ -28,7 +29,7 @@ void gs_system_page_load_callback(lv_obj_t * page)
     reload_switch_value(page,gs_rendering);
     reload_dropdown_value(page,resolution);
     reload_dropdown_value(page,rec_fps);
-
+    reload_slider_value(page, video_scale);
     if (dvr_enabled) lv_obj_add_state(lv_obj_get_child_by_type(rec_enabled,0,&lv_switch_class), LV_STATE_CHECKED);
     else lv_obj_clear_state(lv_obj_get_child_by_type(rec_enabled,0,&lv_switch_class), LV_STATE_CHECKED);
 
@@ -112,6 +113,8 @@ void create_gs_system_menu(lv_obj_t * parent) {
 
     gs_rendering = create_switch(cont,LV_SYMBOL_SETTINGS,"GS Rendering","gs_rendering", menu_page_data,false);
     resolution = create_dropdown(cont,LV_SYMBOL_SETTINGS, "Resolution","","resolution",menu_page_data,false);
+    video_scale = create_slider(cont, LV_SYMBOL_SETTINGS, "Video scale factor", "video_scale", menu_page_data, false, 2);
+
     vsync_disabled = create_switch(cont,LV_SYMBOL_SETTINGS,"Disable VSYNC","disable_vsync", NULL,false);
     lv_obj_add_event_cb(lv_obj_get_child_by_type(vsync_disabled,0,&lv_switch_class), disable_vsync_cb, LV_EVENT_VALUE_CHANGED,NULL);
 

src/main.cpp

@@ -674,6 +674,8 @@ void printHelp() {
     "    --screen-mode <mode>   - Override default screen mode. <width>x<heigth>@<fps> ex: 1920x1080@120\n"
     "\n"
     "    --video-plane-id       - Override default drm plane used for video by plane-id\n"
+	"\n"
+	"    --video-scale <factor> - Scale video output size (0.5 =< factor <= 1.0) (Default: 1.0)\n"
     "\n"
     "    --osd-plane-id         - Override default drm plane used for osd by plane-id\n"
     "\n"
@@ -717,6 +719,7 @@ int main(int argc, char **argv)
     std::ofstream pidFile(pidFilePath);
     pidFile << getpid();
     pidFile.close();
+	float video_scale_factor = 1.0;
 
 	// Load console arguments
 	__BeginParseConsoleArguments__(printHelp) 
@@ -880,6 +883,15 @@ int main(int argc, char **argv)
 		continue;
 	}
 
+	__OnArgument("--video-scale") {
+    	video_scale_factor = atof(__ArgValue);
+    	if (video_scale_factor < 0.5 || video_scale_factor > 1.0) {
+        	fprintf(stderr, "Invalid video scale factor, should be (0.5 =< scale <= 1.0)\n");
+        	return -1;
+    	}
+    	continue;
+	}
+
 	__EndParseConsoleArguments__
 
 	spdlog::set_level(log_level);
@@ -976,7 +988,7 @@ int main(int argc, char **argv)
 		return 0;
 	}
 
-	output_list = modeset_prepare(drm_fd, mode_width, mode_height, mode_vrefresh, video_plane_id_override, osd_plane_id_override);
+	output_list = modeset_prepare(drm_fd, mode_width, mode_height, mode_vrefresh, video_plane_id_override, osd_plane_id_override, video_scale_factor);
 	if (!output_list) {
 		fprintf(stderr,
 				"cannot initialize display. Is display connected? Is --screen-mode correct?\n");