diff options
| author | Ezequiel Garcia <ezequiel@collabora.com> | 2020-08-25 06:52:43 +0300 |
|---|---|---|
| committer | Mauro Carvalho Chehab <mchehab+huawei@kernel.org> | 2020-09-01 15:13:29 +0300 |
| commit | fd902918e3e6c70e771e14e611950f361a78cfc5 (patch) | |
| tree | 1d9cd91a6ff0e4d945832466bd4532ae8e30c17b /drivers/staging/media/rkvdec/rkvdec.c | |
| parent | d3951cfc9bee5b1d4282c2f6b9458b4a94929eee (diff) | |
| download | linux-fd902918e3e6c70e771e14e611950f361a78cfc5.tar.xz | |
media: rkvdec: Use H264_SCALING_MATRIX only when required
Baseline, Main and Extended profiles are specified to
not support a scaling matrix. Also, High profiles
can optionally specify a scaling matrix, using
SPS and PPS NAL units.
To meet this expectation, applications are required to
set the V4L2_CID_MPEG_VIDEO_H264_SCALING_MATRIX control
and set the V4L2_H264_PPS_FLAG_SCALING_MATRIX_PRESENT
flag only when a scaling matrix is specified for a picture.
Implement this on rkvdec, which has hardware support for this
case.
Signed-off-by: Ezequiel Garcia <ezequiel@collabora.com>
Tested-by: Jonas Karlman <jonas@kwiboo.se>
Signed-off-by: Hans Verkuil <hverkuil-cisco@xs4all.nl>
Signed-off-by: Mauro Carvalho Chehab <mchehab+huawei@kernel.org>
Diffstat (limited to 'drivers/staging/media/rkvdec/rkvdec.c')
| -rw-r--r-- | drivers/staging/media/rkvdec/rkvdec.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/drivers/staging/media/rkvdec/rkvdec.c b/drivers/staging/media/rkvdec/rkvdec.c index 9f59dfb62d3f..d25c4a37e2af 100644 --- a/drivers/staging/media/rkvdec/rkvdec.c +++ b/drivers/staging/media/rkvdec/rkvdec.c @@ -68,7 +68,6 @@ static const struct rkvdec_ctrl_desc rkvdec_h264_ctrl_descs[] = { .cfg.id = V4L2_CID_MPEG_VIDEO_H264_PPS, }, { - .mandatory = true, .cfg.id = V4L2_CID_MPEG_VIDEO_H264_SCALING_MATRIX, }, { |