diff options
| author | Hans Verkuil <hans.verkuil@cisco.com> | 2018-08-21 03:00:07 -0400 |
|---|---|---|
| committer | Mauro Carvalho Chehab <mchehab+samsung@kernel.org> | 2018-08-31 08:26:21 -0400 |
| commit | 98efd5525ac092d20ae126936c87c02be0588bdc (patch) | |
| tree | 329bcafa6773a9533ca71923bb3a2ce30b00406a | |
| parent | 56ba4d03d83869f6cf1a7c63da8588dd54aedb18 (diff) | |
| download | linux-98efd5525ac092d20ae126936c87c02be0588bdc.tar.bz2 | |
media: vicodec: simplify blocktype checking
Simplify some blocktype/is_intra checks.
Signed-off-by: Hans Verkuil <hans.verkuil@cisco.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab+samsung@kernel.org>
| -rw-r--r-- | drivers/media/platform/vicodec/vicodec-codec.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/drivers/media/platform/vicodec/vicodec-codec.c b/drivers/media/platform/vicodec/vicodec-codec.c index 7bd11a974db0..e402d988f2ad 100644 --- a/drivers/media/platform/vicodec/vicodec-codec.c +++ b/drivers/media/platform/vicodec/vicodec-codec.c @@ -663,11 +663,10 @@ static u32 encode_plane(u8 *input, u8 *refp, __be16 **rlco, __be16 *rlco_max, if (!is_intra) blocktype = decide_blocktype(input, refp, deltablock, width, input_step); - if (is_intra || blocktype == IBLOCK) { + if (blocktype == IBLOCK) { fwht(input, cf->coeffs, width, input_step, 1); quantize_intra(cf->coeffs, cf->de_coeffs, cf->i_frame_qp); - blocktype = IBLOCK; } else { /* inter code */ encoding |= FRAME_PCODED; |