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>

diff --git a/drivers/media/platform/vicodec/vicodec-codec.c b/drivers/media/platform/vicodec/vicodec-codec.c
index 7bd11a974db0ab9539d0a6aea0d9b56322340fcd..e402d988f2ada94bfb54de973374c84ef0ce6e73 100644 (file)
--- 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;