media: vicodec: Add a flag for I-frames in fwht header

[linux.git] / drivers / media / platform / vicodec / codec-v4l2-fwht.c

diff --git a/drivers/media/platform/vicodec/codec-v4l2-fwht.c b/drivers/media/platform/vicodec/codec-v4l2-fwht.c
index c150348491339bb305fa95ef4f0225602e9dbba5..6573a471c5ca94f0ce0668216ffc663236bf56f7 100644 (file)
--- a/drivers/media/platform/vicodec/codec-v4l2-fwht.c
+++ b/drivers/media/platform/vicodec/codec-v4l2-fwht.c
@@ -218,6 +218,8 @@ int v4l2_fwht_encode(struct v4l2_fwht_state *state, u8 *p_in, u8 *p_out)
                flags |= FWHT_FL_CR_IS_UNCOMPRESSED;
        if (encoding & FWHT_ALPHA_UNENCODED)
                flags |= FWHT_FL_ALPHA_IS_UNCOMPRESSED;
+       if (!(encoding & FWHT_FRAME_PCODED))
+               flags |= FWHT_FL_I_FRAME;
        if (rf.height_div == 1)
                flags |= FWHT_FL_CHROMA_FULL_HEIGHT;
        if (rf.width_div == 1)
@@ -265,7 +267,7 @@ int v4l2_fwht_decode(struct v4l2_fwht_state *state, u8 *p_in, u8 *p_out)
 
        flags = ntohl(state->header.flags);
 
-       if (version == FWHT_VERSION) {
+       if (version >= 2) {
                if ((flags & FWHT_FL_PIXENC_MSK) != info->pixenc)
                        return -EINVAL;
                components_num = 1 + ((flags & FWHT_FL_COMPONENTS_NUM_MSK) >>