Commit 98efd552 authored by Hans Verkuil's avatar Hans Verkuil Committed by Mauro Carvalho Chehab

media: vicodec: simplify blocktype checking

Simplify some blocktype/is_intra checks.
Signed-off-by: default avatarHans Verkuil <hans.verkuil@cisco.com>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab+samsung@kernel.org>
parent 56ba4d03
...@@ -663,11 +663,10 @@ static u32 encode_plane(u8 *input, u8 *refp, __be16 **rlco, __be16 *rlco_max, ...@@ -663,11 +663,10 @@ static u32 encode_plane(u8 *input, u8 *refp, __be16 **rlco, __be16 *rlco_max,
if (!is_intra) if (!is_intra)
blocktype = decide_blocktype(input, refp, blocktype = decide_blocktype(input, refp,
deltablock, width, input_step); deltablock, width, input_step);
if (is_intra || blocktype == IBLOCK) { if (blocktype == IBLOCK) {
fwht(input, cf->coeffs, width, input_step, 1); fwht(input, cf->coeffs, width, input_step, 1);
quantize_intra(cf->coeffs, cf->de_coeffs, quantize_intra(cf->coeffs, cf->de_coeffs,
cf->i_frame_qp); cf->i_frame_qp);
blocktype = IBLOCK;
} else { } else {
/* inter code */ /* inter code */
encoding |= FRAME_PCODED; encoding |= FRAME_PCODED;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment