Skip to content

Commit 1ae3a8b

Browse files
6by96by9
committed
media: hevc_dec: Add in downstream single planar SAND variant
Upstream will take the multi-planar SAND format, but add back in the downstream single planar variant for backwards compatibility Signed-off-by: Dave Stevenson <dave.stevenson@raspberrypi.com>
1 parent 1fb6d02 commit 1ae3a8b

File tree

2 files changed

+152
-47
lines changed

2 files changed

+152
-47
lines changed

‎drivers/media/platform/raspberrypi/hevc_dec/hevc_d_h265.c‎

Lines changed: 70 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -1687,12 +1687,26 @@ static void hevc_d_h265_setup(struct hevc_d_ctx *ctx, struct hevc_d_run *run)
16871687
de->cmd_len = 0;
16881688
de->dpbno_col = ~0U;
16891689

1690-
de->luma_stride = ctx->dst_fmt.height * 128;
1691-
de->frame_luma_addr =
1692-
vb2_dma_contig_plane_dma_addr(&run->dst->vb2_buf, 0);
1693-
de->chroma_stride = de->luma_stride / 2;
1694-
de->frame_chroma_addr =
1695-
vb2_dma_contig_plane_dma_addr(&run->dst->vb2_buf, 1);
1690+
switch (ctx->dst_fmt.pixelformat) {
1691+
case V4L2_PIX_FMT_NV12MT_COL128:
1692+
case V4L2_PIX_FMT_NV12MT_10_COL128:
1693+
de->luma_stride = ctx->dst_fmt.height * 128;
1694+
de->frame_luma_addr =
1695+
vb2_dma_contig_plane_dma_addr(&run->dst->vb2_buf, 0);
1696+
de->chroma_stride = de->luma_stride / 2;
1697+
de->frame_chroma_addr =
1698+
vb2_dma_contig_plane_dma_addr(&run->dst->vb2_buf, 1);
1699+
break;
1700+
case V4L2_PIX_FMT_NV12_COL128:
1701+
case V4L2_PIX_FMT_NV12_10_COL128:
1702+
de->luma_stride = ctx->dst_fmt.plane_fmt[0].bytesperline * 128;
1703+
de->frame_luma_addr =
1704+
vb2_dma_contig_plane_dma_addr(&run->dst->vb2_buf, 0);
1705+
de->chroma_stride = de->luma_stride;
1706+
de->frame_chroma_addr = de->frame_luma_addr +
1707+
(ctx->dst_fmt.height * 128);
1708+
break;
1709+
}
16961710
de->frame_aux = NULL;
16971711

