Skip to content

Commit 53421e7

Browse files
Benjamin Gaignardmchehab
authored andcommitted
media: verisilicon: Add AV1 decoder mode and controls
Add AV1 decoder as new decoder mode to Hantro driver. Register needed AV1 controls for the decoder. Signed-off-by: Benjamin Gaignard <benjamin.gaignard@collabora.com> Reviewed-by: Nicolas Dufresne <nicolas.dufresne@collabora.com> Signed-off-by: Hans Verkuil <hverkuil-cisco@xs4all.nl> Signed-off-by: Mauro Carvalho Chehab <mchehab@kernel.org>
1 parent aa1e34c commit 53421e7

2 files changed

Lines changed: 24 additions & 0 deletions

File tree

drivers/media/platform/verisilicon/hantro.h

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -38,6 +38,7 @@ struct hantro_postproc_ops;
3838
#define HANTRO_H264_DECODER BIT(18)
3939
#define HANTRO_HEVC_DECODER BIT(19)
4040
#define HANTRO_VP9_DECODER BIT(20)
41+
#define HANTRO_AV1_DECODER BIT(21)
4142
#define HANTRO_DECODERS 0xffff0000
4243

4344
/**
@@ -111,6 +112,7 @@ struct hantro_variant {
111112
* @HANTRO_MODE_VP8_DEC: VP8 decoder.
112113
* @HANTRO_MODE_HEVC_DEC: HEVC decoder.
113114
* @HANTRO_MODE_VP9_DEC: VP9 decoder.
115+
* @HANTRO_MODE_AV1_DEC: AV1 decoder
114116
*/
115117
enum hantro_codec_mode {
116118
HANTRO_MODE_NONE = -1,
@@ -120,6 +122,7 @@ enum hantro_codec_mode {
120122
HANTRO_MODE_VP8_DEC,
121123
HANTRO_MODE_HEVC_DEC,
122124
HANTRO_MODE_VP9_DEC,
125+
HANTRO_MODE_AV1_DEC,
123126
};
124127

125128
/*

drivers/media/platform/verisilicon/hantro_drv.c

Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -525,6 +525,27 @@ static const struct hantro_ctrl controls[] = {
525525
.cfg = {
526526
.id = V4L2_CID_STATELESS_VP9_COMPRESSED_HDR,
527527
},
528+
}, {
529+
.codec = HANTRO_AV1_DECODER,
530+
.cfg = {
531+
.id = V4L2_CID_STATELESS_AV1_FRAME,
532+
},
533+
}, {
534+
.codec = HANTRO_AV1_DECODER,
535+
.cfg = {
536+
.id = V4L2_CID_STATELESS_AV1_TILE_GROUP_ENTRY,
537+
.dims = { V4L2_AV1_MAX_TILE_COUNT },
538+
},
539+
}, {
540+
.codec = HANTRO_AV1_DECODER,
541+
.cfg = {
542+
.id = V4L2_CID_STATELESS_AV1_SEQUENCE,
543+
},
544+
}, {
545+
.codec = HANTRO_AV1_DECODER,
546+
.cfg = {
547+
.id = V4L2_CID_STATELESS_AV1_FILM_GRAIN,
548+
},
528549
},
529550
};
530551

0 commit comments

Comments
 (0)