media: vicodec: Move raw frame preparation code to a function
Subsystems (2)
PATCH v4 10/21 media: vicodec: Move raw frame preparation code to a function
Introduce 'prepare_raw_frame' function that fills the values of a raw frame struct according to the format.
--- .../media/platform/vicodec/codec-v4l2-fwht.c | 143 ++++++++++-------- 1 file changed, 78 insertions(+), 65 deletions(-)
drivers/media/platform/vicodec/codec-v4l2-fwht.c +78 -65
@@ -75,117 +75,130 @@ const struct v4l2_fwht_pixfmt_info *v4l2_fwht_get_pixfmt(u32 idx)return v4l2_fwht_pixfmts + idx; } -int v4l2_fwht_encode (struct v4l2_fwht_state *state,u8 *p_in,u8 *p_out) +static int prepare_raw_frame (struct fwht_raw_frame *rf, +const struct v4l2_fwht_pixfmt_info *info,u8 *buf, +unsigned int size) { -unsigned int size = state->stride * state->coded_height; -unsigned int chroma_stride = state->stride; -const struct v4l2_fwht_pixfmt_info *info = state->info; -struct fwht_cframe_hdr *p_hdr; -struct fwht_cframe cf; -struct fwht_raw_frame rf; -u32 encoding; -u32 flags =0 ; - -if (!info) -return -EINVAL ; - - rf.luma = p_in; - rf.width_div = info->width_div; - rf.height_div = info->height_div; - rf.luma_alpha_step = info->luma_alpha_step; - rf.chroma_step = info->chroma_step; - rf.alpha =NULL ; - rf.components_num = info->components_num; + rf->luma = buf; + rf->width_div = info->width_div; + rf->height_div = info->height_div; + rf->luma_alpha_step = info->luma_alpha_step; + rf->chroma_step = info->chroma_step; + rf->alpha =NULL ; + rf->components_num = info->components_num;switch (info->id) {case V4L2_PIX_FMT_GREY : - rf.cb =NULL ; - rf.cr =NULL ; + rf->cb =NULL ; + rf->cr =NULL ;break ;case V4L2_PIX_FMT_YUV420 : - rf.cb = rf.luma + size; - rf.cr = rf.cb + size /4 ; - chroma_stride /=2 ; + rf->cb = rf->luma + size; + rf->cr = rf->cb + size /4 ;break ;case V4L2_PIX_FMT_YVU420 : - rf.cr = rf.luma + size; - rf.cb = rf.cr + size /4 ; - chroma_stride /=2 ; + rf->cr = rf->luma + size; + rf->cb = rf->cr + size /4 ;break ;case V4L2_PIX_FMT_YUV422P : - rf.cb = rf.luma + size; - rf.cr = rf.cb + size /2 ; - chroma_stride /=2 ; + rf->cb = rf->luma + size; + rf->cr = rf->cb + size /2 ;break ;case V4L2_PIX_FMT_NV12 :case V4L2_PIX_FMT_NV16 :case V4L2_PIX_FMT_NV24 : - rf.cb = rf.luma + size; - rf.cr = rf.cb +1 ; + rf->cb = rf->luma + size; + rf->cr = rf->cb +1 ;break ;case V4L2_PIX_FMT_NV21 :case V4L2_PIX_FMT_NV61 :case V4L2_PIX_FMT_NV42 : - rf.cr = rf.luma + size; - rf.cb = rf.cr +1 ; + rf->cr = rf->luma + size; + rf->cb = rf->cr +1 ;break ;case V4L2_PIX_FMT_YUYV : - rf.cb = rf.luma +1 ; - rf.cr = rf.cb +2 ; + rf->cb = rf->luma +1 ; + rf->cr = rf->cb +2 ;break ;case V4L2_PIX_FMT_YVYU : - rf.cr = rf.luma +1 ; - rf.cb = rf.cr +2 ; + rf->cr = rf->luma +1 ; + rf->cb = rf->cr +2 ;break ;case V4L2_PIX_FMT_UYVY : - rf.cb = rf.luma; - rf.cr = rf.cb +2 ; - rf.luma++; + rf->cb = rf->luma; + rf->cr = rf->cb +2 ; + rf->luma++;break ;case V4L2_PIX_FMT_VYUY : - rf.cr = rf.luma; - rf.cb = rf.cr +2 ; - rf.luma++; + rf->cr = rf->luma; + rf->cb = rf->cr +2 ; + rf->luma++;break ;case V4L2_PIX_FMT_RGB24 :case V4L2_PIX_FMT_HSV24 : - rf.cr = rf.luma; - rf.cb = rf.cr +2 ; - rf.luma++; + rf->cr = rf->luma; + rf->cb = rf->cr +2 ; + rf->luma++;break ;case V4L2_PIX_FMT_BGR24 : - rf.cb = rf.luma; - rf.cr = rf.cb +2 ; - rf.luma++; + rf->cb = rf->luma; + rf->cr = rf->cb +2 ; + rf->luma++;break ;case V4L2_PIX_FMT_RGB32 :case V4L2_PIX_FMT_XRGB32 :case V4L2_PIX_FMT_HSV32 : - rf.cr = rf.luma +1 ; - rf.cb = rf.cr +2 ; - rf.luma +=2 ; + rf->cr = rf->luma +1 ; + rf->cb = rf->cr +2 ; + rf->luma +=2 ;break ;case V4L2_PIX_FMT_BGR32 :case V4L2_PIX_FMT_XBGR32 : - rf.cb = rf.luma; - rf.cr = rf.cb +2 ; - rf.luma++; + rf->cb = rf->luma; + rf->cr = rf->cb +2 ; + rf->luma++;break ;case V4L2_PIX_FMT_ARGB32 : - rf.alpha = rf.luma; - rf.cr = rf.luma +1 ; - rf.cb = rf.cr +2 ; - rf.luma +=2 ; + rf->alpha = rf->luma; + rf->cr = rf->luma +1 ; + rf->cb = rf->cr +2 ; + rf->luma +=2 ;break ;case V4L2_PIX_FMT_ABGR32 : - rf.cb = rf.luma; - rf.cr = rf.cb +2 ; - rf.luma++; - rf.alpha = rf.cr +1 ; + rf->cb = rf->luma; + rf->cr = rf->cb +2 ; + rf->luma++; + rf->alpha = rf->cr +1 ;break ;default :return -EINVAL ; } +return 0 ; +} + +int v4l2_fwht_encode (struct v4l2_fwht_state *state,u8 *p_in,u8 *p_out) +{ +unsigned int size = state->stride * state->coded_height; +unsigned int chroma_stride = state->stride; +const struct v4l2_fwht_pixfmt_info *info = state->info; +struct fwht_cframe_hdr *p_hdr; +struct fwht_cframe cf; +struct fwht_raw_frame rf; +u32 encoding; +u32 flags =0 ; + +if (!info) +return -EINVAL ; + +if (prepare_raw_frame (&rf, info, p_in, size)) +return -EINVAL ; + +if (info->planes_num ==3 ) + chroma_stride /=2 ; + +if (info->id ==V4L2_PIX_FMT_NV24 || + info->id ==V4L2_PIX_FMT_NV42 ) + chroma_stride *=2 ; cf.i_frame_qp = state->i_frame_qp; cf.p_frame_qp = state->p_frame_qp;
Signature · 1 line
2.17.1
PATCH v4 11/21 media: vicodec: add field 'buf' to fwht_raw_frame
Add the field 'buf' to fwht_raw_frame to indicate the start of the raw frame buffer.
This field will be used to copy the capture buffer to the reference buffer in the next patch.
--- drivers/media/platform/vicodec/codec-fwht.h | 1 + drivers/media/platform/vicodec/vicodec-core.c | 7 +++++-- 2 files changed, 6 insertions(+), 2 deletions(-)
drivers/media/platform/vicodec/codec-fwht.h +1 -0
@@ -124,6 +124,7 @@ struct fwht_raw_frame {unsigned int luma_alpha_step;unsigned int chroma_step;unsigned int components_num; +u8 *buf;u8 *luma, *cb, *cr, *alpha; };
drivers/media/platform/vicodec/vicodec-core.c +5 -2
@@ -1352,7 +1352,8 @@ static int vicodec_start_streaming(struct vb2_queue *q, state->stride = q_data->coded_width * info->bytesperline_mult; - state->ref_frame.luma =kvmalloc (total_planes_size,GFP_KERNEL ); + state->ref_frame.buf =kvmalloc (total_planes_size,GFP_KERNEL ); + state->ref_frame.luma = state->ref_frame.buf; ctx->comp_max_size = total_planes_size; new_comp_frame =kvmalloc (ctx->comp_max_size,GFP_KERNEL );
@@ -1401,7 +1402,9 @@ static void vicodec_stop_streaming(struct vb2_queue *q)if ((!V4L2_TYPE_IS_OUTPUT (q->type) && !ctx->is_enc) || (V4L2_TYPE_IS_OUTPUT (q->type) && ctx->is_enc)) { -kvfree (ctx->state.ref_frame.luma); +kvfree (ctx->state.ref_frame.buf); + ctx->state.ref_frame.buf =NULL ; + ctx->state.ref_frame.luma =NULL ; ctx->comp_max_size =0 ; ctx->source_changed = false; }
Signature · 1 line
2.17.1
PATCH v4 12/21 media: vicodec: keep the ref frame according to the format in decoder
In reply to Dafna HirschfeldIn the decoder, save the inner reference frame in the same format as the capture buffer.
The decoder writes directly to the capture buffer and then the capture buffer is copied to the reference buffer. This will simplify the stateless decoder.
--- drivers/media/platform/vicodec/codec-fwht.c | 83 +++--- drivers/media/platform/vicodec/codec-fwht.h | 11 +- .../media/platform/vicodec/codec-v4l2-fwht.c | 255 ++---------------- .../media/platform/vicodec/codec-v4l2-fwht.h | 1 + drivers/media/platform/vicodec/vicodec-core.c | 40 +++ 5 files changed, 122 insertions(+), 268 deletions(-)
drivers/media/platform/vicodec/codec-fwht.c +52 -31
@@ -632,12 +632,13 @@ static int decide_blocktype(const u8 *cur, const u8 *reference,return vari <= vard ?IBLOCK :PBLOCK ; } -static void fill_decoder_block (u8 *dst,const s16 *input,int stride) +static void fill_decoder_block (u8 *dst,const s16 *input,int stride, +unsigned int dst_step) {int i, j;for (i =0 ; i <8 ; i++) { -for (j =0 ; j <8 ; j++, input++, dst++) { +for (j =0 ; j <8 ; j++, input++, dst += dst_step) {if (*input <0 ) *dst =0 ;else if (*input >255 )
@@ -645,17 +646,19 @@ static void fill_decoder_block(u8 *dst, const s16 *input, int stride)else *dst = *input; } - dst += stride -8 ; + dst += stride - (8 * dst_step); } } -static void add_deltas (s16 *deltas,const u8 *ref,int stride) +static void add_deltas (s16 *deltas,const u8 *ref,int stride, +unsigned int ref_step) {int k, l;for (k =0 ; k <8 ; k++) {for (l =0 ; l <8 ; l++) { - *deltas += *ref++; + *deltas += *ref; + ref += ref_step;/* * Due to quantizing, it might possible that the * decoded coefficients are slightly out of range
@@ -666,7 +669,7 @@ static void add_deltas(s16 *deltas, const u8 *ref, int stride) *deltas =255 ; deltas++; } - ref += stride -8 ; + ref += stride - (8 * ref_step); } }
@@ -711,8 +714,8 @@ static u32 encode_plane(u8 *input, u8 *refp, __be16 **rlco, __be16 *rlco_max,ifwht (cf->de_coeffs, cf->de_fwht, blocktype);if (blocktype ==PBLOCK ) -add_deltas (cf->de_fwht, refp,8 ); -fill_decoder_block (refp, cf->de_fwht,8 ); +add_deltas (cf->de_fwht, refp,8 ,1 ); +fill_decoder_block (refp, cf->de_fwht,8 ,1 ); } input +=8 * input_step;
@@ -821,8 +824,10 @@ u32 fwht_encode_frame(struct fwht_raw_frame *frm,return encoding; } -static bool decode_plane (struct fwht_cframe *cf,const __be16 **rlco,u8 *ref, -u32 height,u32 width,u32 coded_width, +static bool decode_plane (struct fwht_cframe *cf,const __be16 **rlco, +u32 height,u32 width,const u8 *ref,u32 ref_stride, +unsigned int ref_step,u8 *dst, +unsigned int dst_stride,unsigned int dst_step,bool uncompressed,const __be16 *end_of_rlco_buf) {unsigned int copies =0 ;
@@ -834,10 +839,15 @@ static bool decode_plane(struct fwht_cframe *cf, const __be16 **rlco, u8 *ref, height =round_up (height,8 );if (uncompressed) { +int i; +if (end_of_rlco_buf +1 < *rlco + width * height /2 )return false; -memcpy (ref, *rlco, width * height); - *rlco += width * height /2 ; +for (i =0 ; i < height; i++) { +memcpy (dst, *rlco, width); + dst += dst_stride; + *rlco += width /2 ; + }return true; }
@@ -849,15 +859,17 @@ static bool decode_plane(struct fwht_cframe *cf, const __be16 **rlco, u8 *ref,*/ for (j =0 ; j < height /8 ; j++) {for (i =0 ; i < width /8 ; i++) { -u8 *refp = ref + j *8 * coded_width + i *8 ; +const u8 *refp = ref + j *8 * ref_stride + + i *8 * ref_step; +u8 *dstp = dst + j *8 * dst_stride + i *8 * dst_step;if (copies) {memcpy (cf->de_fwht, copy,sizeof (copy));if (stat &PFRAME_BIT )add_deltas (cf->de_fwht, refp, - coded_width); -fill_decoder_block (refp, cf->de_fwht, - coded_width); + ref_stride, ref_step); +fill_decoder_block (dstp, cf->de_fwht, + dst_stride, dst_step); copies--;continue ; }
@@ -877,23 +889,29 @@ static bool decode_plane(struct fwht_cframe *cf, const __be16 **rlco, u8 *ref,if (copies)memcpy (copy, cf->de_fwht,sizeof (copy));if (stat &PFRAME_BIT ) -add_deltas (cf->de_fwht, refp, coded_width); -fill_decoder_block (refp, cf->de_fwht, coded_width); +add_deltas (cf->de_fwht, refp, + ref_stride, ref_step); +fill_decoder_block (dstp, cf->de_fwht, dst_stride, + dst_step); } }return true; } -bool fwht_decode_frame (struct fwht_cframe *cf,struct fwht_raw_frame *ref, -u32 hdr_flags,unsigned int components_num, -unsigned int width,unsigned int height, -unsigned int coded_width) +bool fwht_decode_frame (struct fwht_cframe *cf,u32 hdr_flags, +unsigned int components_num,unsigned int width, +unsigned int height,const struct fwht_raw_frame *ref, +unsigned int ref_stride,unsigned int ref_chroma_stride, +struct fwht_raw_frame *dst,unsigned int dst_stride, +unsigned int dst_chroma_stride) {const __be16 *rlco = cf->rlc_data;const __be16 *end_of_rlco_buf = cf->rlc_data + (cf->size /sizeof (*rlco)) -1 ; -if (!decode_plane (cf, &rlco, ref->luma, height, width, coded_width, +if (!decode_plane (cf, &rlco, height, width, ref->luma, ref_stride, + ref->luma_alpha_step, dst->luma, dst_stride, + dst->luma_alpha_step, hdr_flags &FWHT_FL_LUMA_IS_UNCOMPRESSED , end_of_rlco_buf))return false;
@@ -901,27 +919,30 @@ bool fwht_decode_frame(struct fwht_cframe *cf, struct fwht_raw_frame *ref,if (components_num >=3 ) {u32 h = height;u32 w = width; -u32 c = coded_width;if (!(hdr_flags &FWHT_FL_CHROMA_FULL_HEIGHT )) h /=2 ; -if (!(hdr_flags &FWHT_FL_CHROMA_FULL_WIDTH )) { +if (!(hdr_flags &FWHT_FL_CHROMA_FULL_WIDTH )) w /=2 ; - c /=2 ; - } -if (!decode_plane (cf, &rlco, ref->cb, h, w, c, + +if (!decode_plane (cf, &rlco, h, w, ref->cb, ref_chroma_stride, + ref->chroma_step, dst->cb, dst_chroma_stride, + dst->chroma_step, hdr_flags &FWHT_FL_CB_IS_UNCOMPRESSED , end_of_rlco_buf))return false; -if (!decode_plane (cf, &rlco, ref->cr, h, w, c, +if (!decode_plane (cf, &rlco, h, w, ref->cr, ref_chroma_stride, + ref->chroma_step, dst->cr, dst_chroma_stride, + dst->chroma_step, hdr_flags &FWHT_FL_CR_IS_UNCOMPRESSED , end_of_rlco_buf))return false; }if (components_num ==4 ) -if (!decode_plane (cf, &rlco, ref->alpha, height, width, - coded_width, +if (!decode_plane (cf, &rlco, height, width, ref->alpha, ref_stride, + ref->luma_alpha_step, dst->alpha, dst_stride, + dst->luma_alpha_step, hdr_flags &FWHT_FL_ALPHA_IS_UNCOMPRESSED , end_of_rlco_buf))return false;
drivers/media/platform/vicodec/codec-fwht.h +6 -5
@@ -141,9 +141,10 @@ u32 fwht_encode_frame(struct fwht_raw_frame *frm, bool is_intra, bool next_is_intra, unsigned int width, unsigned int height, unsigned int stride, unsigned int chroma_stride); -bool fwht_decode_frame (struct fwht_cframe *cf,struct fwht_raw_frame *ref, -u32 hdr_flags,unsigned int components_num, -unsigned int width,unsigned int height, -unsigned int coded_width); - +bool fwht_decode_frame (struct fwht_cframe *cf,u32 hdr_flags, +unsigned int components_num,unsigned int width, +unsigned int height,const struct fwht_raw_frame *ref, +unsigned int ref_stride,unsigned int ref_chroma_stride, +struct fwht_raw_frame *dst,unsigned int dst_stride, +unsigned int dst_chroma_stride);#endif
drivers/media/platform/vicodec/codec-v4l2-fwht.c +23 -232
278 lines not on this page · raw message
drivers/media/platform/vicodec/codec-v4l2-fwht.h +1 -0
@@ -30,6 +30,7 @@ struct v4l2_fwht_state {unsigned int coded_width;unsigned int coded_height;unsigned int stride; +unsigned int ref_stride;unsigned int gop_size;unsigned int gop_cnt;u16 i_frame_qp;
drivers/media/platform/vicodec/vicodec-core.c +40 -0
@@ -154,6 +154,43 @@ static struct vicodec_q_data *get_q_data(struct vicodec_ctx *ctx,return NULL ; } +static void copy_cap_to_ref (const u8 *cap,const struct v4l2_fwht_pixfmt_info *info, +struct v4l2_fwht_state *state) +{ +int plane_idx; +u8 *p_ref = state->ref_frame.buf; +unsigned int cap_stride = state->stride; +unsigned int ref_stride = state->ref_stride; + +for (plane_idx =0 ; plane_idx < info->planes_num; plane_idx++) { +int i; +unsigned int h_div = (plane_idx ==1 || plane_idx ==2 ) ? + info->height_div :1 ; +const u8 *row_cap = cap; +u8 *row_ref = p_ref; + +if (info->planes_num ==3 && plane_idx ==1 ) { + cap_stride /=2 ; + ref_stride /=2 ; + } + +if (plane_idx ==1 && + (info->id ==V4L2_PIX_FMT_NV24 || + info->id ==V4L2_PIX_FMT_NV42 )) { + cap_stride *=2 ; + ref_stride *=2 ; + } + +for (i =0 ; i < state->visible_height / h_div; i++) { +memcpy (row_ref, row_cap, ref_stride); + row_ref += ref_stride; + row_cap += cap_stride; + } + cap += cap_stride * (state->coded_height / h_div); + p_ref += ref_stride * (state->coded_height / h_div); + } +} +static int device_process (struct vicodec_ctx *ctx,struct vb2_v4l2_buffer *src_vb,struct vb2_v4l2_buffer *dst_vb)
@@ -195,6 +232,8 @@ static int device_process(struct vicodec_ctx *ctx, ret =v4l2_fwht_decode (state, p_src, p_dst);if (ret <0 )return ret; +copy_cap_to_ref (p_dst, ctx->state.info, &ctx->state); +vb2_set_plane_payload (&dst_vb->vb2_buf,0 , q_dst->sizeimage); }return 0 ;
@@ -1352,6 +1391,7 @@ static int vicodec_start_streaming(struct vb2_queue *q, state->stride = q_data->coded_width * info->bytesperline_mult; + state->ref_stride = q_data->coded_width * info->luma_alpha_step; state->ref_frame.buf =kvmalloc (total_planes_size,GFP_KERNEL ); state->ref_frame.luma = state->ref_frame.buf; ctx->comp_max_size = total_planes_size;
Signature · 1 line
2.17.1
PATCH v4 13/21 media: vicodec: Validate version dependent header values in a separate function
In reply to Dafna HirschfeldMove the code that validates version dependent header values to a separate function 'validate_by_version'
--- drivers/media/platform/vicodec/vicodec-core.c | 31 ++++++++++++------- 1 file changed, 19 insertions(+), 12 deletions(-)
drivers/media/platform/vicodec/vicodec-core.c +19 -12
@@ -191,6 +191,23 @@ static void copy_cap_to_ref(const u8 *cap, const struct v4l2_fwht_pixfmt_info *i } } +static bool validate_by_version (unsigned int flags,unsigned int version) +{ +if (!version || version >FWHT_VERSION ) +return false; + +if (version >=2 ) { +unsigned int components_num =1 + + ((flags &FWHT_FL_COMPONENTS_NUM_MSK ) >> +FWHT_FL_COMPONENTS_NUM_OFFSET ); +unsigned int pixenc = flags &FWHT_FL_PIXENC_MSK ; + +if (components_num ==0 || components_num >4 || !pixenc) +return false; + } +return true; +} +static int device_process (struct vicodec_ctx *ctx,struct vb2_v4l2_buffer *src_vb,struct vb2_v4l2_buffer *dst_vb)
@@ -397,21 +414,11 @@ static bool is_header_valid(const struct fwht_cframe_hdr *p_hdr)unsigned int version =ntohl (p_hdr->version);unsigned int flags =ntohl (p_hdr->flags); -if (!version || version >FWHT_VERSION ) -return false; -if (w <MIN_WIDTH || w >MAX_WIDTH || h <MIN_HEIGHT || h >MAX_HEIGHT )return false; -if (version >=2 ) { -unsigned int components_num =1 + - ((flags &FWHT_FL_COMPONENTS_NUM_MSK ) >> -FWHT_FL_COMPONENTS_NUM_OFFSET ); -unsigned int pixenc = flags &FWHT_FL_PIXENC_MSK ; - -if (components_num ==0 || components_num >4 || !pixenc) -return false; - } +if (!validate_by_version (flags, version)) +return false; info =info_from_header (p_hdr);if (!info)
Signature · 1 line
2.17.1
PATCH v4 14/21 media: vicodec: rename v4l2_fwht_default_fmt to v4l2_fwht_find_nth_fmt
In reply to Dafna HirschfeldRename 'v4l2_fwht_default_fmt' to 'v4l2_fwht_find_nth_fmt' and add a function 'v4l2_fwht_validate_fmt' to check if a format info matches the parameters.
This function will also be used to validate the stateless params when adding support for stateless codecs.
--- .../media/platform/vicodec/codec-v4l2-fwht.c | 22 ++++++++++++++----- .../media/platform/vicodec/codec-v4l2-fwht.h | 5 ++++- drivers/media/platform/vicodec/vicodec-core.c | 4 ++-- 3 files changed, 23 insertions(+), 8 deletions(-)
drivers/media/platform/vicodec/codec-v4l2-fwht.c +17 -5
@@ -37,7 +37,19 @@ static const struct v4l2_fwht_pixfmt_info v4l2_fwht_pixfmts[] = { { V4L2_PIX_FMT_GREY, 1, 1, 1, 1, 0, 1, 1, 1, 1, FWHT_FL_PIXENC_RGB}, }; -const struct v4l2_fwht_pixfmt_info *v4l2_fwht_default_fmt(u32 width_div, +bool v4l2_fwht_validate_fmt (const struct v4l2_fwht_pixfmt_info *info, +u32 width_div,u32 height_div,u32 components_num, +u32 pixenc) +{ +if (info->width_div == width_div && + info->height_div == height_div && + (!pixenc || info->pixenc == pixenc) && + info->components_num == components_num) +return true; +return false; +} + +const struct v4l2_fwht_pixfmt_info *v4l2_fwht_find_nth_fmt(u32 width_div, u32 height_div, u32 components_num, u32 pixenc,
@@ -46,10 +58,10 @@ const struct v4l2_fwht_pixfmt_info *v4l2_fwht_default_fmt(u32 width_div,unsigned int i;for (i =0 ; i <ARRAY_SIZE (v4l2_fwht_pixfmts); i++) { -if (v4l2_fwht_pixfmts[i].width_div == width_div && - v4l2_fwht_pixfmts[i].height_div == height_div && - (!pixenc || v4l2_fwht_pixfmts[i].pixenc == pixenc) && - v4l2_fwht_pixfmts[i].components_num == components_num) { +bool is_valid =v4l2_fwht_validate_fmt (&v4l2_fwht_pixfmts[i], + width_div, height_div, + components_num, pixenc); +if (is_valid) {if (start_idx ==0 )return v4l2_fwht_pixfmts + i; start_idx--;
drivers/media/platform/vicodec/codec-v4l2-fwht.h +4 -1
@@ -48,7 +48,10 @@ struct v4l2_fwht_state {const struct v4l2_fwht_pixfmt_info *v4l2_fwht_find_pixfmt (u32 pixelformat);const struct v4l2_fwht_pixfmt_info *v4l2_fwht_get_pixfmt (u32 idx); -const struct v4l2_fwht_pixfmt_info *v4l2_fwht_default_fmt(u32 width_div, +bool v4l2_fwht_validate_fmt (const struct v4l2_fwht_pixfmt_info *info, +u32 width_div,u32 height_div,u32 components_num, +u32 pixenc); +const struct v4l2_fwht_pixfmt_info *v4l2_fwht_find_nth_fmt(u32 width_div, u32 height_div, u32 components_num, u32 pixenc,
drivers/media/platform/vicodec/vicodec-core.c +2 -2
@@ -402,7 +402,7 @@ info_from_header(const struct fwht_cframe_hdr *p_hdr) FWHT_FL_COMPONENTS_NUM_OFFSET); pixenc = (flags &FWHT_FL_PIXENC_MSK ); } -return v4l2_fwht_default_fmt (width_div, height_div, +return v4l2_fwht_find_nth_fmt (width_div, height_div, components_num, pixenc,0 ); }
@@ -623,7 +623,7 @@ static int enum_fmt(struct v4l2_fmtdesc *f, struct vicodec_ctx *ctx,if (!info || ctx->is_enc) info =v4l2_fwht_get_pixfmt (f->index);else - info = v4l2_fwht_default_fmt(info->width_div, + info = v4l2_fwht_find_nth_fmt(info->width_div, info->height_div, info->components_num, info->pixenc,
Signature · 1 line
2.17.1
PATCH v4 15/21 media: vicodec: add struct for encoder/decoder instance
In reply to Dafna HirschfeldAdd struct 'vicodec_dev_instance' for the fields in vicodec_dev that have have both decoder and encoder versions.
--- drivers/media/platform/vicodec/vicodec-core.c | 194 +++++++++--------- 1 file changed, 92 insertions(+), 102 deletions(-)
drivers/media/platform/vicodec/vicodec-core.c +92 -102
@@ -89,21 +89,21 @@ enum { V4L2_M2M_DST = 1, }; +struct vicodec_dev_instance { +struct video_device vfd; +struct mutex mutex; +spinlock_t lock; +struct v4l2_m2m_dev *m2m_dev; +}; +struct vicodec_dev {struct v4l2_device v4l2_dev; -struct video_device enc_vfd; -struct video_device dec_vfd; +struct vicodec_dev_instance stateful_enc; +struct vicodec_dev_instance stateful_dec;#ifdef CONFIG_MEDIA_CONTROLLER struct media_device mdev;#endif -struct mutex enc_mutex; -struct mutex dec_mutex; -spinlock_t enc_lock; -spinlock_t dec_lock; - -struct v4l2_m2m_dev *enc_dev; -struct v4l2_m2m_dev *dec_dev; };struct vicodec_ctx {
@@ -368,9 +368,9 @@ static void device_run(void *priv)spin_unlock (ctx->lock);if (ctx->is_enc) -v4l2_m2m_job_finish (dev->enc_dev, ctx->fh.m2m_ctx); +v4l2_m2m_job_finish (dev->stateful_enc.m2m_dev, ctx->fh.m2m_ctx);else -v4l2_m2m_job_finish (dev->dec_dev, ctx->fh.m2m_ctx); +v4l2_m2m_job_finish (dev->stateful_dec.m2m_dev, ctx->fh.m2m_ctx); }static void job_remove_src_buf (struct vicodec_ctx *ctx,u32 state)
@@ -1490,9 +1490,8 @@ static int queue_init(void *priv, struct vb2_queue *src_vq, src_vq->ops = &vicodec_qops; src_vq->mem_ops = &vb2_vmalloc_memops; src_vq->timestamp_flags =V4L2_BUF_FLAG_TIMESTAMP_COPY ; - src_vq->lock = ctx->is_enc ? &ctx->dev->enc_mutex : - &ctx->dev->dec_mutex; - + src_vq->lock = ctx->is_enc ? &ctx->dev->stateful_enc.mutex : + &ctx->dev->stateful_dec.mutex; ret =vb2_queue_init (src_vq);if (ret)return ret;
@@ -1580,7 +1579,7 @@ static int vicodec_open(struct file *file) goto open_unlock; } -if (vfd == &dev->enc_vfd) +if (vfd == &dev->stateful_enc.vfd) ctx->is_enc = true;v4l2_fh_init (&ctx->fh,video_devdata (file));
@@ -1628,13 +1627,13 @@ static int vicodec_open(struct file *file) ctx->state.colorspace =V4L2_COLORSPACE_REC709 ;if (ctx->is_enc) { - ctx->fh.m2m_ctx =v4l2_m2m_ctx_init (dev->enc_dev, ctx, - &queue_init); - ctx->lock = &dev->enc_lock; + ctx->fh.m2m_ctx =v4l2_m2m_ctx_init (dev->stateful_enc.m2m_dev, + ctx, &queue_init); + ctx->lock = &dev->stateful_enc.lock; }else { - ctx->fh.m2m_ctx =v4l2_m2m_ctx_init (dev->dec_dev, ctx, - &queue_init); - ctx->lock = &dev->dec_lock; + ctx->fh.m2m_ctx =v4l2_m2m_ctx_init (dev->stateful_dec.m2m_dev, + ctx, &queue_init); + ctx->lock = &dev->stateful_dec.lock; }if (IS_ERR (ctx->fh.m2m_ctx)) {
@@ -1693,19 +1692,57 @@ static const struct v4l2_m2m_ops m2m_ops = { .job_ready = job_ready, }; +static int register_instance (struct vicodec_dev *dev, +struct vicodec_dev_instance *dev_instance, +const char *name,bool is_enc) +{ +struct video_device *vfd; +int ret; + +spin_lock_init (&dev_instance->lock); +mutex_init (&dev_instance->mutex); + dev_instance->m2m_dev =v4l2_m2m_init (&m2m_ops); +if (IS_ERR (dev_instance->m2m_dev)) { +v4l2_err (&dev->v4l2_dev,"Failed to init vicodec enc device\n" ); +return PTR_ERR (dev_instance->m2m_dev); + } + + dev_instance->vfd = vicodec_videodev; + vfd = &dev_instance->vfd; + vfd->lock = &dev_instance->mutex; + vfd->v4l2_dev = &dev->v4l2_dev; +strscpy (vfd->name, name,sizeof (vfd->name)); + vfd->device_caps =V4L2_CAP_STREAMING | + (multiplanar ?V4L2_CAP_VIDEO_M2M_MPLANE :V4L2_CAP_VIDEO_M2M ); +if (is_enc) { +v4l2_disable_ioctl (vfd,VIDIOC_DECODER_CMD ); +v4l2_disable_ioctl (vfd,VIDIOC_TRY_DECODER_CMD ); + }else { +v4l2_disable_ioctl (vfd,VIDIOC_ENCODER_CMD ); +v4l2_disable_ioctl (vfd,VIDIOC_TRY_ENCODER_CMD ); + } +video_set_drvdata (vfd, dev); + + ret =video_register_device (vfd,VFL_TYPE_GRABBER ,0 ); +if (ret) { +v4l2_err (&dev->v4l2_dev,"Failed to register video device '%s'\n" , name); +v4l2_m2m_release (dev_instance->m2m_dev); +return ret; + } +v4l2_info (&dev->v4l2_dev,"Device '%s' registered as /dev/video%d\n" , + name, vfd->num); +return 0 ; +} +static int vicodec_probe (struct platform_device *pdev) {struct vicodec_dev *dev; -struct video_device *vfd;int ret; dev =devm_kzalloc (&pdev->dev,sizeof (*dev),GFP_KERNEL );if (!dev)return -ENOMEM ; -spin_lock_init (&dev->enc_lock); -spin_lock_init (&dev->dec_lock); - ret =v4l2_device_register (&pdev->dev, &dev->v4l2_dev);if (ret)return ret;
@@ -1719,100 +1756,53 @@ static int vicodec_probe(struct platform_device *pdev) dev->v4l2_dev.mdev = &dev->mdev;#endif -mutex_init (&dev->enc_mutex); -mutex_init (&dev->dec_mutex); -platform_set_drvdata (pdev, dev); - dev->enc_dev =v4l2_m2m_init (&m2m_ops); -if (IS_ERR (dev->enc_dev)) { -v4l2_err (&dev->v4l2_dev,"Failed to init vicodec device\n" ); - ret =PTR_ERR (dev->enc_dev); +if (register_instance (dev, &dev->stateful_enc, +"stateful-encoder" , true)) goto unreg_dev; - } - - dev->dec_dev =v4l2_m2m_init (&m2m_ops); -if (IS_ERR (dev->dec_dev)) { -v4l2_err (&dev->v4l2_dev,"Failed to init vicodec device\n" ); - ret =PTR_ERR (dev->dec_dev); - goto err_enc_m2m; - } - dev->enc_vfd = vicodec_videodev; - vfd = &dev->enc_vfd; - vfd->lock = &dev->enc_mutex; - vfd->v4l2_dev = &dev->v4l2_dev; -strscpy (vfd->name,"vicodec-enc" ,sizeof (vfd->name)); - vfd->device_caps =V4L2_CAP_STREAMING | - (multiplanar ?V4L2_CAP_VIDEO_M2M_MPLANE :V4L2_CAP_VIDEO_M2M ); -v4l2_disable_ioctl (vfd,VIDIOC_DECODER_CMD ); -v4l2_disable_ioctl (vfd,VIDIOC_TRY_DECODER_CMD ); -video_set_drvdata (vfd, dev); - - ret =video_register_device (vfd,VFL_TYPE_GRABBER ,0 ); -if (ret) { -v4l2_err (&dev->v4l2_dev,"Failed to register video device\n" ); - goto err_dec_m2m; - } -v4l2_info (&dev->v4l2_dev, -"Device registered as /dev/video%d\n" , vfd->num); - - dev->dec_vfd = vicodec_videodev; - vfd = &dev->dec_vfd; - vfd->lock = &dev->dec_mutex; - vfd->v4l2_dev = &dev->v4l2_dev; - vfd->device_caps =V4L2_CAP_STREAMING | - (multiplanar ?V4L2_CAP_VIDEO_M2M_MPLANE :V4L2_CAP_VIDEO_M2M ); -strscpy (vfd->name,"vicodec-dec" ,sizeof (vfd->name)); -v4l2_disable_ioctl (vfd,VIDIOC_ENCODER_CMD ); -v4l2_disable_ioctl (vfd,VIDIOC_TRY_ENCODER_CMD ); -video_set_drvdata (vfd, dev); - - ret =video_register_device (vfd,VFL_TYPE_GRABBER ,0 ); -if (ret) { -v4l2_err (&dev->v4l2_dev,"Failed to register video device\n" ); - goto unreg_enc; - } -v4l2_info (&dev->v4l2_dev, -"Device registered as /dev/video%d\n" , vfd->num); +if (register_instance (dev, &dev->stateful_dec, +"stateful-decoder" , false)) + goto unreg_sf_enc;#ifdef CONFIG_MEDIA_CONTROLLER - ret =v4l2_m2m_register_media_controller (dev->enc_dev, - &dev->enc_vfd,MEDIA_ENT_F_PROC_VIDEO_ENCODER ); + ret =v4l2_m2m_register_media_controller (dev->stateful_enc.m2m_dev, + &dev->stateful_enc.vfd, +MEDIA_ENT_F_PROC_VIDEO_ENCODER );if (ret) { -v4l2_err (&dev->v4l2_dev,"Failed to init mem2mem media controller\n" ); +v4l2_err (&dev->v4l2_dev,"Failed to init mem2mem media controller for enc\n" ); goto unreg_m2m; } - ret =v4l2_m2m_register_media_controller (dev->dec_dev, - &dev->dec_vfd,MEDIA_ENT_F_PROC_VIDEO_DECODER ); + ret =v4l2_m2m_register_media_controller (dev->stateful_dec.m2m_dev, + &dev->stateful_dec.vfd, +MEDIA_ENT_F_PROC_VIDEO_DECODER );if (ret) { -v4l2_err (&dev->v4l2_dev,"Failed to init mem2mem media controller\n" ); - goto unreg_m2m_enc_mc; +v4l2_err (&dev->v4l2_dev,"Failed to init mem2mem media controller for dec\n" ); + goto unreg_m2m_sf_enc_mc; } ret =media_device_register (&dev->mdev);if (ret) {v4l2_err (&dev->v4l2_dev,"Failed to register mem2mem media device\n" ); - goto unreg_m2m_dec_mc; + goto unreg_m2m_sf_dec_mc; }#endif return 0 ;#ifdef CONFIG_MEDIA_CONTROLLER -unreg_m2m_dec_mc: -v4l2_m2m_unregister_media_controller (dev->dec_dev); -unreg_m2m_enc_mc: -v4l2_m2m_unregister_media_controller (dev->enc_dev); +unreg_m2m_sf_dec_mc: +v4l2_m2m_unregister_media_controller (dev->stateful_dec.m2m_dev); +unreg_m2m_sf_enc_mc: +v4l2_m2m_unregister_media_controller (dev->stateful_enc.m2m_dev); unreg_m2m: -video_unregister_device (&dev->dec_vfd); +video_unregister_device (&dev->stateful_dec.vfd); +v4l2_m2m_release (dev->stateful_dec.m2m_dev);#endif -unreg_enc: -video_unregister_device (&dev->enc_vfd); -err_dec_m2m: -v4l2_m2m_release (dev->dec_dev); -err_enc_m2m: -v4l2_m2m_release (dev->enc_dev); +unreg_sf_enc: +video_unregister_device (&dev->stateful_enc.vfd); +v4l2_m2m_release (dev->stateful_enc.m2m_dev); unreg_dev:v4l2_device_unregister (&dev->v4l2_dev);
@@ -1827,15 +1817,15 @@ static int vicodec_remove(struct platform_device *pdev)#ifdef CONFIG_MEDIA_CONTROLLER media_device_unregister (&dev->mdev); -v4l2_m2m_unregister_media_controller (dev->enc_dev); -v4l2_m2m_unregister_media_controller (dev->dec_dev); +v4l2_m2m_unregister_media_controller (dev->stateful_enc.m2m_dev); +v4l2_m2m_unregister_media_controller (dev->stateful_dec.m2m_dev);media_device_cleanup (&dev->mdev);#endif -v4l2_m2m_release (dev->enc_dev); -v4l2_m2m_release (dev->dec_dev); -video_unregister_device (&dev->enc_vfd); -video_unregister_device (&dev->dec_vfd); +v4l2_m2m_release (dev->stateful_enc.m2m_dev); +v4l2_m2m_release (dev->stateful_dec.m2m_dev); +video_unregister_device (&dev->stateful_enc.vfd); +video_unregister_device (&dev->stateful_dec.vfd);v4l2_device_unregister (&dev->v4l2_dev);return 0 ;
Signature · 1 line
2.17.1
PATCH v4 16/21 media: vicodec: add documentation to V4L2_CID_FWHT_I/P_FRAME_QP
In reply to Dafna Hirschfeldadd documentation to V4L2_CID_FWHT_I/P_FRAME_QP
controls in ext-ctrls-codec.rst
--- Documentation/media/uapi/v4l/ext-ctrls-codec.rst | 12 ++++++++++++ 1 file changed, 12 insertions(+)
Documentation/media/uapi/v4l/ext-ctrls-codec.rst +12 -0
@@ -1537,6 +1537,18 @@ enum v4l2_mpeg_video_h264_hierarchical_coding_type - non-intra-coded frames, in zigzag scanning order. Only relevant for non-4:2:0 YUV formats. + + +.. _v4l2-mpeg-fwht: + +``V4L2_CID_FWHT_I_FRAME_QP (integer)`` + Quantization parameter for an I frame for FWHT. Valid range: from 1 + to 31. + +``V4L2_CID_FWHT_P_FRAME_QP (integer)`` + Quantization parameter for a P frame for FWHT. Valid range: from 1 + to 31. + MFC 5.1 MPEG Controls =====================
Signature · 1 line
2.17.1
PATCH v4 17/21 media: vicodec: add documentation to V4L2_CID_MPEG_VIDEO_FWHT_PARAMS
In reply to Dafna Hirschfeldadd documentation to V4L2_CID_MPEG_VIDEO_FWHT_PARAMS control and it's related 'v4l2_ctrl_fwht_params' struct
--- .../media/uapi/v4l/ext-ctrls-codec.rst | 54 +++++++++++++++++++ 1 file changed, 54 insertions(+)
Documentation/media/uapi/v4l/ext-ctrls-codec.rst +54 -0
@@ -1541,6 +1541,60 @@ enum v4l2_mpeg_video_h264_hierarchical_coding_type - .. _v4l2-mpeg-fwht: +``V4L2_CID_MPEG_VIDEO_FWHT_PARAMS (struct)`` + Specifies the fwht parameters (as extracted from the bitstream) for the + associated FWHT data. This includes the necessary parameters for + configuring a stateless hardware decoding pipeline for FWHT. + + .. note:: + + This compound control is not yet part of the public kernel API and + it is expected to change. + +.. c:type:: v4l2_ctrl_fwht_params + +.. cssclass:: longtable + +.. flat-table:: struct v4l2_ctrl_fwht_params + :header-rows: 0 + :stub-columns: 0 + :widths: 1 1 2 + + * - __u64 + - ``backward_ref_ts`` + - Timestamp of the V4L2 capture buffer to use as backward reference, used + with P-coded frames. The timestamp refers to the + ``timestamp`` field in struct :c:type:`v4l2_buffer`. Use the + :c:func:`v4l2_timeval_to_ns()` function to convert the struct + :c:type:`timeval` in struct :c:type:`v4l2_buffer` to a __u64. + * - __u32 + - ``version`` + - The version of the codec + * - __u32 + - ``width`` + - The width of the frame + * - __u32 + - ``height`` + - The height of the frame + * - __u32 + - ``flags`` + - The flags of the frame + * - __u32 + - ``colorspace`` + - The colorspace of the frame, from enum :c:type:`v4l2_colorspace`. + * - __u32 + - ``xfer_func`` + - The transfer function, from enum :c:type:`v4l2_xfer_func`. + * - __u32 + - ``ycbcr_enc`` + - The Y'CbCr encoding, from enum :c:type:`v4l2_ycbcr_encoding`. + * - __u32 + - ``quantization`` + - The quantization range, from enum :c:type:`v4l2_quantization`. + * - __u32 + - ``comp_frame_size`` + - The size of the compressed frame. + ``V4L2_CID_FWHT_I_FRAME_QP (integer)`` Quantization parameter for an I frame for FWHT. Valid range: from 1 to 31.
Signature · 1 line
2.17.1
Re: [PATCH v4 17/21] media: vicodec: add documentation to V4L2_CID_MPEG_VIDEO_FWHT_PARAMS
Quoted 2 lines · Dafna Hirschfeld
add documentation to
V4L2_CID_MPEG_VIDEO_FWHT_PARAMScontrol and it's related 'v4l2_ctrl_fwht_params' struct
it's -> its
Quoted 42 lines
Signed-off-by Dafna Hirschfeld <[email protected]>--- .../media/uapi/v4l/ext-ctrls-codec.rst | 54 +++++++++++++++++++ 1 file changed, 54 insertions(+)Documentation/media/uapi/v4l/ext-ctrls-codec.rst +28
-0@@ -1541,6 +1541,60 @@ enum v4l2_mpeg_video_h264_hierarchical_coding_type - .. _v4l2-mpeg-fwht: +``V4L2_CID_MPEG_VIDEO_FWHT_PARAMS (struct)`` + Specifies the fwht parameters (as extracted from the bitstream) for the + associated FWHT data. This includes the necessary parameters for + configuring a stateless hardware decoding pipeline for FWHT. + + .. note:: + + This compound control is not yet part of the public kernel API and + it is expected to change. + +.. c:type:: v4l2_ctrl_fwht_params + +.. cssclass:: longtable + +.. flat-table:: struct v4l2_ctrl_fwht_params + :header-rows: 0 + :stub-columns: 0 + :widths: 1 1 2 + + * - __u64 + - ``backward_ref_ts`` + - Timestamp of the V4L2 capture buffer to use as backward reference, used + with P-coded frames. The timestamp refers to the + ``timestamp`` field in struct :c:type:`v4l2_buffer`. Use the + :c:func:`v4l2_timeval_to_ns()` function to convert the struct + :c:type:`timeval` in struct :c:type:`v4l2_buffer` to a __u64. + * - __u32 + - ``version``
Documentation/media/uapi/v4l/ext-ctrls-codec.rst enum v4l2_mpeg_video_h264_hierarchical_coding_type - · line 1581
Quoted 10 lines
Documentation/media/uapi/v4l/ext-ctrls-codec.rst +10
-0+ - The version of the codec + * - __u32 + - ``width`` + - The width of the frame + * - __u32 + - ``height`` + - The height of the frame + * - __u32 + - ``flags`` + - The flags of the frame
You need to add a table documenting the flags.
Quoted 5 lines
Documentation/media/uapi/v4l/ext-ctrls-codec.rst +5
-0+ * - __u32 + - ``colorspace`` + - The colorspace of the frame, from enum :c:type:`v4l2_colorspace`. + * - __u32 + - ``xfer_func``
Documentation/media/uapi/v4l/ext-ctrls-codec.rst enum v4l2_mpeg_video_h264_hierarchical_coding_type - · line 1596
Quoted 10 lines
Documentation/media/uapi/v4l/ext-ctrls-codec.rst +10
-0+ - The transfer function, from enum :c:type:`v4l2_xfer_func`. + * - __u32 + - ``ycbcr_enc`` + - The Y'CbCr encoding, from enum :c:type:`v4l2_ycbcr_encoding`. + * - __u32 + - ``quantization`` + - The quantization range, from enum :c:type:`v4l2_quantization`. + * - __u32 + - ``comp_frame_size`` + - The size of the compressed frame.
Why do we need this? Isn't this set via the 'bytesused' field when we queue the buffer containing the compressed frame?
I think this field should be dropped.
Documentation/media/uapi/v4l/ext-ctrls-codec.rst enum v4l2_mpeg_video_h264_hierarchical_coding_type - · line 1600
Quoted 5 lines
Documentation/media/uapi/v4l/ext-ctrls-codec.rst +1
-0+ ``V4L2_CID_FWHT_I_FRAME_QP (integer)`` Quantization parameter for an I frame for FWHT. Valid range: from 1 to 31.
Regards,
Hans
PATCH v4 18/21 media: vicodec: add documentation to V4L2_PIX_FMT_FWHT_STATELESS
In reply to Dafna Hirschfeldadd documentation to V4L2_PIX_FMT_FWHT_STATELESS
in pixfmt-compressed.rst
--- Documentation/media/uapi/v4l/pixfmt-compressed.rst | 5 +++++ 1 file changed, 5 insertions(+)
Documentation/media/uapi/v4l/pixfmt-compressed.rst +5 -0
@@ -125,3 +125,8 @@ Compressed Formats - Video elementary stream using a codec based on the Fast Walsh Hadamard Transform. This codec is implemented by the vicodec ('Virtual Codec') driver. See the codec-fwht.h header for more details. + * .. _V4L2-PIX-FMT-FWHT-STATELESS: + + - ``V4L2_PIX_FMT_FWHT_STATELESS`` + - 'SFWH' + - Same format as V4L2_PIX_FMT_FWHT but requires stateless codec implementation.
Signature · 1 line
2.17.1
PATCH v4 19/21 media: vicodec: Introducing stateless fwht defs and structs
In reply to Dafna HirschfeldAdd structs and definitions needed to implement stateless decoder for fwht.
--- drivers/media/platform/vicodec/vicodec-core.c | 23 ++++++++----- drivers/media/v4l2-core/v4l2-ctrls.c | 10 ++++++ include/media/fwht-ctrls.h | 32 +++++++++++++++++++ include/media/v4l2-ctrls.h | 4 ++- include/uapi/linux/v4l2-controls.h | 3 ++ include/uapi/linux/videodev2.h | 1 + 6 files changed, 64 insertions(+), 9 deletions(-) create mode 100644 include/media/fwht-ctrls.h
drivers/media/platform/vicodec/vicodec-core.c +15 -8
@@ -64,6 +64,10 @@ static const struct v4l2_fwht_pixfmt_info pixfmt_fwht = {V4L2_PIX_FMT_FWHT ,0 ,3 ,1 ,1 ,1 ,1 ,1 ,0 ,1 }; +static const struct v4l2_fwht_pixfmt_info pixfmt_stateless_fwht = { +V4L2_PIX_FMT_FWHT_STATELESS ,0 ,3 ,1 ,1 ,1 ,1 ,1 ,0 ,1 +}; +static void vicodec_dev_release (struct device *dev) { }
@@ -1510,10 +1514,6 @@ static int queue_init(void *priv, struct vb2_queue *src_vq,return vb2_queue_init (dst_vq); } -#define VICODEC_CID_CUSTOM_BASE (V4L2_CID_MPEG_BASE | 0xf000) -#define VICODEC_CID_I_FRAME_QP (VICODEC_CID_CUSTOM_BASE + 0) -#define VICODEC_CID_P_FRAME_QP (VICODEC_CID_CUSTOM_BASE + 1) -static int vicodec_s_ctrl (struct v4l2_ctrl *ctrl) { struct vicodec_ctx *ctx = container_of(ctrl->handler,
@@ -1523,10 +1523,10 @@ static int vicodec_s_ctrl(struct v4l2_ctrl *ctrl)case V4L2_CID_MPEG_VIDEO_GOP_SIZE : ctx->state.gop_size = ctrl->val;return 0 ; -case VICODEC_CID_I_FRAME_QP : +case V4L2_CID_FWHT_I_FRAME_QP : ctx->state.i_frame_qp = ctrl->val;return 0 ; -case VICODEC_CID_P_FRAME_QP : +case V4L2_CID_FWHT_P_FRAME_QP : ctx->state.p_frame_qp = ctrl->val;return 0 ; }
@@ -1539,7 +1539,7 @@ static const struct v4l2_ctrl_ops vicodec_ctrl_ops = {static const struct v4l2_ctrl_config vicodec_ctrl_i_frame = { .ops = &vicodec_ctrl_ops, - .id =VICODEC_CID_I_FRAME_QP , + .id =V4L2_CID_FWHT_I_FRAME_QP , .name ="FWHT I-Frame QP Value" , .type =V4L2_CTRL_TYPE_INTEGER , .min =1 ,
@@ -1550,7 +1550,7 @@ static const struct v4l2_ctrl_config vicodec_ctrl_i_frame = {static const struct v4l2_ctrl_config vicodec_ctrl_p_frame = { .ops = &vicodec_ctrl_ops, - .id =VICODEC_CID_P_FRAME_QP , + .id =V4L2_CID_FWHT_I_FRAME_QP , .name ="FWHT P-Frame QP Value" , .type =V4L2_CTRL_TYPE_INTEGER , .min =1 ,
@@ -1559,6 +1559,13 @@ static const struct v4l2_ctrl_config vicodec_ctrl_p_frame = { .step = 1, }; +static const struct v4l2_ctrl_config vicodec_ctrl_stateless_state = { + .id =V4L2_CID_MPEG_VIDEO_FWHT_PARAMS , + .elem_size =sizeof (struct v4l2_ctrl_fwht_params ), + .name ="FWHT-Stateless State Params" , + .type =V4L2_CTRL_TYPE_FWHT_PARAMS , +}; +/* * File operations */
drivers/media/v4l2-core/v4l2-ctrls.c +10 -0
@@ -849,6 +849,7 @@ const char *v4l2_ctrl_get_name(u32 id)case V4L2_CID_MPEG_VIDEO_FORCE_KEY_FRAME :return "Force Key Frame" ;case V4L2_CID_MPEG_VIDEO_MPEG2_SLICE_PARAMS :return "MPEG-2 Slice Parameters" ;case V4L2_CID_MPEG_VIDEO_MPEG2_QUANTIZATION :return "MPEG-2 Quantization Matrices" ; +case V4L2_CID_MPEG_VIDEO_FWHT_PARAMS :return "FWHT stateless parameters" ;/* VPX controls */ case V4L2_CID_MPEG_VIDEO_VPX_NUM_PARTITIONS :return "VPX Number of Partitions" ;
@@ -1303,6 +1304,9 @@ void v4l2_ctrl_fill(u32 id, const char **name, enum v4l2_ctrl_type *type,case V4L2_CID_MPEG_VIDEO_MPEG2_QUANTIZATION : *type =V4L2_CTRL_TYPE_MPEG2_QUANTIZATION ;break ; +case V4L2_CID_MPEG_VIDEO_FWHT_PARAMS : + *type =V4L2_CTRL_TYPE_FWHT_PARAMS ; +break ;default : *type =V4L2_CTRL_TYPE_INTEGER ;break ;
@@ -1669,6 +1673,9 @@ static int std_validate(const struct v4l2_ctrl *ctrl, u32 idx,case V4L2_CTRL_TYPE_MPEG2_QUANTIZATION :return 0 ; +case V4L2_CTRL_TYPE_FWHT_PARAMS : +return 0 ; +default :return -EINVAL ; }
@@ -2249,6 +2256,9 @@ static struct v4l2_ctrl *v4l2_ctrl_new(struct v4l2_ctrl_handler *hdl,case V4L2_CTRL_TYPE_MPEG2_QUANTIZATION : elem_size =sizeof (struct v4l2_ctrl_mpeg2_quantization );break ; +case V4L2_CTRL_TYPE_FWHT_PARAMS : + elem_size =sizeof (struct v4l2_ctrl_fwht_params ); +break ;default :if (type <V4L2_CTRL_COMPOUND_TYPES ) elem_size =sizeof (s32);
include/media/fwht-ctrls.h new file +32 -0
@@ -0,0 +1,32 @@ +/* SPDX-License-Identifier: GPL-2.0 */ +/* +* These are the FWHT state controls for use with stateless FWHT +* codec drivers. +* +* It turns out that these structs are not stable yet and will undergo +* more changes. So keep them private until they are stable and ready to +* become part of the official public API. +*/ + +#ifndef _FWHT_CTRLS_H_ +#define _FWHT_CTRLS_H_ + +#define V4L2_CTRL_TYPE_FWHT_PARAMS 0x0105 + +#define V4L2_CID_MPEG_VIDEO_FWHT_PARAMS (V4L2_CID_MPEG_BASE + 292) + +struct v4l2_ctrl_fwht_params { +__u64 backward_ref_ts; +__u32 version; +__u32 width; +__u32 height; +__u32 flags; +__u32 colorspace; +__u32 xfer_func; +__u32 ycbcr_enc; +__u32 quantization; +__u32 comp_frame_size; +}; + + +#endif
include/media/v4l2-ctrls.h +3 -1
@@ -23,10 +23,11 @@#include <media/media-request.h> /* -* Include the mpeg2 stateless codec compound control definitions. +* Include the mpeg2 and fwht stateless codec compound control definitions. * This will move to the public headers once this API is fully stable. */ #include <media/mpeg2-ctrls.h> +#include <media/fwht-ctrls.h> /* forward references */ struct file ;
@@ -60,6 +61,7 @@ union v4l2_ctrl_ptr {char *p_char;struct v4l2_ctrl_mpeg2_slice_params *p_mpeg2_slice_params;struct v4l2_ctrl_mpeg2_quantization *p_mpeg2_quantization; +struct v4l2_ctrl_fwht_params *p_fwht_params;void *p; };
include/uapi/linux/v4l2-controls.h +3 -0
@@ -404,6 +404,9 @@ enum v4l2_mpeg_video_multi_slice_mode {#define V4L2_CID_MPEG_VIDEO_MV_V_SEARCH_RANGE (V4L2_CID_MPEG_BASE+228)#define V4L2_CID_MPEG_VIDEO_FORCE_KEY_FRAME (V4L2_CID_MPEG_BASE+229) +#define V4L2_CID_FWHT_I_FRAME_QP (V4L2_CID_MPEG_BASE + 290) +#define V4L2_CID_FWHT_P_FRAME_QP (V4L2_CID_MPEG_BASE + 291) +#define V4L2_CID_MPEG_VIDEO_H263_I_FRAME_QP (V4L2_CID_MPEG_BASE+300)#define V4L2_CID_MPEG_VIDEO_H263_P_FRAME_QP (V4L2_CID_MPEG_BASE+301)#define V4L2_CID_MPEG_VIDEO_H263_B_FRAME_QP (V4L2_CID_MPEG_BASE+302)
include/uapi/linux/videodev2.h +1 -0
@@ -669,6 +669,7 @@ struct v4l2_pix_format {#define V4L2_PIX_FMT_VP9 v4l2_fourcc('V', 'P', '9', '0')/* VP9 */ #define V4L2_PIX_FMT_HEVC v4l2_fourcc('H', 'E', 'V', 'C')/* HEVC aka H.265 */ #define V4L2_PIX_FMT_FWHT v4l2_fourcc('F', 'W', 'H', 'T')/* Fast Walsh Hadamard Transform (vicodec) */ +#define V4L2_PIX_FMT_FWHT_STATELESS v4l2_fourcc('S', 'F', 'W', 'H')/* Stateless FWHT (vicodec) */ /* Vendor-specific formats */ #define V4L2_PIX_FMT_CPIA1 v4l2_fourcc('C', 'P', 'I', 'A')/* cpia1 YUV */
Signature · 1 line
2.17.1
Re: [PATCH v4 19/21] media: vicodec: Introducing stateless fwht defs and structs
Quoted 54 lines · Dafna Hirschfeld
Add structs and definitions needed to implement stateless decoder for fwht.
Signed-off-by Dafna Hirschfeld <[email protected]>--- drivers/media/platform/vicodec/vicodec-core.c | 23 ++++++++----- drivers/media/v4l2-core/v4l2-ctrls.c | 10 ++++++ include/media/fwht-ctrls.h | 32 +++++++++++++++++++ include/media/v4l2-ctrls.h | 4 ++- include/uapi/linux/v4l2-controls.h | 3 ++ include/uapi/linux/videodev2.h | 1 + 6 files changed, 64 insertions(+), 9 deletions(-) create mode 100644 include/media/fwht-ctrls.hdrivers/media/platform/vicodec/vicodec-core.c +6
-6@@ -64,6 +64,10 @@ static const struct v4l2_fwht_pixfmt_info pixfmt_fwht = {V4L2_PIX_FMT_FWHT ,0 ,3 ,1 ,1 ,1 ,1 ,1 ,0 ,1 }; +static const struct v4l2_fwht_pixfmt_info pixfmt_stateless_fwht = { +V4L2_PIX_FMT_FWHT_STATELESS ,0 ,3 ,1 ,1 ,1 ,1 ,1 ,0 ,1 +}; +static void vicodec_dev_release (struct device *dev) { }@@ -1510,10 +1514,6 @@ static int queue_init(void *priv, struct vb2_queue *src_vq,return vb2_queue_init (dst_vq); } -#define VICODEC_CID_CUSTOM_BASE (V4L2_CID_MPEG_BASE | 0xf000) -#define VICODEC_CID_I_FRAME_QP (VICODEC_CID_CUSTOM_BASE + 0) -#define VICODEC_CID_P_FRAME_QP (VICODEC_CID_CUSTOM_BASE + 1) -static int vicodec_s_ctrl (struct v4l2_ctrl *ctrl) { struct vicodec_ctx *ctx = container_of(ctrl->handler,@@ -1523,10 +1523,10 @@ static int vicodec_s_ctrl(struct v4l2_ctrl *ctrl)case V4L2_CID_MPEG_VIDEO_GOP_SIZE : ctx->state.gop_size = ctrl->val;return 0 ; -case VICODEC_CID_I_FRAME_QP : +case V4L2_CID_FWHT_I_FRAME_QP : ctx->state.i_frame_qp = ctrl->val;return 0 ; -case VICODEC_CID_P_FRAME_QP : +case V4L2_CID_FWHT_P_FRAME_QP : ctx->state.p_frame_qp = ctrl->val;return 0 ; }
drivers/media/platform/vicodec/vicodec-core.c static const struct v4l2_ctrl_ops vicodec_ctrl_ops = { · line 1545
Quoted 8 lines
drivers/media/platform/vicodec/vicodec-core.c +1
-1@@ -1539,7 +1539,7 @@ static const struct v4l2_ctrl_ops vicodec_ctrl_ops = {static const struct v4l2_ctrl_config vicodec_ctrl_i_frame = { .ops = &vicodec_ctrl_ops, - .id =VICODEC_CID_I_FRAME_QP , + .id =V4L2_CID_FWHT_I_FRAME_QP , .name ="FWHT I-Frame QP Value" , .type =V4L2_CTRL_TYPE_INTEGER , .min =1 ,
This struct and...
drivers/media/platform/vicodec/vicodec-core.c static const struct v4l2_ctrl_config vicodec_ctrl_p_frame = { · line 1560
Quoted 12 lines
drivers/media/platform/vicodec/vicodec-core.c +1
-1@@ -1550,7 +1550,7 @@ static const struct v4l2_ctrl_config vicodec_ctrl_i_frame = {static const struct v4l2_ctrl_config vicodec_ctrl_p_frame = { .ops = &vicodec_ctrl_ops, - .id =VICODEC_CID_P_FRAME_QP , + .id =V4L2_CID_FWHT_I_FRAME_QP , .name ="FWHT P-Frame QP Value" , .type =V4L2_CTRL_TYPE_INTEGER , .min =1 ,@@ -1559,6 +1559,13 @@ static const struct v4l2_ctrl_config vicodec_ctrl_p_frame = { .step = 1, };
... and this struct can be removed since these controls are now part of the v4l2-ctrls.c core. Use v4l2_ctrl_new_std instead of v4l2_ctrl_new_custom to create them.
drivers/media/platform/vicodec/vicodec-core.c static const struct v4l2_ctrl_config vicodec_ctrl_p_frame = { · line 1566
Quoted 6 lines
drivers/media/platform/vicodec/vicodec-core.c +5
-0+static const struct v4l2_ctrl_config vicodec_ctrl_stateless_state = { + .id =V4L2_CID_MPEG_VIDEO_FWHT_PARAMS , + .elem_size =sizeof (struct v4l2_ctrl_fwht_params ), + .name ="FWHT-Stateless State Params" , + .type =V4L2_CTRL_TYPE_FWHT_PARAMS ,
Drop these last two fields since the control framework will provide them.
Quoted 10 lines
drivers/media/platform/vicodec/vicodec-core.c +2
-0+}; +/* * File operations */ drivers/media/v4l2-core/v4l2-ctrls.c +0
-0
drivers/media/v4l2-core/v4l2-ctrls.c const char *v4l2_ctrl_get_name(u32 id) · line 852
Quoted 4 lines
drivers/media/v4l2-core/v4l2-ctrls.c +1
-0@@ -849,6 +849,7 @@ const char *v4l2_ctrl_get_name(u32 id)case V4L2_CID_MPEG_VIDEO_FORCE_KEY_FRAME :return "Force Key Frame" ;case V4L2_CID_MPEG_VIDEO_MPEG2_SLICE_PARAMS :return "MPEG-2 Slice Parameters" ;case V4L2_CID_MPEG_VIDEO_MPEG2_QUANTIZATION :return "MPEG-2 Quantization Matrices" ; +case V4L2_CID_MPEG_VIDEO_FWHT_PARAMS :return "FWHT stateless parameters" ;
"FWHT Stateless Parameters" (capital S and P)
I'm missing support for V4L2_CID_FWHT_I_FRAME_QP and V4L2_CID_FWHT_P_FRAME_QP here.
Quoted 101 lines
drivers/media/v4l2-core/v4l2-ctrls.c +9
-0/* VPX controls */ case V4L2_CID_MPEG_VIDEO_VPX_NUM_PARTITIONS :return "VPX Number of Partitions" ;@@ -1303,6 +1304,9 @@ void v4l2_ctrl_fill(u32 id, const char **name, enum v4l2_ctrl_type *type,case V4L2_CID_MPEG_VIDEO_MPEG2_QUANTIZATION : *type =V4L2_CTRL_TYPE_MPEG2_QUANTIZATION ;break ; +case V4L2_CID_MPEG_VIDEO_FWHT_PARAMS : + *type =V4L2_CTRL_TYPE_FWHT_PARAMS ; +break ;default : *type =V4L2_CTRL_TYPE_INTEGER ;break ;@@ -1669,6 +1673,9 @@ static int std_validate(const struct v4l2_ctrl *ctrl, u32 idx,case V4L2_CTRL_TYPE_MPEG2_QUANTIZATION :return 0 ; +case V4L2_CTRL_TYPE_FWHT_PARAMS : +return 0 ; +default :return -EINVAL ; }@@ -2249,6 +2256,9 @@ static struct v4l2_ctrl *v4l2_ctrl_new(struct v4l2_ctrl_handler *hdl,case V4L2_CTRL_TYPE_MPEG2_QUANTIZATION : elem_size =sizeof (struct v4l2_ctrl_mpeg2_quantization );break ; +case V4L2_CTRL_TYPE_FWHT_PARAMS : + elem_size =sizeof (struct v4l2_ctrl_fwht_params ); +break ;default :if (type <V4L2_CTRL_COMPOUND_TYPES ) elem_size =sizeof (s32);include/media/fwht-ctrls.h new file +32
-0@@ -0,0 +1,32 @@ +/* SPDX-License-Identifier: GPL-2.0 */ +/* +* These are the FWHT state controls for use with stateless FWHT +* codec drivers. +* +* It turns out that these structs are not stable yet and will undergo +* more changes. So keep them private until they are stable and ready to +* become part of the official public API. +*/ + +#ifndef _FWHT_CTRLS_H_ +#define _FWHT_CTRLS_H_ + +#define V4L2_CTRL_TYPE_FWHT_PARAMS 0x0105 + +#define V4L2_CID_MPEG_VIDEO_FWHT_PARAMS (V4L2_CID_MPEG_BASE + 292) + +struct v4l2_ctrl_fwht_params { +__u64 backward_ref_ts; +__u32 version; +__u32 width; +__u32 height; +__u32 flags; +__u32 colorspace; +__u32 xfer_func; +__u32 ycbcr_enc; +__u32 quantization; +__u32 comp_frame_size; +}; + + +#endif include/media/v4l2-ctrls.h +3
-1@@ -23,10 +23,11 @@#include <media/media-request.h> /* -* Include the mpeg2 stateless codec compound control definitions. +* Include the mpeg2 and fwht stateless codec compound control definitions. * This will move to the public headers once this API is fully stable. */ #include <media/mpeg2-ctrls.h> +#include <media/fwht-ctrls.h> /* forward references */ struct file ;@@ -60,6 +61,7 @@ union v4l2_ctrl_ptr {char *p_char;struct v4l2_ctrl_mpeg2_slice_params *p_mpeg2_slice_params;struct v4l2_ctrl_mpeg2_quantization *p_mpeg2_quantization; +struct v4l2_ctrl_fwht_params *p_fwht_params;void *p; };include/uapi/linux/v4l2-controls.h +0
-0
include/uapi/linux/v4l2-controls.h enum v4l2_mpeg_video_multi_slice_mode { · line 406
Quoted 3 lines
include/uapi/linux/v4l2-controls.h +0
-0@@ -404,6 +404,9 @@ enum v4l2_mpeg_video_multi_slice_mode {#define V4L2_CID_MPEG_VIDEO_MV_V_SEARCH_RANGE (V4L2_CID_MPEG_BASE+228)#define V4L2_CID_MPEG_VIDEO_FORCE_KEY_FRAME (V4L2_CID_MPEG_BASE+229)
Add this comment here:
/* CIDs for the FWHT codec as used by the vicodec driver. */
Quoted 12 lines
include/uapi/linux/v4l2-controls.h +3
-0+#define V4L2_CID_FWHT_I_FRAME_QP (V4L2_CID_MPEG_BASE + 290) +#define V4L2_CID_FWHT_P_FRAME_QP (V4L2_CID_MPEG_BASE + 291) +#define V4L2_CID_MPEG_VIDEO_H263_I_FRAME_QP (V4L2_CID_MPEG_BASE+300)#define V4L2_CID_MPEG_VIDEO_H263_P_FRAME_QP (V4L2_CID_MPEG_BASE+301)#define V4L2_CID_MPEG_VIDEO_H263_B_FRAME_QP (V4L2_CID_MPEG_BASE+302)include/uapi/linux/videodev2.h +0
-0
include/uapi/linux/videodev2.h struct v4l2_pix_format { · line 675
Quoted 7 lines
include/uapi/linux/videodev2.h +1
-0@@ -669,6 +669,7 @@ struct v4l2_pix_format {#define V4L2_PIX_FMT_VP9 v4l2_fourcc('V', 'P', '9', '0')/* VP9 */ #define V4L2_PIX_FMT_HEVC v4l2_fourcc('H', 'E', 'V', 'C')/* HEVC aka H.265 */ #define V4L2_PIX_FMT_FWHT v4l2_fourcc('F', 'W', 'H', 'T')/* Fast Walsh Hadamard Transform (vicodec) */ +#define V4L2_PIX_FMT_FWHT_STATELESS v4l2_fourcc('S', 'F', 'W', 'H')/* Stateless FWHT (vicodec) */ /* Vendor-specific formats */ #define V4L2_PIX_FMT_CPIA1 v4l2_fourcc('C', 'P', 'I', 'A')/* cpia1 YUV */
Regards,
Hans