16981712
if (s->sps.bit_depth_luma_minus8 !=
@@ -1704,15 +1718,16 @@ static void hevc_d_h265_setup(struct hevc_d_ctx *ctx, struct hevc_d_run *run)
17041718
goto fail;
17051719
}
17061720
if (s->sps.bit_depth_luma_minus8 == 0) {
1707-
if (ctx->dst_fmt.pixelformat != V4L2_PIX_FMT_NV12MT_COL128) {
1721+
if (ctx->dst_fmt.pixelformat != V4L2_PIX_FMT_NV12MT_COL128 &&
1722+
ctx->dst_fmt.pixelformat != V4L2_PIX_FMT_NV12_COL128) {
17081723
v4l2_err(&dev->v4l2_dev,
17091724
"Pixel format %#x != NV12MT_COL128 for 8-bit output",
17101725
ctx->dst_fmt.pixelformat);
17111726
goto fail;
17121727
}
17131728
} else if (s->sps.bit_depth_luma_minus8 == 2) {
1714-
if (ctx->dst_fmt.pixelformat !=
1715-
V4L2_PIX_FMT_NV12MT_10_COL128) {
1729+
if (ctx->dst_fmt.pixelformat != V4L2_PIX_FMT_NV12MT_10_COL128 &&
1730+
ctx->dst_fmt.pixelformat != V4L2_PIX_FMT_NV12_10_COL128) {
17161731
v4l2_err(&dev->v4l2_dev,
17171732
"Pixel format %#x != NV12MT_10_COL128 for 10-bit output",
17181733
ctx->dst_fmt.pixelformat);
@@ -1723,20 +1738,41 @@ static void hevc_d_h265_setup(struct hevc_d_ctx *ctx, struct hevc_d_run *run)
17231738
s->sps.bit_depth_luma_minus8 + 8);
17241739
goto fail;
17251740
}
1726-
if (run->dst->vb2_buf.num_planes != 2) {
1727-
v4l2_warn(&dev->v4l2_dev, "Capture planes (%d) != 2\n",
1728-
run->dst->vb2_buf.num_planes);
1729-
goto fail;
1730-
}
1731-
if (run->dst->planes[0].length < ctx->dst_fmt.plane_fmt[0].sizeimage ||
1732-
run->dst->planes[1].length < ctx->dst_fmt.plane_fmt[1].sizeimage) {
1733-
v4l2_warn(&dev->v4l2_dev,
1734-
"Capture planes length (%d/%d) < sizeimage (%d/%d)\n",
1735-
run->dst->planes[0].length,
1736-
run->dst->planes[1].length,
1737-
ctx->dst_fmt.plane_fmt[0].sizeimage,
1738-
ctx->dst_fmt.plane_fmt[1].sizeimage);
1739-
goto fail;
1741+
1742+
switch (ctx->dst_fmt.pixelformat) {
1743+
case V4L2_PIX_FMT_NV12MT_COL128:
1744+
case V4L2_PIX_FMT_NV12MT_10_COL128:
1745+
if (run->dst->vb2_buf.num_planes != 2) {
1746+
v4l2_warn(&dev->v4l2_dev, "Capture planes (%d) != 2\n",
1747+
run->dst->vb2_buf.num_planes);
1748+
goto fail;
1749+
}
1750+
if (run->dst->planes[0].length < ctx->dst_fmt.plane_fmt[0].sizeimage ||
1751+
run->dst->planes[1].length < ctx->dst_fmt.plane_fmt[1].sizeimage) {
1752+
v4l2_warn(&dev->v4l2_dev,
1753+
"Capture planes length (%d/%d) < sizeimage (%d/%d)\n",
1754+
run->dst->planes[0].length,
1755+
run->dst->planes[1].length,
1756+
ctx->dst_fmt.plane_fmt[0].sizeimage,
1757+
ctx->dst_fmt.plane_fmt[1].sizeimage);
1758+
goto fail;
1759+
}
1760+
break;
1761+
case V4L2_PIX_FMT_NV12_COL128:
1762+
case V4L2_PIX_FMT_NV12_10_COL128:
1763+
if (run->dst->vb2_buf.num_planes != 1) {
1764+
v4l2_warn(&dev->v4l2_dev, "Capture planes (%d) != 1\n",
1765+
run->dst->vb2_buf.num_planes);
1766+
goto fail;
1767+
}
1768+
if (run->dst->planes[0].length < ctx->dst_fmt.plane_fmt[0].sizeimage) {
1769+
v4l2_warn(&dev->v4l2_dev,
1770+
"Capture planes length (%d) < sizeimage (%d)\n",
1771+
run->dst->planes[0].length,
1772+
ctx->dst_fmt.plane_fmt[0].sizeimage);
1773+
goto fail;
1774+
}
1775+
break;
17401776
}
17411777

17421778
/*
@@ -1896,8 +1932,13 @@ static void hevc_d_h265_setup(struct hevc_d_ctx *ctx, struct hevc_d_run *run)
18961932

18971933
de->ref_addrs[i][0] =
18981934
vb2_dma_contig_plane_dma_addr(buf, 0);
1899-
de->ref_addrs[i][1] =
1900-
vb2_dma_contig_plane_dma_addr(buf, 1);
1935+
if (ctx->dst_fmt.pixelformat == V4L2_PIX_FMT_NV12MT_COL128 ||
1936+
ctx->dst_fmt.pixelformat == V4L2_PIX_FMT_NV12MT_10_COL128)
1937+
de->ref_addrs[i][1] =
1938+
vb2_dma_contig_plane_dma_addr(buf, 1);
1939+
else
1940+
de->ref_addrs[i][1] = de->ref_addrs[i][0] +
1941+
(ctx->dst_fmt.height * 128);
19011942
}
19021943

19031944
/* Move DPB from temp */
@@ -2564,9 +2605,11 @@ static int try_ctrl_sps(struct v4l2_ctrl *ctrl)
25642605
return 0;
25652606

25662607
if ((sps->bit_depth_luma_minus8 == 0 &&
2567-
ctx->dst_fmt.pixelformat != V4L2_PIX_FMT_NV12MT_COL128) ||
2608+
ctx->dst_fmt.pixelformat != V4L2_PIX_FMT_NV12MT_COL128 &&
2609+
ctx->dst_fmt.pixelformat != V4L2_PIX_FMT_NV12_COL128) ||
25682610
(sps->bit_depth_luma_minus8 == 2 &&
2569-
ctx->dst_fmt.pixelformat != V4L2_PIX_FMT_NV12MT_10_COL128)) {
2611+
ctx->dst_fmt.pixelformat != V4L2_PIX_FMT_NV12MT_10_COL128 &&
2612+
ctx->dst_fmt.pixelformat != V4L2_PIX_FMT_NV12_10_COL128)) {
25702613
v4l2_warn(&dev->v4l2_dev,
25712614
"SPS luma depth %d does not match capture format\n",
25722615
sps->bit_depth_luma_minus8 + 8);

‎drivers/media/platform/raspberrypi/hevc_dec/hevc_d_video.c‎

Lines changed: 82 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -150,17 +150,57 @@ static void hevc_d_prepare_dst_format(struct v4l2_pix_format_mplane *pix_fmt)
150150
bytesperline = width * 4 / 3;
151151
sizeimage = bytesperline * height;
152152
break;
153+
154+
case V4L2_PIX_FMT_NV12_COL128:
155+
/* Width rounds up to columns */
156+
width = ALIGN(width, 128);
157+
height = ALIGN(height, 8);
158+
159+
/* column height
160+
* Accept suggested shape if at least min & < 2 * min
161+
*/
162+
bytesperline = constrain2x(bytesperline, height * 3 / 2);
163+
sizeimage = bytesperline * width;
164+
break;
165+
166+
case V4L2_PIX_FMT_NV12_10_COL128:
167+
/* width in pixels (3 pels = 4 bytes) rounded to 128 byte
168+
* columns
169+
*/
170+
width = ALIGN(((width + 2) / 3), 32) * 3;
171+
height = ALIGN(height, 8);
172+
173+
/* column height
174+
* Accept suggested shape if at least min & < 2 * min
175+
*/
176+
bytesperline = constrain2x(bytesperline, height * 3 / 2);
177+
sizeimage = bytesperline * width * 4 / 3;
178+
break;
179+
153180
}
154181

155182
pix_fmt->width = width;
156183
pix_fmt->height = height;
157184

158185
pix_fmt->field = V4L2_FIELD_NONE;
159-
pix_fmt->plane_fmt[0].bytesperline = bytesperline;
160-
pix_fmt->plane_fmt[0].sizeimage = sizeimage;
161-
pix_fmt->plane_fmt[1].bytesperline = bytesperline;
162-
pix_fmt->plane_fmt[1].sizeimage = sizeimage / 2;
163-
pix_fmt->num_planes = 2;
186+
187+
switch (pix_fmt->pixelformat) {
188+
default:
189+
case V4L2_PIX_FMT_NV12MT_COL128:
190+
case V4L2_PIX_FMT_NV12MT_10_COL128:
191+
pix_fmt->plane_fmt[0].bytesperline = bytesperline;
192+
pix_fmt->plane_fmt[0].sizeimage = sizeimage;
193+
pix_fmt->plane_fmt[1].bytesperline = bytesperline;
194+
pix_fmt->plane_fmt[1].sizeimage = sizeimage / 2;
195+
pix_fmt->num_planes = 2;
196+
break;
197+
case V4L2_PIX_FMT_NV12_COL128:
198+
case V4L2_PIX_FMT_NV12_10_COL128:
199+
pix_fmt->plane_fmt[0].bytesperline = bytesperline;
200+
pix_fmt->plane_fmt[0].sizeimage = sizeimage;
201+
pix_fmt->num_planes = 1;
202+
break;
203+
}
164204
}
165205

