Add features to an existing driver
Subsystems (2)
Jackson Lee
maintainerv5 cover Add features to an existing driver
From: "jackson.lee" <[email protected]>
The wave5 codec driver is a stateful encoder/decoder.
The following patches is for supporting yuv422 inpuy format, supporting runtime suspend/resume feature and extra things.
v4l2-compliance results:
========================
v4l2-compliance 1.24.1, 64 bits, 64-bit time_t
Buffer ioctls:
warn: v4l2-test-buffers.cpp(693): VIDIOC_CREATE_BUFS not supported
warn: v4l2-test-buffers.cpp(693): VIDIOC_CREATE_BUFS not supported
test VIDIOC_REQBUFS/CREATE_BUFS/QUERYBUF: OK
test VIDIOC_EXPBUF: OK
test Requests: OK (Not Supported)
Total for wave5-dec device /dev/video0: 45, Succeeded: 45, Failed: 0, Warnings: 2 Total for wave5-enc device /dev/video1: 45, Succeeded: 45, Failed: 0, Warnings: 0
Fluster test results:
=====================
Running test suite JCT-VC-HEVC_V1 with decoder GStreamer-H.265-V4L2-Gst1.0 Using 1 parallel job(s)
Ran 132/147 tests successfully in 97.421 secs
(1 test fails because of not supporting to parse multi frames, 1 test fails because of a missing frame and slight corruption,
2 tests fail because of sizes which are incompatible with the IP, 11 tests fail because of unsupported 10 bit format)
Running test suite JVT-AVC_V1 with decoder GStreamer-H.264-V4L2-Gst1.0 Using 1 parallel job(s)
Ran 77/135 tests successfully in 37.233 secs
(58 fail because the hardware is unable to decode MBAFF / FMO / Field / Extended profile streams.)
Change since v4:
================
* For [PATCH v4 2/4] media: chips-media: wave5: Support runtime suspend/resume
- Fix warning message
* For [PATCH v4 3/4] media: chips-media: wave5: Use helpers to calculate bytesperline and sizeimage.
- Fix warning message
- add Reviewed-By tag
* For [PATCH v4 4/4] media: chips-media: wave5: Support YUV422 raw pixel-formats on the encoder
- add Reviewed-By tag
Change since v3:
=================
* For [PATCH v4 1/4] media: chips-media: wave5: Support SPS/PPS generation for each IDR
- add Reviewed-By tag
* For [PATCH v4 2/4] media: chips-media: wave5: Support runtime suspend/resume
- add Reviewed-By tag
* For [PATCH v4 3/4] media: chips-media: wave5: Use helpers to calculate bytesperline and sizeimage.
- modify the commit message
- define three framesize structures for decoder
* For [PATCH v4 4/4] media: chips-media: wave5: Support YUV422 raw pixel-formats on the encoder
- modify the commit message
- use the v4l2_format_info to calculate luma, chroma size
Change since v2:
=================
* For [PATCH v3 0/4] media: chips-media: wave5: Support SPS/PPS generation for each IDR
- add the suggested _SHIFT suffix
* For [PATCH v3 1/4] media: chips-media: wave5: Support runtime suspend/resume
- change a commit message
* For [PATCH v3 2/4] media: chips-media: wave5: Use helpers to calculate bytesperline and sizeimage
- add pix_fmt_type parameter into wave5_update_pix_fmt function
- add min/max width/height values into dec_fmt_list
Change since v1:
=================
* For [PATCH v2 0/4] media: chips-media: wave5: Support SPS/PPS generation for each IDR
- define a macro for register addresses
* For [PATCH v2 1/4] media: chips-media: wave5: Support runtime suspend/resume
- add auto suspend/resume
* For [PATCH v2 2/4] media: chips-media: wave5: Use helpers to calculate bytesperline and sizeimage
- use helper functions to calculate bytesperline and sizeimage
* For [PATCH v2 3/4] media: chips-media: wave5: Support YUV422 raw pixel-formats on the encoder
- remove unnecessary codes
Change since v0:
=================
The DEFAULT_SRC_SIZE macro was defined using multiple lines, To make a simple define, tab and multiple lines has been removed, The macro is defined using one line.
jackson.lee (4):
media: chips-media: wave5: Support SPS/PPS generation for each IDR
media: chips-media: wave5: Support runtime suspend/resume
media: chips-media: wave5: Use helpers to calculate bytesperline and
sizeimage.
media: chips-media: wave5: Support YUV422 raw pixel-formats on the
encoder.
.../platform/chips-media/wave5/wave5-helper.c | 24 ++ .../platform/chips-media/wave5/wave5-helper.h | 5 + .../platform/chips-media/wave5/wave5-hw.c | 23 +- .../chips-media/wave5/wave5-vpu-dec.c | 312 +++++++----------- .../chips-media/wave5/wave5-vpu-enc.c | 308 +++++++++-------- .../platform/chips-media/wave5/wave5-vpu.c | 43 +++ .../platform/chips-media/wave5/wave5-vpu.h | 5 +- .../platform/chips-media/wave5/wave5-vpuapi.c | 14 +- .../platform/chips-media/wave5/wave5-vpuapi.h | 1 + .../chips-media/wave5/wave5-vpuconfig.h | 27 +- .../media/platform/chips-media/wave5/wave5.h | 3 + 11 files changed, 420 insertions(+), 345 deletions(-)
Signature · 1 line
2.43.0
Jackson Lee
maintainerPATCH v5 1/4 media: chips-media: wave5: Support SPS/PPS generation for each IDR
From: "jackson.lee" <[email protected]>
Provide a control to toggle (0 = off / 1 = on), whether the SPS and PPS are generated for every IDR.
--- .../platform/chips-media/wave5/wave5-hw.c | 19 +++++++++++++++---- .../chips-media/wave5/wave5-vpu-enc.c | 7 +++++++ .../platform/chips-media/wave5/wave5-vpuapi.h | 1 + 3 files changed, 23 insertions(+), 4 deletions(-)
drivers/media/platform/chips-media/wave5/wave5-hw.c +15 -4
@@ -23,6 +23,15 @@#define FEATURE_AVC_ENCODER BIT(1)#define FEATURE_HEVC_ENCODER BIT(0) +#define ENC_AVC_INTRA_IDR_PARAM_MASK 0x7ff +#define ENC_AVC_INTRA_PERIOD_SHIFT 6 +#define ENC_AVC_IDR_PERIOD_SHIFT 17 +#define ENC_AVC_FORCED_IDR_HEADER_SHIFT 28 + +#define ENC_HEVC_INTRA_QP_SHIFT 3 +#define ENC_HEVC_FORCED_IDR_HEADER_SHIFT 9 +#define ENC_HEVC_INTRA_PERIOD_SHIFT 16 +/* Decoder support fields */ #define FEATURE_AVC_DECODER BIT(3)#define FEATURE_HEVC_DECODER BIT(2)
@@ -1601,12 +1610,14 @@ int wave5_vpu_enc_init_seq(struct vpu_instance *inst)if (inst->std ==W_AVC_ENC )vpu_write_reg (inst->dev,W5_CMD_ENC_SEQ_INTRA_PARAM , p_param->intra_qp | - ((p_param->intra_period &0x7ff ) <<6 ) | - ((p_param->avc_idr_period &0x7ff ) <<17 )); + ((p_param->intra_period &ENC_AVC_INTRA_IDR_PARAM_MASK ) <<ENC_AVC_INTRA_PERIOD_SHIFT ) | + ((p_param->avc_idr_period &ENC_AVC_INTRA_IDR_PARAM_MASK ) <<ENC_AVC_IDR_PERIOD_SHIFT ) | + (p_param->forced_idr_header_enable <<ENC_AVC_FORCED_IDR_HEADER_SHIFT ));else if (inst->std ==W_HEVC_ENC )vpu_write_reg (inst->dev,W5_CMD_ENC_SEQ_INTRA_PARAM , - p_param->decoding_refresh_type | (p_param->intra_qp <<3 ) | - (p_param->intra_period <<16 )); + p_param->decoding_refresh_type | (p_param->intra_qp <<ENC_HEVC_INTRA_QP_SHIFT ) | + (p_param->forced_idr_header_enable <<ENC_HEVC_FORCED_IDR_HEADER_SHIFT ) | + (p_param->intra_period <<ENC_HEVC_INTRA_PERIOD_SHIFT )); reg_val = (p_param->rdo_skip <<2 ) | (p_param->lambda_scaling_enable << 3) |
drivers/media/platform/chips-media/wave5/wave5-vpu-enc.c +7 -0
@@ -1061,6 +1061,9 @@ static int wave5_vpu_enc_s_ctrl(struct v4l2_ctrl *ctrl)case V4L2_CID_MPEG_VIDEO_H264_ENTROPY_MODE : inst->enc_param.entropy_coding_mode = ctrl->val;break ; +case V4L2_CID_MPEG_VIDEO_PREPEND_SPSPPS_TO_IDR : + inst->enc_param.forced_idr_header_enable = ctrl->val; +break ;case V4L2_CID_MIN_BUFFERS_FOR_OUTPUT :break ;default :
@@ -1219,6 +1222,7 @@ static void wave5_set_enc_openparam(struct enc_open_param *open_param,else open_param->wave_param.intra_refresh_arg = num_ctu_row; } + open_param->wave_param.forced_idr_header_enable = input.forced_idr_header_enable; }static int initialize_sequence (struct vpu_instance *inst)
@@ -1701,6 +1705,9 @@ static int wave5_vpu_open_enc(struct file *filp) 0, 1, 1, 0);v4l2_ctrl_new_std (v4l2_ctrl_hdl, &wave5_vpu_enc_ctrl_ops,V4L2_CID_MIN_BUFFERS_FOR_OUTPUT ,1 ,32 ,1 ,1 ); +v4l2_ctrl_new_std (v4l2_ctrl_hdl, &wave5_vpu_enc_ctrl_ops, +V4L2_CID_MPEG_VIDEO_PREPEND_SPSPPS_TO_IDR , +0 ,1 ,1 ,0 );if (v4l2_ctrl_hdl->error) { ret = -ENODEV ;
drivers/media/platform/chips-media/wave5/wave5-vpuapi.h +1 -0
@@ -566,6 +566,7 @@ struct enc_wave_param { u32 lambda_scaling_enable: 1; /* enable lambda scaling using custom GOP */ u32 transform8x8_enable: 1; /* enable 8x8 intra prediction and 8x8 transform */ u32 mb_level_rc_enable: 1; /* enable MB-level rate control */ + u32 forced_idr_header_enable: 1; /* enable header encoding before IDR frame */ };struct enc_open_param {
Signature · 1 line
2.43.0
Jackson Lee
maintainerPATCH v5 2/4 media: chips-media: wave5: Support runtime suspend/resume
In reply to Jackson LeeFrom: "jackson.lee" <[email protected]>
Add support for runtime suspend/resume in the encoder and decoder. This is achieved by saving the VPU state and powering it off while the VPU idle.
--- .../platform/chips-media/wave5/wave5-hw.c | 4 +- .../chips-media/wave5/wave5-vpu-dec.c | 16 ++++++- .../chips-media/wave5/wave5-vpu-enc.c | 15 +++++++ .../platform/chips-media/wave5/wave5-vpu.c | 43 +++++++++++++++++++ .../platform/chips-media/wave5/wave5-vpuapi.c | 14 ++++-- .../media/platform/chips-media/wave5/wave5.h | 3 ++ 6 files changed, 88 insertions(+), 7 deletions(-)
drivers/media/platform/chips-media/wave5/wave5-hw.c +2 -2
@@ -1084,8 +1084,8 @@ int wave5_vpu_re_init(struct device *dev, u8 *fw, size_t size)return setup_wave5_properties (dev); } -static int wave5_vpu_sleep_wake (struct device *dev,bool i_sleep_wake,const uint16_t *code, -size_t size) +int wave5_vpu_sleep_wake (struct device *dev,bool i_sleep_wake,const uint16_t *code, +size_t size) {u32 reg_val;struct vpu_buf *common_vb;
drivers/media/platform/chips-media/wave5/wave5-vpu-dec.c +14 -2
@@ -5,6 +5,7 @@* Copyright (C) 2021-2023 CHIPS&MEDIA INC */ +#include <linux/pm_runtime.h> #include "wave5-helper.h" #define VPU_DEC_DEV_NAME "C&M Wave5 VPU decoder"
@@ -518,6 +519,8 @@ static void wave5_vpu_dec_finish_decode(struct vpu_instance *inst)if (q_status.report_queue_count ==0 && (q_status.instance_queue_count ==0 || dec_info.sequence_changed)) {dev_dbg (inst->dev->dev,"%s: finishing job.\n" , __func__); +pm_runtime_mark_last_busy (inst->dev->dev); +pm_runtime_put_autosuspend (inst->dev->dev);v4l2_m2m_job_finish (inst->v4l2_m2m_dev, m2m_ctx); } }
@@ -1382,6 +1385,7 @@ static int wave5_vpu_dec_start_streaming(struct vb2_queue *q, unsigned int countint ret =0 ;dev_dbg (inst->dev->dev,"%s: type: %u\n" , __func__, q->type); +pm_runtime_resume_and_get (inst->dev->dev);v4l2_m2m_update_start_streaming_state (m2m_ctx, q);
@@ -1425,13 +1429,15 @@ static int wave5_vpu_dec_start_streaming(struct vb2_queue *q, unsigned int count } } } - +pm_runtime_mark_last_busy (inst->dev->dev); +pm_runtime_put_autosuspend (inst->dev->dev);return ret; free_bitstream_vbuf:wave5_vdi_free_dma_memory (inst->dev, &inst->bitstream_vbuf); return_buffers:wave5_return_bufs (q,VB2_BUF_STATE_QUEUED ); +pm_runtime_put_autosuspend (inst->dev->dev);return ret; }
@@ -1517,6 +1523,7 @@ static void wave5_vpu_dec_stop_streaming(struct vb2_queue *q)bool check_cmd = TRUE;dev_dbg (inst->dev->dev,"%s: type: %u\n" , __func__, q->type); +pm_runtime_resume_and_get (inst->dev->dev);while (check_cmd) {struct queue_status_info q_status;
@@ -1540,6 +1547,9 @@ static void wave5_vpu_dec_stop_streaming(struct vb2_queue *q)streamoff_output (q); elsestreamoff_capture (q ); + +pm_runtime_mark_last_busy (inst->dev->dev); +pm_runtime_put_autosuspend (inst->dev->dev); }static const struct vb2_ops wave5_vpu_dec_vb2_ops = {
@@ -1626,7 +1636,7 @@ static void wave5_vpu_dec_device_run(void *priv)int ret =0 ;dev_dbg (inst->dev->dev,"%s: Fill the ring buffer with new bitstream data" , __func__); - +pm_runtime_resume_and_get (inst->dev->dev); ret =fill_ringbuffer (inst);if (ret) {dev_warn (inst->dev->dev,"Filling ring buffer failed\n" );
@@ -1709,6 +1719,8 @@ static void wave5_vpu_dec_device_run(void *priv) finish_job_and_return:dev_dbg (inst->dev->dev,"%s: leave and finish job" , __func__); +pm_runtime_mark_last_busy (inst->dev->dev); +pm_runtime_put_autosuspend (inst->dev->dev);v4l2_m2m_job_finish (inst->v4l2_m2m_dev, m2m_ctx); }
drivers/media/platform/chips-media/wave5/wave5-vpu-enc.c +15 -0
@@ -5,6 +5,7 @@* Copyright (C) 2021-2023 CHIPS&MEDIA INC */ +#include <linux/pm_runtime.h> #include "wave5-helper.h" #define VPU_ENC_DEV_NAME "C&M Wave5 VPU encoder"
@@ -1310,6 +1311,7 @@ static int wave5_vpu_enc_start_streaming(struct vb2_queue *q, unsigned int countstruct v4l2_m2m_ctx *m2m_ctx = inst->v4l2_fh.m2m_ctx;int ret =0 ; +pm_runtime_resume_and_get (inst->dev->dev);v4l2_m2m_update_start_streaming_state (m2m_ctx, q);if (inst->state ==VPU_INST_STATE_NONE && q->type ==V4L2_BUF_TYPE_VIDEO_OUTPUT_MPLANE ) {
@@ -1364,9 +1366,13 @@ static int wave5_vpu_enc_start_streaming(struct vb2_queue *q, unsigned int countif (ret) goto return_buffers; +pm_runtime_mark_last_busy (inst->dev->dev); +pm_runtime_put_autosuspend (inst->dev->dev);return 0 ; return_buffers:wave5_return_bufs (q,VB2_BUF_STATE_QUEUED ); +pm_runtime_mark_last_busy (inst->dev->dev); +pm_runtime_put_autosuspend (inst->dev->dev);return ret; }
@@ -1408,6 +1414,7 @@ static void wave5_vpu_enc_stop_streaming(struct vb2_queue *q)*/ dev_dbg (inst->dev->dev,"%s: type: %u\n" , __func__, q->type); +pm_runtime_resume_and_get (inst->dev->dev);if (wave5_vpu_both_queues_are_streaming (inst))switch_state (inst,VPU_INST_STATE_STOP );
@@ -1432,6 +1439,9 @@ static void wave5_vpu_enc_stop_streaming(struct vb2_queue *q)streamoff_output (inst, q); elsestreamoff_capture (inst ,q ); + +pm_runtime_mark_last_busy (inst->dev->dev); +pm_runtime_put_autosuspend (inst->dev->dev); }static const struct vb2_ops wave5_vpu_enc_vb2_ops = {
@@ -1478,6 +1488,7 @@ static void wave5_vpu_enc_device_run(void *priv)u32 fail_res =0 ;int ret =0 ; +pm_runtime_resume_and_get (inst->dev->dev);switch (inst->state) {case VPU_INST_STATE_PIC_RUN : ret =start_encode (inst, &fail_res);
@@ -1491,6 +1502,8 @@ static void wave5_vpu_enc_device_run(void *priv)break ; }dev_dbg (inst->dev->dev,"%s: leave with active job" , __func__); +pm_runtime_mark_last_busy (inst->dev->dev); +pm_runtime_put_autosuspend (inst->dev->dev);return ;default : WARN(1, "Execution of a job in state %s is invalid.\n",
@@ -1498,6 +1511,8 @@ static void wave5_vpu_enc_device_run(void *priv)break ; }dev_dbg (inst->dev->dev,"%s: leave and finish job" , __func__); +pm_runtime_mark_last_busy (inst->dev->dev); +pm_runtime_put_autosuspend (inst->dev->dev);v4l2_m2m_job_finish (inst->v4l2_m2m_dev, m2m_ctx); }
drivers/media/platform/chips-media/wave5/wave5-vpu.c +43 -0
73 lines not on this page · raw message
drivers/media/platform/chips-media/wave5/wave5-vpuapi.c +11 -3
@@ -6,6 +6,8 @@*/ #include <linux/bug.h> +#include <linux/pm_runtime.h> +#include <linux/delay.h> #include "wave5-vpuapi.h" #include "wave5-regdefine.h" #include "wave5.h"
@@ -200,9 +202,13 @@ int wave5_vpu_dec_close(struct vpu_instance *inst, u32 *fail_res)if (!inst->codec_info)return -EINVAL ; +pm_runtime_resume_and_get (inst->dev->dev); + ret =mutex_lock_interruptible (&vpu_dev->hw_lock); -if (ret) +if (ret) { +pm_runtime_put_sync (inst->dev->dev);return ret; + } do { ret = wave5_vpu_dec_finish_seq(inst, fail_res);
@@ -234,7 +240,7 @@ int wave5_vpu_dec_close(struct vpu_instance *inst, u32 *fail_res) unlock_and_return:mutex_unlock (&vpu_dev->hw_lock); - +pm_runtime_put_sync (inst->dev->dev);return ret; }
@@ -702,6 +708,8 @@ int wave5_vpu_enc_close(struct vpu_instance *inst, u32 *fail_res)if (!inst->codec_info)return -EINVAL ; +pm_runtime_resume_and_get (inst->dev->dev); + ret =mutex_lock_interruptible (&vpu_dev->hw_lock);if (ret)return ret;
@@ -733,9 +741,9 @@ int wave5_vpu_enc_close(struct vpu_instance *inst, u32 *fail_res) }wave5_vdi_free_dma_memory (vpu_dev, &p_enc_info->vb_task); -mutex_unlock (&vpu_dev->hw_lock); +pm_runtime_put_sync (inst->dev->dev);return 0 ; }
drivers/media/platform/chips-media/wave5/wave5.h +3 -0
@@ -56,6 +56,9 @@ int wave5_vpu_get_version(struct vpu_device *vpu_dev, u32 *revision);int wave5_vpu_init (struct device *dev,u8 *fw,size_t size); +int wave5_vpu_sleep_wake (struct device *dev,bool i_sleep_wake,const uint16_t *code, +size_t size); +int wave5_vpu_reset (struct device *dev,enum sw_reset_mode reset_mode);int wave5_vpu_build_up_dec_param (struct vpu_instance *inst,struct dec_open_param *param);
Signature · 1 line
2.43.0
Jackson Lee
maintainerPATCH v5 3/4 media: chips-media: wave5: Use helpers to calculate bytesperline and sizeimage.
In reply to Jackson LeeFrom: "jackson.lee" <[email protected]>
Use v4l2-common helper functions to calculate bytesperline and sizeimage, instead of calculating in a wave5 driver directly.
In case of raw(YUV) v4l2_pix_format, the wave5 driver updates v4l2_pix_format_mplane struct through v4l2_fill_pixfmt_mp() function.
Encoder and Decoder need same bytesperline and sizeimage values for same v4l2_pix_format.
So, a wave5_update_pix_fmt is refactored to support both together.
--- .../platform/chips-media/wave5/wave5-helper.c | 24 ++ .../platform/chips-media/wave5/wave5-helper.h | 5 + .../chips-media/wave5/wave5-vpu-dec.c | 296 ++++++------------ .../chips-media/wave5/wave5-vpu-enc.c | 197 +++++------- .../platform/chips-media/wave5/wave5-vpu.h | 5 +- .../chips-media/wave5/wave5-vpuconfig.h | 27 +- 6 files changed, 235 insertions(+), 319 deletions(-)
drivers/media/platform/chips-media/wave5/wave5-helper.c +24 -0
@@ -7,6 +7,8 @@#include "wave5-helper.h" +#define DEFAULT_BS_SIZE (width, height) ((width) * (height) / 8 * 3) +const char *state_to_str (enum vpu_instance_state state) {switch (state) {
@@ -224,3 +226,25 @@ void wave5_return_bufs(struct vb2_queue *q, u32 state)v4l2_m2m_buf_done (vbuf, state); } } + +void wave5_update_pix_fmt (struct v4l2_pix_format_mplane *pix_mp, +int pix_fmt_type, +unsigned int width, +unsigned int height, +const struct v4l2_frmsize_stepwise *frmsize) +{ +v4l2_apply_frmsize_constraints (&width, &height, frmsize); + +if (pix_fmt_type ==VPU_FMT_TYPE_CODEC ) { + pix_mp->width = width; + pix_mp->height = height; + pix_mp->num_planes =1 ; + pix_mp->plane_fmt[0 ].bytesperline =0 ; + pix_mp->plane_fmt[0 ].sizeimage =max (DEFAULT_BS_SIZE (width, height), + pix_mp->plane_fmt[0 ].sizeimage); + }else { +v4l2_fill_pixfmt_mp (pix_mp, pix_mp->pixelformat, width, height); + } + pix_mp->flags =0 ; + pix_mp->field =V4L2_FIELD_NONE ; +}
drivers/media/platform/chips-media/wave5/wave5-helper.h +5 -0
@@ -28,4 +28,9 @@ const struct vpu_format *wave5_find_vpu_fmt_by_idx(unsigned int idx, const struct vpu_format fmt_list[MAX_FMTS]);enum wave_std wave5_to_vpu_std (unsigned int v4l2_pix_fmt,enum vpu_instance_type type);void wave5_return_bufs (struct vb2_queue *q,u32 state); +void wave5_update_pix_fmt (struct v4l2_pix_format_mplane *pix_mp, +int pix_fmt_type, +unsigned int width, +unsigned int height, +const struct v4l2_frmsize_stepwise *frmsize);#endif
drivers/media/platform/chips-media/wave5/wave5-vpu-dec.c +102 -194
444 lines not on this page · raw message
drivers/media/platform/chips-media/wave5/wave5-vpu-enc.c +80 -117
327 lines not on this page · raw message
drivers/media/platform/chips-media/wave5/wave5-vpu.h +1 -4
@@ -38,10 +38,7 @@ enum vpu_fmt_type {struct vpu_format {unsigned int v4l2_pix_fmt; -unsigned int max_width; -unsigned int min_width; -unsigned int max_height; -unsigned int min_height; +const struct v4l2_frmsize_stepwise *v4l2_frmsize; };static inline struct vpu_instance *wave5_to_vpu_inst (struct v4l2_fh *vfh)
drivers/media/platform/chips-media/wave5/wave5-vpuconfig.h +23 -4
@@ -30,10 +30,29 @@#define MAX_NUM_INSTANCE 32 -#define W5_MIN_ENC_PIC_WIDTH 256 -#define W5_MIN_ENC_PIC_HEIGHT 128 -#define W5_MAX_ENC_PIC_WIDTH 8192 -#define W5_MAX_ENC_PIC_HEIGHT 8192 +#define W5_DEF_DEC_PIC_WIDTH 720U +#define W5_DEF_DEC_PIC_HEIGHT 480U +#define W5_MIN_DEC_PIC_8_WIDTH 8U +#define W5_MIN_DEC_PIC_8_HEIGHT 8U +#define W5_MIN_DEC_PIC_32_WIDTH 32U +#define W5_MIN_DEC_PIC_32_HEIGHT 32U +#define W5_MAX_DEC_PIC_WIDTH 8192U +#define W5_MAX_DEC_PIC_HEIGHT 4320U +#define W5_DEC_CODEC_STEP_WIDTH 1U +#define W5_DEC_CODEC_STEP_HEIGHT 1U +#define W5_DEC_RAW_STEP_WIDTH 32U +#define W5_DEC_RAW_STEP_HEIGHT 16U + +#define W5_DEF_ENC_PIC_WIDTH 416U +#define W5_DEF_ENC_PIC_HEIGHT 240U +#define W5_MIN_ENC_PIC_WIDTH 256U +#define W5_MIN_ENC_PIC_HEIGHT 128U +#define W5_MAX_ENC_PIC_WIDTH 8192U +#define W5_MAX_ENC_PIC_HEIGHT 8192U +#define W5_ENC_CODEC_STEP_WIDTH 8U +#define W5_ENC_CODEC_STEP_HEIGHT 8U +#define W5_ENC_RAW_STEP_WIDTH 32U +#define W5_ENC_RAW_STEP_HEIGHT 16U// application specific configuration #define VPU_ENC_TIMEOUT 60000
Signature · 1 line
2.43.0
Re: [PATCH v5 3/4] media: chips-media: wave5: Use helpers to calculate bytesperline and sizeimage.
Quoted 350 lines · Jackson Lee
From: "jackson.lee" <[email protected]>
Use v4l2-common helper functions to calculate bytesperline and sizeimage, instead of calculating in a wave5 driver directly.
In case of raw(YUV)
v4l2_pix_format, the wave5 driver updatesv4l2_pix_format_mplanestruct throughv4l2_fill_pixfmt_mp()function.Encoder and Decoder need same bytesperline and sizeimage values for same
v4l2_pix_format.
So, awave5_update_pix_fmtis refactored to support both together.Signed-off-by Jackson.lee <[email protected]>Signed-off-by Nas Chung <[email protected]>Reviewed-by Nicolas Dufresne <[email protected]>--- .../platform/chips-media/wave5/wave5-helper.c | 24 ++ .../platform/chips-media/wave5/wave5-helper.h | 5 + .../chips-media/wave5/wave5-vpu-dec.c | 296 ++++++------------ .../chips-media/wave5/wave5-vpu-enc.c | 197 +++++------- .../platform/chips-media/wave5/wave5-vpu.h | 5 +- .../chips-media/wave5/wave5-vpuconfig.h | 27 +- 6 files changed, 235 insertions(+), 319 deletions(-)drivers/media/platform/chips-media/wave5/wave5-helper.c +24
-0@@ -7,6 +7,8 @@#include "wave5-helper.h" +#define DEFAULT_BS_SIZE (width, height) ((width) * (height) / 8 * 3) +const char *state_to_str (enum vpu_instance_state state) {switch (state) {@@ -224,3 +226,25 @@ void wave5_return_bufs(struct vb2_queue *q, u32 state)v4l2_m2m_buf_done (vbuf, state); } } + +void wave5_update_pix_fmt (struct v4l2_pix_format_mplane *pix_mp, +int pix_fmt_type, +unsigned int width, +unsigned int height, +const struct v4l2_frmsize_stepwise *frmsize) +{ +v4l2_apply_frmsize_constraints (&width, &height, frmsize); + +if (pix_fmt_type ==VPU_FMT_TYPE_CODEC ) { + pix_mp->width = width; + pix_mp->height = height; + pix_mp->num_planes =1 ; + pix_mp->plane_fmt[0 ].bytesperline =0 ; + pix_mp->plane_fmt[0 ].sizeimage =max (DEFAULT_BS_SIZE (width, height), + pix_mp->plane_fmt[0 ].sizeimage); + }else { +v4l2_fill_pixfmt_mp (pix_mp, pix_mp->pixelformat, width, height); + } + pix_mp->flags =0 ; + pix_mp->field =V4L2_FIELD_NONE ; +}drivers/media/platform/chips-media/wave5/wave5-helper.h +5
-0@@ -28,4 +28,9 @@ const struct vpu_format *wave5_find_vpu_fmt_by_idx(unsigned int idx, const struct vpu_format fmt_list[MAX_FMTS]);enum wave_std wave5_to_vpu_std (unsigned int v4l2_pix_fmt,enum vpu_instance_type type);void wave5_return_bufs (struct vb2_queue *q,u32 state); +void wave5_update_pix_fmt (struct v4l2_pix_format_mplane *pix_mp, +int pix_fmt_type, +unsigned int width, +unsigned int height, +const struct v4l2_frmsize_stepwise *frmsize);#endif drivers/media/platform/chips-media/wave5/wave5-vpu-dec.c +63
-131@@ -11,111 +11,92 @@#define VPU_DEC_DEV_NAME "C&M Wave5 VPU decoder"#define VPU_DEC_DRV_NAME "wave5-dec" -#define DEFAULT_SRC_SIZE (width, height) ({ \ - (width) * (height) / 8 * 3; \ -}) +static const struct v4l2_frmsize_stepwise dec_hevc_frmsize = { + .min_width =W5_MIN_DEC_PIC_8_WIDTH , + .max_width =W5_MAX_DEC_PIC_WIDTH , + .step_width =W5_DEC_CODEC_STEP_WIDTH , + .min_height =W5_MIN_DEC_PIC_8_HEIGHT , + .max_height =W5_MAX_DEC_PIC_HEIGHT , + .step_height =W5_DEC_CODEC_STEP_HEIGHT , +}; + +static const struct v4l2_frmsize_stepwise dec_h264_frmsize = { + .min_width =W5_MIN_DEC_PIC_32_WIDTH , + .max_width =W5_MAX_DEC_PIC_WIDTH , + .step_width =W5_DEC_CODEC_STEP_WIDTH , + .min_height =W5_MIN_DEC_PIC_32_HEIGHT , + .max_height =W5_MAX_DEC_PIC_HEIGHT , + .step_height =W5_DEC_CODEC_STEP_HEIGHT , +}; + +static const struct v4l2_frmsize_stepwise dec_raw_frmsize = { + .min_width =W5_MIN_DEC_PIC_8_WIDTH , + .max_width =W5_MAX_DEC_PIC_WIDTH , + .step_width =W5_DEC_RAW_STEP_WIDTH , + .min_height =W5_MIN_DEC_PIC_8_HEIGHT , + .max_height =W5_MAX_DEC_PIC_HEIGHT , + .step_height =W5_DEC_RAW_STEP_HEIGHT , +};static const struct vpu_format dec_fmt_list[FMT_TYPES ][MAX_FMTS ] = { [VPU_FMT_TYPE_CODEC ] = { { .v4l2_pix_fmt =V4L2_PIX_FMT_HEVC , - .max_width =8192 , - .min_width =8 , - .max_height =4320 , - .min_height =8 , + .v4l2_frmsize = &dec_hevc_frmsize, }, { .v4l2_pix_fmt =V4L2_PIX_FMT_H264 , - .max_width =8192 , - .min_width =32 , - .max_height =4320 , - .min_height =32 , + .v4l2_frmsize = &dec_h264_frmsize, }, }, [VPU_FMT_TYPE_RAW ] = { { .v4l2_pix_fmt =V4L2_PIX_FMT_YUV420 , - .max_width =8192 , - .min_width =8 , - .max_height =4320 , - .min_height =8 , + .v4l2_frmsize = &dec_raw_frmsize, }, { .v4l2_pix_fmt =V4L2_PIX_FMT_NV12 , - .max_width =8192 , - .min_width =8 , - .max_height =4320 , - .min_height =8 , + .v4l2_frmsize = &dec_raw_frmsize, }, { .v4l2_pix_fmt =V4L2_PIX_FMT_NV21 , - .max_width =8192 , - .min_width =8 , - .max_height =4320 , - .min_height =8 , + .v4l2_frmsize = &dec_raw_frmsize, }, { .v4l2_pix_fmt =V4L2_PIX_FMT_YUV422P , - .max_width =8192 , - .min_width =8 , - .max_height =4320 , - .min_height =8 , + .v4l2_frmsize = &dec_raw_frmsize, }, { .v4l2_pix_fmt =V4L2_PIX_FMT_NV16 , - .max_width =8192 , - .min_width =8 , - .max_height =4320 , - .min_height =8 , + .v4l2_frmsize = &dec_raw_frmsize, }, { .v4l2_pix_fmt =V4L2_PIX_FMT_NV61 , - .max_width =8192 , - .min_width =8 , - .max_height =4320 , - .min_height =8 , + .v4l2_frmsize = &dec_raw_frmsize, }, { .v4l2_pix_fmt =V4L2_PIX_FMT_YUV420M , - .max_width =8192 , - .min_width =8 , - .max_height =4320 , - .min_height =8 , + .v4l2_frmsize = &dec_raw_frmsize, }, { .v4l2_pix_fmt =V4L2_PIX_FMT_NV12M , - .max_width =8192 , - .min_width =8 , - .max_height =4320 , - .min_height =8 , + .v4l2_frmsize = &dec_raw_frmsize, }, { .v4l2_pix_fmt =V4L2_PIX_FMT_NV21M , - .max_width =8192 , - .min_width =8 , - .max_height =4320 , - .min_height =8 , + .v4l2_frmsize = &dec_raw_frmsize, }, { .v4l2_pix_fmt =V4L2_PIX_FMT_YUV422M , - .max_width =8192 , - .min_width =8 , - .max_height =4320 , - .min_height =8 , + .v4l2_frmsize = &dec_raw_frmsize, }, { .v4l2_pix_fmt =V4L2_PIX_FMT_NV16M , - .max_width =8192 , - .min_width =8 , - .max_height =4320 , - .min_height =8 , + .v4l2_frmsize = &dec_raw_frmsize, }, { .v4l2_pix_fmt =V4L2_PIX_FMT_NV61M , - .max_width =8192 , - .min_width =8 , - .max_height =4320 , - .min_height =8 , + .v4l2_frmsize = &dec_raw_frmsize, }, } };@@ -234,74 +215,6 @@ static void wave5_handle_src_buffer(struct vpu_instance *inst, dma_addr_t rd_ptr inst->remaining_consumed_bytes = consumed_bytes; } -static void wave5_update_pix_fmt (struct v4l2_pix_format_mplane *pix_mp,unsigned int width, -unsigned int height) -{ -switch (pix_mp->pixelformat) { -case V4L2_PIX_FMT_YUV420 : -case V4L2_PIX_FMT_NV12 : -case V4L2_PIX_FMT_NV21 : - pix_mp->width =round_up (width,32 ); - pix_mp->height =round_up (height,16 ); - pix_mp->plane_fmt[0 ].bytesperline =round_up (width,32 ); - pix_mp->plane_fmt[0 ].sizeimage = width * height *3 /2 ; -break ; -case V4L2_PIX_FMT_YUV422P : -case V4L2_PIX_FMT_NV16 : -case V4L2_PIX_FMT_NV61 : - pix_mp->width =round_up (width,32 ); - pix_mp->height =round_up (height,16 ); - pix_mp->plane_fmt[0 ].bytesperline =round_up (width,32 ); - pix_mp->plane_fmt[0 ].sizeimage = width * height *2 ; -break ; -case V4L2_PIX_FMT_YUV420M : - pix_mp->width =round_up (width,32 ); - pix_mp->height =round_up (height,16 ); - pix_mp->plane_fmt[0 ].bytesperline =round_up (width,32 ); - pix_mp->plane_fmt[0 ].sizeimage = width * height; - pix_mp->plane_fmt[1 ].bytesperline =round_up (width,32 ) /2 ; - pix_mp->plane_fmt[1 ].sizeimage = width * height /4 ; - pix_mp->plane_fmt[2 ].bytesperline =round_up (width,32 ) /2 ; - pix_mp->plane_fmt[2 ].sizeimage = width * height /4 ; -break ; -case V4L2_PIX_FMT_NV12M : -case V4L2_PIX_FMT_NV21M : - pix_mp->width =round_up (width,32 ); - pix_mp->height =round_up (height,16 ); - pix_mp->plane_fmt[0 ].bytesperline =round_up (width,32 ); - pix_mp->plane_fmt[0 ].sizeimage = width * height; - pix_mp->plane_fmt[1 ].bytesperline =round_up (width,32 ); - pix_mp->plane_fmt[1 ].sizeimage = width * height /2 ; -break ; -case V4L2_PIX_FMT_YUV422M : - pix_mp->width =round_up (width,32 ); - pix_mp->height =round_up (height,16 ); - pix_mp->plane_fmt[0 ].bytesperline =round_up (width,32 ); - pix_mp->plane_fmt[0 ].sizeimage = width * height; - pix_mp->plane_fmt[1 ].bytesperline =round_up (width,32 ) /2 ; - pix_mp->plane_fmt[1 ].sizeimage = width * height /2 ; - pix_mp->plane_fmt[2 ].bytesperline =round_up (width,32 ) /2 ; - pix_mp->plane_fmt[2 ].sizeimage = width * height /2 ; -break ; -case V4L2_PIX_FMT_NV16M : -case V4L2_PIX_FMT_NV61M : - pix_mp->width =round_up (width,32 ); - pix_mp->height =round_up (height,16 ); - pix_mp->plane_fmt[0 ].bytesperline =round_up (width,32 ); - pix_mp->plane_fmt[0 ].sizeimage = width * height; - pix_mp->plane_fmt[1 ].bytesperline =round_up (width,32 ); - pix_mp->plane_fmt[1 ].sizeimage = width * height; -break ; -default : - pix_mp->width = width; - pix_mp->height = height; - pix_mp->plane_fmt[0 ].bytesperline =0 ; - pix_mp->plane_fmt[0 ].sizeimage =max (DEFAULT_SRC_SIZE (width, height), - pix_mp->plane_fmt[0 ].sizeimage); -break ; - } -} -static int start_decode (struct vpu_instance *inst,u32 *fail_res) {struct v4l2_m2m_ctx *m2m_ctx = inst->v4l2_fh.m2m_ctx;@@ -389,6 +302,8 @@ static int handle_dynamic_resolution_change(struct vpu_instance *inst) }if (p_dec_info->initial_info_obtained) { +const struct vpu_format *vpu_fmt; + inst->conf_win.left = initial_info->pic_crop_rect.left; inst->conf_win.top = initial_info->pic_crop_rect.top; inst->conf_win.width = initial_info->pic_width -@@ -396,10 +311,27 @@ static int handle_dynamic_resolution_change(struct vpu_instance *inst) inst->conf_win.height = initial_info->pic_height - initial_info->pic_crop_rect.top - initial_info->pic_crop_rect.bottom; -wave5_update_pix_fmt (&inst->src_fmt, initial_info->pic_width, - initial_info->pic_height); -wave5_update_pix_fmt (&inst->dst_fmt, initial_info->pic_width, - initial_info->pic_height); + vpu_fmt =wave5_find_vpu_fmt (inst->src_fmt.pixelformat, + dec_fmt_list[VPU_FMT_TYPE_CODEC ]); +if (!vpu_fmt) +return -EINVAL ; + +wave5_update_pix_fmt (&inst->src_fmt, +VPU_FMT_TYPE_CODEC , + initial_info->pic_width, + initial_info->pic_height, + vpu_fmt->v4l2_frmsize); + + vpu_fmt =wave5_find_vpu_fmt (inst->dst_fmt.pixelformat, + dec_fmt_list[VPU_FMT_TYPE_RAW ]); +if (!vpu_fmt) +return -EINVAL ; + +wave5_update_pix_fmt (&inst->dst_fmt, +VPU_FMT_TYPE_RAW , + initial_info->pic_width, + initial_info->pic_height, + vpu_fmt->v4l2_frmsize); }v4l2_event_queue_fh (fh, &vpu_event_src_ch);
drivers/media/platform/chips-media/wave5/wave5-vpu-dec.c static int wave5_vpu_dec_enum_framesizes(struct file *f, void *fh, struct v4l2_f · line 480
Quoted 4 lines
drivers/media/platform/chips-media/wave5/wave5-vpu-dec.c +1
-0@@ -545,15 +477,11 @@ static int wave5_vpu_dec_enum_framesizes(struct file *f, void *fh, struct v4l2_f vpu_fmt =wave5_find_vpu_fmt (fsize->pixel_format, dec_fmt_list[VPU_FMT_TYPE_RAW ]);if (!vpu_fmt)return -EINVAL ; +return -ENOTTY ;
Huh? Where does this come from? It wasn't part of v4, and it doesn't make sense either.
It looks like a spurious test line that you forgot to remove.
Regards,
Hans
drivers/media/platform/chips-media/wave5/wave5-vpu-dec.c static int wave5_vpu_dec_enum_framesizes(struct file *f, void *fh, struct v4l2_f · line 487
Quoted 13 lines
drivers/media/platform/chips-media/wave5/wave5-vpu-dec.c +1
-6} fsize->type =V4L2_FRMSIZE_TYPE_CONTINUOUS ; - fsize->stepwise.min_width = vpu_fmt->min_width; - fsize->stepwise.max_width = vpu_fmt->max_width; - fsize->stepwise.step_width =1 ; - fsize->stepwise.min_height = vpu_fmt->min_height; - fsize->stepwise.max_height = vpu_fmt->max_height; - fsize->stepwise.step_height =1 ; + fsize->stepwise = *vpu_fmt->v4l2_frmsize;return 0 ; }
Regards,
Hans
jackson.lee
maintainerRE: [PATCH v5 3/4] media: chips-media: wave5: Use helpers to calculate bytesperline and sizeimage.
Hi Hans
Quoted 377 lines
-----Original Message-----
From: Hans Verkuil <[email protected]>
Sent: Thursday, June 13, 2024 7:29 PM
To: jackson.lee <[email protected]>; [email protected]; [email protected]; [email protected]
Cc: [email protected]; [email protected]; Nas Chung <[email protected]>; lafley.kim <[email protected]>; b- [email protected]; Nicolas Dufresne <[email protected]>
Subject: Re: [PATCH v5 3/4] media: chips-media: wave5: Use helpers to calculate bytesperline and sizeimage.Quoted 45 lines · Jackson Lee
From: "jackson.lee" <[email protected]>
Use v4l2-common helper functions to calculate bytesperline and sizeimage, instead of calculating in a wave5 driver directly.
In case of raw(YUV)
v4l2_pix_format, the wave5 driver updatesv4l2_pix_format_mplanestruct throughv4l2_fill_pixfmt_mp()function.Encoder and Decoder need same bytesperline and sizeimage values for same
v4l2_pix_format.
So, awave5_update_pix_fmtis refactored to support both together.Signed-off-by Jackson.lee <[email protected]>Signed-off-by Nas Chung <[email protected]>Reviewed-by Nicolas Dufresne <[email protected]>--- .../platform/chips-media/wave5/wave5-helper.c | 24 ++ .../platform/chips-media/wave5/wave5-helper.h | 5 + .../chips-media/wave5/wave5-vpu-dec.c | 296 ++++++------------ .../chips-media/wave5/wave5-vpu-enc.c | 197 +++++------- .../platform/chips-media/wave5/wave5-vpu.h | 5 +- .../chips-media/wave5/wave5-vpuconfig.h | 27 +- 6 files changed, 235 insertions(+), 319 deletions(-)drivers/media/platform/chips-media/wave5/wave5-helper.c +6
-0@@ -7,6 +7,8 @@#include "wave5-helper.h" +#define DEFAULT_BS_SIZE (width, height) ((width) * (height) / 8 * 3) +const char *state_to_str (enum vpu_instance_state state) {switch (state) {@@ -224,3 +226,25 @@ void wave5_return_bufs(struct vb2_queue *q, u32 state)v4l2_m2m_buf_done (vbuf, state); } } + +void wave5_update_pix_fmt(struct v4l2_pix_format_mplane *pix_mp, + int pix_fmt_type, + unsigned int width,drivers/media/platform/chips-media/wave5/wave5-helper.c void wave5_return_bufs(struct vb2_queue *q, u32 state) · line 242
Quoted 10 lines
drivers/media/platform/chips-media/wave5/wave5-helper.c +10
-0+unsigned int height, + const struct v4l2_frmsize_stepwise *frmsize) { + v4l2_apply_frmsize_constraints(&width, &height, frmsize); + + if (pix_fmt_type == VPU_FMT_TYPE_CODEC) { + pix_mp->width = width; + pix_mp->height = height; + pix_mp->num_planes = 1; + pix_mp->plane_fmt[0].bytesperline = 0; + pix_mp->plane_fmt[0].sizeimage = max(DEFAULT_BS_SIZE(width,height),
drivers/media/platform/chips-media/wave5/wave5-helper.h const struct vpu_format
Quoted 13 lines
drivers/media/platform/chips-media/wave5/wave5-helper.c +7
-0+ pix_mp->plane_fmt[0].sizeimage); + }else { +v4l2_fill_pixfmt_mp (pix_mp, pix_mp->pixelformat, width, height); + } + pix_mp->flags =0 ; + pix_mp->field =V4L2_FIELD_NONE ; +}drivers/media/platform/chips-media/wave5/wave5-helper.h +0
-0@@ -28,4 +28,9 @@ const struct vpu_format*wave5_find_vpu_fmt_by_idx(unsigned int idx,
drivers/media/platform/chips-media/wave5/wave5-helper.h const struct vpu_format · line 28
Quoted 1 line
drivers/media/platform/chips-media/wave5/wave5-helper.h +0
-0const struct vpu_formatfmt_list[MAX_FMTS]); enum
wave_stddrivers/media/platform/chips-media/wave5/wave5-vpu-dec.c static void wave5_handle_src_buffer(struct
Quoted 163 lines
wave5_to_vpu_std(unsigned int v4l2_pix_fmt, enum vpu_instance_type type); voidwave5_return_bufs(struct vb2_queue *q, u32 state);drivers/media/platform/chips-media/wave5/wave5-helper.h +5
-0+void wave5_update_pix_fmt (struct v4l2_pix_format_mplane *pix_mp, +int pix_fmt_type, +unsigned int width, +unsigned int height, +const struct v4l2_frmsize_stepwise *frmsize);#endif drivers/media/platform/chips-media/wave5/wave5-vpu-dec.c +37
-59@@ -11,111 +11,92 @@#define VPU_DEC_DEV_NAME "C&M Wave5 VPU decoder"#define VPU_DEC_DRV_NAME "wave5-dec" -#define DEFAULT_SRC_SIZE (width, height) ({ \ - (width) * (height) / 8 * 3; \ -}) +static const struct v4l2_frmsize_stepwise dec_hevc_frmsize = { + .min_width =W5_MIN_DEC_PIC_8_WIDTH , + .max_width =W5_MAX_DEC_PIC_WIDTH , + .step_width =W5_DEC_CODEC_STEP_WIDTH , + .min_height =W5_MIN_DEC_PIC_8_HEIGHT , + .max_height =W5_MAX_DEC_PIC_HEIGHT , + .step_height =W5_DEC_CODEC_STEP_HEIGHT , }; + +static const struct v4l2_frmsize_stepwise dec_h264_frmsize = { + .min_width =W5_MIN_DEC_PIC_32_WIDTH , + .max_width =W5_MAX_DEC_PIC_WIDTH , + .step_width =W5_DEC_CODEC_STEP_WIDTH , + .min_height =W5_MIN_DEC_PIC_32_HEIGHT , + .max_height =W5_MAX_DEC_PIC_HEIGHT , + .step_height =W5_DEC_CODEC_STEP_HEIGHT , }; + +static const struct v4l2_frmsize_stepwise dec_raw_frmsize = { + .min_width =W5_MIN_DEC_PIC_8_WIDTH , + .max_width =W5_MAX_DEC_PIC_WIDTH , + .step_width =W5_DEC_RAW_STEP_WIDTH , + .min_height =W5_MIN_DEC_PIC_8_HEIGHT , + .max_height =W5_MAX_DEC_PIC_HEIGHT , + .step_height =W5_DEC_RAW_STEP_HEIGHT , };static const struct vpu_format dec_fmt_list[FMT_TYPES ][MAX_FMTS ] = { [VPU_FMT_TYPE_CODEC ] = { { .v4l2_pix_fmt =V4L2_PIX_FMT_HEVC , - .max_width =8192 , - .min_width =8 , - .max_height =4320 , - .min_height =8 , + .v4l2_frmsize = &dec_hevc_frmsize, }, { .v4l2_pix_fmt =V4L2_PIX_FMT_H264 , - .max_width =8192 , - .min_width =32 , - .max_height =4320 , - .min_height =32 , + .v4l2_frmsize = &dec_h264_frmsize, }, }, [VPU_FMT_TYPE_RAW ] = { { .v4l2_pix_fmt =V4L2_PIX_FMT_YUV420 , - .max_width =8192 , - .min_width =8 , - .max_height =4320 , - .min_height =8 , + .v4l2_frmsize = &dec_raw_frmsize, }, { .v4l2_pix_fmt =V4L2_PIX_FMT_NV12 , - .max_width =8192 , - .min_width =8 , - .max_height =4320 , - .min_height =8 , + .v4l2_frmsize = &dec_raw_frmsize, }, { .v4l2_pix_fmt =V4L2_PIX_FMT_NV21 , - .max_width =8192 , - .min_width =8 , - .max_height =4320 , - .min_height =8 , + .v4l2_frmsize = &dec_raw_frmsize, }, { .v4l2_pix_fmt =V4L2_PIX_FMT_YUV422P , - .max_width =8192 , - .min_width =8 , - .max_height =4320 , - .min_height =8 , + .v4l2_frmsize = &dec_raw_frmsize, }, { .v4l2_pix_fmt =V4L2_PIX_FMT_NV16 , - .max_width =8192 , - .min_width =8 , - .max_height =4320 , - .min_height =8 , + .v4l2_frmsize = &dec_raw_frmsize, }, { .v4l2_pix_fmt =V4L2_PIX_FMT_NV61 , - .max_width =8192 , - .min_width =8 , - .max_height =4320 , - .min_height =8 , + .v4l2_frmsize = &dec_raw_frmsize, }, { .v4l2_pix_fmt =V4L2_PIX_FMT_YUV420M , - .max_width =8192 , - .min_width =8 , - .max_height =4320 , - .min_height =8 , + .v4l2_frmsize = &dec_raw_frmsize, }, { .v4l2_pix_fmt =V4L2_PIX_FMT_NV12M , - .max_width =8192 , - .min_width =8 , - .max_height =4320 , - .min_height =8 , + .v4l2_frmsize = &dec_raw_frmsize, }, { .v4l2_pix_fmt =V4L2_PIX_FMT_NV21M , - .max_width =8192 , - .min_width =8 , - .max_height =4320 , - .min_height =8 , + .v4l2_frmsize = &dec_raw_frmsize, }, { .v4l2_pix_fmt =V4L2_PIX_FMT_YUV422M , - .max_width =8192 , - .min_width =8 , - .max_height =4320 , - .min_height =8 , + .v4l2_frmsize = &dec_raw_frmsize, }, { .v4l2_pix_fmt =V4L2_PIX_FMT_NV16M , - .max_width =8192 , - .min_width =8 , - .max_height =4320 , - .min_height =8 , + .v4l2_frmsize = &dec_raw_frmsize, }, { .v4l2_pix_fmt =V4L2_PIX_FMT_NV61M , - .max_width =8192 , - .min_width =8 , - .max_height =4320 , - .min_height =8 , + .v4l2_frmsize = &dec_raw_frmsize, }, } };@@ -234,74 +215,6 @@ static void wave5_handle_src_buffer(struct
vpu_instance*inst,dma_addr_trd_ptrdrivers/media/platform/chips-media/wave5/wave5-vpu-dec.c static void wave5_handle_src_buffer(struct · line 236
Quoted 3 lines
drivers/media/platform/chips-media/wave5/wave5-vpu-dec.c +0
-1inst->remaining_consumed_bytes = consumed_bytes; } -static void wave5_update_pix_fmt(struct v4l2_pix_format_mplane *pix_mp,unsigned int width,
Quoted 52 lines
drivers/media/platform/chips-media/wave5/wave5-vpu-dec.c +0
-52- unsigned int height) -{ -switch (pix_mp->pixelformat) { -case V4L2_PIX_FMT_YUV420 : -case V4L2_PIX_FMT_NV12 : -case V4L2_PIX_FMT_NV21 : - pix_mp->width =round_up (width,32 ); - pix_mp->height =round_up (height,16 ); - pix_mp->plane_fmt[0 ].bytesperline =round_up (width,32 ); - pix_mp->plane_fmt[0 ].sizeimage = width * height *3 /2 ; -break ; -case V4L2_PIX_FMT_YUV422P : -case V4L2_PIX_FMT_NV16 : -case V4L2_PIX_FMT_NV61 : - pix_mp->width =round_up (width,32 ); - pix_mp->height =round_up (height,16 ); - pix_mp->plane_fmt[0 ].bytesperline =round_up (width,32 ); - pix_mp->plane_fmt[0 ].sizeimage = width * height *2 ; -break ; -case V4L2_PIX_FMT_YUV420M : - pix_mp->width =round_up (width,32 ); - pix_mp->height =round_up (height,16 ); - pix_mp->plane_fmt[0 ].bytesperline =round_up (width,32 ); - pix_mp->plane_fmt[0 ].sizeimage = width * height; - pix_mp->plane_fmt[1 ].bytesperline =round_up (width,32 ) /2 ; - pix_mp->plane_fmt[1 ].sizeimage = width * height /4 ; - pix_mp->plane_fmt[2 ].bytesperline =round_up (width,32 ) /2 ; - pix_mp->plane_fmt[2 ].sizeimage = width * height /4 ; -break ; -case V4L2_PIX_FMT_NV12M : -case V4L2_PIX_FMT_NV21M : - pix_mp->width =round_up (width,32 ); - pix_mp->height =round_up (height,16 ); - pix_mp->plane_fmt[0 ].bytesperline =round_up (width,32 ); - pix_mp->plane_fmt[0 ].sizeimage = width * height; - pix_mp->plane_fmt[1 ].bytesperline =round_up (width,32 ); - pix_mp->plane_fmt[1 ].sizeimage = width * height /2 ; -break ; -case V4L2_PIX_FMT_YUV422M : - pix_mp->width =round_up (width,32 ); - pix_mp->height =round_up (height,16 ); - pix_mp->plane_fmt[0 ].bytesperline =round_up (width,32 ); - pix_mp->plane_fmt[0 ].sizeimage = width * height; - pix_mp->plane_fmt[1 ].bytesperline =round_up (width,32 ) /2 ; - pix_mp->plane_fmt[1 ].sizeimage = width * height /2 ; - pix_mp->plane_fmt[2 ].bytesperline =round_up (width,32 ) /2 ; - pix_mp->plane_fmt[2 ].sizeimage = width * height /2 ; -break ; -case V4L2_PIX_FMT_NV16M : -case V4L2_PIX_FMT_NV61M : - pix_mp->width =round_up (width,32 ); - pix_mp->height =round_up (height,16 );drivers/media/platform/chips-media/wave5/wave5-vpu-dec.c static void wave5_handle_src_buffer(struct vpu_instance *inst, dma_addr_t rd_ptr
Quoted 10 lines
drivers/media/platform/chips-media/wave5/wave5-vpu-dec.c +0
-10- pix_mp->plane_fmt[0 ].bytesperline =round_up (width,32 ); - pix_mp->plane_fmt[0 ].sizeimage = width * height; - pix_mp->plane_fmt[1 ].bytesperline =round_up (width,32 ); - pix_mp->plane_fmt[1 ].sizeimage = width * height; -break ; -default : - pix_mp->width = width; - pix_mp->height = height; - pix_mp->plane_fmt[0 ].bytesperline =0 ; - pix_mp->plane_fmt[0].sizeimage = max(DEFAULT_SRC_SIZE(width,height),
drivers/media/platform/chips-media/wave5/wave5-vpu-dec.c static void wave5_handle_src_buffer(struct vpu_instance *inst, dma_addr_t rd_ptr
Quoted 8 lines
drivers/media/platform/chips-media/wave5/wave5-vpu-dec.c +1
-5- pix_mp->plane_fmt[0].sizeimage); -break ; - } -} -static int start_decode (struct vpu_instance *inst,u32 *fail_res) { struct v4l2_m2m_ctx *m2m_ctx = inst->v4l2_fh.m2m_ctx; @@ -389,6 +302,8 @@ static int handle_dynamic_resolution_change(struct vpu_instance*inst)
drivers/media/platform/chips-media/wave5/wave5-vpu-dec.c static int handle_dynamic_resolution_change(struct vpu_instance *inst)
Quoted 8 lines
drivers/media/platform/chips-media/wave5/wave5-vpu-dec.c +2
-0}if (p_dec_info->initial_info_obtained) { +const struct vpu_format *vpu_fmt; + inst->conf_win.left = initial_info->pic_crop_rect.left; inst->conf_win.top = initial_info->pic_crop_rect.top; inst->conf_win.width = initial_info->pic_width - @@ -396,10+311,27
Quoted 33 lines
@@ static int
handle_dynamic_resolution_change(struct vpu_instance *inst)drivers/media/platform/chips-media/wave5/wave5-vpu-dec.c +0
-0inst->conf_win.height = initial_info->pic_height - initial_info->pic_crop_rect.top -
initial_info->pic_crop_rect.bottom;drivers/media/platform/chips-media/wave5/wave5-vpu-dec.c +21
-4-wave5_update_pix_fmt (&inst->src_fmt, initial_info->pic_width, - initial_info->pic_height); -wave5_update_pix_fmt (&inst->dst_fmt, initial_info->pic_width, - initial_info->pic_height); + vpu_fmt =wave5_find_vpu_fmt (inst->src_fmt.pixelformat, + dec_fmt_list[VPU_FMT_TYPE_CODEC ]); +if (!vpu_fmt) +return -EINVAL ; + +wave5_update_pix_fmt (&inst->src_fmt, +VPU_FMT_TYPE_CODEC , + initial_info->pic_width, + initial_info->pic_height, + vpu_fmt->v4l2_frmsize); + + vpu_fmt =wave5_find_vpu_fmt (inst->dst_fmt.pixelformat, + dec_fmt_list[VPU_FMT_TYPE_RAW ]); +if (!vpu_fmt) +return -EINVAL ; + +wave5_update_pix_fmt (&inst->dst_fmt, +VPU_FMT_TYPE_RAW , + initial_info->pic_width, + initial_info->pic_height, + vpu_fmt->v4l2_frmsize); } v4l2_event_queue_fh(fh, &vpu_event_src_ch); @@ -545,15 +477,11 @@Quoted 1 line
static int wave5_vpu_dec_enum_framesizes(struct file *f, void *fh, struct
v4l2_fQuoted 1 line
vpu_fmt= wave5_find_vpu_fmt(fsize->pixel_format,dec_fmt_list[VPU_FMT_TYPE_RAW]);
drivers/media/platform/chips-media/wave5/wave5-vpu-dec.c static int wave5_vpu_dec_enum_framesizes(struct file *f, void *fh, struct v4l2_f · line 480
Quoted 3 lines
drivers/media/platform/chips-media/wave5/wave5-vpu-dec.c +1
-0if (!vpu_fmt)return -EINVAL ; +return -ENOTTY ;Huh? Where does this come from? It wasn't part of v4, and it doesn't make sense either.
Quoted 5 lines
It looks like a spurious test line that you forgot to remove.
Regards,
Hans
Sorry for the confusion.
It should be removed.
Due to this code, we have been sharing incorrect v4l2-compliance results in the cover letter.
To pass the v4l2-compliance test correctly, Can we change the following code to v6?
Quoted 11 lines
drivers/media/platform/chips-media/wave5/wave5-vpu-dec.c static int wave5_vpu_dec_enum_framesizes(struct file *f, void *fh, struct v4l2_f · line 484
Quoted 11 lines
drivers/media/platform/chips-media/wave5/wave5-vpu-dec.c +1
-6} fsize->type =V4L2_FRMSIZE_TYPE_CONTINUOUS ; - fsize->stepwise.min_width = vpu_fmt->min_width; - fsize->stepwise.max_width = vpu_fmt->max_width; - fsize->stepwise.step_width =1 ; - fsize->stepwise.min_height = vpu_fmt->min_height; - fsize->stepwise.max_height = vpu_fmt->max_height; - fsize->stepwise.step_height =1 ; + fsize->stepwise = *vpu_fmt->v4l2_frmsize;
fsize->stepwise.min_width = vpu_fmt->v4l2_frmsize->min_width; fsize->stepwise.max_width = vpu_fmt->v4l2_frmsize->max_width; fsize->stepwise.step_width = W5_DEC_CODEC_STEP_WIDTH; fsize->stepwise.min_height = vpu_fmt->v4l2_frmsize->min_height; fsize->stepwise.max_height = vpu_fmt->v4l2_frmsize->max_height; fsize->stepwise.step_height = W5_DEC_CODEC_STEP_HEIGHT;
thanks
Jackson
Quoted 7 lines
Quoted 3 lines
return 0;
}Regards,
Hans
Re: [PATCH v5 3/4] media: chips-media: wave5: Use helpers to calculate bytesperline and sizeimage.
Quoted 384 lines · jackson.lee
Hi Hans
Quoted 381 lines
-----Original Message-----
From: Hans Verkuil <[email protected]>
Sent: Thursday, June 13, 2024 7:29 PM
To: jackson.lee <[email protected]>; [email protected]; [email protected]; [email protected]
Cc: [email protected]; [email protected]; Nas Chung <[email protected]>; lafley.kim <[email protected]>; b- [email protected]; Nicolas Dufresne <[email protected]>
Subject: Re: [PATCH v5 3/4] media: chips-media: wave5: Use helpers to calculate bytesperline and sizeimage.Quoted 45 lines · Jackson Lee
From: "jackson.lee" <[email protected]>
Use v4l2-common helper functions to calculate bytesperline and sizeimage, instead of calculating in a wave5 driver directly.
In case of raw(YUV)
v4l2_pix_format, the wave5 driver updatesv4l2_pix_format_mplanestruct throughv4l2_fill_pixfmt_mp()function.Encoder and Decoder need same bytesperline and sizeimage values for same
v4l2_pix_format.
So, awave5_update_pix_fmtis refactored to support both together.Signed-off-by Jackson.lee <[email protected]>Signed-off-by Nas Chung <[email protected]>Reviewed-by Nicolas Dufresne <[email protected]>--- .../platform/chips-media/wave5/wave5-helper.c | 24 ++ .../platform/chips-media/wave5/wave5-helper.h | 5 + .../chips-media/wave5/wave5-vpu-dec.c | 296 ++++++------------ .../chips-media/wave5/wave5-vpu-enc.c | 197 +++++------- .../platform/chips-media/wave5/wave5-vpu.h | 5 +- .../chips-media/wave5/wave5-vpuconfig.h | 27 +- 6 files changed, 235 insertions(+), 319 deletions(-)drivers/media/platform/chips-media/wave5/wave5-helper.c +6
-0@@ -7,6 +7,8 @@#include "wave5-helper.h" +#define DEFAULT_BS_SIZE (width, height) ((width) * (height) / 8 * 3) +const char *state_to_str (enum vpu_instance_state state) {switch (state) {@@ -224,3 +226,25 @@ void wave5_return_bufs(struct vb2_queue *q, u32 state)v4l2_m2m_buf_done (vbuf, state); } } + +void wave5_update_pix_fmt(struct v4l2_pix_format_mplane *pix_mp, + int pix_fmt_type, + unsigned int width,drivers/media/platform/chips-media/wave5/wave5-helper.c void wave5_return_bufs(struct vb2_queue *q, u32 state) · line 242
Quoted 10 lines
drivers/media/platform/chips-media/wave5/wave5-helper.c +10
-0+unsigned int height, + const struct v4l2_frmsize_stepwise *frmsize) { + v4l2_apply_frmsize_constraints(&width, &height, frmsize); + + if (pix_fmt_type == VPU_FMT_TYPE_CODEC) { + pix_mp->width = width; + pix_mp->height = height; + pix_mp->num_planes = 1; + pix_mp->plane_fmt[0].bytesperline = 0; + pix_mp->plane_fmt[0].sizeimage = max(DEFAULT_BS_SIZE(width,height),
drivers/media/platform/chips-media/wave5/wave5-helper.h const struct vpu_format
Quoted 13 lines
drivers/media/platform/chips-media/wave5/wave5-helper.c +7
-0+ pix_mp->plane_fmt[0].sizeimage); + }else { +v4l2_fill_pixfmt_mp (pix_mp, pix_mp->pixelformat, width, height); + } + pix_mp->flags =0 ; + pix_mp->field =V4L2_FIELD_NONE ; +}drivers/media/platform/chips-media/wave5/wave5-helper.h +0
-0@@ -28,4 +28,9 @@ const struct vpu_format*wave5_find_vpu_fmt_by_idx(unsigned int idx,
drivers/media/platform/chips-media/wave5/wave5-helper.h const struct vpu_format · line 28
Quoted 1 line
drivers/media/platform/chips-media/wave5/wave5-helper.h +0
-0const struct vpu_formatfmt_list[MAX_FMTS]); enum
wave_stddrivers/media/platform/chips-media/wave5/wave5-vpu-dec.c static void wave5_handle_src_buffer(struct
Quoted 163 lines
wave5_to_vpu_std(unsigned int v4l2_pix_fmt, enum vpu_instance_type type); voidwave5_return_bufs(struct vb2_queue *q, u32 state);drivers/media/platform/chips-media/wave5/wave5-helper.h +5
-0+void wave5_update_pix_fmt (struct v4l2_pix_format_mplane *pix_mp, +int pix_fmt_type, +unsigned int width, +unsigned int height, +const struct v4l2_frmsize_stepwise *frmsize);#endif drivers/media/platform/chips-media/wave5/wave5-vpu-dec.c +37
-59@@ -11,111 +11,92 @@#define VPU_DEC_DEV_NAME "C&M Wave5 VPU decoder"#define VPU_DEC_DRV_NAME "wave5-dec" -#define DEFAULT_SRC_SIZE (width, height) ({ \ - (width) * (height) / 8 * 3; \ -}) +static const struct v4l2_frmsize_stepwise dec_hevc_frmsize = { + .min_width =W5_MIN_DEC_PIC_8_WIDTH , + .max_width =W5_MAX_DEC_PIC_WIDTH , + .step_width =W5_DEC_CODEC_STEP_WIDTH , + .min_height =W5_MIN_DEC_PIC_8_HEIGHT , + .max_height =W5_MAX_DEC_PIC_HEIGHT , + .step_height =W5_DEC_CODEC_STEP_HEIGHT , }; + +static const struct v4l2_frmsize_stepwise dec_h264_frmsize = { + .min_width =W5_MIN_DEC_PIC_32_WIDTH , + .max_width =W5_MAX_DEC_PIC_WIDTH , + .step_width =W5_DEC_CODEC_STEP_WIDTH , + .min_height =W5_MIN_DEC_PIC_32_HEIGHT , + .max_height =W5_MAX_DEC_PIC_HEIGHT , + .step_height =W5_DEC_CODEC_STEP_HEIGHT , }; + +static const struct v4l2_frmsize_stepwise dec_raw_frmsize = { + .min_width =W5_MIN_DEC_PIC_8_WIDTH , + .max_width =W5_MAX_DEC_PIC_WIDTH , + .step_width =W5_DEC_RAW_STEP_WIDTH , + .min_height =W5_MIN_DEC_PIC_8_HEIGHT , + .max_height =W5_MAX_DEC_PIC_HEIGHT , + .step_height =W5_DEC_RAW_STEP_HEIGHT , };static const struct vpu_format dec_fmt_list[FMT_TYPES ][MAX_FMTS ] = { [VPU_FMT_TYPE_CODEC ] = { { .v4l2_pix_fmt =V4L2_PIX_FMT_HEVC , - .max_width =8192 , - .min_width =8 , - .max_height =4320 , - .min_height =8 , + .v4l2_frmsize = &dec_hevc_frmsize, }, { .v4l2_pix_fmt =V4L2_PIX_FMT_H264 , - .max_width =8192 , - .min_width =32 , - .max_height =4320 , - .min_height =32 , + .v4l2_frmsize = &dec_h264_frmsize, }, }, [VPU_FMT_TYPE_RAW ] = { { .v4l2_pix_fmt =V4L2_PIX_FMT_YUV420 , - .max_width =8192 , - .min_width =8 , - .max_height =4320 , - .min_height =8 , + .v4l2_frmsize = &dec_raw_frmsize, }, { .v4l2_pix_fmt =V4L2_PIX_FMT_NV12 , - .max_width =8192 , - .min_width =8 , - .max_height =4320 , - .min_height =8 , + .v4l2_frmsize = &dec_raw_frmsize, }, { .v4l2_pix_fmt =V4L2_PIX_FMT_NV21 , - .max_width =8192 , - .min_width =8 , - .max_height =4320 , - .min_height =8 , + .v4l2_frmsize = &dec_raw_frmsize, }, { .v4l2_pix_fmt =V4L2_PIX_FMT_YUV422P , - .max_width =8192 , - .min_width =8 , - .max_height =4320 , - .min_height =8 , + .v4l2_frmsize = &dec_raw_frmsize, }, { .v4l2_pix_fmt =V4L2_PIX_FMT_NV16 , - .max_width =8192 , - .min_width =8 , - .max_height =4320 , - .min_height =8 , + .v4l2_frmsize = &dec_raw_frmsize, }, { .v4l2_pix_fmt =V4L2_PIX_FMT_NV61 , - .max_width =8192 , - .min_width =8 , - .max_height =4320 , - .min_height =8 , + .v4l2_frmsize = &dec_raw_frmsize, }, { .v4l2_pix_fmt =V4L2_PIX_FMT_YUV420M , - .max_width =8192 , - .min_width =8 , - .max_height =4320 , - .min_height =8 , + .v4l2_frmsize = &dec_raw_frmsize, }, { .v4l2_pix_fmt =V4L2_PIX_FMT_NV12M , - .max_width =8192 , - .min_width =8 , - .max_height =4320 , - .min_height =8 , + .v4l2_frmsize = &dec_raw_frmsize, }, { .v4l2_pix_fmt =V4L2_PIX_FMT_NV21M , - .max_width =8192 , - .min_width =8 , - .max_height =4320 , - .min_height =8 , + .v4l2_frmsize = &dec_raw_frmsize, }, { .v4l2_pix_fmt =V4L2_PIX_FMT_YUV422M , - .max_width =8192 , - .min_width =8 , - .max_height =4320 , - .min_height =8 , + .v4l2_frmsize = &dec_raw_frmsize, }, { .v4l2_pix_fmt =V4L2_PIX_FMT_NV16M , - .max_width =8192 , - .min_width =8 , - .max_height =4320 , - .min_height =8 , + .v4l2_frmsize = &dec_raw_frmsize, }, { .v4l2_pix_fmt =V4L2_PIX_FMT_NV61M , - .max_width =8192 , - .min_width =8 , - .max_height =4320 , - .min_height =8 , + .v4l2_frmsize = &dec_raw_frmsize, }, } };@@ -234,74 +215,6 @@ static void wave5_handle_src_buffer(struct
vpu_instance*inst,dma_addr_trd_ptrdrivers/media/platform/chips-media/wave5/wave5-vpu-dec.c static void wave5_handle_src_buffer(struct · line 236
Quoted 3 lines
drivers/media/platform/chips-media/wave5/wave5-vpu-dec.c +0
-1inst->remaining_consumed_bytes = consumed_bytes; } -static void wave5_update_pix_fmt(struct v4l2_pix_format_mplane *pix_mp,unsigned int width,
Quoted 52 lines
drivers/media/platform/chips-media/wave5/wave5-vpu-dec.c +0
-52- unsigned int height) -{ -switch (pix_mp->pixelformat) { -case V4L2_PIX_FMT_YUV420 : -case V4L2_PIX_FMT_NV12 : -case V4L2_PIX_FMT_NV21 : - pix_mp->width =round_up (width,32 ); - pix_mp->height =round_up (height,16 ); - pix_mp->plane_fmt[0 ].bytesperline =round_up (width,32 ); - pix_mp->plane_fmt[0 ].sizeimage = width * height *3 /2 ; -break ; -case V4L2_PIX_FMT_YUV422P : -case V4L2_PIX_FMT_NV16 : -case V4L2_PIX_FMT_NV61 : - pix_mp->width =round_up (width,32 ); - pix_mp->height =round_up (height,16 ); - pix_mp->plane_fmt[0 ].bytesperline =round_up (width,32 ); - pix_mp->plane_fmt[0 ].sizeimage = width * height *2 ; -break ; -case V4L2_PIX_FMT_YUV420M : - pix_mp->width =round_up (width,32 ); - pix_mp->height =round_up (height,16 ); - pix_mp->plane_fmt[0 ].bytesperline =round_up (width,32 ); - pix_mp->plane_fmt[0 ].sizeimage = width * height; - pix_mp->plane_fmt[1 ].bytesperline =round_up (width,32 ) /2 ; - pix_mp->plane_fmt[1 ].sizeimage = width * height /4 ; - pix_mp->plane_fmt[2 ].bytesperline =round_up (width,32 ) /2 ; - pix_mp->plane_fmt[2 ].sizeimage = width * height /4 ; -break ; -case V4L2_PIX_FMT_NV12M : -case V4L2_PIX_FMT_NV21M : - pix_mp->width =round_up (width,32 ); - pix_mp->height =round_up (height,16 ); - pix_mp->plane_fmt[0 ].bytesperline =round_up (width,32 ); - pix_mp->plane_fmt[0 ].sizeimage = width * height; - pix_mp->plane_fmt[1 ].bytesperline =round_up (width,32 ); - pix_mp->plane_fmt[1 ].sizeimage = width * height /2 ; -break ; -case V4L2_PIX_FMT_YUV422M : - pix_mp->width =round_up (width,32 ); - pix_mp->height =round_up (height,16 ); - pix_mp->plane_fmt[0 ].bytesperline =round_up (width,32 ); - pix_mp->plane_fmt[0 ].sizeimage = width * height; - pix_mp->plane_fmt[1 ].bytesperline =round_up (width,32 ) /2 ; - pix_mp->plane_fmt[1 ].sizeimage = width * height /2 ; - pix_mp->plane_fmt[2 ].bytesperline =round_up (width,32 ) /2 ; - pix_mp->plane_fmt[2 ].sizeimage = width * height /2 ; -break ; -case V4L2_PIX_FMT_NV16M : -case V4L2_PIX_FMT_NV61M : - pix_mp->width =round_up (width,32 ); - pix_mp->height =round_up (height,16 );drivers/media/platform/chips-media/wave5/wave5-vpu-dec.c static void wave5_handle_src_buffer(struct vpu_instance *inst, dma_addr_t rd_ptr
Quoted 10 lines
drivers/media/platform/chips-media/wave5/wave5-vpu-dec.c +0
-10- pix_mp->plane_fmt[0 ].bytesperline =round_up (width,32 ); - pix_mp->plane_fmt[0 ].sizeimage = width * height; - pix_mp->plane_fmt[1 ].bytesperline =round_up (width,32 ); - pix_mp->plane_fmt[1 ].sizeimage = width * height; -break ; -default : - pix_mp->width = width; - pix_mp->height = height; - pix_mp->plane_fmt[0 ].bytesperline =0 ; - pix_mp->plane_fmt[0].sizeimage = max(DEFAULT_SRC_SIZE(width,height),
drivers/media/platform/chips-media/wave5/wave5-vpu-dec.c static void wave5_handle_src_buffer(struct vpu_instance *inst, dma_addr_t rd_ptr
Quoted 8 lines
drivers/media/platform/chips-media/wave5/wave5-vpu-dec.c +1
-5- pix_mp->plane_fmt[0].sizeimage); -break ; - } -} -static int start_decode (struct vpu_instance *inst,u32 *fail_res) { struct v4l2_m2m_ctx *m2m_ctx = inst->v4l2_fh.m2m_ctx; @@ -389,6 +302,8 @@ static int handle_dynamic_resolution_change(struct vpu_instance*inst)
drivers/media/platform/chips-media/wave5/wave5-vpu-dec.c static int handle_dynamic_resolution_change(struct vpu_instance *inst)
Quoted 8 lines
drivers/media/platform/chips-media/wave5/wave5-vpu-dec.c +2
-0}if (p_dec_info->initial_info_obtained) { +const struct vpu_format *vpu_fmt; + inst->conf_win.left = initial_info->pic_crop_rect.left; inst->conf_win.top = initial_info->pic_crop_rect.top; inst->conf_win.width = initial_info->pic_width - @@ -396,10+311,27
Quoted 33 lines
@@ static int
handle_dynamic_resolution_change(struct vpu_instance *inst)drivers/media/platform/chips-media/wave5/wave5-vpu-dec.c +0
-0inst->conf_win.height = initial_info->pic_height - initial_info->pic_crop_rect.top -
initial_info->pic_crop_rect.bottom;drivers/media/platform/chips-media/wave5/wave5-vpu-dec.c +21
-4-wave5_update_pix_fmt (&inst->src_fmt, initial_info->pic_width, - initial_info->pic_height); -wave5_update_pix_fmt (&inst->dst_fmt, initial_info->pic_width, - initial_info->pic_height); + vpu_fmt =wave5_find_vpu_fmt (inst->src_fmt.pixelformat, + dec_fmt_list[VPU_FMT_TYPE_CODEC ]); +if (!vpu_fmt) +return -EINVAL ; + +wave5_update_pix_fmt (&inst->src_fmt, +VPU_FMT_TYPE_CODEC , + initial_info->pic_width, + initial_info->pic_height, + vpu_fmt->v4l2_frmsize); + + vpu_fmt =wave5_find_vpu_fmt (inst->dst_fmt.pixelformat, + dec_fmt_list[VPU_FMT_TYPE_RAW ]); +if (!vpu_fmt) +return -EINVAL ; + +wave5_update_pix_fmt (&inst->dst_fmt, +VPU_FMT_TYPE_RAW , + initial_info->pic_width, + initial_info->pic_height, + vpu_fmt->v4l2_frmsize); } v4l2_event_queue_fh(fh, &vpu_event_src_ch); @@ -545,15 +477,11 @@Quoted 1 line
static int wave5_vpu_dec_enum_framesizes(struct file *f, void *fh, struct
v4l2_fQuoted 1 line
vpu_fmt= wave5_find_vpu_fmt(fsize->pixel_format,dec_fmt_list[VPU_FMT_TYPE_RAW]);
drivers/media/platform/chips-media/wave5/wave5-vpu-dec.c static int wave5_vpu_dec_enum_framesizes(struct file *f, void *fh, struct v4l2_f · line 480
Quoted 3 lines
drivers/media/platform/chips-media/wave5/wave5-vpu-dec.c +1
-0if (!vpu_fmt)return -EINVAL ; +return -ENOTTY ;Huh? Where does this come from? It wasn't part of v4, and it doesn't make sense either.
It looks like a spurious test line that you forgot to remove.
Regards,
Quoted 8 lines
Quoted 1 line
Hans
Sorry for the confusion.
It should be removed.
Due to this code, we have been sharing incorrect v4l2-compliance results in the cover letter.To pass the v4l2-compliance test correctly, Can we change the following code to v6?
I think so, yes.
Regards,
Hans
Quoted 33 lines
Quoted 5 lines
Quoted 5 lines
}
Quoted 8 lines
drivers/media/platform/chips-media/wave5/wave5-vpu-dec.c static int wave5_vpu_dec_enum_framesizes(struct file *f, void *fh, struct v4l2_f · line 484
Quoted 8 lines
drivers/media/platform/chips-media/wave5/wave5-vpu-dec.c +1
-6fsize->type =V4L2_FRMSIZE_TYPE_CONTINUOUS ; - fsize->stepwise.min_width = vpu_fmt->min_width; - fsize->stepwise.max_width = vpu_fmt->max_width; - fsize->stepwise.step_width =1 ; - fsize->stepwise.min_height = vpu_fmt->min_height; - fsize->stepwise.max_height = vpu_fmt->max_height; - fsize->stepwise.step_height =1 ; + fsize->stepwise = *vpu_fmt->v4l2_frmsize;
fsize->stepwise.min_width=vpu_fmt->v4l2_frmsize->min_width;fsize->stepwise.max_width=vpu_fmt->v4l2_frmsize->max_width;fsize->stepwise.step_width=W5_DEC_CODEC_STEP_WIDTH;fsize->stepwise.min_height=vpu_fmt->v4l2_frmsize->min_height;fsize->stepwise.max_height=vpu_fmt->v4l2_frmsize->max_height;fsize->stepwise.step_height=W5_DEC_CODEC_STEP_HEIGHT;thanks
JacksonQuoted 7 lines
Quoted 3 lines
return 0;
}Regards,
Hans
Jackson Lee
maintainerPATCH v5 4/4 media: chips-media: wave5: Support YUV422 raw pixel-formats on the encoder.
In reply to Jackson LeeFrom: "jackson.lee" <[email protected]>
Add support for the YUV422P, NV16, NV61, YUV422M, NV16M, NV61M raw pixel-formats to the Wave5 encoder.
All these formats have a chroma subsampling ratio of 4:2:2 and therefore require a new image size calculation as the driver previously only handled a ratio of 4:2:0.
--- .../chips-media/wave5/wave5-vpu-enc.c | 89 +++++++++++++++---- 1 file changed, 74 insertions(+), 15 deletions(-)
drivers/media/platform/chips-media/wave5/wave5-vpu-enc.c +74 -15
@@ -66,6 +66,30 @@ static const struct vpu_format enc_fmt_list[FMT_TYPES][MAX_FMTS] = { .v4l2_pix_fmt = V4L2_PIX_FMT_NV21M, .v4l2_frmsize = &enc_frmsize[VPU_FMT_TYPE_RAW], }, + { + .v4l2_pix_fmt = V4L2_PIX_FMT_YUV422P, + .v4l2_frmsize = &enc_frmsize[VPU_FMT_TYPE_RAW], + }, + { + .v4l2_pix_fmt = V4L2_PIX_FMT_NV16, + .v4l2_frmsize = &enc_frmsize[VPU_FMT_TYPE_RAW], + }, + { + .v4l2_pix_fmt = V4L2_PIX_FMT_NV61, + .v4l2_frmsize = &enc_frmsize[VPU_FMT_TYPE_RAW], + }, + { + .v4l2_pix_fmt = V4L2_PIX_FMT_YUV422M, + .v4l2_frmsize = &enc_frmsize[VPU_FMT_TYPE_RAW], + }, + { + .v4l2_pix_fmt = V4L2_PIX_FMT_NV16M, + .v4l2_frmsize = &enc_frmsize[VPU_FMT_TYPE_RAW], + }, + { + .v4l2_pix_fmt = V4L2_PIX_FMT_NV61M, + .v4l2_frmsize = &enc_frmsize[VPU_FMT_TYPE_RAW], + }, } };
@@ -109,13 +133,26 @@ static int start_encode(struct vpu_instance *inst, u32 *fail_res)struct vb2_v4l2_buffer *dst_buf;struct frame_buffer frame_buf;struct enc_param pic_param; -u32 stride =ALIGN (inst->dst_fmt.width,32 ); -u32 luma_size = (stride * inst->dst_fmt.height); -u32 chroma_size = ((stride /2 ) * (inst->dst_fmt.height /2 )); +const struct v4l2_format_info *info; +u32 stride = inst->src_fmt.plane_fmt[0 ].bytesperline; +u32 luma_size =0 ; +u32 chroma_size =0 ;memset (&pic_param,0 ,sizeof (struct enc_param ));memset (&frame_buf,0 ,sizeof (struct frame_buffer )); + info =v4l2_format_info (inst->src_fmt.pixelformat); +if (!info) +return -EINVAL ; + +if (info->mem_planes ==1 ) { + luma_size = stride * inst->dst_fmt.height; + chroma_size = luma_size / (info->hdiv * info->vdiv); + }else { + luma_size = inst->src_fmt.plane_fmt[0 ].sizeimage; + chroma_size = inst->src_fmt.plane_fmt[1 ].sizeimage; + } + dst_buf =v4l2_m2m_next_dst_buf (m2m_ctx);if (!dst_buf) {dev_dbg (inst->dev->dev,"%s: No destination buffer found\n" , __func__);
@@ -480,6 +517,7 @@ static int wave5_vpu_enc_s_fmt_out(struct file *file, void *fh, struct v4l2_form {struct vpu_instance *inst =wave5_to_vpu_inst (fh);const struct vpu_format *vpu_fmt; +const struct v4l2_format_info *info;int i, ret; dev_dbg(inst->dev->dev, "%s: fourcc: %u width: %u height: %u num_planes: %u field: %u\n",
@@ -501,16 +539,20 @@ static int wave5_vpu_enc_s_fmt_out(struct file *file, void *fh, struct v4l2_form inst->src_fmt.plane_fmt[i].sizeimage = f->fmt.pix_mp.plane_fmt[i].sizeimage; } -if (inst->src_fmt.pixelformat ==V4L2_PIX_FMT_NV12 || - inst->src_fmt.pixelformat ==V4L2_PIX_FMT_NV12M ) { - inst->cbcr_interleave = true; - inst->nv21 = false; - }else if (inst->src_fmt.pixelformat ==V4L2_PIX_FMT_NV21 || - inst->src_fmt.pixelformat ==V4L2_PIX_FMT_NV21M ) { - inst->cbcr_interleave = true; + info =v4l2_format_info (inst->src_fmt.pixelformat); +if (!info) +return -EINVAL ; + + inst->cbcr_interleave = (info->comp_planes ==2 ) ? true : false; + +switch (inst->src_fmt.pixelformat) { +case V4L2_PIX_FMT_NV21 : +case V4L2_PIX_FMT_NV21M : +case V4L2_PIX_FMT_NV61 : +case V4L2_PIX_FMT_NV61M : inst->nv21 = true; - }else { - inst->cbcr_interleave = false; +break ; +default : inst->nv21 = false; }
@@ -1095,13 +1137,23 @@ static void wave5_vpu_enc_buf_queue(struct vb2_buffer *vb)v4l2_m2m_buf_queue (m2m_ctx, vbuf); } -static void wave5_set_enc_openparam (struct enc_open_param *open_param, -struct vpu_instance *inst) +static int wave5_set_enc_openparam (struct enc_open_param *open_param, +struct vpu_instance *inst) {struct enc_wave_param input = inst->enc_param; +const struct v4l2_format_info *info;u32 num_ctu_row =ALIGN (inst->dst_fmt.height,64 ) /64 ;u32 num_mb_row =ALIGN (inst->dst_fmt.height,16 ) /16 ; + info =v4l2_format_info (inst->src_fmt.pixelformat); +if (!info) +return -EINVAL ; + +if (info->hdiv ==2 && info->vdiv ==1 ) + open_param->src_format =FORMAT_422 ; +else + open_param->src_format =FORMAT_420 ; + open_param->wave_param.gop_preset_idx =PRESET_IDX_IPP_SINGLE ; open_param->wave_param.hvs_qp_scale =2 ; open_param->wave_param.hvs_max_delta_qp =10 ;
@@ -1190,6 +1242,8 @@ static void wave5_set_enc_openparam(struct enc_open_param *open_param, open_param->wave_param.intra_refresh_arg = num_ctu_row; } open_param->wave_param.forced_idr_header_enable = input.forced_idr_header_enable; + +return 0 ; }static int initialize_sequence (struct vpu_instance *inst)
@@ -1285,7 +1339,12 @@ static int wave5_vpu_enc_start_streaming(struct vb2_queue *q, unsigned int countmemset (&open_param,0 ,sizeof (struct enc_open_param )); -wave5_set_enc_openparam (&open_param, inst); + ret =wave5_set_enc_openparam (&open_param, inst); +if (ret) { +dev_dbg (inst->dev->dev,"%s: wave5_set_enc_openparam, fail: %d\n" , + __func__, ret); + goto return_buffers; + } ret =wave5_vpu_enc_open (inst, &open_param);if (ret) {
Signature · 1 line
2.43.0