aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJernej Skrabec2024-01-14 11:01:07 +0100
committerPaul Kocialkowski2024-07-30 15:27:35 +0200
commita958f9f04440dae80641dc7fddb003a6658c3634 (patch)
treec59844c1eda2009a5212186e4f6119f871cf1b32
parentc0dd00acd1defdcad63a0eb5d383176302b5f533 (diff)
media: cedrus: Enable JPEG decoding in various variants
As far as manuals go, only A10 and A13 don't have JPEG support mentioned, all others do. To be safe, enable it on all variants except A10 and A13. Signed-off-by: Jernej Skrabec <jernej.skrabec@gmail.com>
-rw-r--r--drivers/staging/media/sunxi/cedrus/cedrus.c29
1 files changed, 20 insertions, 9 deletions
diff --git a/drivers/staging/media/sunxi/cedrus/cedrus.c b/drivers/staging/media/sunxi/cedrus/cedrus.c
index f52df6836045..c0ba2c1bda1a 100644
--- a/drivers/staging/media/sunxi/cedrus/cedrus.c
+++ b/drivers/staging/media/sunxi/cedrus/cedrus.c
@@ -563,6 +563,7 @@ static void cedrus_remove(struct platform_device *pdev)
static const struct cedrus_variant sun4i_a10_cedrus_variant = {
.capabilities = CEDRUS_CAPABILITY_MPEG2_DEC |
+ CEDRUS_CAPABILITY_JPEG_DEC |
CEDRUS_CAPABILITY_H264_DEC |
CEDRUS_CAPABILITY_VP8_DEC,
.mod_rate = 320000000,
@@ -577,8 +578,10 @@ static const struct cedrus_variant sun5i_a13_cedrus_variant = {
static const struct cedrus_variant sun7i_a20_cedrus_variant = {
.capabilities = CEDRUS_CAPABILITY_MPEG2_DEC |
+ CEDRUS_CAPABILITY_JPEG_DEC |
CEDRUS_CAPABILITY_H264_DEC |
- CEDRUS_CAPABILITY_VP8_DEC,
+ CEDRUS_CAPABILITY_VP8_DEC |
+ CEDRUS_CAPABILITY_JPEG_DEC,
.mod_rate = 320000000,
};
@@ -586,7 +589,8 @@ static const struct cedrus_variant sun8i_a33_cedrus_variant = {
.capabilities = CEDRUS_CAPABILITY_UNTILED |
CEDRUS_CAPABILITY_MPEG2_DEC |
CEDRUS_CAPABILITY_H264_DEC |
- CEDRUS_CAPABILITY_VP8_DEC,
+ CEDRUS_CAPABILITY_VP8_DEC |
+ CEDRUS_CAPABILITY_JPEG_DEC,
.mod_rate = 320000000,
};
@@ -595,13 +599,15 @@ static const struct cedrus_variant sun8i_h3_cedrus_variant = {
CEDRUS_CAPABILITY_MPEG2_DEC |
CEDRUS_CAPABILITY_H264_DEC |
CEDRUS_CAPABILITY_H265_DEC |
- CEDRUS_CAPABILITY_VP8_DEC,
+ CEDRUS_CAPABILITY_VP8_DEC |
+ CEDRUS_CAPABILITY_JPEG_DEC,
.mod_rate = 402000000,
};
static const struct cedrus_variant sun8i_v3s_cedrus_variant = {
.capabilities = CEDRUS_CAPABILITY_UNTILED |
- CEDRUS_CAPABILITY_H264_DEC,
+ CEDRUS_CAPABILITY_H264_DEC |
+ CEDRUS_CAPABILITY_JPEG_DEC,
.mod_rate = 297000000,
};
@@ -609,7 +615,8 @@ static const struct cedrus_variant sun8i_r40_cedrus_variant = {
.capabilities = CEDRUS_CAPABILITY_UNTILED |
CEDRUS_CAPABILITY_MPEG2_DEC |
CEDRUS_CAPABILITY_H264_DEC |
- CEDRUS_CAPABILITY_VP8_DEC,
+ CEDRUS_CAPABILITY_VP8_DEC |
+ CEDRUS_CAPABILITY_JPEG_DEC,
.mod_rate = 297000000,
};
@@ -617,7 +624,8 @@ static const struct cedrus_variant sun20i_d1_cedrus_variant = {
.capabilities = CEDRUS_CAPABILITY_UNTILED |
CEDRUS_CAPABILITY_MPEG2_DEC |
CEDRUS_CAPABILITY_H264_DEC |
- CEDRUS_CAPABILITY_H265_DEC,
+ CEDRUS_CAPABILITY_H265_DEC |
+ CEDRUS_CAPABILITY_JPEG_DEC,
.mod_rate = 432000000,
};
@@ -626,7 +634,8 @@ static const struct cedrus_variant sun50i_a64_cedrus_variant = {
CEDRUS_CAPABILITY_MPEG2_DEC |
CEDRUS_CAPABILITY_H264_DEC |
CEDRUS_CAPABILITY_H265_DEC |
- CEDRUS_CAPABILITY_VP8_DEC,
+ CEDRUS_CAPABILITY_VP8_DEC |
+ CEDRUS_CAPABILITY_JPEG_DEC,
.mod_rate = 402000000,
};
@@ -635,7 +644,8 @@ static const struct cedrus_variant sun50i_h5_cedrus_variant = {
CEDRUS_CAPABILITY_MPEG2_DEC |
CEDRUS_CAPABILITY_H264_DEC |
CEDRUS_CAPABILITY_H265_DEC |
- CEDRUS_CAPABILITY_VP8_DEC,
+ CEDRUS_CAPABILITY_VP8_DEC |
+ CEDRUS_CAPABILITY_JPEG_DEC,
.mod_rate = 402000000,
};
@@ -645,7 +655,8 @@ static const struct cedrus_variant sun50i_h6_cedrus_variant = {
CEDRUS_CAPABILITY_H264_DEC |
CEDRUS_CAPABILITY_H265_DEC |
CEDRUS_CAPABILITY_H265_10_DEC |
- CEDRUS_CAPABILITY_VP8_DEC,
+ CEDRUS_CAPABILITY_VP8_DEC |
+ CEDRUS_CAPABILITY_JPEG_DEC,
.mod_rate = 600000000,
};