166206
static int hevc_d_querycap(struct file *file, void *priv,
@@ -245,19 +285,30 @@ static int hevc_d_hevc_validate_sps(const struct v4l2_ctrl_hevc_sps * const sps)
245285
static u32 pixelformat_from_sps(const struct v4l2_ctrl_hevc_sps * const sps,
246286
const int index)
247287
{
288+
static const u32 all_formats[] = {
289+
V4L2_PIX_FMT_NV12MT_COL128,
290+
V4L2_PIX_FMT_NV12MT_10_COL128,
291+
V4L2_PIX_FMT_NV12_COL128,
292+
V4L2_PIX_FMT_NV12_10_COL128,
293+
};
248294
u32 pf = 0;
249295

250296
if (!is_sps_set(sps) || !hevc_d_hevc_validate_sps(sps)) {
251297
/* Treat this as an error? For now return both */
252-
if (index == 0)
253-
pf = V4L2_PIX_FMT_NV12MT_COL128;
254-
else if (index == 1)
255-
pf = V4L2_PIX_FMT_NV12MT_10_COL128;
256-
} else if (index == 0) {
257-
if (sps->bit_depth_luma_minus8 == 0)
258-
pf = V4L2_PIX_FMT_NV12MT_COL128;
259-
else if (sps->bit_depth_luma_minus8 == 2)
260-
pf = V4L2_PIX_FMT_NV12MT_10_COL128;
298+
if (index < ARRAY_SIZE(all_formats))
299+
pf = all_formats[index];
300+
} else {
301+
if (index == 0) {
302+
if (sps->bit_depth_luma_minus8 == 0)
303+
pf = V4L2_PIX_FMT_NV12MT_COL128;
304+
else if (sps->bit_depth_luma_minus8 == 2)
305+
pf = V4L2_PIX_FMT_NV12MT_10_COL128;
306+
} else if (index == 1) {
307+
if (sps->bit_depth_luma_minus8 == 0)
308+
pf = V4L2_PIX_FMT_NV12_COL128;
309+
else if (sps->bit_depth_luma_minus8 == 2)
310+
pf = V4L2_PIX_FMT_NV12_10_COL128;
311+
}
261312
}
262313

263314
return pf;
@@ -466,17 +517,28 @@ static int hevc_d_queue_setup(struct vb2_queue *vq, unsigned int *nbufs,
466517
pix_fmt = get_dst_fmt(ctx);
467518

468519
if (*nplanes) {
469-
if (*nplanes < 2 ||
470-
sizes[0] < pix_fmt->plane_fmt[0].sizeimage ||
471-
sizes[1] < pix_fmt->plane_fmt[1].sizeimage)
472-
return -EINVAL;
520+
if (pix_fmt->pixelformat == V4L2_PIX_FMT_NV12MT_COL128 ||
521+
pix_fmt->pixelformat == V4L2_PIX_FMT_NV12MT_10_COL128) {
522+
if (*nplanes < 2 ||
523+
sizes[0] < pix_fmt->plane_fmt[0].sizeimage ||
524+
sizes[1] < pix_fmt->plane_fmt[1].sizeimage)
525+
return -EINVAL;
526+
} else {
527+
if (sizes[0] < pix_fmt->plane_fmt[0].sizeimage)
528+
return -EINVAL;
529+
}
473530
} else {
474531
sizes[0] = pix_fmt->plane_fmt[0].sizeimage;
475532
if (V4L2_TYPE_IS_OUTPUT(vq->type)) {
476533
*nplanes = 1;
477534
} else {
478-
sizes[1] = pix_fmt->plane_fmt[1].sizeimage;
479-
*nplanes = 2;
535+
if (pix_fmt->pixelformat == V4L2_PIX_FMT_NV12MT_COL128 ||
536+
pix_fmt->pixelformat == V4L2_PIX_FMT_NV12MT_10_COL128) {
537+
sizes[1] = pix_fmt->plane_fmt[1].sizeimage;
538+
*nplanes = 2;
539+
} else {
540+
*nplanes = 1;
541+
}
480542
}
481543
}
482544

0 commit comments

Comments
 (0)