20ea6adbf1
Build system: x86_64 Build-tested: bcm2708, bcm2709, bcm2710, bcm2711 Run-tested: bcm2708/RPiB+, bcm2709/RPi3B, bcm2710/RPi3B, bcm2711/RPi4B Signed-off-by: Marty Jones <mj8263788@gmail.com> Signed-off-by: Álvaro Fernández Rojas <noltari@gmail.com>
37 lines
1.5 KiB
Diff
37 lines
1.5 KiB
Diff
From 9a7b20e4a376a2cccb2fb8d3e87eb4358c17d2e8 Mon Sep 17 00:00:00 2001
|
|
From: Dave Stevenson <dave.stevenson@raspberrypi.com>
|
|
Date: Thu, 15 Apr 2021 11:07:55 +0100
|
|
Subject: [PATCH] staging/bcm2835-codec: Do not update crop from S_FMT
|
|
after res change
|
|
|
|
During decode, setting the CAPTURE queue format was setting the crop
|
|
rectangle to the requested height before aligning up the format to
|
|
cater for simple clients that weren't expecting to deal with cropping
|
|
and the SELECTION API.
|
|
This caused problems on some resolution change events if the client
|
|
didn't also then use the selection API.
|
|
|
|
Disable the crop update after a resolution change.
|
|
|
|
Signed-off-by: Dave Stevenson <dave.stevenson@raspberrypi.com>
|
|
---
|
|
.../vc04_services/bcm2835-codec/bcm2835-v4l2-codec.c | 7 +++++++
|
|
1 file changed, 7 insertions(+)
|
|
|
|
--- a/drivers/staging/vc04_services/bcm2835-codec/bcm2835-v4l2-codec.c
|
|
+++ b/drivers/staging/vc04_services/bcm2835-codec/bcm2835-v4l2-codec.c
|
|
@@ -999,6 +999,13 @@ static void handle_fmt_changed(struct bc
|
|
|
|
q_data->crop_width = format->es.video.crop.width;
|
|
q_data->crop_height = format->es.video.crop.height;
|
|
+ /*
|
|
+ * Stop S_FMT updating crop_height should it be unaligned.
|
|
+ * Client can still update the crop region via S_SELECTION should it
|
|
+ * really want to, but the decoder is likely to complain that the
|
|
+ * format then doesn't match.
|
|
+ */
|
|
+ q_data->selection_set = true;
|
|
q_data->bytesperline = get_bytesperline(format->es.video.width,
|
|
q_data->fmt);
|
|
|