blob: c87ca955ba3bd53f9ad540f93cd2238b4acc2017 (
plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
|
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);
|
