Skip to content

Commit d899b03

Browse files
Cai YiWeirkhuangtao
authored andcommitted
media: rockchip: isp1: del nonsupport yuv format
from isp specification, only semi-planar with uv swap. Change-Id: I3fc713cd6cbab1e12a94d7b8144d7d43a6de5530 Signed-off-by: Cai YiWei <cyw@rock-chips.com>
1 parent 2c61995 commit d899b03

1 file changed

Lines changed: 4 additions & 55 deletions

File tree

  • drivers/media/platform/rockchip/isp1

drivers/media/platform/rockchip/isp1/capture.c

Lines changed: 4 additions & 55 deletions
Original file line numberDiff line numberDiff line change
@@ -172,22 +172,6 @@ static const struct capture_fmt mp_fmts[] = {
172172
.mplanes = 1,
173173
.uv_swap = 0,
174174
.write_format = MI_CTRL_MP_WRITE_YUVINT,
175-
}, {
176-
.fourcc = V4L2_PIX_FMT_YVYU,
177-
.fmt_type = FMT_YUV,
178-
.bpp = { 16 },
179-
.cplanes = 1,
180-
.mplanes = 1,
181-
.uv_swap = 1,
182-
.write_format = MI_CTRL_MP_WRITE_YUVINT,
183-
}, {
184-
.fourcc = V4L2_PIX_FMT_VYUY,
185-
.fmt_type = FMT_YUV,
186-
.bpp = { 16 },
187-
.cplanes = 1,
188-
.mplanes = 1,
189-
.uv_swap = 1,
190-
.write_format = MI_CTRL_MP_WRITE_YUVINT,
191175
}, {
192176
.fourcc = V4L2_PIX_FMT_YUV422P,
193177
.fmt_type = FMT_YUV,
@@ -213,12 +197,12 @@ static const struct capture_fmt mp_fmts[] = {
213197
.uv_swap = 1,
214198
.write_format = MI_CTRL_MP_WRITE_YUV_SPLA,
215199
}, {
216-
.fourcc = V4L2_PIX_FMT_YVU422M,
200+
.fourcc = V4L2_PIX_FMT_YUV422M,
217201
.fmt_type = FMT_YUV,
218202
.bpp = { 8, 8, 8 },
219203
.cplanes = 3,
220204
.mplanes = 3,
221-
.uv_swap = 1,
205+
.uv_swap = 0,
222206
.write_format = MI_CTRL_MP_WRITE_YUV_PLA_OR_RAW8,
223207
},
224208
/* yuv420 */
@@ -262,14 +246,6 @@ static const struct capture_fmt mp_fmts[] = {
262246
.mplanes = 1,
263247
.uv_swap = 0,
264248
.write_format = MI_CTRL_MP_WRITE_YUV_PLA_OR_RAW8,
265-
}, {
266-
.fourcc = V4L2_PIX_FMT_YVU420,
267-
.fmt_type = FMT_YUV,
268-
.bpp = { 8, 8, 8 },
269-
.cplanes = 3,
270-
.mplanes = 1,
271-
.uv_swap = 1,
272-
.write_format = MI_CTRL_MP_WRITE_YUV_PLA_OR_RAW8,
273249
},
274250
/* yuv444 */
275251
{
@@ -368,24 +344,6 @@ static const struct capture_fmt sp_fmts[] = {
368344
.uv_swap = 0,
369345
.write_format = MI_CTRL_SP_WRITE_INT,
370346
.output_format = MI_CTRL_SP_OUTPUT_YUV422,
371-
}, {
372-
.fourcc = V4L2_PIX_FMT_YVYU,
373-
.fmt_type = FMT_YUV,
374-
.bpp = { 16 },
375-
.cplanes = 1,
376-
.mplanes = 1,
377-
.uv_swap = 1,
378-
.write_format = MI_CTRL_SP_WRITE_INT,
379-
.output_format = MI_CTRL_SP_OUTPUT_YUV422,
380-
}, {
381-
.fourcc = V4L2_PIX_FMT_VYUY,
382-
.fmt_type = FMT_YUV,
383-
.bpp = { 16 },
384-
.cplanes = 1,
385-
.mplanes = 1,
386-
.uv_swap = 1,
387-
.write_format = MI_CTRL_SP_WRITE_INT,
388-
.output_format = MI_CTRL_SP_OUTPUT_YUV422,
389347
}, {
390348
.fourcc = V4L2_PIX_FMT_YUV422P,
391349
.fmt_type = FMT_YUV,
@@ -414,12 +372,12 @@ static const struct capture_fmt sp_fmts[] = {
414372
.write_format = MI_CTRL_SP_WRITE_SPLA,
415373
.output_format = MI_CTRL_SP_OUTPUT_YUV422,
416374
}, {
417-
.fourcc = V4L2_PIX_FMT_YVU422M,
375+
.fourcc = V4L2_PIX_FMT_YUV422M,
418376
.fmt_type = FMT_YUV,
419377
.bpp = { 8, 8, 8 },
420378
.cplanes = 3,
421379
.mplanes = 3,
422-
.uv_swap = 1,
380+
.uv_swap = 0,
423381
.write_format = MI_CTRL_SP_WRITE_PLA,
424382
.output_format = MI_CTRL_SP_OUTPUT_YUV422,
425383
},
@@ -469,15 +427,6 @@ static const struct capture_fmt sp_fmts[] = {
469427
.uv_swap = 0,
470428
.write_format = MI_CTRL_SP_WRITE_PLA,
471429
.output_format = MI_CTRL_SP_OUTPUT_YUV420,
472-
}, {
473-
.fourcc = V4L2_PIX_FMT_YVU420,
474-
.fmt_type = FMT_YUV,
475-
.bpp = { 8, 8, 8 },
476-
.cplanes = 3,
477-
.mplanes = 1,
478-
.uv_swap = 1,
479-
.write_format = MI_CTRL_SP_WRITE_PLA,
480-
.output_format = MI_CTRL_SP_OUTPUT_YUV420,
481430
},
482431
/* yuv444 */
483432
{

0 commit comments

Comments
 (0)