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
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
175
176
177
178
179
180
181
182
183
184
185
186
187
188
189
190
191
192
193
194
195
196
197
198
199
200
201
202
203
204
205
206
207
208
209
210
211
212
213
214
215
216
217
218
219
220
221
222
223
224
225
226
227
228
229
230
231
232
233
234
235
236
237
238
239
240
241
242
243
244
245
246
247
248
249
250
251
252
253
254
255
256
|
From f30e24aa4a64cb6c341140270b74357505a20d4f Mon Sep 17 00:00:00 2001
From: John Cox <jc@kynesim.co.uk>
Date: Thu, 8 Apr 2021 18:34:09 +0100
Subject: [PATCH] media: rpivid: Improve SPS/PPS error
handling/validation
Move size and width checking from bitstream processing to control
validation
Signed-off-by: John Cox <jc@kynesim.co.uk>
---
drivers/staging/media/rpivid/rpivid.c | 5 +-
drivers/staging/media/rpivid/rpivid.h | 6 +-
drivers/staging/media/rpivid/rpivid_h265.c | 132 ++++++++++++++++++---
3 files changed, 121 insertions(+), 22 deletions(-)
--- a/drivers/staging/media/rpivid/rpivid.c
+++ b/drivers/staging/media/rpivid/rpivid.c
@@ -38,12 +38,14 @@ static const struct rpivid_control rpivi
{
.cfg = {
.id = V4L2_CID_MPEG_VIDEO_HEVC_SPS,
+ .ops = &rpivid_hevc_sps_ctrl_ops,
},
.required = true,
},
{
.cfg = {
.id = V4L2_CID_MPEG_VIDEO_HEVC_PPS,
+ .ops = &rpivid_hevc_pps_ctrl_ops,
},
.required = true,
},
@@ -119,7 +121,7 @@ static int rpivid_init_ctrls(struct rpiv
for (i = 0; i < rpivid_ctrls_COUNT; i++) {
ctrl = v4l2_ctrl_new_custom(hdl, &rpivid_ctrls[i].cfg,
- NULL);
+ ctx);
if (hdl->error) {
v4l2_err(&dev->v4l2_dev,
"Failed to create new custom control id=%#x\n",
@@ -191,6 +193,7 @@ static int rpivid_request_validate(struc
if (!ctrl_test) {
v4l2_info(&ctx->dev->v4l2_dev,
"Missing required codec control\n");
+ v4l2_ctrl_request_hdl_put(hdl);
return -ENOENT;
}
}
--- a/drivers/staging/media/rpivid/rpivid.h
+++ b/drivers/staging/media/rpivid/rpivid.h
@@ -185,7 +185,7 @@ struct rpivid_dev {
struct platform_device *pdev;
struct device *dev;
struct v4l2_m2m_dev *m2m_dev;
- struct rpivid_dec_ops *dec_ops;
+ const struct rpivid_dec_ops *dec_ops;
/* Device file mutex */
struct mutex dev_mutex;
@@ -201,7 +201,9 @@ struct rpivid_dev {
struct rpivid_hw_irq_ctrl ic_active2;
};
-extern struct rpivid_dec_ops rpivid_dec_ops_h265;
+extern const struct rpivid_dec_ops rpivid_dec_ops_h265;
+extern const struct v4l2_ctrl_ops rpivid_hevc_sps_ctrl_ops;
+extern const struct v4l2_ctrl_ops rpivid_hevc_pps_ctrl_ops;
struct v4l2_ctrl *rpivid_find_ctrl(struct rpivid_ctx *ctx, u32 id);
void *rpivid_find_control_data(struct rpivid_ctx *ctx, u32 id);
--- a/drivers/staging/media/rpivid/rpivid_h265.c
+++ b/drivers/staging/media/rpivid/rpivid_h265.c
@@ -1432,9 +1432,13 @@ static int updated_ps(struct rpivid_dec_
s->ctb_addr_rs_to_ts = kmalloc_array(s->ctb_size,
sizeof(*s->ctb_addr_rs_to_ts),
GFP_KERNEL);
+ if (!s->ctb_addr_rs_to_ts)
+ goto fail;
s->ctb_addr_ts_to_rs = kmalloc_array(s->ctb_size,
sizeof(*s->ctb_addr_ts_to_rs),
GFP_KERNEL);
+ if (!s->ctb_addr_ts_to_rs)
+ goto fail;
if (!(s->pps.flags & V4L2_HEVC_PPS_FLAG_TILES_ENABLED)) {
s->tile_width = 1;
@@ -1446,8 +1450,12 @@ static int updated_ps(struct rpivid_dec_
s->col_bd = kmalloc((s->tile_width + 1) * sizeof(*s->col_bd),
GFP_KERNEL);
+ if (!s->col_bd)
+ goto fail;
s->row_bd = kmalloc((s->tile_height + 1) * sizeof(*s->row_bd),
GFP_KERNEL);
+ if (!s->row_bd)
+ goto fail;
s->col_bd[0] = 0;
for (i = 1; i < s->tile_width; i++)
@@ -1462,8 +1470,13 @@ static int updated_ps(struct rpivid_dec_
s->row_bd[s->tile_height] = s->ctb_height;
fill_rs_to_ts(s);
-
return 0;
+
+fail:
+ free_ps_info(s);
+ /* Set invalid to force reload */
+ s->sps.pic_width_in_luma_samples = 0;
+ return -ENOMEM;
}
static int write_cmd_buffer(struct rpivid_dev *const dev,
@@ -1694,7 +1707,9 @@ static void rpivid_h265_setup(struct rpi
memcpy(&s->pps, run->h265.pps, sizeof(s->pps));
/* Recalc stuff as required */
- updated_ps(s);
+ rv = updated_ps(s);
+ if (rv)
+ goto fail;
}
de = dec_env_new(ctx);
@@ -1772,22 +1787,6 @@ static void rpivid_h265_setup(struct rpi
goto fail;
}
- if (s->sps.pic_width_in_luma_samples > 4096 ||
- s->sps.pic_height_in_luma_samples > 4096) {
- v4l2_warn(&dev->v4l2_dev,
- "Pic dimension (%dx%d) exeeds 4096\n",
- s->sps.pic_width_in_luma_samples,
- s->sps.pic_height_in_luma_samples);
- goto fail;
- }
- if ((s->tile_width != 1 || s->tile_height != 1) &&
- (s->pps.flags &
- V4L2_HEVC_PPS_FLAG_ENTROPY_CODING_SYNC_ENABLED)) {
- v4l2_warn(&dev->v4l2_dev,
- "Tiles + WPP not supported\n");
- goto fail;
- }
-
// Fill in ref planes with our address s.t. if we mess
// up refs somehow then we still have a valid address
// entry
@@ -2515,9 +2514,104 @@ static void rpivid_h265_trigger(struct r
}
}
-struct rpivid_dec_ops rpivid_dec_ops_h265 = {
+const struct rpivid_dec_ops rpivid_dec_ops_h265 = {
.setup = rpivid_h265_setup,
.start = rpivid_h265_start,
.stop = rpivid_h265_stop,
.trigger = rpivid_h265_trigger,
};
+
+static int try_ctrl_sps(struct v4l2_ctrl *ctrl)
+{
+ const struct v4l2_ctrl_hevc_sps *const sps = ctrl->p_new.p_hevc_sps;
+ struct rpivid_ctx *const ctx = ctrl->priv;
+ struct rpivid_dev *const dev = ctx->dev;
+
+ if (sps->chroma_format_idc != 1) {
+ v4l2_warn(&dev->v4l2_dev,
+ "Chroma format (%d) unsupported\n",
+ sps->chroma_format_idc);
+ return -EINVAL;
+ }
+
+ if (sps->bit_depth_luma_minus8 != 0 &&
+ sps->bit_depth_luma_minus8 != 2) {
+ v4l2_warn(&dev->v4l2_dev,
+ "Luma depth (%d) unsupported\n",
+ sps->bit_depth_luma_minus8 + 8);
+ return -EINVAL;
+ }
+
+ if (sps->bit_depth_luma_minus8 != sps->bit_depth_chroma_minus8) {
+ v4l2_warn(&dev->v4l2_dev,
+ "Chroma depth (%d) != Luma depth (%d)\n",
+ sps->bit_depth_chroma_minus8 + 8,
+ sps->bit_depth_luma_minus8 + 8);
+ return -EINVAL;
+ }
+
+ if (!sps->pic_width_in_luma_samples ||
+ !sps->pic_height_in_luma_samples ||
+ sps->pic_width_in_luma_samples > 4096 ||
+ sps->pic_height_in_luma_samples > 4096) {
+ v4l2_warn(&dev->v4l2_dev,
+ "Bad sps width (%u) x height (%u)\n",
+ sps->pic_width_in_luma_samples,
+ sps->pic_height_in_luma_samples);
+ return -EINVAL;
+ }
+
+ if (!ctx->dst_fmt_set)
+ return 0;
+
+ if ((sps->bit_depth_luma_minus8 == 0 &&
+ ctx->dst_fmt.pixelformat != V4L2_PIX_FMT_NV12_COL128) ||
+ (sps->bit_depth_luma_minus8 == 2 &&
+ ctx->dst_fmt.pixelformat != V4L2_PIX_FMT_NV12_10_COL128)) {
+ v4l2_warn(&dev->v4l2_dev,
+ "SPS luma depth %d does not match capture format\n",
+ sps->bit_depth_luma_minus8 + 8);
+ return -EINVAL;
+ }
+
+ if (sps->pic_width_in_luma_samples > ctx->dst_fmt.width ||
+ sps->pic_height_in_luma_samples > ctx->dst_fmt.height) {
+ v4l2_warn(&dev->v4l2_dev,
+ "SPS size (%dx%d) > capture size (%d,%d)\n",
+ sps->pic_width_in_luma_samples,
+ sps->pic_height_in_luma_samples,
+ ctx->dst_fmt.width,
+ ctx->dst_fmt.height);
+ return -EINVAL;
+ }
+
+ return 0;
+}
+
+const struct v4l2_ctrl_ops rpivid_hevc_sps_ctrl_ops = {
+ .try_ctrl = try_ctrl_sps,
+};
+
+static int try_ctrl_pps(struct v4l2_ctrl *ctrl)
+{
+ const struct v4l2_ctrl_hevc_pps *const pps = ctrl->p_new.p_hevc_pps;
+ struct rpivid_ctx *const ctx = ctrl->priv;
+ struct rpivid_dev *const dev = ctx->dev;
+
+ if ((pps->flags &
+ V4L2_HEVC_PPS_FLAG_ENTROPY_CODING_SYNC_ENABLED) &&
+ (pps->flags &
+ V4L2_HEVC_PPS_FLAG_TILES_ENABLED) &&
+ (pps->num_tile_columns_minus1 || pps->num_tile_rows_minus1)) {
+ v4l2_warn(&dev->v4l2_dev,
+ "WPP + Tiles not supported\n");
+ return -EINVAL;
+ }
+
+ return 0;
+}
+
+const struct v4l2_ctrl_ops rpivid_hevc_pps_ctrl_ops = {
+ .try_ctrl = try_ctrl_pps,
+};
+
|
