From 3b5a2c06f3c34255e678f33cba02b7dc040bec95 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Barnab=C3=A1s=20P=C5=91cze?= Date: Thu, 7 Aug 2025 18:07:02 +0200 Subject: [PATCH] spa: libcamera: source: remove format config shortcut Remove the code that is supposed to compare the current and the to-be-set format for returning early if they match. This is removed: * v4l2 also does not have it either; * it needs more consideration (there are not properly handled fields); * it would make later changes somewhat more complicated. (cherry picked from commit 05a9e52cafe3579a4386d394cee74b8038ed2cad) --- spa/plugins/libcamera/libcamera-source.cpp | 19 ------------------- 1 file changed, 19 deletions(-) diff --git a/spa/plugins/libcamera/libcamera-source.cpp b/spa/plugins/libcamera/libcamera-source.cpp index a342bda7d..6c647671b 100644 --- a/spa/plugins/libcamera/libcamera-source.cpp +++ b/spa/plugins/libcamera/libcamera-source.cpp @@ -1865,35 +1865,16 @@ int port_set_format(struct impl *impl, struct port *port, return -EINVAL; } - if (port->current_format && info.media_type == port->current_format->media_type && - info.media_subtype == port->current_format->media_subtype && - info.info.raw.format == port->current_format->info.raw.format && - info.info.raw.size.width == port->current_format->info.raw.size.width && - info.info.raw.size.height == port->current_format->info.raw.size.height && - info.info.raw.flags == port->current_format->info.raw.flags && - (!(info.info.raw.flags & SPA_VIDEO_FLAG_MODIFIER) || - (info.info.raw.modifier == port->current_format->info.raw.modifier))) - return 0; break; case SPA_MEDIA_SUBTYPE_mjpg: if (spa_format_video_mjpg_parse(format, &info.info.mjpg) < 0) return -EINVAL; - if (port->current_format && info.media_type == port->current_format->media_type && - info.media_subtype == port->current_format->media_subtype && - info.info.mjpg.size.width == port->current_format->info.mjpg.size.width && - info.info.mjpg.size.height == port->current_format->info.mjpg.size.height) - return 0; break; case SPA_MEDIA_SUBTYPE_h264: if (spa_format_video_h264_parse(format, &info.info.h264) < 0) return -EINVAL; - if (port->current_format && info.media_type == port->current_format->media_type && - info.media_subtype == port->current_format->media_subtype && - info.info.h264.size.width == port->current_format->info.h264.size.width && - info.info.h264.size.height == port->current_format->info.h264.size.height) - return 0; break; default: return -EINVAL;