media: vicodec: Add a flag for I-frames in fwht header
PATCH 1/1 media: vicodec: Add a flag for I-frames in fwht header
Add a flag 'FWHT_FL_I_FRAME' that indicates that
this is an I-frame. This requires incrementing
to version 3
Signed-off-by Dafna Hirschfeld <[email protected]>
--- drivers/media/platform/vicodec/codec-fwht.h | 3 ++- drivers/media/platform/vicodec/codec-v4l2-fwht.c | 2 +- drivers/media/platform/vicodec/vicodec-core.c | 4 ++-- 3 files changed, 5 insertions(+), 4 deletions(-)
drivers/media/platform/vicodec/codec-fwht.h +2 -1
@@ -56,7 +56,7 @@#define FWHT_MAGIC1 0x4f4f4f4f#define FWHT_MAGIC2 0xffffffff -#define FWHT_VERSION 2 +#define FWHT_VERSION 3/* Set if this is an interlaced format */ #define FWHT_FL_IS_INTERLACED BIT(0)
@@ -76,6 +76,7 @@#define FWHT_FL_CHROMA_FULL_HEIGHT BIT(7)#define FWHT_FL_CHROMA_FULL_WIDTH BIT(8)#define FWHT_FL_ALPHA_IS_UNCOMPRESSED BIT(9) +#define FWHT_FL_I_FRAME BIT(10)/* A 4-values flag - the number of components - 1 */ #define FWHT_FL_COMPONENTS_NUM_MSK GENMASK(18, 16)
drivers/media/platform/vicodec/codec-v4l2-fwht.c +1 -1
@@ -265,7 +265,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) >>
drivers/media/platform/vicodec/vicodec-core.c +2 -2
@@ -339,7 +339,7 @@ info_from_header(const struct fwht_cframe_hdr *p_hdr)unsigned int pixenc =0 ;unsigned int version =ntohl (p_hdr->version); -if (version ==FWHT_VERSION ) { +if (version >=2 ) { components_num =1 + ((flags &FWHT_FL_COMPONENTS_NUM_MSK ) >>FWHT_FL_COMPONENTS_NUM_OFFSET ); pixenc = (flags &FWHT_FL_PIXENC_MSK );
@@ -362,7 +362,7 @@ static bool is_header_valid(const struct fwht_cframe_hdr *p_hdr)if (w <MIN_WIDTH || w >MAX_WIDTH || h <MIN_HEIGHT || h >MAX_HEIGHT )return false; -if (version ==FWHT_VERSION ) { +if (version >=2 ) {unsigned int components_num =1 + ((flags &FWHT_FL_COMPONENTS_NUM_MSK ) >>FWHT_FL_COMPONENTS_NUM_OFFSET );
Signature · 1 line
2.17.1