media: qcom: iris: encoder feature enhancements batch2
Subsystems (4)
cover media: qcom: iris: encoder feature enhancements batch2
Hi All,
This patch series introduces several enhancements to the Qualcomm Iris encoder driver, improving support for V4L2 controls and enabling more
video encoding features.
All patches have been tested with v4l2-compliance and v4l2-ctl on gen1:QCS6490, gen2:QCS8300, QCS8550, QCS9100, X1E-80100.
Commands used for V4l2-ctl validation:
Intra Refresh:
./v4l2-ctl --verbose -d /dev/video1 \
--set-fmt-video-out=width=1920,height=1080,pixelformat=NV12 \
--set-selection-output target=crop,width=1920,height=1080 \
--set-fmt-video=pixelformat=H264 --stream-mmap --stream-out-mmap \
--stream-from=input_nv12_1080p.yuv \
--stream-to=output/ir_random.h264 \
--set-ctrl intra_refresh_period_type=0,intra_refresh_period=30
./v4l2-ctl --verbose -d /dev/video1 \
--set-fmt-video-out=width=1920,height=1080,pixelformat=NV12 \
--set-selection-output target=crop,width=1920,height=1080 \
--set-fmt-video=pixelformat=H264 --stream-mmap --stream-out-mmap \
--stream-from=input_nv12_1080p.yuv \
--stream-to=output/ir_cyclic.h264 \
--set-ctrl intra_refresh_period_type=1,intra_refresh_period=30
./v4l2-ctl --verbose -d /dev/video1 \
--set-fmt-video-out=width=1920,height=1080,pixelformat=NV12 \
--set-selection-output target=crop,width=1920,height=1080 \
--set-fmt-video=pixelformat=HEVC --stream-mmap --stream-out-mmap \
--stream-from=input_nv12_1080p.yuv \
--stream-to=output/ir_random.h265 \
--set-ctrl intra_refresh_period_type=0,intra_refresh_period=30
./v4l2-ctl --verbose -d /dev/video1 \
--set-fmt-video-out=width=1920,height=1080,pixelformat=NV12 \
--set-selection-output target=crop,width=1920,height=1080 \
--set-fmt-video=pixelformat=HEVC --stream-mmap --stream-out-mmap \
--stream-from=input_nv12_1080p.yuv \
--stream-to=output/ir_cyclic.h265 \
--set-ctrl intra_refresh_period_type=1,intra_refresh_period=30
B frames:
./v4l2-ctl --verbose -d /dev/video1 \
--set-fmt-video-out=width=1920,height=1080,pixelformat=NV12 \
--set-selection-output target=crop,width=1920,height=1080 \
--set-fmt-video=pixelformat=H264 --stream-mmap --stream-out-mmap \
--stream-from=input_nv12_1080p.yuv \
--stream-to=output/b_frames.h264 \
--set-ctrl video_b_frames=1
./v4l2-ctl --verbose -d /dev/video1 \
--set-fmt-video-out=width=1920,height=1080,pixelformat=NV12 \
--set-selection-output target=crop,width=1920,height=1080 \
--set-fmt-video=pixelformat=HEVC --stream-mmap --stream-out-mmap \
--stream-from=input_nv12_1080p.yuv \
--stream-to=output/b_frames.h265 \
--set-ctrl video_b_frames=1
LTR:
./v4l2-ctl --verbose -d /dev/video1 \
--set-fmt-video-out=width=1920,height=1080,pixelformat=NV12 \
--set-selection-output target=crop,width=1920,height=1080 \
--set-fmt-video=pixelformat=H264 --stream-mmap --stream-out-mmap \
--stream-from=input_nv12_1080p.yuv \
--stream-to=output/ltr.h264 \
--set-ctrl ltr_count=2,frame_ltr_index=1
./v4l2-ctl --verbose -d /dev/video1 \
--set-fmt-video-out=width=1920,height=1080,pixelformat=NV12 \
--set-selection-output target=crop,width=1920,height=1080 \
--set-fmt-video=pixelformat=HEVC --stream-mmap --stream-out-mmap \
--stream-from=input_nv12_1080p.yuv \
--stream-to=output/ltr.h265 \
--set-ctrl ltr_count=2,frame_ltr_index=1
Hierarchical Coding:
./v4l2-ctl --verbose -d /dev/video1 \
--set-fmt-video-out=width=1920,height=1080,pixelformat=NV12 \
--set-selection-output target=crop,width=1920,height=1080 \
--set-fmt-video=pixelformat=H264 --stream-mmap --stream-out-mmap \
--stream-from=input_nv12_1080p.yuv \
--stream-to=output/hier_coding.h264 \
--set-ctrl enable_h264_hierarchical_coding=1,h264_hierarchical_coding_type=1,h264_number_of_hc_layers=3
./v4l2-ctl --verbose -d /dev/video1 \
--set-fmt-video-out=width=1920,height=1080,pixelformat=NV12 \
--set-selection-output target=crop,width=1920,height=1080 \
--set-fmt-video=pixelformat=HEVC --stream-mmap --stream-out-mmap \
--stream-from=input_nv12_1080p.yuv \
--stream-to=output/hier_coding.h265 \
--set-ctrl hevc_hierarchical_coding_type=1,hevc_hierarchical_coding_layer=5
The result of v4l2-compliance on QCS8300:
v4l2-compliance 1.31.0-5379, 64 bits, 64-bit time_t v4l2-compliance SHA: 14c988631ad4 2025-11-11 11:19:35
Compliance test for iris_driver device /dev/video1:
Driver Info:
Driver name : iris_driver
Card type : Iris Encoder
Bus info : platform:aa00000.video-codec
Driver version : 6.18.0
Capabilities : 0x84204000 Video Memory-to-Memory Multiplanar Streaming
Extended Pix Format
Device Capabilities
Device Caps : 0x04204000
Video Memory-to-Memory Multiplanar Streaming
Extended Pix Format
Detected Stateful Encoder
Required ioctls:
test VIDIOC_QUERYCAP: OK
test invalid ioctls: OK
Allow for multiple opens:
test second /dev/video1 open: OK
test VIDIOC_QUERYCAP: OK
test VIDIOC_G/S_PRIORITY: OK
test for unlimited opens: OK
Debug ioctls:
test VIDIOC_DBG_G/S_REGISTER: OK (Not Supported) test VIDIOC_LOG_STATUS: OK (Not Supported)
Input ioctls:
test VIDIOC_G/S_TUNER/ENUM_FREQ_BANDS: OK (Not Supported) test VIDIOC_G/S_FREQUENCY: OK (Not Supported) test VIDIOC_S_HW_FREQ_SEEK: OK (Not Supported) test VIDIOC_ENUMAUDIO: OK (Not Supported)
test VIDIOC_G/S/ENUMINPUT: OK (Not Supported) test VIDIOC_G/S_AUDIO: OK (Not Supported)
Inputs: 0 Audio Inputs: 0 Tuners: 0
Output ioctls:
test VIDIOC_G/S_MODULATOR: OK (Not Supported) test VIDIOC_G/S_FREQUENCY: OK (Not Supported) test VIDIOC_ENUMAUDOUT: OK (Not Supported) test VIDIOC_G/S/ENUMOUTPUT: OK (Not Supported) test VIDIOC_G/S_AUDOUT: OK (Not Supported)
Outputs: 0 Audio Outputs: 0 Modulators: 0
Input/Output configuration ioctls:
test VIDIOC_ENUM/G/S/QUERY_STD: OK (Not Supported) test VIDIOC_ENUM/G/S/QUERY_DV_TIMINGS: OK (Not Supported) test VIDIOC_DV_TIMINGS_CAP: OK (Not Supported) test VIDIOC_G/S_EDID: OK (Not Supported)
Control ioctls:
test VIDIOC_QUERY_EXT_CTRL/QUERYMENU: OK test VIDIOC_QUERYCTRL: OK
test VIDIOC_G/S_CTRL: OK
test VIDIOC_G/S/TRY_EXT_CTRLS: OK test VIDIOC_(UN)SUBSCRIBE_EVENT/DQEVENT: OK test VIDIOC_G/S_JPEGCOMP: OK (Not Supported) Standard Controls: 52 Private Controls: 0
Format ioctls:
test VIDIOC_ENUM_FMT/FRAMESIZES/FRAMEINTERVALS: OK test VIDIOC_G/S_PARM: OK
test VIDIOC_G_FBUF: OK (Not Supported) test VIDIOC_G_FMT: OK
test VIDIOC_TRY_FMT: OK
test VIDIOC_S_FMT: OK
test VIDIOC_G_SLICED_VBI_CAP: OK (Not Supported) test Cropping: OK
test Composing: OK (Not Supported)
test Scaling: OK (Not Supported)
Codec ioctls:
test VIDIOC_(TRY_)ENCODER_CMD: OK
test VIDIOC_G_ENC_INDEX: OK (Not Supported) test VIDIOC_(TRY_)DECODER_CMD: OK (Not Supported)
Buffer ioctls:
test VIDIOC_REQBUFS/CREATE_BUFS/QUERYBUF: OK test CREATE_BUFS maximum buffers: OK test VIDIOC_REMOVE_BUFS: OK
test VIDIOC_EXPBUF: OK
test Requests: OK (Not Supported) test blocking wait: OK
Test input 0:
Streaming ioctls:
test read/write: OK (Not Supported) Video Capture Multiplanar: Captured 61 buffers test MMAP (select, REQBUFS): OK
Video Capture Multiplanar: Captured 61 buffers test MMAP (epoll, REQBUFS): OK
Video Capture Multiplanar: Captured 61 buffers test MMAP (select, CREATE_BUFS): OK Video Capture Multiplanar: Captured 61 buffers test MMAP (epoll, CREATE_BUFS): OK
test USERPTR (select): OK (Not Supported) test DMABUF: Cannot test, specify --expbuf-device
Total for iris_driver device /dev/video1: 54, Succeeded: 54, Failed: 0, Warnings: 0
The result of v4l2-compliance on QCS6490:
v4l2-compliance 1.31.0-5379, 64 bits, 64-bit time_t v4l2-compliance SHA: 14c988631ad4 2025-11-11 11:19:35
Compliance test for iris_driver device /dev/video1:
Driver Info:
Driver name : iris_driver
Card type : Iris Encoder
Bus info : platform:aa00000.video-codec
Driver version : 6.18.0
Capabilities : 0x84204000 Video Memory-to-Memory Multiplanar Streaming
Extended Pix Format
Device Capabilities
Device Caps : 0x04204000
Video Memory-to-Memory Multiplanar Streaming
Extended Pix Format
Detected Stateful Encoder
Required ioctls:
test VIDIOC_QUERYCAP: OK
test invalid ioctls: OK
Allow for multiple opens:
test second /dev/video1 open: OK
test VIDIOC_QUERYCAP: OK
test VIDIOC_G/S_PRIORITY: OK
test for unlimited opens: OK
Debug ioctls:
test VIDIOC_DBG_G/S_REGISTER: OK (Not Supported) test VIDIOC_LOG_STATUS: OK (Not Supported)
Input ioctls:
test VIDIOC_G/S_TUNER/ENUM_FREQ_BANDS: OK (Not Supported) test VIDIOC_G/S_FREQUENCY: OK (Not Supported) test VIDIOC_S_HW_FREQ_SEEK: OK (Not Supported) test VIDIOC_ENUMAUDIO: OK (Not Supported)
test VIDIOC_G/S/ENUMINPUT: OK (Not Supported) test VIDIOC_G/S_AUDIO: OK (Not Supported)
Inputs: 0 Audio Inputs: 0 Tuners: 0
Output ioctls:
test VIDIOC_G/S_MODULATOR: OK (Not Supported) test VIDIOC_G/S_FREQUENCY: OK (Not Supported) test VIDIOC_ENUMAUDOUT: OK (Not Supported) test VIDIOC_G/S/ENUMOUTPUT: OK (Not Supported) test VIDIOC_G/S_AUDOUT: OK (Not Supported)
Outputs: 0 Audio Outputs: 0 Modulators: 0
Input/Output configuration ioctls:
test VIDIOC_ENUM/G/S/QUERY_STD: OK (Not Supported) test VIDIOC_ENUM/G/S/QUERY_DV_TIMINGS: OK (Not Supported) test VIDIOC_DV_TIMINGS_CAP: OK (Not Supported) test VIDIOC_G/S_EDID: OK (Not Supported)
Control ioctls:
test VIDIOC_QUERY_EXT_CTRL/QUERYMENU: OK test VIDIOC_QUERYCTRL: OK
test VIDIOC_G/S_CTRL: OK
test VIDIOC_G/S/TRY_EXT_CTRLS: OK test VIDIOC_(UN)SUBSCRIBE_EVENT/DQEVENT: OK test VIDIOC_G/S_JPEGCOMP: OK (Not Supported) Standard Controls: 27 Private Controls: 0
Format ioctls:
test VIDIOC_ENUM_FMT/FRAMESIZES/FRAMEINTERVALS: OK test VIDIOC_G/S_PARM: OK
test VIDIOC_G_FBUF: OK (Not Supported) test VIDIOC_G_FMT: OK
test VIDIOC_TRY_FMT: OK
test VIDIOC_S_FMT: OK
test VIDIOC_G_SLICED_VBI_CAP: OK (Not Supported) test Cropping: OK
test Composing: OK (Not Supported)
test Scaling: OK (Not Supported)
Codec ioctls:
test VIDIOC_(TRY_)ENCODER_CMD: OK
test VIDIOC_G_ENC_INDEX: OK (Not Supported) test VIDIOC_(TRY_)DECODER_CMD: OK (Not Supported)
Buffer ioctls:
test VIDIOC_REQBUFS/CREATE_BUFS/QUERYBUF: OK test CREATE_BUFS maximum buffers: OK test VIDIOC_REMOVE_BUFS: OK
test VIDIOC_EXPBUF: OK
test Requests: OK (Not Supported) test blocking wait: OK
Test input 0:
Streaming ioctls:
test read/write: OK (Not Supported) Video Capture Multiplanar: Captured 61 buffers test MMAP (select, REQBUFS): OK
Video Capture Multiplanar: Captured 61 buffers test MMAP (epoll, REQBUFS): OK
Video Capture Multiplanar: Captured 61 buffers test MMAP (select, CREATE_BUFS): OK Video Capture Multiplanar: Captured 61 buffers test MMAP (epoll, CREATE_BUFS): OK
test USERPTR (select): OK (Not Supported) test DMABUF: Cannot test, specify --expbuf-device
Total for iris_driver device /dev/video1: 54, Succeeded: 54, Failed: 0, Warnings: 0
Dependencies:
https://lore.kernel.org/all/20251114-iris_encoder_enhancements-v6-0-d6d35a92635d@oss.qualcomm.com/
---
Wangao Wang (4):
media: qcom: iris: Add intra refresh support for gen1 encoder
media: qcom: iris: Add Long-Term Reference support for encoder
media: qcom: iris: Add B frames support for encoder
media: qcom: iris: Add hierarchical coding support for encoder
drivers/media/platform/qcom/iris/iris_ctrls.c | 337 ++++++++++++++++++++- drivers/media/platform/qcom/iris/iris_ctrls.h | 12 +- .../platform/qcom/iris/iris_hfi_gen1_command.c | 55 ++++ .../platform/qcom/iris/iris_hfi_gen1_defines.h | 45 +++ .../platform/qcom/iris/iris_hfi_gen2_defines.h | 12 + drivers/media/platform/qcom/iris/iris_instance.h | 4 + .../platform/qcom/iris/iris_platform_common.h | 19 ++ .../media/platform/qcom/iris/iris_platform_gen1.c | 94 +++++- .../media/platform/qcom/iris/iris_platform_gen2.c | 90 +++++- drivers/media/platform/qcom/iris/iris_vpu_buffer.c | 58 +++- 10 files changed, 710 insertions(+), 16 deletions(-)
---
base-commit: 92fd6e84175befa1775e5c0ab682938eca27c0b2
change-id: 20251125-batch2_iris_encoder_enhancements-3e5c42b93a25
prerequisite-message-id: 20251114-iris_encoder_enhancements-v6-0-d6d35a92635d@oss.qualcomm.com
prerequisite-patch-id: 2b77a7b9bfb436751da0bf69488dbff567a38479
prerequisite-patch-id: 190f29ef211b046f0d031e3a4b52f2c3bccd0cd9
prerequisite-patch-id: 92ff1a1958eeacd53d70e155bb8214f9987ddf85
prerequisite-patch-id: 0dae6aaa8db7df0729436cf9268d29ea363f0eed
prerequisite-patch-id: 6382693f5a5a7438660f2e592b30163551d92791
prerequisite-patch-id: 9aa16211c36540a61d219eb25f09b7625b9bdbde
Best regards,
Signature · 1 line
Wangao Wang <[email protected]>
PATCH 1/4 media: qcom: iris: Add intra refresh support for gen1 encoder
Add support for intra refresh configuration on gen1 encoder by enabling V4L2_CID_MPEG_VIDEO_INTRA_REFRESH_PERIOD and V4L2_CID_MPEG_VIDEO_INTRA_REFRESH_PERIOD_TYPE controls.
Key changes:
Added intra refresh capability for gen1 encoder.
Implemented handler for intra refresh period and type.
Defined HFI property and structure for gen1.
Renamed iris_set_ir_period_gen2() for gen2 to keep implementation separate.
--- drivers/media/platform/qcom/iris/iris_ctrls.c | 36 +++++++++++++++++++++- drivers/media/platform/qcom/iris/iris_ctrls.h | 3 +- .../platform/qcom/iris/iris_hfi_gen1_command.c | 8 +++++ .../platform/qcom/iris/iris_hfi_gen1_defines.h | 13 ++++++++ .../media/platform/qcom/iris/iris_platform_gen1.c | 19 ++++++++++++ .../media/platform/qcom/iris/iris_platform_gen2.c | 2 +- 6 files changed, 78 insertions(+), 3 deletions(-)
drivers/media/platform/qcom/iris/iris_ctrls.c +35 -1
@@ -962,7 +962,41 @@ int iris_set_flip(struct iris_inst *inst, enum platform_inst_fw_cap_type cap_id) &hfi_val, sizeof(u32)); } -int iris_set_ir_period (struct iris_inst *inst,enum platform_inst_fw_cap_type cap_id) +int iris_set_ir_period_gen1 (struct iris_inst *inst,enum platform_inst_fw_cap_type cap_id) +{ +const struct iris_hfi_command_ops *hfi_ops = inst->core->hfi_ops; +struct v4l2_pix_format_mplane *fmt = &inst->fmt_dst->fmt.pix_mp; +u32 ir_period = inst->fw_caps[cap_id].value; +u32 hfi_id = inst->fw_caps[cap_id].hfi_id; +struct hfi_intra_refresh hfi_val; + +if (!ir_period) +return -EINVAL ; + +if (inst->fw_caps[IR_TYPE ].value == +V4L2_CID_MPEG_VIDEO_INTRA_REFRESH_PERIOD_TYPE_RANDOM ) { + hfi_val.mode =HFI_INTRA_REFRESH_RANDOM ; + }else if (inst->fw_caps[IR_TYPE ].value == +V4L2_CID_MPEG_VIDEO_INTRA_REFRESH_PERIOD_TYPE_CYCLIC ) { + hfi_val.mode =HFI_INTRA_REFRESH_CYCLIC ; + }else { +return -EINVAL ; + } + + hfi_val.mbs = fmt->width * fmt->height; + hfi_val.mbs /=16 *16 ; +if (hfi_val.mbs % ir_period) + hfi_val.mbs++; + hfi_val.mbs /= ir_period; + +return hfi_ops->session_set_property (inst, hfi_id, +HFI_HOST_FLAGS_NONE , +iris_get_port_info (inst, cap_id), +HFI_PAYLOAD_STRUCTURE , + &hfi_val,sizeof (hfi_val)); +} + +int iris_set_ir_period_gen2 (struct iris_inst *inst,enum platform_inst_fw_cap_type cap_id) {const struct iris_hfi_command_ops *hfi_ops = inst->core->hfi_ops;struct vb2_queue *q =v4l2_m2m_get_dst_vq (inst->m2m_ctx);
drivers/media/platform/qcom/iris/iris_ctrls.h +2 -1
@@ -34,7 +34,8 @@ int iris_set_frame_qp(struct iris_inst *inst, enum platform_inst_fw_cap_type capint iris_set_qp_range (struct iris_inst *inst,enum platform_inst_fw_cap_type cap_id);int iris_set_rotation (struct iris_inst *inst,enum platform_inst_fw_cap_type cap_id);int iris_set_flip (struct iris_inst *inst,enum platform_inst_fw_cap_type cap_id); -int iris_set_ir_period (struct iris_inst *inst,enum platform_inst_fw_cap_type cap_id); +int iris_set_ir_period_gen1 (struct iris_inst *inst,enum platform_inst_fw_cap_type cap_id); +int iris_set_ir_period_gen2 (struct iris_inst *inst,enum platform_inst_fw_cap_type cap_id);int iris_set_properties (struct iris_inst *inst,u32 plane);#endif
drivers/media/platform/qcom/iris/iris_hfi_gen1_command.c +8 -0
@@ -685,6 +685,14 @@ iris_hfi_gen1_packet_session_set_property(struct hfi_session_set_property_pkt *p packet->shdr.hdr.size +=sizeof (u32) +sizeof (*plane_actual_info);break ; } +case HFI_PROPERTY_PARAM_VENC_INTRA_REFRESH : { +struct hfi_intra_refresh *in = pdata, *intra_refresh = prop_data; + + intra_refresh->mode = in->mode; + intra_refresh->mbs = in->mbs; + packet->shdr.hdr.size +=sizeof (u32) +sizeof (*intra_refresh); +break ; + }default :return -EINVAL ; }
drivers/media/platform/qcom/iris/iris_hfi_gen1_defines.h +13 -0
@@ -139,6 +139,14 @@#define HFI_PROPERTY_PARAM_VENC_H264_DEBLOCK_CONTROL 0x2005003#define HFI_PROPERTY_PARAM_VENC_RATE_CONTROL 0x2005004#define HFI_PROPERTY_PARAM_VENC_SESSION_QP_RANGE_V2 0x2005009 + +#define HFI_INTRA_REFRESH_NONE 0x1 +#define HFI_INTRA_REFRESH_CYCLIC 0x2 +#define HFI_INTRA_REFRESH_ADAPTIVE 0x3 +#define HFI_INTRA_REFRESH_CYCLIC_ADAPTIVE 0x4 +#define HFI_INTRA_REFRESH_RANDOM 0x5 + +#define HFI_PROPERTY_PARAM_VENC_INTRA_REFRESH 0x200500d#define HFI_PROPERTY_PARAM_VENC_MAX_NUM_B_FRAMES 0x2005020#define HFI_PROPERTY_CONFIG_VENC_TARGET_BITRATE 0x2006001#define HFI_PROPERTY_CONFIG_VENC_SYNC_FRAME_SEQUENCE_HEADER 0x2006008
@@ -447,6 +455,11 @@ struct hfi_framerate {u32 framerate; }; +struct hfi_intra_refresh { +u32 mode; +u32 mbs; +}; +struct hfi_event_data {u32 error;u32 height;
drivers/media/platform/qcom/iris/iris_platform_gen1.c +19 -0
@@ -230,6 +230,25 @@ static const struct platform_inst_fw_cap inst_fw_cap_sm8250_enc[] = { .flags = CAP_FLAG_OUTPUT_PORT, .set = iris_set_qp_range, }, + { + .cap_id = IR_TYPE, + .min = V4L2_CID_MPEG_VIDEO_INTRA_REFRESH_PERIOD_TYPE_RANDOM, + .max = V4L2_CID_MPEG_VIDEO_INTRA_REFRESH_PERIOD_TYPE_CYCLIC, + .step_or_mask =BIT (V4L2_CID_MPEG_VIDEO_INTRA_REFRESH_PERIOD_TYPE_RANDOM ) | + BIT(V4L2_CID_MPEG_VIDEO_INTRA_REFRESH_PERIOD_TYPE_CYCLIC), + .value = V4L2_CID_MPEG_VIDEO_INTRA_REFRESH_PERIOD_TYPE_RANDOM, + .flags = CAP_FLAG_OUTPUT_PORT | CAP_FLAG_MENU, + }, + { + .cap_id = IR_PERIOD, + .min = 0, + .max = INT_MAX, + .step_or_mask = 1, + .value = 0, + .hfi_id = HFI_PROPERTY_PARAM_VENC_INTRA_REFRESH, + .flags = CAP_FLAG_OUTPUT_PORT, + .set = iris_set_ir_period_gen1, + }, }; static struct platform_inst_caps platform_inst_cap_sm8250 = {
drivers/media/platform/qcom/iris/iris_platform_gen2.c +1 -1
@@ -635,7 +635,7 @@ static const struct platform_inst_fw_cap inst_fw_cap_sm8550_enc[] = { .value = 0, .flags = CAP_FLAG_OUTPUT_PORT | CAP_FLAG_DYNAMIC_ALLOWED, - .set = iris_set_ir_period, + .set = iris_set_ir_period_gen2, }, };
Signature · 1 line
2.43.0
Bryan O'Donoghue
maintainerRe: [PATCH 1/4] media: qcom: iris: Add intra refresh support for gen1 encoder
drivers/media/platform/qcom/iris/iris_ctrls.c int iris_set_flip(struct iris_inst *inst, enum platform_inst_fw_cap_type cap_id) · line 987
Quoted 2 lines · Wangao Wang
drivers/media/platform/qcom/iris/iris_ctrls.c +2
-0+ hfi_val.mbs = fmt->width * fmt->height; + hfi_val.mbs /=16 *16 ;
256
But why ? Also why express it as 16 * 16 ?
drivers/media/platform/qcom/iris/iris_ctrls.c int iris_set_flip(struct iris_inst *inst, enum platform_inst_fw_cap_type cap_id) · line 990
Quoted 3 lines
drivers/media/platform/qcom/iris/iris_ctrls.c +3
-0+if (hfi_val.mbs % ir_period) + hfi_val.mbs++; + hfi_val.mbs /= ir_period;
This code deserves some commentary.
---
bod
Re: [PATCH 1/4] media: qcom: iris: Add intra refresh support for gen1 encoder
Quoted 8 lines · Bryan O'Donoghue
Quoted 2 lines · Wangao Wang
+ hfi_val.mbs =
fmt->width*fmt->height;
+ hfi_val.mbs /= 16 * 16;256
But why ? Also why express it as 16 * 16 ?
Quoted 8 lines
Quoted 3 lines
+ if (hfi_val.mbs %
ir_period)
+ hfi_val.mbs++;
+ hfi_val.mbs /=ir_period;This code deserves some commentary.
---
bod
16 * 16 is the size of a macroblock.
Here, we first calculate the total number of macroblocks in one frame, then determine the number of macroblocks that need intra refresh in each frame based on the ir_period. All macroblocks must be refreshed within a single ir_period.
However, there is an issue: the macroblock sizes for AVC and HEVC are different. I will address this in a later patch and add comments accordingly.
Signature · 2 lines
Best Regards, Wangao
Dikshita Agarwal
maintainerRe: [PATCH 1/4] media: qcom: iris: Add intra refresh support for gen1 encoder
In reply to Wangao WangQuoted 9 lines · Wangao Wang
Add support for intra refresh configuration on gen1 encoder by enabling
V4L2_CID_MPEG_VIDEO_INTRA_REFRESH_PERIODandV4L2_CID_MPEG_VIDEO_INTRA_REFRESH_PERIOD_TYPEcontrols.Key changes:
Added intra refresh capability for gen1 encoder.
Implemented handler for intra refresh period and type.
Defined HFI property and structure for gen1.
Renamediris_set_ir_period_gen2()for gen2 to keep implementation separate.
No need to explain the code in commit text.
Quoted 36 lines
Signed-off-by Wangao Wang <[email protected]>--- drivers/media/platform/qcom/iris/iris_ctrls.c | 36 +++++++++++++++++++++- drivers/media/platform/qcom/iris/iris_ctrls.h | 3 +- .../platform/qcom/iris/iris_hfi_gen1_command.c | 8 +++++ .../platform/qcom/iris/iris_hfi_gen1_defines.h | 13 ++++++++ .../media/platform/qcom/iris/iris_platform_gen1.c | 19 ++++++++++++ .../media/platform/qcom/iris/iris_platform_gen2.c | 2 +- 6 files changed, 78 insertions(+), 3 deletions(-)drivers/media/platform/qcom/iris/iris_ctrls.c +16
-1@@ -962,7 +962,41 @@ int iris_set_flip(struct iris_inst *inst, enum platform_inst_fw_cap_type cap_id) &hfi_val, sizeof(u32)); } -int iris_set_ir_period (struct iris_inst *inst,enum platform_inst_fw_cap_type cap_id) +int iris_set_ir_period_gen1 (struct iris_inst *inst,enum platform_inst_fw_cap_type cap_id) +{ +const struct iris_hfi_command_ops *hfi_ops = inst->core->hfi_ops; +struct v4l2_pix_format_mplane *fmt = &inst->fmt_dst->fmt.pix_mp; +u32 ir_period = inst->fw_caps[cap_id].value; +u32 hfi_id = inst->fw_caps[cap_id].hfi_id; +struct hfi_intra_refresh hfi_val; + +if (!ir_period) +return -EINVAL ; + +if (inst->fw_caps[IR_TYPE ].value == +V4L2_CID_MPEG_VIDEO_INTRA_REFRESH_PERIOD_TYPE_RANDOM ) { + hfi_val.mode =HFI_INTRA_REFRESH_RANDOM ; + }else if (inst->fw_caps[IR_TYPE ].value == +V4L2_CID_MPEG_VIDEO_INTRA_REFRESH_PERIOD_TYPE_CYCLIC ) {
drivers/media/platform/qcom/iris/iris_ctrls.c int iris_set_flip(struct iris_inst *inst, enum platform_inst_fw_cap_type cap_id) · line 990
Quoted 10 lines
drivers/media/platform/qcom/iris/iris_ctrls.c +10
-0+ hfi_val.mode =HFI_INTRA_REFRESH_CYCLIC ; + }else { +return -EINVAL ; + } + + hfi_val.mbs = fmt->width * fmt->height; + hfi_val.mbs /=16 *16 ; +if (hfi_val.mbs % ir_period) + hfi_val.mbs++; + hfi_val.mbs /= ir_period;
Can we have some comment here to explain what is this calculation for?
Quoted 50 lines
drivers/media/platform/qcom/iris/iris_ctrls.c +9
-0+ +return hfi_ops->session_set_property (inst, hfi_id, +HFI_HOST_FLAGS_NONE , +iris_get_port_info (inst, cap_id), +HFI_PAYLOAD_STRUCTURE , + &hfi_val,sizeof (hfi_val)); +} + +int iris_set_ir_period_gen2 (struct iris_inst *inst,enum platform_inst_fw_cap_type cap_id) {const struct iris_hfi_command_ops *hfi_ops = inst->core->hfi_ops;struct vb2_queue *q =v4l2_m2m_get_dst_vq (inst->m2m_ctx);drivers/media/platform/qcom/iris/iris_ctrls.h +2
-1@@ -34,7 +34,8 @@ int iris_set_frame_qp(struct iris_inst *inst, enum platform_inst_fw_cap_type capint iris_set_qp_range (struct iris_inst *inst,enum platform_inst_fw_cap_type cap_id);int iris_set_rotation (struct iris_inst *inst,enum platform_inst_fw_cap_type cap_id);int iris_set_flip (struct iris_inst *inst,enum platform_inst_fw_cap_type cap_id); -int iris_set_ir_period (struct iris_inst *inst,enum platform_inst_fw_cap_type cap_id); +int iris_set_ir_period_gen1 (struct iris_inst *inst,enum platform_inst_fw_cap_type cap_id); +int iris_set_ir_period_gen2 (struct iris_inst *inst,enum platform_inst_fw_cap_type cap_id);int iris_set_properties (struct iris_inst *inst,u32 plane);#endif drivers/media/platform/qcom/iris/iris_hfi_gen1_command.c +8
-0@@ -685,6 +685,14 @@ iris_hfi_gen1_packet_session_set_property(struct hfi_session_set_property_pkt *p packet->shdr.hdr.size +=sizeof (u32) +sizeof (*plane_actual_info);break ; } +case HFI_PROPERTY_PARAM_VENC_INTRA_REFRESH : { +struct hfi_intra_refresh *in = pdata, *intra_refresh = prop_data; + + intra_refresh->mode = in->mode; + intra_refresh->mbs = in->mbs; + packet->shdr.hdr.size +=sizeof (u32) +sizeof (*intra_refresh); +break ; + }default :return -EINVAL ; }drivers/media/platform/qcom/iris/iris_hfi_gen1_defines.h +0
-0
drivers/media/platform/qcom/iris/iris_hfi_gen1_defines.h line 146
Quoted 8 lines
drivers/media/platform/qcom/iris/iris_hfi_gen1_defines.h +5
-0@@ -139,6 +139,14 @@#define HFI_PROPERTY_PARAM_VENC_H264_DEBLOCK_CONTROL 0x2005003#define HFI_PROPERTY_PARAM_VENC_RATE_CONTROL 0x2005004#define HFI_PROPERTY_PARAM_VENC_SESSION_QP_RANGE_V2 0x2005009 + +#define HFI_INTRA_REFRESH_NONE 0x1 +#define HFI_INTRA_REFRESH_CYCLIC 0x2 +#define HFI_INTRA_REFRESH_ADAPTIVE 0x3 +#define HFI_INTRA_REFRESH_CYCLIC_ADAPTIVE 0x4
HFI_INTRA_REFRESH_ADAPTIVE and HFI_INTRA_REFRESH_CYCLIC_ADAPTIVE are not being used, do we need these macros here?
Quoted 29 lines
drivers/media/platform/qcom/iris/iris_hfi_gen1_defines.h +8
-0+#define HFI_INTRA_REFRESH_RANDOM 0x5 + +#define HFI_PROPERTY_PARAM_VENC_INTRA_REFRESH 0x200500d#define HFI_PROPERTY_PARAM_VENC_MAX_NUM_B_FRAMES 0x2005020#define HFI_PROPERTY_CONFIG_VENC_TARGET_BITRATE 0x2006001#define HFI_PROPERTY_CONFIG_VENC_SYNC_FRAME_SEQUENCE_HEADER 0x2006008@@ -447,6 +455,11 @@ struct hfi_framerate {u32 framerate; }; +struct hfi_intra_refresh { +u32 mode; +u32 mbs; +}; +struct hfi_event_data {u32 error;u32 height;drivers/media/platform/qcom/iris/iris_platform_gen1.c +3
-0@@ -230,6 +230,25 @@ static const struct platform_inst_fw_cap inst_fw_cap_sm8250_enc[] = { .flags = CAP_FLAG_OUTPUT_PORT, .set = iris_set_qp_range, }, + { + .cap_id = IR_TYPE, + .min = V4L2_CID_MPEG_VIDEO_INTRA_REFRESH_PERIOD_TYPE_RANDOM,
drivers/media/platform/qcom/iris/iris_platform_gen1.c static const struct platform_inst_fw_cap inst_fw_cap_sm8250_enc[] = { · line 245
Quoted 10 lines
drivers/media/platform/qcom/iris/iris_platform_gen1.c +10
-0+ .max = V4L2_CID_MPEG_VIDEO_INTRA_REFRESH_PERIOD_TYPE_CYCLIC, + .step_or_mask =BIT (V4L2_CID_MPEG_VIDEO_INTRA_REFRESH_PERIOD_TYPE_RANDOM ) | + BIT(V4L2_CID_MPEG_VIDEO_INTRA_REFRESH_PERIOD_TYPE_CYCLIC), + .value = V4L2_CID_MPEG_VIDEO_INTRA_REFRESH_PERIOD_TYPE_RANDOM, + .flags = CAP_FLAG_OUTPUT_PORT | CAP_FLAG_MENU, + }, + { + .cap_id = IR_PERIOD, + .min = 0, + .max = INT_MAX,
is this value correct? please recheck.
Thanks,
Dikshita
Quoted 23 lines
drivers/media/platform/qcom/iris/iris_platform_gen1.c +6
-0+ .step_or_mask = 1, + .value = 0, + .hfi_id = HFI_PROPERTY_PARAM_VENC_INTRA_REFRESH, + .flags = CAP_FLAG_OUTPUT_PORT, + .set = iris_set_ir_period_gen1, + }, }; static struct platform_inst_caps platform_inst_cap_sm8250 = {drivers/media/platform/qcom/iris/iris_platform_gen2.c +1
-1@@ -635,7 +635,7 @@ static const struct platform_inst_fw_cap inst_fw_cap_sm8550_enc[] = { .value = 0, .flags = CAP_FLAG_OUTPUT_PORT | CAP_FLAG_DYNAMIC_ALLOWED, - .set = iris_set_ir_period, + .set = iris_set_ir_period_gen2, }, };
Re: [PATCH 1/4] media: qcom: iris: Add intra refresh support for gen1 encoder
Quoted 9 lines · Dikshita Agarwal
drivers/media/platform/qcom/iris/iris_hfi_gen1_defines.h line 146
Quoted 5 lines
drivers/media/platform/qcom/iris/iris_hfi_gen1_defines.h +5
-0+ +#define HFI_INTRA_REFRESH_NONE 0x1 +#define HFI_INTRA_REFRESH_CYCLIC 0x2 +#define HFI_INTRA_REFRESH_ADAPTIVE 0x3 +#define HFI_INTRA_REFRESH_CYCLIC_ADAPTIVE 0x4
HFI_INTRA_REFRESH_ADAPTIVEandHFI_INTRA_REFRESH_CYCLIC_ADAPTIVEare not being used, do we need these macros here?
I referred to the Venus driver, which also defines it but does not use it.
Quoted 7 lines
drivers/media/platform/qcom/iris/iris_platform_gen1.c static const struct platform_inst_fw_cap inst_fw_cap_sm8250_enc[] = { · line 245
Quoted 4 lines
drivers/media/platform/qcom/iris/iris_platform_gen1.c +4
-0+ { + .cap_id = IR_PERIOD, + .min = 0, + .max = INT_MAX,is this value correct? please recheck.
This value is incorrect; I will fix it in v2.
Signature · 2 lines
Best Regards, Wangao
PATCH 2/4 media: qcom: iris: Add Long-Term Reference support for encoder
In reply to Wangao WangAdd Long-Term Reference(LTR) frame support for both gen1 and gen2 encoders by enabling the following V4L2 controls:V4L2_CID_MPEG_VIDEO_LTR_COUNT V4L2_CID_MPEG_VIDEO_USE_LTR_FRAMES V4L2_CID_MPEG_VIDEO_FRAME_LTR_INDEX
Key changes:
Added LTR capability IDs and V4L2 controls. Implemented handlers for LTR count, use, and mark (gen1/gen2). Defined new HFI properties and structures for LTR. Updated platform capability tables and buffer size calculations.
--- drivers/media/platform/qcom/iris/iris_ctrls.c | 126 +++++++++++++++++++++ drivers/media/platform/qcom/iris/iris_ctrls.h | 5 + .../platform/qcom/iris/iris_hfi_gen1_command.c | 25 ++++ .../platform/qcom/iris/iris_hfi_gen1_defines.h | 24 ++++ .../platform/qcom/iris/iris_hfi_gen2_defines.h | 3 + .../platform/qcom/iris/iris_platform_common.h | 6 + .../media/platform/qcom/iris/iris_platform_gen1.c | 30 +++++ .../media/platform/qcom/iris/iris_platform_gen2.c | 30 +++++ drivers/media/platform/qcom/iris/iris_vpu_buffer.c | 33 ++++-- 9 files changed, 270 insertions(+), 12 deletions(-)
drivers/media/platform/qcom/iris/iris_ctrls.c +126 -0
@@ -108,6 +108,12 @@ static enum platform_inst_fw_cap_type iris_get_cap_id(u32 id)return IR_TYPE ;case V4L2_CID_MPEG_VIDEO_INTRA_REFRESH_PERIOD :return IR_PERIOD ; +case V4L2_CID_MPEG_VIDEO_LTR_COUNT : +return LTR_COUNT ; +case V4L2_CID_MPEG_VIDEO_USE_LTR_FRAMES : +return USE_LTR ; +case V4L2_CID_MPEG_VIDEO_FRAME_LTR_INDEX : +return MARK_LTR ;default :return INST_FW_CAP_MAX ; }
@@ -205,6 +211,12 @@ static u32 iris_get_v4l2_id(enum platform_inst_fw_cap_type cap_id)return V4L2_CID_MPEG_VIDEO_INTRA_REFRESH_PERIOD_TYPE ;case IR_PERIOD :return V4L2_CID_MPEG_VIDEO_INTRA_REFRESH_PERIOD ; +case LTR_COUNT : +return V4L2_CID_MPEG_VIDEO_LTR_COUNT ; +case USE_LTR : +return V4L2_CID_MPEG_VIDEO_USE_LTR_FRAMES ; +case MARK_LTR : +return V4L2_CID_MPEG_VIDEO_FRAME_LTR_INDEX ;default :return 0 ; }
@@ -1022,6 +1034,120 @@ int iris_set_ir_period_gen2(struct iris_inst *inst, enum platform_inst_fw_cap_ty &ir_period, sizeof(u32)); } +int iris_set_ltr_count_gen1 (struct iris_inst *inst,enum platform_inst_fw_cap_type cap_id) +{ +const struct iris_hfi_command_ops *hfi_ops = inst->core->hfi_ops; +u32 ltr_count = inst->fw_caps[cap_id].value; +u32 hfi_id = inst->fw_caps[cap_id].hfi_id; +struct hfi_ltr_mode ltr_mode; + +if (!ltr_count) +return -EINVAL ; + + ltr_mode.count = ltr_count; + ltr_mode.mode =HFI_LTR_MODE_MANUAL ; + ltr_mode.trust_mode =1 ; + +return hfi_ops->session_set_property (inst, hfi_id, +HFI_HOST_FLAGS_NONE , +iris_get_port_info (inst, cap_id), +HFI_PAYLOAD_STRUCTURE , + <r_mode,sizeof (ltr_mode)); +} + +int iris_set_use_ltr (struct iris_inst *inst,enum platform_inst_fw_cap_type cap_id) +{ +const struct iris_hfi_command_ops *hfi_ops = inst->core->hfi_ops; +struct vb2_queue *sq =v4l2_m2m_get_src_vq (inst->m2m_ctx); +struct vb2_queue *dq =v4l2_m2m_get_dst_vq (inst->m2m_ctx); +u32 ltr_count = inst->fw_caps[LTR_COUNT ].value; +u32 hfi_id = inst->fw_caps[cap_id].hfi_id; +struct hfi_ltr_use ltr_use; + +if (!vb2_is_streaming (sq) && !vb2_is_streaming (dq)) +return -EINVAL ; + +if (!ltr_count) +return -EINVAL ; + + ltr_use.ref_ltr = inst->fw_caps[cap_id].value; + ltr_use.use_constrnt = true; + ltr_use.frames =0 ; + +return hfi_ops->session_set_property (inst, hfi_id, +HFI_HOST_FLAGS_NONE , +iris_get_port_info (inst, cap_id), +HFI_PAYLOAD_STRUCTURE , + <r_use,sizeof (ltr_use)); +} + +int iris_set_mark_ltr (struct iris_inst *inst,enum platform_inst_fw_cap_type cap_id) +{ +const struct iris_hfi_command_ops *hfi_ops = inst->core->hfi_ops; +struct vb2_queue *sq =v4l2_m2m_get_src_vq (inst->m2m_ctx); +struct vb2_queue *dq =v4l2_m2m_get_dst_vq (inst->m2m_ctx); +u32 ltr_count = inst->fw_caps[LTR_COUNT ].value; +u32 hfi_id = inst->fw_caps[cap_id].hfi_id; +struct hfi_ltr_mark ltr_mark; + +if (!vb2_is_streaming (sq) && !vb2_is_streaming (dq)) +return -EINVAL ; + +if (!ltr_count) +return -EINVAL ; + + ltr_mark.mark_frame = inst->fw_caps[cap_id].value; + +return hfi_ops->session_set_property (inst, hfi_id, +HFI_HOST_FLAGS_NONE , +iris_get_port_info (inst, cap_id), +HFI_PAYLOAD_STRUCTURE , + <r_mark,sizeof (ltr_mark)); +} + +int iris_set_ltr_count_gen2 (struct iris_inst *inst,enum platform_inst_fw_cap_type cap_id) +{ +const struct iris_hfi_command_ops *hfi_ops = inst->core->hfi_ops; +u32 ltr_count = inst->fw_caps[cap_id].value; +u32 hfi_id = inst->fw_caps[cap_id].hfi_id; + +if (!ltr_count) +return -EINVAL ; + +if (inst->hfi_rc_type ==HFI_RATE_CONTROL_VBR_VFR || + inst->hfi_rc_type ==HFI_RATE_CONTROL_VBR_CFR || + inst->hfi_rc_type ==HFI_RATE_CONTROL_CQ ) +return -EINVAL ; + +return hfi_ops->session_set_property (inst, hfi_id, +HFI_HOST_FLAGS_NONE , +iris_get_port_info (inst, cap_id), +HFI_PAYLOAD_U32 , + <r_count,sizeof (u32)); +} + +int iris_set_use_and_mark_ltr (struct iris_inst *inst,enum platform_inst_fw_cap_type cap_id) +{ +const struct iris_hfi_command_ops *hfi_ops = inst->core->hfi_ops; +u32 ltr_count = inst->fw_caps[LTR_COUNT ].value; +u32 hfi_val = inst->fw_caps[cap_id].value; +u32 hfi_id = inst->fw_caps[cap_id].hfi_id; + +if (!ltr_count || hfi_val ==INVALID_DEFAULT_MARK_OR_USE_LTR ) +return -EINVAL ; + +if (inst->hfi_rc_type ==HFI_RATE_CONTROL_VBR_VFR || + inst->hfi_rc_type ==HFI_RATE_CONTROL_VBR_CFR || + inst->hfi_rc_type ==HFI_RATE_CONTROL_CQ ) +return -EINVAL ; + +return hfi_ops->session_set_property (inst, hfi_id, +HFI_HOST_FLAGS_NONE , +iris_get_port_info (inst, cap_id), +HFI_PAYLOAD_U32 , + &hfi_val,sizeof (u32)); +} +int iris_set_properties (struct iris_inst *inst,u32 plane) {const struct iris_hfi_command_ops *hfi_ops = inst->core->hfi_ops;
drivers/media/platform/qcom/iris/iris_ctrls.h +5 -0
@@ -36,6 +36,11 @@ int iris_set_rotation(struct iris_inst *inst, enum platform_inst_fw_cap_type capint iris_set_flip (struct iris_inst *inst,enum platform_inst_fw_cap_type cap_id);int iris_set_ir_period_gen1 (struct iris_inst *inst,enum platform_inst_fw_cap_type cap_id);int iris_set_ir_period_gen2 (struct iris_inst *inst,enum platform_inst_fw_cap_type cap_id); +int iris_set_ltr_count_gen1 (struct iris_inst *inst,enum platform_inst_fw_cap_type cap_id); +int iris_set_ltr_count_gen2 (struct iris_inst *inst,enum platform_inst_fw_cap_type cap_id); +int iris_set_use_ltr (struct iris_inst *inst,enum platform_inst_fw_cap_type cap_id); +int iris_set_mark_ltr (struct iris_inst *inst,enum platform_inst_fw_cap_type cap_id); +int iris_set_use_and_mark_ltr (struct iris_inst *inst,enum platform_inst_fw_cap_type cap_id);int iris_set_properties (struct iris_inst *inst,u32 plane);#endif
drivers/media/platform/qcom/iris/iris_hfi_gen1_command.c +25 -0
@@ -693,6 +693,31 @@ iris_hfi_gen1_packet_session_set_property(struct hfi_session_set_property_pkt *p packet->shdr.hdr.size +=sizeof (u32) +sizeof (*intra_refresh);break ; } +case HFI_PROPERTY_PARAM_VENC_LTRMODE : { +struct hfi_ltr_mode *in = pdata, *ltr_mode = prop_data; + + ltr_mode->mode = in->mode; + ltr_mode->count = in->count; + ltr_mode->trust_mode = in->trust_mode; + packet->shdr.hdr.size +=sizeof (u32) +sizeof (*ltr_mode); +break ; + } +case HFI_PROPERTY_CONFIG_VENC_USELTRFRAME : { +struct hfi_ltr_use *in = pdata, *ltr_use = prop_data; + + ltr_use->frames = in->frames; + ltr_use->ref_ltr = in->ref_ltr; + ltr_use->use_constrnt = in->use_constrnt; + packet->shdr.hdr.size +=sizeof (u32) +sizeof (*ltr_use); +break ; + } +case HFI_PROPERTY_CONFIG_VENC_MARKLTRFRAME : { +struct hfi_ltr_mark *in = pdata, *ltr_mark = prop_data; + + ltr_mark->mark_frame = in->mark_frame; + packet->shdr.hdr.size +=sizeof (u32) +sizeof (*ltr_mark); +break ; + }default :return -EINVAL ; }
drivers/media/platform/qcom/iris/iris_hfi_gen1_defines.h +24 -0
@@ -147,8 +147,16 @@#define HFI_INTRA_REFRESH_RANDOM 0x5#define HFI_PROPERTY_PARAM_VENC_INTRA_REFRESH 0x200500d + +#define HFI_LTR_MODE_DISABLE 0x0 +#define HFI_LTR_MODE_MANUAL 0x1 +#define HFI_LTR_MODE_PERIODIC 0x2 + +#define HFI_PROPERTY_PARAM_VENC_LTRMODE 0x200501c#define HFI_PROPERTY_PARAM_VENC_MAX_NUM_B_FRAMES 0x2005020#define HFI_PROPERTY_CONFIG_VENC_TARGET_BITRATE 0x2006001 +#define HFI_PROPERTY_CONFIG_VENC_MARKLTRFRAME 0x2006009 +#define HFI_PROPERTY_CONFIG_VENC_USELTRFRAME 0x200600a#define HFI_PROPERTY_CONFIG_VENC_SYNC_FRAME_SEQUENCE_HEADER 0x2006008struct hfi_pkt_hdr {
@@ -460,6 +468,22 @@ struct hfi_intra_refresh {u32 mbs; }; +struct hfi_ltr_mode { +u32 mode; +u32 count; +u32 trust_mode; +}; + +struct hfi_ltr_use { +u32 ref_ltr; +u32 use_constrnt; +u32 frames; +}; + +struct hfi_ltr_mark { +u32 mark_frame; +}; +struct hfi_event_data {u32 error;u32 height;
drivers/media/platform/qcom/iris/iris_hfi_gen2_defines.h +3 -0
@@ -71,6 +71,9 @@ enum hfi_rate_control {#define HFI_PROP_MIN_QP_PACKED 0x0300012f#define HFI_PROP_MAX_QP_PACKED 0x03000130#define HFI_PROP_IR_RANDOM_PERIOD 0x03000131 +#define HFI_PROP_LTR_COUNT 0x03000134 +#define HFI_PROP_LTR_MARK 0x03000135 +#define HFI_PROP_LTR_USE 0x03000136#define HFI_PROP_TOTAL_BITRATE 0x0300013b#define HFI_PROP_MAX_GOP_FRAMES 0x03000146#define HFI_PROP_MAX_B_FRAMES 0x03000147
drivers/media/platform/qcom/iris/iris_platform_common.h +6 -0
@@ -29,6 +29,9 @@ struct iris_inst;#define MAX_QP_HEVC 63#define DEFAULT_QP 20#define BITRATE_DEFAULT 20000000 +#define INVALID_DEFAULT_MARK_OR_USE_LTR -1 +#define MAX_LTR_FRAME_COUNT_GEN1 4 +#define MAX_LTR_FRAME_COUNT_GEN2 2enum stage_type {STAGE_1 =1 ,
@@ -148,6 +151,9 @@ enum platform_inst_fw_cap_type {VFLIP ,IR_TYPE ,IR_PERIOD , +LTR_COUNT , +USE_LTR , +MARK_LTR , INST_FW_CAP_MAX, };
drivers/media/platform/qcom/iris/iris_platform_gen1.c +30 -0
@@ -249,6 +249,36 @@ static const struct platform_inst_fw_cap inst_fw_cap_sm8250_enc[] = { .flags = CAP_FLAG_OUTPUT_PORT, .set = iris_set_ir_period_gen1, }, + { + .cap_id = LTR_COUNT, + .min = 0, + .max = MAX_LTR_FRAME_COUNT_GEN1, + .step_or_mask = 1, + .value = 0, + .hfi_id = HFI_PROPERTY_PARAM_VENC_LTRMODE, + .flags = CAP_FLAG_OUTPUT_PORT, + .set = iris_set_ltr_count_gen1, + }, + { + .cap_id = USE_LTR, + .min = 0, + .max = ((1 << MAX_LTR_FRAME_COUNT_GEN1) - 1), + .step_or_mask = 0, + .value = 0, + .hfi_id = HFI_PROPERTY_CONFIG_VENC_USELTRFRAME, + .flags = CAP_FLAG_INPUT_PORT | CAP_FLAG_DYNAMIC_ALLOWED, + .set = iris_set_use_ltr, + }, + { + .cap_id = MARK_LTR, + .min = 0, + .max = (MAX_LTR_FRAME_COUNT_GEN1 - 1), + .step_or_mask = 1, + .value = 0, + .hfi_id = HFI_PROPERTY_CONFIG_VENC_MARKLTRFRAME, + .flags = CAP_FLAG_INPUT_PORT | CAP_FLAG_DYNAMIC_ALLOWED, + .set = iris_set_mark_ltr, + }, }; static struct platform_inst_caps platform_inst_cap_sm8250 = {
drivers/media/platform/qcom/iris/iris_platform_gen2.c +30 -0
@@ -637,6 +637,36 @@ static const struct platform_inst_fw_cap inst_fw_cap_sm8550_enc[] = { CAP_FLAG_DYNAMIC_ALLOWED, .set = iris_set_ir_period_gen2, }, + { + .cap_id = LTR_COUNT, + .min = 0, + .max = MAX_LTR_FRAME_COUNT_GEN2, + .step_or_mask = 1, + .value = 0, + .hfi_id = HFI_PROP_LTR_COUNT, + .flags = CAP_FLAG_OUTPUT_PORT, + .set = iris_set_ltr_count_gen2, + }, + { + .cap_id = USE_LTR, + .min = 0, + .max = ((1 << MAX_LTR_FRAME_COUNT_GEN2) - 1), + .step_or_mask = 0, + .value = 0, + .hfi_id = HFI_PROP_LTR_USE, + .flags = CAP_FLAG_INPUT_PORT | CAP_FLAG_DYNAMIC_ALLOWED, + .set = iris_set_use_and_mark_ltr, + }, + { + .cap_id = MARK_LTR, + .min = INVALID_DEFAULT_MARK_OR_USE_LTR, + .max = (MAX_LTR_FRAME_COUNT_GEN2 - 1), + .step_or_mask = 1, + .value = INVALID_DEFAULT_MARK_OR_USE_LTR, + .hfi_id = HFI_PROP_LTR_MARK, + .flags = CAP_FLAG_INPUT_PORT | CAP_FLAG_DYNAMIC_ALLOWED, + .set = iris_set_use_and_mark_ltr, + }, };static struct platform_inst_caps platform_inst_cap_sm8550 = {
drivers/media/platform/qcom/iris/iris_vpu_buffer.c +21 -12
@@ -668,6 +668,19 @@ static u32 iris_vpu_enc_bin_size(struct iris_inst *inst) num_vpp_pipes, inst->hfi_rc_type); } +static inline u32 hfi_buffer_get_recon_count (struct iris_inst *inst) +{ +u32 num_ref =1 ; +u32 ltr_count; + + ltr_count = inst->fw_caps[LTR_COUNT ].value; + +if (ltr_count) + num_ref = num_ref + ltr_count; + +return num_ref +1 ; +} +static inline u32 hfi_buffer_comv_enc (u32 frame_width,u32 frame_height,u32 lcu_size,u32 num_recon,u32 standard)
@@ -693,17 +706,14 @@ static u32 iris_vpu_enc_comv_size(struct iris_inst *inst) {u32 height =iris_vpu_enc_get_bitstream_height (inst);u32 width =iris_vpu_enc_get_bitstream_width (inst); -u32 num_recon =1 ; -u32 lcu_size =16 ; +u32 num_recon =hfi_buffer_get_recon_count (inst); +u32 standard, lcu_size; -if (inst->codec ==V4L2_PIX_FMT_HEVC ) { - lcu_size =32 ; -return hfi_buffer_comv_enc (width, height, lcu_size, - num_recon +1 ,HFI_CODEC_ENCODE_HEVC ); - } + standard = (inst->codec ==V4L2_PIX_FMT_HEVC ) ? +HFI_CODEC_ENCODE_HEVC :HFI_CODEC_ENCODE_AVC ; + lcu_size = (inst->codec ==V4L2_PIX_FMT_HEVC ) ?32 :16 ; -return hfi_buffer_comv_enc (width, height, lcu_size, - num_recon +1 ,HFI_CODEC_ENCODE_AVC ); +return hfi_buffer_comv_enc (width, height, lcu_size, num_recon, standard); } static inline
@@ -1402,10 +1412,9 @@ static u32 iris_vpu_enc_scratch2_size(struct iris_inst *inst) {u32 frame_height =iris_vpu_enc_get_bitstream_height (inst);u32 frame_width =iris_vpu_enc_get_bitstream_width (inst); -u32 num_ref =1 ; +u32 num_ref =hfi_buffer_get_recon_count (inst); -return hfi_buffer_scratch2_enc (frame_width, frame_height, num_ref, - false); +return hfi_buffer_scratch2_enc (frame_width, frame_height, num_ref, false); }static u32 iris_vpu_enc_vpss_size (struct iris_inst *inst)
Signature · 1 line
2.43.0
Bryan O'Donoghue
maintainerRe: [PATCH 2/4] media: qcom: iris: Add Long-Term Reference support for encoder
Quoted 197 lines · Wangao Wang
Add Long-Term Reference(LTR) frame support for both gen1 and gen2 encoders by enabling the following V4L2 controls:
V4L2_CID_MPEG_VIDEO_LTR_COUNTV4L2_CID_MPEG_VIDEO_USE_LTR_FRAMESV4L2_CID_MPEG_VIDEO_FRAME_LTR_INDEXKey changes:
Added LTR capability IDs and V4L2 controls. Implemented handlers for LTR count, use, and mark (gen1/gen2). Defined new HFI properties and structures for LTR. Updated platform capability tables and buffer size calculations.Signed-off-by Wangao Wang <[email protected]>--- drivers/media/platform/qcom/iris/iris_ctrls.c | 126 +++++++++++++++++++++ drivers/media/platform/qcom/iris/iris_ctrls.h | 5 + .../platform/qcom/iris/iris_hfi_gen1_command.c | 25 ++++ .../platform/qcom/iris/iris_hfi_gen1_defines.h | 24 ++++ .../platform/qcom/iris/iris_hfi_gen2_defines.h | 3 + .../platform/qcom/iris/iris_platform_common.h | 6 + .../media/platform/qcom/iris/iris_platform_gen1.c | 30 +++++ .../media/platform/qcom/iris/iris_platform_gen2.c | 30 +++++ drivers/media/platform/qcom/iris/iris_vpu_buffer.c | 33 ++++-- 9 files changed, 270 insertions(+), 12 deletions(-)drivers/media/platform/qcom/iris/iris_ctrls.c +126
-0@@ -108,6 +108,12 @@ static enum platform_inst_fw_cap_type iris_get_cap_id(u32 id)return IR_TYPE ;case V4L2_CID_MPEG_VIDEO_INTRA_REFRESH_PERIOD :return IR_PERIOD ; +case V4L2_CID_MPEG_VIDEO_LTR_COUNT : +return LTR_COUNT ; +case V4L2_CID_MPEG_VIDEO_USE_LTR_FRAMES : +return USE_LTR ; +case V4L2_CID_MPEG_VIDEO_FRAME_LTR_INDEX : +return MARK_LTR ;default :return INST_FW_CAP_MAX ; }@@ -205,6 +211,12 @@ static u32 iris_get_v4l2_id(enum platform_inst_fw_cap_type cap_id)return V4L2_CID_MPEG_VIDEO_INTRA_REFRESH_PERIOD_TYPE ;case IR_PERIOD :return V4L2_CID_MPEG_VIDEO_INTRA_REFRESH_PERIOD ; +case LTR_COUNT : +return V4L2_CID_MPEG_VIDEO_LTR_COUNT ; +case USE_LTR : +return V4L2_CID_MPEG_VIDEO_USE_LTR_FRAMES ; +case MARK_LTR : +return V4L2_CID_MPEG_VIDEO_FRAME_LTR_INDEX ;default :return 0 ; }@@ -1022,6 +1034,120 @@ int iris_set_ir_period_gen2(struct iris_inst *inst, enum platform_inst_fw_cap_ty &ir_period, sizeof(u32)); } +int iris_set_ltr_count_gen1 (struct iris_inst *inst,enum platform_inst_fw_cap_type cap_id) +{ +const struct iris_hfi_command_ops *hfi_ops = inst->core->hfi_ops; +u32 ltr_count = inst->fw_caps[cap_id].value; +u32 hfi_id = inst->fw_caps[cap_id].hfi_id; +struct hfi_ltr_mode ltr_mode; + +if (!ltr_count) +return -EINVAL ; + + ltr_mode.count = ltr_count; + ltr_mode.mode =HFI_LTR_MODE_MANUAL ; + ltr_mode.trust_mode =1 ; + +return hfi_ops->session_set_property (inst, hfi_id, +HFI_HOST_FLAGS_NONE , +iris_get_port_info (inst, cap_id), +HFI_PAYLOAD_STRUCTURE , + <r_mode,sizeof (ltr_mode)); +} + +int iris_set_use_ltr (struct iris_inst *inst,enum platform_inst_fw_cap_type cap_id) +{ +const struct iris_hfi_command_ops *hfi_ops = inst->core->hfi_ops; +struct vb2_queue *sq =v4l2_m2m_get_src_vq (inst->m2m_ctx); +struct vb2_queue *dq =v4l2_m2m_get_dst_vq (inst->m2m_ctx); +u32 ltr_count = inst->fw_caps[LTR_COUNT ].value; +u32 hfi_id = inst->fw_caps[cap_id].hfi_id; +struct hfi_ltr_use ltr_use; + +if (!vb2_is_streaming (sq) && !vb2_is_streaming (dq)) +return -EINVAL ; + +if (!ltr_count) +return -EINVAL ; + + ltr_use.ref_ltr = inst->fw_caps[cap_id].value; + ltr_use.use_constrnt = true; + ltr_use.frames =0 ; + +return hfi_ops->session_set_property (inst, hfi_id, +HFI_HOST_FLAGS_NONE , +iris_get_port_info (inst, cap_id), +HFI_PAYLOAD_STRUCTURE , + <r_use,sizeof (ltr_use)); +} + +int iris_set_mark_ltr (struct iris_inst *inst,enum platform_inst_fw_cap_type cap_id) +{ +const struct iris_hfi_command_ops *hfi_ops = inst->core->hfi_ops; +struct vb2_queue *sq =v4l2_m2m_get_src_vq (inst->m2m_ctx); +struct vb2_queue *dq =v4l2_m2m_get_dst_vq (inst->m2m_ctx); +u32 ltr_count = inst->fw_caps[LTR_COUNT ].value; +u32 hfi_id = inst->fw_caps[cap_id].hfi_id; +struct hfi_ltr_mark ltr_mark; + +if (!vb2_is_streaming (sq) && !vb2_is_streaming (dq)) +return -EINVAL ; + +if (!ltr_count) +return -EINVAL ; + + ltr_mark.mark_frame = inst->fw_caps[cap_id].value; + +return hfi_ops->session_set_property (inst, hfi_id, +HFI_HOST_FLAGS_NONE , +iris_get_port_info (inst, cap_id), +HFI_PAYLOAD_STRUCTURE , + <r_mark,sizeof (ltr_mark)); +} + +int iris_set_ltr_count_gen2 (struct iris_inst *inst,enum platform_inst_fw_cap_type cap_id) +{ +const struct iris_hfi_command_ops *hfi_ops = inst->core->hfi_ops; +u32 ltr_count = inst->fw_caps[cap_id].value; +u32 hfi_id = inst->fw_caps[cap_id].hfi_id; + +if (!ltr_count) +return -EINVAL ; + +if (inst->hfi_rc_type ==HFI_RATE_CONTROL_VBR_VFR || + inst->hfi_rc_type ==HFI_RATE_CONTROL_VBR_CFR || + inst->hfi_rc_type ==HFI_RATE_CONTROL_CQ ) +return -EINVAL ; + +return hfi_ops->session_set_property (inst, hfi_id, +HFI_HOST_FLAGS_NONE , +iris_get_port_info (inst, cap_id), +HFI_PAYLOAD_U32 , + <r_count,sizeof (u32)); +} + +int iris_set_use_and_mark_ltr (struct iris_inst *inst,enum platform_inst_fw_cap_type cap_id) +{ +const struct iris_hfi_command_ops *hfi_ops = inst->core->hfi_ops; +u32 ltr_count = inst->fw_caps[LTR_COUNT ].value; +u32 hfi_val = inst->fw_caps[cap_id].value; +u32 hfi_id = inst->fw_caps[cap_id].hfi_id; + +if (!ltr_count || hfi_val ==INVALID_DEFAULT_MARK_OR_USE_LTR ) +return -EINVAL ; + +if (inst->hfi_rc_type ==HFI_RATE_CONTROL_VBR_VFR || + inst->hfi_rc_type ==HFI_RATE_CONTROL_VBR_CFR || + inst->hfi_rc_type ==HFI_RATE_CONTROL_CQ ) +return -EINVAL ; + +return hfi_ops->session_set_property (inst, hfi_id, +HFI_HOST_FLAGS_NONE , +iris_get_port_info (inst, cap_id), +HFI_PAYLOAD_U32 , + &hfi_val,sizeof (u32)); +} +int iris_set_properties (struct iris_inst *inst,u32 plane) {const struct iris_hfi_command_ops *hfi_ops = inst->core->hfi_ops;drivers/media/platform/qcom/iris/iris_ctrls.h +5
-0@@ -36,6 +36,11 @@ int iris_set_rotation(struct iris_inst *inst, enum platform_inst_fw_cap_type capint iris_set_flip (struct iris_inst *inst,enum platform_inst_fw_cap_type cap_id);int iris_set_ir_period_gen1 (struct iris_inst *inst,enum platform_inst_fw_cap_type cap_id);int iris_set_ir_period_gen2 (struct iris_inst *inst,enum platform_inst_fw_cap_type cap_id); +int iris_set_ltr_count_gen1 (struct iris_inst *inst,enum platform_inst_fw_cap_type cap_id); +int iris_set_ltr_count_gen2 (struct iris_inst *inst,enum platform_inst_fw_cap_type cap_id); +int iris_set_use_ltr (struct iris_inst *inst,enum platform_inst_fw_cap_type cap_id); +int iris_set_mark_ltr (struct iris_inst *inst,enum platform_inst_fw_cap_type cap_id); +int iris_set_use_and_mark_ltr (struct iris_inst *inst,enum platform_inst_fw_cap_type cap_id);int iris_set_properties (struct iris_inst *inst,u32 plane);#endif drivers/media/platform/qcom/iris/iris_hfi_gen1_command.c +0
-0
drivers/media/platform/qcom/iris/iris_hfi_gen1_command.c iris_hfi_gen1_packet_session_set_property(struct hfi_session_set_property_pkt *p · line 702
Quoted 10 lines
drivers/media/platform/qcom/iris/iris_hfi_gen1_command.c +7
-0@@ -693,6 +693,31 @@ iris_hfi_gen1_packet_session_set_property(struct hfi_session_set_property_pkt *p packet->shdr.hdr.size +=sizeof (u32) +sizeof (*intra_refresh);break ; } +case HFI_PROPERTY_PARAM_VENC_LTRMODE : { +struct hfi_ltr_mode *in = pdata, *ltr_mode = prop_data; + + ltr_mode->mode = in->mode; + ltr_mode->count = in->count; + ltr_mode->trust_mode = in->trust_mode; + packet->shdr.hdr.size +=sizeof (u32) +sizeof (*ltr_mode);
This looks like an unconditional pattern in this code
packet->shdr.hdr.size += sizeof(u32) for each one of the switch cases.
Could you at least add a patch to the end of this series to tidy this up - either always incrmenting by sizeof(u32) before the swich - or making a macro or static inline that packs the header appropriately.
Also what is the sizeof(u32) representative of ? "Some field in the header" - get that but right now its just a literal unnamed dword.
Quoted 250 lines
drivers/media/platform/qcom/iris/iris_hfi_gen1_command.c +18
-0+break ; + } +case HFI_PROPERTY_CONFIG_VENC_USELTRFRAME : { +struct hfi_ltr_use *in = pdata, *ltr_use = prop_data; + + ltr_use->frames = in->frames; + ltr_use->ref_ltr = in->ref_ltr; + ltr_use->use_constrnt = in->use_constrnt; + packet->shdr.hdr.size +=sizeof (u32) +sizeof (*ltr_use); +break ; + } +case HFI_PROPERTY_CONFIG_VENC_MARKLTRFRAME : { +struct hfi_ltr_mark *in = pdata, *ltr_mark = prop_data; + + ltr_mark->mark_frame = in->mark_frame; + packet->shdr.hdr.size +=sizeof (u32) +sizeof (*ltr_mark); +break ; + }default :return -EINVAL ; }drivers/media/platform/qcom/iris/iris_hfi_gen1_defines.h +24
-0@@ -147,8 +147,16 @@#define HFI_INTRA_REFRESH_RANDOM 0x5#define HFI_PROPERTY_PARAM_VENC_INTRA_REFRESH 0x200500d + +#define HFI_LTR_MODE_DISABLE 0x0 +#define HFI_LTR_MODE_MANUAL 0x1 +#define HFI_LTR_MODE_PERIODIC 0x2 + +#define HFI_PROPERTY_PARAM_VENC_LTRMODE 0x200501c#define HFI_PROPERTY_PARAM_VENC_MAX_NUM_B_FRAMES 0x2005020#define HFI_PROPERTY_CONFIG_VENC_TARGET_BITRATE 0x2006001 +#define HFI_PROPERTY_CONFIG_VENC_MARKLTRFRAME 0x2006009 +#define HFI_PROPERTY_CONFIG_VENC_USELTRFRAME 0x200600a#define HFI_PROPERTY_CONFIG_VENC_SYNC_FRAME_SEQUENCE_HEADER 0x2006008struct hfi_pkt_hdr {@@ -460,6 +468,22 @@ struct hfi_intra_refresh {u32 mbs; }; +struct hfi_ltr_mode { +u32 mode; +u32 count; +u32 trust_mode; +}; + +struct hfi_ltr_use { +u32 ref_ltr; +u32 use_constrnt; +u32 frames; +}; + +struct hfi_ltr_mark { +u32 mark_frame; +}; +struct hfi_event_data {u32 error;u32 height;drivers/media/platform/qcom/iris/iris_hfi_gen2_defines.h +3
-0@@ -71,6 +71,9 @@ enum hfi_rate_control {#define HFI_PROP_MIN_QP_PACKED 0x0300012f#define HFI_PROP_MAX_QP_PACKED 0x03000130#define HFI_PROP_IR_RANDOM_PERIOD 0x03000131 +#define HFI_PROP_LTR_COUNT 0x03000134 +#define HFI_PROP_LTR_MARK 0x03000135 +#define HFI_PROP_LTR_USE 0x03000136#define HFI_PROP_TOTAL_BITRATE 0x0300013b#define HFI_PROP_MAX_GOP_FRAMES 0x03000146#define HFI_PROP_MAX_B_FRAMES 0x03000147drivers/media/platform/qcom/iris/iris_platform_common.h +6
-0@@ -29,6 +29,9 @@ struct iris_inst;#define MAX_QP_HEVC 63#define DEFAULT_QP 20#define BITRATE_DEFAULT 20000000 +#define INVALID_DEFAULT_MARK_OR_USE_LTR -1 +#define MAX_LTR_FRAME_COUNT_GEN1 4 +#define MAX_LTR_FRAME_COUNT_GEN2 2enum stage_type {STAGE_1 =1 ,@@ -148,6 +151,9 @@ enum platform_inst_fw_cap_type {VFLIP ,IR_TYPE ,IR_PERIOD , +LTR_COUNT , +USE_LTR , +MARK_LTR , INST_FW_CAP_MAX, };drivers/media/platform/qcom/iris/iris_platform_gen1.c +30
-0@@ -249,6 +249,36 @@ static const struct platform_inst_fw_cap inst_fw_cap_sm8250_enc[] = { .flags = CAP_FLAG_OUTPUT_PORT, .set = iris_set_ir_period_gen1, }, + { + .cap_id = LTR_COUNT, + .min = 0, + .max = MAX_LTR_FRAME_COUNT_GEN1, + .step_or_mask = 1, + .value = 0, + .hfi_id = HFI_PROPERTY_PARAM_VENC_LTRMODE, + .flags = CAP_FLAG_OUTPUT_PORT, + .set = iris_set_ltr_count_gen1, + }, + { + .cap_id = USE_LTR, + .min = 0, + .max = ((1 << MAX_LTR_FRAME_COUNT_GEN1) - 1), + .step_or_mask = 0, + .value = 0, + .hfi_id = HFI_PROPERTY_CONFIG_VENC_USELTRFRAME, + .flags = CAP_FLAG_INPUT_PORT | CAP_FLAG_DYNAMIC_ALLOWED, + .set = iris_set_use_ltr, + }, + { + .cap_id = MARK_LTR, + .min = 0, + .max = (MAX_LTR_FRAME_COUNT_GEN1 - 1), + .step_or_mask = 1, + .value = 0, + .hfi_id = HFI_PROPERTY_CONFIG_VENC_MARKLTRFRAME, + .flags = CAP_FLAG_INPUT_PORT | CAP_FLAG_DYNAMIC_ALLOWED, + .set = iris_set_mark_ltr, + }, }; static struct platform_inst_caps platform_inst_cap_sm8250 = {drivers/media/platform/qcom/iris/iris_platform_gen2.c +30
-0@@ -637,6 +637,36 @@ static const struct platform_inst_fw_cap inst_fw_cap_sm8550_enc[] = { CAP_FLAG_DYNAMIC_ALLOWED, .set = iris_set_ir_period_gen2, }, + { + .cap_id = LTR_COUNT, + .min = 0, + .max = MAX_LTR_FRAME_COUNT_GEN2, + .step_or_mask = 1, + .value = 0, + .hfi_id = HFI_PROP_LTR_COUNT, + .flags = CAP_FLAG_OUTPUT_PORT, + .set = iris_set_ltr_count_gen2, + }, + { + .cap_id = USE_LTR, + .min = 0, + .max = ((1 << MAX_LTR_FRAME_COUNT_GEN2) - 1), + .step_or_mask = 0, + .value = 0, + .hfi_id = HFI_PROP_LTR_USE, + .flags = CAP_FLAG_INPUT_PORT | CAP_FLAG_DYNAMIC_ALLOWED, + .set = iris_set_use_and_mark_ltr, + }, + { + .cap_id = MARK_LTR, + .min = INVALID_DEFAULT_MARK_OR_USE_LTR, + .max = (MAX_LTR_FRAME_COUNT_GEN2 - 1), + .step_or_mask = 1, + .value = INVALID_DEFAULT_MARK_OR_USE_LTR, + .hfi_id = HFI_PROP_LTR_MARK, + .flags = CAP_FLAG_INPUT_PORT | CAP_FLAG_DYNAMIC_ALLOWED, + .set = iris_set_use_and_mark_ltr, + }, };static struct platform_inst_caps platform_inst_cap_sm8550 = {drivers/media/platform/qcom/iris/iris_vpu_buffer.c +21
-13@@ -668,6 +668,19 @@ static u32 iris_vpu_enc_bin_size(struct iris_inst *inst) num_vpp_pipes, inst->hfi_rc_type); } +static inline u32 hfi_buffer_get_recon_count (struct iris_inst *inst) +{ +u32 num_ref =1 ; +u32 ltr_count; + + ltr_count = inst->fw_caps[LTR_COUNT ].value; + +if (ltr_count) + num_ref = num_ref + ltr_count; + +return num_ref +1 ; +} +static inline u32 hfi_buffer_comv_enc (u32 frame_width,u32 frame_height,u32 lcu_size,u32 num_recon,u32 standard)@@ -693,17 +706,14 @@ static u32 iris_vpu_enc_comv_size(struct iris_inst *inst) {u32 height =iris_vpu_enc_get_bitstream_height (inst);u32 width =iris_vpu_enc_get_bitstream_width (inst); -u32 num_recon =1 ; -u32 lcu_size =16 ; +u32 num_recon =hfi_buffer_get_recon_count (inst); +u32 standard, lcu_size; -if (inst->codec ==V4L2_PIX_FMT_HEVC ) { - lcu_size =32 ; -return hfi_buffer_comv_enc (width, height, lcu_size, - num_recon +1 ,HFI_CODEC_ENCODE_HEVC ); - } + standard = (inst->codec ==V4L2_PIX_FMT_HEVC ) ? +HFI_CODEC_ENCODE_HEVC :HFI_CODEC_ENCODE_AVC ; + lcu_size = (inst->codec ==V4L2_PIX_FMT_HEVC ) ?32 :16 ; -return hfi_buffer_comv_enc (width, height, lcu_size, - num_recon +1 ,HFI_CODEC_ENCODE_AVC ); +return hfi_buffer_comv_enc (width, height, lcu_size, num_recon, standard); } static inline@@ -1402,10 +1412,9 @@ static u32 iris_vpu_enc_scratch2_size(struct iris_inst *inst) {u32 frame_height =iris_vpu_enc_get_bitstream_height (inst);u32 frame_width =iris_vpu_enc_get_bitstream_width (inst); -u32 num_ref =1 ; +u32 num_ref =hfi_buffer_get_recon_count (inst); -return hfi_buffer_scratch2_enc (frame_width, frame_height, num_ref, - false); +return hfi_buffer_scratch2_enc (frame_width, frame_height, num_ref, false); }static u32 iris_vpu_enc_vpss_size (struct iris_inst *inst) --2.43.0
Re: [PATCH 2/4] media: qcom: iris: Add Long-Term Reference support for encoder
Quoted 15 lines · Bryan O'Donoghue
Quoted 4 lines
(quoted diff) +0
-0@@ -693,6 +693,31 @@ iris_hfi_gen1_packet_session_set_property(struct
hfi_session_set_property_pkt*p
packet->shdr.hdr.size+= sizeof(u32) +sizeof(*intra_refresh); break;Quoted 8 lines
}
+ caseHFI_PROPERTY_PARAM_VENC_LTRMODE: {
+ structhfi_ltr_mode*in = pdata,*ltr_mode=prop_data; +
+ltr_mode->mode=in->mode;
+ltr_mode->count=in->count;
+ltr_mode->trust_mode=in->trust_mode;
+packet->shdr.hdr.size+= sizeof(u32) +sizeof(*ltr_mode);This looks like an unconditional pattern in this code
Quoted 8 lines
packet->shdr.hdr.size+= sizeof(u32) for each one of the switch cases.Could you at least add a patch to the end of this series to tidy this up
- either always incrmenting by sizeof(u32) before the swich - or making a macro or static inline that packs the header appropriately.Also what is the sizeof(u32) representative of ? "Some field in the header" - get that but right now its just a literal unnamed dword.
A patch will be added in v2 to optimize the code structure here.
Signature · 2 lines
Best Regards, Wangao
Dikshita Agarwal
maintainerRe: [PATCH 2/4] media: qcom: iris: Add Long-Term Reference support for encoder
In reply to Wangao WangQuoted 37 lines · Wangao Wang
Add Long-Term Reference(LTR) frame support for both gen1 and gen2 encoders by enabling the following V4L2 controls:
V4L2_CID_MPEG_VIDEO_LTR_COUNTV4L2_CID_MPEG_VIDEO_USE_LTR_FRAMESV4L2_CID_MPEG_VIDEO_FRAME_LTR_INDEXKey changes:
Added LTR capability IDs and V4L2 controls. Implemented handlers for LTR count, use, and mark (gen1/gen2). Defined new HFI properties and structures for LTR. Updated platform capability tables and buffer size calculations.Signed-off-by Wangao Wang <[email protected]>--- drivers/media/platform/qcom/iris/iris_ctrls.c | 126 +++++++++++++++++++++ drivers/media/platform/qcom/iris/iris_ctrls.h | 5 + .../platform/qcom/iris/iris_hfi_gen1_command.c | 25 ++++ .../platform/qcom/iris/iris_hfi_gen1_defines.h | 24 ++++ .../platform/qcom/iris/iris_hfi_gen2_defines.h | 3 + .../platform/qcom/iris/iris_platform_common.h | 6 + .../media/platform/qcom/iris/iris_platform_gen1.c | 30 +++++ .../media/platform/qcom/iris/iris_platform_gen2.c | 30 +++++ drivers/media/platform/qcom/iris/iris_vpu_buffer.c | 33 ++++-- 9 files changed, 270 insertions(+), 12 deletions(-)static struct
platform_inst_capsplatform_inst_cap_sm8550= {drivers/media/platform/qcom/iris/iris_vpu_buffer.c +2
-0@@ -668,6 +668,19 @@ static u32 iris_vpu_enc_bin_size(struct iris_inst *inst) num_vpp_pipes, inst->hfi_rc_type); } +static inline u32 hfi_buffer_get_recon_count (struct iris_inst *inst) +{
drivers/media/platform/qcom/iris/iris_vpu_buffer.c static u32 iris_vpu_enc_bin_size(struct iris_inst *inst) · line 682
Quoted 10 lines
drivers/media/platform/qcom/iris/iris_vpu_buffer.c +10
-0+u32 num_ref =1 ; +u32 ltr_count; + + ltr_count = inst->fw_caps[LTR_COUNT ].value; + +if (ltr_count) + num_ref = num_ref + ltr_count; + +return num_ref +1 ; +}
Here you are always returning num_ref+1 which might break iris_vpu_enc_scratch2_size calculation since you are using this as common API for calculating ref buffers. Please recheck.
Quoted 11 lines
drivers/media/platform/qcom/iris/iris_vpu_buffer.c +2
-2+static inline u32 hfi_buffer_comv_enc (u32 frame_width,u32 frame_height,u32 lcu_size,u32 num_recon,u32 standard)@@ -693,17 +706,14 @@ static u32 iris_vpu_enc_comv_size(struct iris_inst *inst) {u32 height =iris_vpu_enc_get_bitstream_height (inst);u32 width =iris_vpu_enc_get_bitstream_width (inst); -u32 num_recon =1 ; -u32 lcu_size =16 ; +u32 num_recon =hfi_buffer_get_recon_count (inst);
drivers/media/platform/qcom/iris/iris_vpu_buffer.c static u32 iris_vpu_enc_comv_size(struct iris_inst *inst) · line 714
Quoted 10 lines
drivers/media/platform/qcom/iris/iris_vpu_buffer.c +4
-5+u32 standard, lcu_size; -if (inst->codec ==V4L2_PIX_FMT_HEVC ) { - lcu_size =32 ; -return hfi_buffer_comv_enc (width, height, lcu_size, - num_recon +1 ,HFI_CODEC_ENCODE_HEVC ); - } + standard = (inst->codec ==V4L2_PIX_FMT_HEVC ) ? +HFI_CODEC_ENCODE_HEVC :HFI_CODEC_ENCODE_AVC ; + lcu_size = (inst->codec ==V4L2_PIX_FMT_HEVC ) ?32 :16 ;
these code optimization is not in the scope of this change. pls have in a spearate patch if needed.
Thanks,
Dikshita
Quoted 21 lines
drivers/media/platform/qcom/iris/iris_vpu_buffer.c +3
-5-return hfi_buffer_comv_enc (width, height, lcu_size, - num_recon +1 ,HFI_CODEC_ENCODE_AVC ); +return hfi_buffer_comv_enc (width, height, lcu_size, num_recon, standard); } static inline@@ -1402,10 +1412,9 @@ static u32 iris_vpu_enc_scratch2_size(struct iris_inst *inst) {u32 frame_height =iris_vpu_enc_get_bitstream_height (inst);u32 frame_width =iris_vpu_enc_get_bitstream_width (inst); -u32 num_ref =1 ; +u32 num_ref =hfi_buffer_get_recon_count (inst); -return hfi_buffer_scratch2_enc (frame_width, frame_height, num_ref, - false); +return hfi_buffer_scratch2_enc (frame_width, frame_height, num_ref, false); }static u32 iris_vpu_enc_vpss_size (struct iris_inst *inst)
Dikshita Agarwal
maintainerRe: [PATCH 2/4] media: qcom: iris: Add Long-Term Reference support for encoder
In reply to Wangao WangQuoted 81 lines · Wangao Wang
Add Long-Term Reference(LTR) frame support for both gen1 and gen2 encoders by enabling the following V4L2 controls:
V4L2_CID_MPEG_VIDEO_LTR_COUNTV4L2_CID_MPEG_VIDEO_USE_LTR_FRAMESV4L2_CID_MPEG_VIDEO_FRAME_LTR_INDEXKey changes:
Added LTR capability IDs and V4L2 controls. Implemented handlers for LTR count, use, and mark (gen1/gen2). Defined new HFI properties and structures for LTR. Updated platform capability tables and buffer size calculations.Signed-off-by Wangao Wang <[email protected]>--- drivers/media/platform/qcom/iris/iris_ctrls.c | 126 +++++++++++++++++++++ drivers/media/platform/qcom/iris/iris_ctrls.h | 5 + .../platform/qcom/iris/iris_hfi_gen1_command.c | 25 ++++ .../platform/qcom/iris/iris_hfi_gen1_defines.h | 24 ++++ .../platform/qcom/iris/iris_hfi_gen2_defines.h | 3 + .../platform/qcom/iris/iris_platform_common.h | 6 + .../media/platform/qcom/iris/iris_platform_gen1.c | 30 +++++ .../media/platform/qcom/iris/iris_platform_gen2.c | 30 +++++ drivers/media/platform/qcom/iris/iris_vpu_buffer.c | 33 ++++-- 9 files changed, 270 insertions(+), 12 deletions(-)drivers/media/platform/qcom/iris/iris_ctrls.c +34
-0@@ -108,6 +108,12 @@ static enum platform_inst_fw_cap_type iris_get_cap_id(u32 id)return IR_TYPE ;case V4L2_CID_MPEG_VIDEO_INTRA_REFRESH_PERIOD :return IR_PERIOD ; +case V4L2_CID_MPEG_VIDEO_LTR_COUNT : +return LTR_COUNT ; +case V4L2_CID_MPEG_VIDEO_USE_LTR_FRAMES : +return USE_LTR ; +case V4L2_CID_MPEG_VIDEO_FRAME_LTR_INDEX : +return MARK_LTR ;default :return INST_FW_CAP_MAX ; }@@ -205,6 +211,12 @@ static u32 iris_get_v4l2_id(enum platform_inst_fw_cap_type cap_id)return V4L2_CID_MPEG_VIDEO_INTRA_REFRESH_PERIOD_TYPE ;case IR_PERIOD :return V4L2_CID_MPEG_VIDEO_INTRA_REFRESH_PERIOD ; +case LTR_COUNT : +return V4L2_CID_MPEG_VIDEO_LTR_COUNT ; +case USE_LTR : +return V4L2_CID_MPEG_VIDEO_USE_LTR_FRAMES ; +case MARK_LTR : +return V4L2_CID_MPEG_VIDEO_FRAME_LTR_INDEX ;default :return 0 ; }@@ -1022,6 +1034,120 @@ int iris_set_ir_period_gen2(struct iris_inst *inst, enum platform_inst_fw_cap_ty &ir_period, sizeof(u32)); } +int iris_set_ltr_count_gen1 (struct iris_inst *inst,enum platform_inst_fw_cap_type cap_id) +{ +const struct iris_hfi_command_ops *hfi_ops = inst->core->hfi_ops; +u32 ltr_count = inst->fw_caps[cap_id].value; +u32 hfi_id = inst->fw_caps[cap_id].hfi_id; +struct hfi_ltr_mode ltr_mode; + +if (!ltr_count) +return -EINVAL ; + + ltr_mode.count = ltr_count; + ltr_mode.mode =HFI_LTR_MODE_MANUAL ; + ltr_mode.trust_mode =1 ; + +return hfi_ops->session_set_property (inst, hfi_id, +HFI_HOST_FLAGS_NONE , +iris_get_port_info (inst, cap_id), +HFI_PAYLOAD_STRUCTURE , + <r_mode,sizeof (ltr_mode)); +} + +int iris_set_use_ltr (struct iris_inst *inst,enum platform_inst_fw_cap_type cap_id)
drivers/media/platform/qcom/iris/iris_ctrls.c int iris_set_ir_period_gen2(struct iris_inst *inst, enum platform_inst_fw_cap_ty · line 1068
Quoted 10 lines
drivers/media/platform/qcom/iris/iris_ctrls.c +10
-0+{ +const struct iris_hfi_command_ops *hfi_ops = inst->core->hfi_ops; +struct vb2_queue *sq =v4l2_m2m_get_src_vq (inst->m2m_ctx); +struct vb2_queue *dq =v4l2_m2m_get_dst_vq (inst->m2m_ctx); +u32 ltr_count = inst->fw_caps[LTR_COUNT ].value; +u32 hfi_id = inst->fw_caps[cap_id].hfi_id; +struct hfi_ltr_use ltr_use; + +if (!vb2_is_streaming (sq) && !vb2_is_streaming (dq)) +return -EINVAL ;
RC check not required here?
Quoted 20 lines
drivers/media/platform/qcom/iris/iris_ctrls.c +20
-0+ +if (!ltr_count) +return -EINVAL ; + + ltr_use.ref_ltr = inst->fw_caps[cap_id].value; + ltr_use.use_constrnt = true; + ltr_use.frames =0 ; + +return hfi_ops->session_set_property (inst, hfi_id, +HFI_HOST_FLAGS_NONE , +iris_get_port_info (inst, cap_id), +HFI_PAYLOAD_STRUCTURE , + <r_use,sizeof (ltr_use)); +} + +int iris_set_mark_ltr (struct iris_inst *inst,enum platform_inst_fw_cap_type cap_id) +{ +const struct iris_hfi_command_ops *hfi_ops = inst->core->hfi_ops; +struct vb2_queue *sq =v4l2_m2m_get_src_vq (inst->m2m_ctx); +struct vb2_queue *dq =v4l2_m2m_get_dst_vq (inst->m2m_ctx);
drivers/media/platform/qcom/iris/iris_ctrls.c int iris_set_ir_period_gen2(struct iris_inst *inst, enum platform_inst_fw_cap_ty · line 1098
Quoted 10 lines
drivers/media/platform/qcom/iris/iris_ctrls.c +10
-0+u32 ltr_count = inst->fw_caps[LTR_COUNT ].value; +u32 hfi_id = inst->fw_caps[cap_id].hfi_id; +struct hfi_ltr_mark ltr_mark; + +if (!vb2_is_streaming (sq) && !vb2_is_streaming (dq)) +return -EINVAL ; + +if (!ltr_count) +return -EINVAL ; +
RC check not required here?
Quoted 35 lines
drivers/media/platform/qcom/iris/iris_ctrls.c +35
-0+ ltr_mark.mark_frame = inst->fw_caps[cap_id].value; + +return hfi_ops->session_set_property (inst, hfi_id, +HFI_HOST_FLAGS_NONE , +iris_get_port_info (inst, cap_id), +HFI_PAYLOAD_STRUCTURE , + <r_mark,sizeof (ltr_mark)); +} + +int iris_set_ltr_count_gen2 (struct iris_inst *inst,enum platform_inst_fw_cap_type cap_id) +{ +const struct iris_hfi_command_ops *hfi_ops = inst->core->hfi_ops; +u32 ltr_count = inst->fw_caps[cap_id].value; +u32 hfi_id = inst->fw_caps[cap_id].hfi_id; + +if (!ltr_count) +return -EINVAL ; + +if (inst->hfi_rc_type ==HFI_RATE_CONTROL_VBR_VFR || + inst->hfi_rc_type ==HFI_RATE_CONTROL_VBR_CFR || + inst->hfi_rc_type ==HFI_RATE_CONTROL_CQ ) +return -EINVAL ; + +return hfi_ops->session_set_property (inst, hfi_id, +HFI_HOST_FLAGS_NONE , +iris_get_port_info (inst, cap_id), +HFI_PAYLOAD_U32 , + <r_count,sizeof (u32)); +} + +int iris_set_use_and_mark_ltr (struct iris_inst *inst,enum platform_inst_fw_cap_type cap_id) +{ +const struct iris_hfi_command_ops *hfi_ops = inst->core->hfi_ops; +u32 ltr_count = inst->fw_caps[LTR_COUNT ].value; +u32 hfi_val = inst->fw_caps[cap_id].value;
drivers/media/platform/qcom/iris/iris_ctrls.c int iris_set_ir_period_gen2(struct iris_inst *inst, enum platform_inst_fw_cap_ty · line 1143
Quoted 10 lines
drivers/media/platform/qcom/iris/iris_ctrls.c +10
-0+u32 hfi_id = inst->fw_caps[cap_id].hfi_id; + +if (!ltr_count || hfi_val ==INVALID_DEFAULT_MARK_OR_USE_LTR ) +return -EINVAL ; + +if (inst->hfi_rc_type ==HFI_RATE_CONTROL_VBR_VFR || + inst->hfi_rc_type ==HFI_RATE_CONTROL_VBR_CFR || + inst->hfi_rc_type ==HFI_RATE_CONTROL_CQ ) +return -EINVAL ; +
Streaming check is not required here?
Thanks,
Dikshita
Quoted 7 lines
drivers/media/platform/qcom/iris/iris_ctrls.c +7
-0+return hfi_ops->session_set_property (inst, hfi_id, +HFI_HOST_FLAGS_NONE , +iris_get_port_info (inst, cap_id), +HFI_PAYLOAD_U32 , + &hfi_val,sizeof (u32)); +} +
PATCH 3/4 media: qcom: iris: Add B frames support for encoder
In reply to Wangao WangAdd support for B-frame configuration on both gen1 and gen2 encoders by enabling V4L2_CID_MPEG_VIDEO_B_FRAMES control.
Key changes:
Added capability IDs for B-frame and intra period. Implemented handler for GOP structure with B-frames. Defined HFI property and structure for gen1. Updated platform tables and buffer logic for gen2.
--- drivers/media/platform/qcom/iris/iris_ctrls.c | 25 ++++++++++++++++++++++ drivers/media/platform/qcom/iris/iris_ctrls.h | 1 + .../platform/qcom/iris/iris_hfi_gen1_command.c | 8 +++++++ .../platform/qcom/iris/iris_hfi_gen1_defines.h | 6 ++++++ .../platform/qcom/iris/iris_platform_common.h | 2 ++ .../media/platform/qcom/iris/iris_platform_gen1.c | 19 +++++++++++++++- .../media/platform/qcom/iris/iris_platform_gen2.c | 10 +++++++++ drivers/media/platform/qcom/iris/iris_vpu_buffer.c | 6 +++++- 8 files changed, 75 insertions(+), 2 deletions(-)
drivers/media/platform/qcom/iris/iris_ctrls.c +25 -0
@@ -114,6 +114,8 @@ static enum platform_inst_fw_cap_type iris_get_cap_id(u32 id)return USE_LTR ;case V4L2_CID_MPEG_VIDEO_FRAME_LTR_INDEX :return MARK_LTR ; +case V4L2_CID_MPEG_VIDEO_B_FRAMES : +return B_FRAME ;default :return INST_FW_CAP_MAX ; }
@@ -217,6 +219,8 @@ static u32 iris_get_v4l2_id(enum platform_inst_fw_cap_type cap_id)return V4L2_CID_MPEG_VIDEO_USE_LTR_FRAMES ;case MARK_LTR :return V4L2_CID_MPEG_VIDEO_FRAME_LTR_INDEX ; +case B_FRAME : +return V4L2_CID_MPEG_VIDEO_B_FRAMES ;default :return 0 ; }
@@ -1148,6 +1152,27 @@ int iris_set_use_and_mark_ltr(struct iris_inst *inst, enum platform_inst_fw_cap_ &hfi_val, sizeof(u32)); } +int iris_set_intra_period (struct iris_inst *inst,enum platform_inst_fw_cap_type cap_id) +{ +const struct iris_hfi_command_ops *hfi_ops = inst->core->hfi_ops; +u32 gop_size = inst->fw_caps[GOP_SIZE ].value; +u32 b_frame = inst->fw_caps[B_FRAME ].value; +u32 hfi_id = inst->fw_caps[cap_id].hfi_id; +struct hfi_intra_period intra_period; + +if (!gop_size || b_frame >= gop_size) +return -EINVAL ; + + intra_period.pframes = (gop_size -1 ) / (b_frame +1 ); + intra_period.bframes = b_frame; + +return hfi_ops->session_set_property (inst, hfi_id, +HFI_HOST_FLAGS_NONE , +iris_get_port_info (inst, cap_id), +HFI_PAYLOAD_STRUCTURE , + &intra_period,sizeof (intra_period)); +} +int iris_set_properties (struct iris_inst *inst,u32 plane) {const struct iris_hfi_command_ops *hfi_ops = inst->core->hfi_ops;
drivers/media/platform/qcom/iris/iris_ctrls.h +1 -0
@@ -41,6 +41,7 @@ int iris_set_ltr_count_gen2(struct iris_inst *inst, enum platform_inst_fw_cap_tyint iris_set_use_ltr (struct iris_inst *inst,enum platform_inst_fw_cap_type cap_id);int iris_set_mark_ltr (struct iris_inst *inst,enum platform_inst_fw_cap_type cap_id);int iris_set_use_and_mark_ltr (struct iris_inst *inst,enum platform_inst_fw_cap_type cap_id); +int iris_set_intra_period (struct iris_inst *inst,enum platform_inst_fw_cap_type cap_id);int iris_set_properties (struct iris_inst *inst,u32 plane);#endif
drivers/media/platform/qcom/iris/iris_hfi_gen1_command.c +8 -0
@@ -718,6 +718,14 @@ iris_hfi_gen1_packet_session_set_property(struct hfi_session_set_property_pkt *p packet->shdr.hdr.size +=sizeof (u32) +sizeof (*ltr_mark);break ; } +case HFI_PROPERTY_CONFIG_VENC_INTRA_PERIOD : { +struct hfi_intra_period *in = pdata, *intra_period = prop_data; + + intra_period->pframes = in->pframes; + intra_period->bframes = in->bframes; + packet->shdr.hdr.size +=sizeof (u32) +sizeof (*intra_period); +break ; + }default :return -EINVAL ; }
drivers/media/platform/qcom/iris/iris_hfi_gen1_defines.h +6 -0
@@ -155,6 +155,7 @@#define HFI_PROPERTY_PARAM_VENC_LTRMODE 0x200501c#define HFI_PROPERTY_PARAM_VENC_MAX_NUM_B_FRAMES 0x2005020#define HFI_PROPERTY_CONFIG_VENC_TARGET_BITRATE 0x2006001 +#define HFI_PROPERTY_CONFIG_VENC_INTRA_PERIOD 0x2006003#define HFI_PROPERTY_CONFIG_VENC_MARKLTRFRAME 0x2006009#define HFI_PROPERTY_CONFIG_VENC_USELTRFRAME 0x200600a#define HFI_PROPERTY_CONFIG_VENC_SYNC_FRAME_SEQUENCE_HEADER 0x2006008
@@ -484,6 +485,11 @@ struct hfi_ltr_mark {u32 mark_frame; }; +struct hfi_intra_period { +u32 pframes; +u32 bframes; +}; +struct hfi_event_data {u32 error;u32 height;
drivers/media/platform/qcom/iris/iris_platform_common.h +2 -0
@@ -154,6 +154,8 @@ enum platform_inst_fw_cap_type {LTR_COUNT ,USE_LTR ,MARK_LTR , +B_FRAME , +INTRA_PERIOD , INST_FW_CAP_MAX, };
drivers/media/platform/qcom/iris/iris_platform_gen1.c +18 -1
@@ -177,7 +177,6 @@ static const struct platform_inst_fw_cap inst_fw_cap_sm8250_enc[] = { .max = (1 << 16) - 1, .step_or_mask = 1, .value = 30, - .set = iris_set_u32 }, { .cap_id = ENTROPY_MODE,
@@ -279,6 +278,24 @@ static const struct platform_inst_fw_cap inst_fw_cap_sm8250_enc[] = { .flags = CAP_FLAG_INPUT_PORT | CAP_FLAG_DYNAMIC_ALLOWED, .set = iris_set_mark_ltr, }, + { + .cap_id = B_FRAME, + .min = 0, + .max = 3, + .step_or_mask = 1, + .value = 0, + .flags = CAP_FLAG_OUTPUT_PORT, + }, + { + .cap_id = INTRA_PERIOD, + .min = 0, + .max = 1, + .step_or_mask = 1, + .value = 0, + .hfi_id = HFI_PROPERTY_CONFIG_VENC_INTRA_PERIOD, + .flags = CAP_FLAG_OUTPUT_PORT, + .set = iris_set_intra_period, + }, }; static struct platform_inst_caps platform_inst_cap_sm8250 = {
drivers/media/platform/qcom/iris/iris_platform_gen2.c +10 -0
@@ -667,6 +667,16 @@ static const struct platform_inst_fw_cap inst_fw_cap_sm8550_enc[] = { .flags = CAP_FLAG_INPUT_PORT | CAP_FLAG_DYNAMIC_ALLOWED, .set = iris_set_use_and_mark_ltr, }, + { + .cap_id = B_FRAME, + .min = 0, + .max = 1, + .step_or_mask = 1, + .value = 0, + .hfi_id = HFI_PROP_MAX_B_FRAMES, + .flags = CAP_FLAG_OUTPUT_PORT, + .set = iris_set_u32, + }, };static struct platform_inst_caps platform_inst_cap_sm8550 = {
drivers/media/platform/qcom/iris/iris_vpu_buffer.c +5 -1
@@ -670,11 +670,15 @@ static u32 iris_vpu_enc_bin_size(struct iris_inst *inst)static inline u32 hfi_buffer_get_recon_count (struct iris_inst *inst) { +u32 bframe_count, ltr_count;u32 num_ref =1 ; -u32 ltr_count; + bframe_count = inst->fw_caps[B_FRAME ].value; ltr_count = inst->fw_caps[LTR_COUNT ].value; +if (bframe_count) + num_ref =2 ; +if (ltr_count) num_ref = num_ref + ltr_count;
Signature · 1 line
2.43.0
Bryan O'Donoghue
maintainerRe: [PATCH 3/4] media: qcom: iris: Add B frames support for encoder
drivers/media/platform/qcom/iris/iris_ctrls.c int iris_set_use_and_mark_ltr(struct iris_inst *inst, enum platform_inst_fw_cap_ · line 1167
Quoted 2 lines · Wangao Wang
drivers/media/platform/qcom/iris/iris_ctrls.c +2
-0+ intra_period.pframes = (gop_size -1 ) / (b_frame +1 ); + intra_period.bframes = b_frame;
Why do you need to set pframes when setting bframes ?
---
bod
Re: [PATCH 3/4] media: qcom: iris: Add B frames support for encoder
Quoted 8 lines · Bryan O'Donoghue
Quoted 2 lines · Wangao Wang
+ intra_period.pframes = (
gop_size- 1) / (b_frame+ 1); + intra_period.bframes =b_frame;Why do you need to set pframes when setting bframes ?
---
bod
intra_period represents the length of a GOP, which includes both P-frames and B-frames. The counts of P-frames and B-frames within a GOP must be communicated to the firmware.
Signature · 2 lines
Best Regards, Wangao
Dikshita Agarwal
maintainerRe: [PATCH 3/4] media: qcom: iris: Add B frames support for encoder
In reply to Wangao WangQuoted 107 lines · Wangao Wang
Add support for B-frame configuration on both gen1 and gen2 encoders by enabling
V4L2_CID_MPEG_VIDEO_B_FRAMEScontrol.Key changes:
Added capability IDs for B-frame and intra period. Implemented handler for GOP structure with B-frames. Defined HFI property and structure for gen1. Updated platform tables and buffer logic for gen2.Signed-off-by Wangao Wang <[email protected]>--- drivers/media/platform/qcom/iris/iris_ctrls.c | 25 ++++++++++++++++++++++ drivers/media/platform/qcom/iris/iris_ctrls.h | 1 + .../platform/qcom/iris/iris_hfi_gen1_command.c | 8 +++++++ .../platform/qcom/iris/iris_hfi_gen1_defines.h | 6 ++++++ .../platform/qcom/iris/iris_platform_common.h | 2 ++ .../media/platform/qcom/iris/iris_platform_gen1.c | 19 +++++++++++++++- .../media/platform/qcom/iris/iris_platform_gen2.c | 10 +++++++++ drivers/media/platform/qcom/iris/iris_vpu_buffer.c | 6 +++++- 8 files changed, 75 insertions(+), 2 deletions(-)drivers/media/platform/qcom/iris/iris_ctrls.c +25
-0@@ -114,6 +114,8 @@ static enum platform_inst_fw_cap_type iris_get_cap_id(u32 id)return USE_LTR ;case V4L2_CID_MPEG_VIDEO_FRAME_LTR_INDEX :return MARK_LTR ; +case V4L2_CID_MPEG_VIDEO_B_FRAMES : +return B_FRAME ;default :return INST_FW_CAP_MAX ; }@@ -217,6 +219,8 @@ static u32 iris_get_v4l2_id(enum platform_inst_fw_cap_type cap_id)return V4L2_CID_MPEG_VIDEO_USE_LTR_FRAMES ;case MARK_LTR :return V4L2_CID_MPEG_VIDEO_FRAME_LTR_INDEX ; +case B_FRAME : +return V4L2_CID_MPEG_VIDEO_B_FRAMES ;default :return 0 ; }@@ -1148,6 +1152,27 @@ int iris_set_use_and_mark_ltr(struct iris_inst *inst, enum platform_inst_fw_cap_ &hfi_val, sizeof(u32)); } +int iris_set_intra_period (struct iris_inst *inst,enum platform_inst_fw_cap_type cap_id) +{ +const struct iris_hfi_command_ops *hfi_ops = inst->core->hfi_ops; +u32 gop_size = inst->fw_caps[GOP_SIZE ].value; +u32 b_frame = inst->fw_caps[B_FRAME ].value; +u32 hfi_id = inst->fw_caps[cap_id].hfi_id; +struct hfi_intra_period intra_period; + +if (!gop_size || b_frame >= gop_size) +return -EINVAL ; + + intra_period.pframes = (gop_size -1 ) / (b_frame +1 ); + intra_period.bframes = b_frame; + +return hfi_ops->session_set_property (inst, hfi_id, +HFI_HOST_FLAGS_NONE , +iris_get_port_info (inst, cap_id), +HFI_PAYLOAD_STRUCTURE , + &intra_period,sizeof (intra_period)); +} +int iris_set_properties (struct iris_inst *inst,u32 plane) {const struct iris_hfi_command_ops *hfi_ops = inst->core->hfi_ops;drivers/media/platform/qcom/iris/iris_ctrls.h +1
-0@@ -41,6 +41,7 @@ int iris_set_ltr_count_gen2(struct iris_inst *inst, enum platform_inst_fw_cap_tyint iris_set_use_ltr (struct iris_inst *inst,enum platform_inst_fw_cap_type cap_id);int iris_set_mark_ltr (struct iris_inst *inst,enum platform_inst_fw_cap_type cap_id);int iris_set_use_and_mark_ltr (struct iris_inst *inst,enum platform_inst_fw_cap_type cap_id); +int iris_set_intra_period (struct iris_inst *inst,enum platform_inst_fw_cap_type cap_id);int iris_set_properties (struct iris_inst *inst,u32 plane);#endif drivers/media/platform/qcom/iris/iris_hfi_gen1_command.c +8
-0@@ -718,6 +718,14 @@ iris_hfi_gen1_packet_session_set_property(struct hfi_session_set_property_pkt *p packet->shdr.hdr.size +=sizeof (u32) +sizeof (*ltr_mark);break ; } +case HFI_PROPERTY_CONFIG_VENC_INTRA_PERIOD : { +struct hfi_intra_period *in = pdata, *intra_period = prop_data; + + intra_period->pframes = in->pframes; + intra_period->bframes = in->bframes; + packet->shdr.hdr.size +=sizeof (u32) +sizeof (*intra_period); +break ; + }default :return -EINVAL ; }drivers/media/platform/qcom/iris/iris_hfi_gen1_defines.h +0
-0
drivers/media/platform/qcom/iris/iris_hfi_gen1_defines.h line 158
Quoted 4 lines
drivers/media/platform/qcom/iris/iris_hfi_gen1_defines.h +1
-0@@ -155,6 +155,7 @@#define HFI_PROPERTY_PARAM_VENC_LTRMODE 0x200501c#define HFI_PROPERTY_PARAM_VENC_MAX_NUM_B_FRAMES 0x2005020#define HFI_PROPERTY_CONFIG_VENC_TARGET_BITRATE 0x2006001 +#define HFI_PROPERTY_CONFIG_VENC_INTRA_PERIOD 0x2006003
do we need to set HFI_PROPERTY_PARAM_VENC_MAX_NUM_B_FRAMES as well for gen1? Please check.
Quoted 33 lines
drivers/media/platform/qcom/iris/iris_hfi_gen1_defines.h +5
-0#define HFI_PROPERTY_CONFIG_VENC_MARKLTRFRAME 0x2006009#define HFI_PROPERTY_CONFIG_VENC_USELTRFRAME 0x200600a#define HFI_PROPERTY_CONFIG_VENC_SYNC_FRAME_SEQUENCE_HEADER 0x2006008@@ -484,6 +485,11 @@ struct hfi_ltr_mark {u32 mark_frame; }; +struct hfi_intra_period { +u32 pframes; +u32 bframes; +}; +struct hfi_event_data {u32 error;u32 height;drivers/media/platform/qcom/iris/iris_platform_common.h +2
-0@@ -154,6 +154,8 @@ enum platform_inst_fw_cap_type {LTR_COUNT ,USE_LTR ,MARK_LTR , +B_FRAME , +INTRA_PERIOD , INST_FW_CAP_MAX, };drivers/media/platform/qcom/iris/iris_platform_gen1.c +0
-0
drivers/media/platform/qcom/iris/iris_platform_gen1.c static const struct platform_inst_fw_cap inst_fw_cap_sm8250_enc[] = { · line 180
Quoted 4 lines
drivers/media/platform/qcom/iris/iris_platform_gen1.c +0
-1@@ -177,7 +177,6 @@ static const struct platform_inst_fw_cap inst_fw_cap_sm8250_enc[] = { .max = (1 << 16) - 1, .step_or_mask = 1, .value = 30, - .set = iris_set_u32
what is being removed here and why?
Quoted 36 lines
drivers/media/platform/qcom/iris/iris_platform_gen1.c +18
-0}, { .cap_id = ENTROPY_MODE,@@ -279,6 +278,24 @@ static const struct platform_inst_fw_cap inst_fw_cap_sm8250_enc[] = { .flags = CAP_FLAG_INPUT_PORT | CAP_FLAG_DYNAMIC_ALLOWED, .set = iris_set_mark_ltr, }, + { + .cap_id = B_FRAME, + .min = 0, + .max = 3, + .step_or_mask = 1, + .value = 0, + .flags = CAP_FLAG_OUTPUT_PORT, + }, + { + .cap_id = INTRA_PERIOD, + .min = 0, + .max = 1, + .step_or_mask = 1, + .value = 0, + .hfi_id = HFI_PROPERTY_CONFIG_VENC_INTRA_PERIOD, + .flags = CAP_FLAG_OUTPUT_PORT, + .set = iris_set_intra_period, + }, };static struct
platform_inst_capsplatform_inst_cap_sm8550= {drivers/media/platform/qcom/iris/iris_vpu_buffer.c +0
-0@@ -670,11 +670,15 @@ static u32 iris_vpu_enc_bin_size(struct iris_inst *inst)static inline u32 hfi_buffer_get_recon_count (struct iris_inst *inst)
drivers/media/platform/qcom/iris/iris_vpu_buffer.c static u32 iris_vpu_enc_bin_size(struct iris_inst *inst) · line 680
Quoted 10 lines
drivers/media/platform/qcom/iris/iris_vpu_buffer.c +4
-1{ +u32 bframe_count, ltr_count;u32 num_ref =1 ; -u32 ltr_count; + bframe_count = inst->fw_caps[B_FRAME ].value; ltr_count = inst->fw_caps[LTR_COUNT ].value; +if (bframe_count) + num_ref =2 ;
this would impact the scratch2 size calculation as well, please check if this is as expected for scratch2.
Thanks,
Dikshita
Quoted 5 lines
drivers/media/platform/qcom/iris/iris_vpu_buffer.c +1
-0+if (ltr_count) num_ref = num_ref + ltr_count;
PATCH 4/4 media: qcom: iris: Add hierarchical coding support for encoder
In reply to Wangao WangAdd hierarchical coding support for both gen1 and gen2 encoders by enabling
the following V4L2 controls:
H264:V4L2_CID_MPEG_VIDEO_H264_HIERARCHICAL_CODING, V4L2_CID_MPEG_VIDEO_H264_HIERARCHICAL_CODING_TYPE, V4L2_CID_MPEG_VIDEO_H264_HIERARCHICAL_CODING_LAYER
HEVC(gen2 only):V4L2_CID_MPEG_VIDEO_HEVC_HIER_CODING_TYPE, V4L2_CID_MPEG_VIDEO_HEVC_HIER_CODING_LAYER
Key changes:
Added capability IDs for hierarchical coding enable, type, and layer count. Implemented handlers for layer type and layer count (gen1/gen2). Defined new HFI properties and enums for hierarchical coding. Updated platform capability tables and buffer logic to handle hierarchical
coding.
--- drivers/media/platform/qcom/iris/iris_ctrls.c | 150 +++++++++++++++++++++ drivers/media/platform/qcom/iris/iris_ctrls.h | 3 + .../platform/qcom/iris/iris_hfi_gen1_command.c | 14 ++ .../platform/qcom/iris/iris_hfi_gen1_defines.h | 2 + .../platform/qcom/iris/iris_hfi_gen2_defines.h | 9 ++ drivers/media/platform/qcom/iris/iris_instance.h | 4 + .../platform/qcom/iris/iris_platform_common.h | 11 ++ .../media/platform/qcom/iris/iris_platform_gen1.c | 26 ++++ .../media/platform/qcom/iris/iris_platform_gen2.c | 48 +++++++ drivers/media/platform/qcom/iris/iris_vpu_buffer.c | 21 +++ 10 files changed, 288 insertions(+)
drivers/media/platform/qcom/iris/iris_ctrls.c +150 -0
@@ -116,6 +116,16 @@ static enum platform_inst_fw_cap_type iris_get_cap_id(u32 id)return MARK_LTR ;case V4L2_CID_MPEG_VIDEO_B_FRAMES :return B_FRAME ; +case V4L2_CID_MPEG_VIDEO_H264_HIERARCHICAL_CODING : +return LAYER_ENABLE ; +case V4L2_CID_MPEG_VIDEO_H264_HIERARCHICAL_CODING_TYPE : +return LAYER_TYPE_H264 ; +case V4L2_CID_MPEG_VIDEO_HEVC_HIER_CODING_TYPE : +return LAYER_TYPE_HEVC ; +case V4L2_CID_MPEG_VIDEO_H264_HIERARCHICAL_CODING_LAYER : +return LAYER_COUNT_H264 ; +case V4L2_CID_MPEG_VIDEO_HEVC_HIER_CODING_LAYER : +return LAYER_COUNT_HEVC ;default :return INST_FW_CAP_MAX ; }
@@ -221,6 +231,16 @@ static u32 iris_get_v4l2_id(enum platform_inst_fw_cap_type cap_id)return V4L2_CID_MPEG_VIDEO_FRAME_LTR_INDEX ;case B_FRAME :return V4L2_CID_MPEG_VIDEO_B_FRAMES ; +case LAYER_ENABLE : +return V4L2_CID_MPEG_VIDEO_H264_HIERARCHICAL_CODING ; +case LAYER_TYPE_H264 : +return V4L2_CID_MPEG_VIDEO_H264_HIERARCHICAL_CODING_TYPE ; +case LAYER_TYPE_HEVC : +return V4L2_CID_MPEG_VIDEO_HEVC_HIER_CODING_TYPE ; +case LAYER_COUNT_H264 : +return V4L2_CID_MPEG_VIDEO_H264_HIERARCHICAL_CODING_LAYER ; +case LAYER_COUNT_HEVC : +return V4L2_CID_MPEG_VIDEO_HEVC_HIER_CODING_LAYER ;default :return 0 ; }
@@ -1173,6 +1193,136 @@ int iris_set_intra_period(struct iris_inst *inst, enum platform_inst_fw_cap_type &intra_period, sizeof(intra_period)); } +int iris_set_layer_type (struct iris_inst *inst,enum platform_inst_fw_cap_type cap_id) +{ +const struct iris_hfi_command_ops *hfi_ops = inst->core->hfi_ops; +u32 layer_enable = inst->fw_caps[LAYER_ENABLE ].value; +u32 hfi_id = inst->fw_caps[cap_id].hfi_id; +u32 layer_type; + +if (inst->hfi_rc_type ==HFI_RATE_CONTROL_CQ || + inst->hfi_rc_type ==HFI_RATE_CONTROL_OFF ) +return -EINVAL ; + +if (inst->codec ==V4L2_PIX_FMT_H264 ) { +if (!layer_enable || !inst->fw_caps[LAYER_COUNT_H264 ].value) +return -EINVAL ; + +if (inst->fw_caps[LAYER_TYPE_H264 ].value == +V4L2_MPEG_VIDEO_H264_HIERARCHICAL_CODING_P ) { +if (inst->hfi_rc_type ==HFI_RC_VBR_CFR ) + layer_type =HFI_HIER_P_HYBRID_LTR ; +else + layer_type =HFI_HIER_P_SLIDING_WINDOW ; + }else if (inst->fw_caps[LAYER_TYPE_HEVC ].value == +V4L2_MPEG_VIDEO_HEVC_HIERARCHICAL_CODING_B ) { +if (inst->hfi_rc_type ==HFI_RC_VBR_CFR ) + layer_type =HFI_HIER_B ; +else +return -EINVAL ; + }else { +return -EINVAL ; + } + }else if (inst->codec ==V4L2_PIX_FMT_HEVC ) { +if (!inst->fw_caps[LAYER_COUNT_HEVC ].value) +return -EINVAL ; + +if (inst->fw_caps[LAYER_TYPE_HEVC ].value == +V4L2_MPEG_VIDEO_HEVC_HIERARCHICAL_CODING_P ) { + layer_type =HFI_HIER_P_SLIDING_WINDOW ; + }else if (inst->fw_caps[LAYER_TYPE_HEVC ].value == +V4L2_MPEG_VIDEO_HEVC_HIERARCHICAL_CODING_B ) { +if (inst->hfi_rc_type ==HFI_RC_VBR_CFR ) + layer_type =HFI_HIER_B ; +else +return -EINVAL ; + }else { +return -EINVAL ; + } + } + + inst->hfi_layer_type = layer_type; + +return hfi_ops->session_set_property (inst, hfi_id, +HFI_HOST_FLAGS_NONE , +iris_get_port_info (inst, cap_id), +HFI_PAYLOAD_U32_ENUM , + &layer_type,sizeof (u32)); +} + +int iris_set_layer_count_gen1 (struct iris_inst *inst,enum platform_inst_fw_cap_type cap_id) +{ +const struct iris_hfi_command_ops *hfi_ops = inst->core->hfi_ops; +struct vb2_queue *sq =v4l2_m2m_get_src_vq (inst->m2m_ctx); +struct vb2_queue *dq =v4l2_m2m_get_dst_vq (inst->m2m_ctx); +u32 layer_enable = inst->fw_caps[LAYER_ENABLE ].value; +u32 layer_count = inst->fw_caps[cap_id].value; +u32 hfi_id; + +if (!layer_enable || !layer_count) +return -EINVAL ; + + inst->hfi_layer_count = layer_count; + +if (!vb2_is_streaming (sq) && !vb2_is_streaming (dq)) { + hfi_id =HFI_PROPERTY_PARAM_VENC_HIER_P_MAX_NUM_ENH_LAYER ; + hfi_ops->session_set_property (inst, hfi_id, +HFI_HOST_FLAGS_NONE , +iris_get_port_info (inst, cap_id), +HFI_PAYLOAD_U32 , + &layer_count,sizeof (u32)); + } + + hfi_id = inst->fw_caps[cap_id].hfi_id; +return hfi_ops->session_set_property (inst, hfi_id, +HFI_HOST_FLAGS_NONE , +iris_get_port_info (inst, cap_id), +HFI_PAYLOAD_U32 , + &layer_count,sizeof (u32)); +} + +int iris_set_layer_count_gen2 (struct iris_inst *inst,enum platform_inst_fw_cap_type cap_id) +{ +const struct iris_hfi_command_ops *hfi_ops = inst->core->hfi_ops; +u32 hfi_id = inst->fw_caps[cap_id].hfi_id; +u32 layer_type = inst->hfi_layer_type; +u32 layer_count, layer_count_max; + + layer_count = (inst->codec ==V4L2_PIX_FMT_H264 ) ? + inst->fw_caps[LAYER_COUNT_H264 ].value : + inst->fw_caps[LAYER_COUNT_HEVC ].value; + +if (!layer_type || !layer_count) +return -EINVAL ; + +if (layer_type ==HFI_HIER_B ) { + layer_count_max =MAX_LAYER_HB ; + }else if (layer_type ==HFI_HIER_P_HYBRID_LTR ) { + layer_count_max =MAX_AVC_LAYER_HP_HYBRID_LTR ; + }else if (layer_type ==HFI_HIER_P_SLIDING_WINDOW ) { +if (inst->codec ==V4L2_PIX_FMT_H264 ) { + layer_count_max =MAX_AVC_LAYER_HP_SLIDING_WINDOW ; + }else { +if (inst->hfi_rc_type ==HFI_RC_VBR_CFR ) + layer_count_max =MAX_HEVC_VBR_LAYER_HP_SLIDING_WINDOW ; +else + layer_count_max =MAX_HEVC_LAYER_HP_SLIDING_WINDOW ; + } + } + +if (layer_count > layer_count_max) + layer_count = layer_count_max; + + layer_count +=1 ;/* base layer */ + inst->hfi_layer_count = layer_count; + +return hfi_ops->session_set_property (inst, hfi_id, +HFI_HOST_FLAGS_NONE , +iris_get_port_info (inst, cap_id), +HFI_PAYLOAD_U32 , + &layer_count,sizeof (u32)); +} +int iris_set_properties (struct iris_inst *inst,u32 plane) {const struct iris_hfi_command_ops *hfi_ops = inst->core->hfi_ops;
drivers/media/platform/qcom/iris/iris_ctrls.h +3 -0
@@ -42,6 +42,9 @@ int iris_set_use_ltr(struct iris_inst *inst, enum platform_inst_fw_cap_type cap_int iris_set_mark_ltr (struct iris_inst *inst,enum platform_inst_fw_cap_type cap_id);int iris_set_use_and_mark_ltr (struct iris_inst *inst,enum platform_inst_fw_cap_type cap_id);int iris_set_intra_period (struct iris_inst *inst,enum platform_inst_fw_cap_type cap_id); +int iris_set_layer_type (struct iris_inst *inst,enum platform_inst_fw_cap_type cap_id); +int iris_set_layer_count_gen1 (struct iris_inst *inst,enum platform_inst_fw_cap_type cap_id); +int iris_set_layer_count_gen2 (struct iris_inst *inst,enum platform_inst_fw_cap_type cap_id);int iris_set_properties (struct iris_inst *inst,u32 plane);#endif
drivers/media/platform/qcom/iris/iris_hfi_gen1_command.c +14 -0
@@ -726,6 +726,20 @@ iris_hfi_gen1_packet_session_set_property(struct hfi_session_set_property_pkt *p packet->shdr.hdr.size +=sizeof (u32) +sizeof (*intra_period);break ; } +case HFI_PROPERTY_PARAM_VENC_HIER_P_MAX_NUM_ENH_LAYER : { +u32 *in = pdata; + + packet->data[1 ] = *in; + packet->shdr.hdr.size +=sizeof (u32) *2 ; +break ; + } +case HFI_PROPERTY_CONFIG_VENC_HIER_P_ENH_LAYER : { +u32 *in = pdata; + + packet->data[1 ] = *in; + packet->shdr.hdr.size +=sizeof (u32) *2 ; +break ; + }default :return -EINVAL ; }
drivers/media/platform/qcom/iris/iris_hfi_gen1_defines.h +2 -0
@@ -154,11 +154,13 @@#define HFI_PROPERTY_PARAM_VENC_LTRMODE 0x200501c#define HFI_PROPERTY_PARAM_VENC_MAX_NUM_B_FRAMES 0x2005020 +#define HFI_PROPERTY_PARAM_VENC_HIER_P_MAX_NUM_ENH_LAYER 0x2005026#define HFI_PROPERTY_CONFIG_VENC_TARGET_BITRATE 0x2006001#define HFI_PROPERTY_CONFIG_VENC_INTRA_PERIOD 0x2006003#define HFI_PROPERTY_CONFIG_VENC_MARKLTRFRAME 0x2006009#define HFI_PROPERTY_CONFIG_VENC_USELTRFRAME 0x200600a#define HFI_PROPERTY_CONFIG_VENC_SYNC_FRAME_SEQUENCE_HEADER 0x2006008 +#define HFI_PROPERTY_CONFIG_VENC_HIER_P_ENH_LAYER 0x200600bstruct hfi_pkt_hdr {u32 size;
drivers/media/platform/qcom/iris/iris_hfi_gen2_defines.h +9 -0
@@ -74,6 +74,15 @@ enum hfi_rate_control {#define HFI_PROP_LTR_COUNT 0x03000134#define HFI_PROP_LTR_MARK 0x03000135#define HFI_PROP_LTR_USE 0x03000136 + +enum hfi_layer_encoding_type { +HFI_HIER_P_SLIDING_WINDOW =0x1 , +HFI_HIER_P_HYBRID_LTR =0x2 , +HFI_HIER_B =0x3 , +}; + +#define HFI_PROP_LAYER_ENCODING_TYPE 0x03000138 +#define HFI_PROP_LAYER_COUNT 0x03000139#define HFI_PROP_TOTAL_BITRATE 0x0300013b#define HFI_PROP_MAX_GOP_FRAMES 0x03000146#define HFI_PROP_MAX_B_FRAMES 0x03000147
drivers/media/platform/qcom/iris/iris_instance.h +4 -0
@@ -73,6 +73,8 @@ struct iris_fmt {* @enc_raw_height: source image height for encoder instance * @enc_scale_width: scale width for encoder instance * @enc_scale_height: scale height for encoder instance +* @hfi_layer_type: hierarchical coding layer type +* @hfi_layer_count: hierarchical coding layer count */ struct iris_inst {
@@ -115,6 +117,8 @@ struct iris_inst {u32 enc_raw_height;u32 enc_scale_width;u32 enc_scale_height; +u32 hfi_layer_type; + u32 hfi_layer_count; };#endif
drivers/media/platform/qcom/iris/iris_platform_common.h +11 -0
@@ -32,6 +32,12 @@ struct iris_inst;#define INVALID_DEFAULT_MARK_OR_USE_LTR -1#define MAX_LTR_FRAME_COUNT_GEN1 4#define MAX_LTR_FRAME_COUNT_GEN2 2 +#define MAX_LAYER_HB 3 +#define MAX_AVC_LAYER_HP_HYBRID_LTR 5 +#define MAX_AVC_LAYER_HP_SLIDING_WINDOW 3 +#define MAX_HEVC_LAYER_HP_SLIDING_WINDOW 3 +#define MAX_HEVC_VBR_LAYER_HP_SLIDING_WINDOW 5 +#define MAX_HIER_CODING_LAYER_GEN1 6enum stage_type {STAGE_1 =1 ,
@@ -156,6 +162,11 @@ enum platform_inst_fw_cap_type {MARK_LTR ,B_FRAME ,INTRA_PERIOD , +LAYER_ENABLE , +LAYER_TYPE_H264 , +LAYER_TYPE_HEVC , +LAYER_COUNT_H264 , +LAYER_COUNT_HEVC , INST_FW_CAP_MAX, };
drivers/media/platform/qcom/iris/iris_platform_gen1.c +26 -0
@@ -296,6 +296,32 @@ static const struct platform_inst_fw_cap inst_fw_cap_sm8250_enc[] = { .flags = CAP_FLAG_OUTPUT_PORT, .set = iris_set_intra_period, }, + { + .cap_id = LAYER_ENABLE, + .min = 0, + .max = 1, + .step_or_mask = 1, + .value = 0, + .flags = CAP_FLAG_OUTPUT_PORT, + }, + { + .cap_id = LAYER_TYPE_H264, + .min = V4L2_MPEG_VIDEO_H264_HIERARCHICAL_CODING_P, + .max = V4L2_MPEG_VIDEO_H264_HIERARCHICAL_CODING_P, + .step_or_mask = BIT(V4L2_MPEG_VIDEO_H264_HIERARCHICAL_CODING_P), + .value = V4L2_MPEG_VIDEO_H264_HIERARCHICAL_CODING_P, + .flags = CAP_FLAG_OUTPUT_PORT | CAP_FLAG_MENU, + }, + { + .cap_id = LAYER_COUNT_H264, + .min = 0, + .max = MAX_HIER_CODING_LAYER_GEN1, + .step_or_mask = 1, + .value = 0, + .hfi_id = HFI_PROPERTY_CONFIG_VENC_HIER_P_ENH_LAYER, + .flags = CAP_FLAG_OUTPUT_PORT, + .set = iris_set_layer_count_gen1, + }, }; static struct platform_inst_caps platform_inst_cap_sm8250 = {
drivers/media/platform/qcom/iris/iris_platform_gen2.c +48 -0
54 lines not on this page · raw message
drivers/media/platform/qcom/iris/iris_vpu_buffer.c +21 -0
@@ -670,6 +670,8 @@ static u32 iris_vpu_enc_bin_size(struct iris_inst *inst)static inline u32 hfi_buffer_get_recon_count (struct iris_inst *inst) { +u32 layer_count = inst->hfi_layer_count; +u32 layer_type = inst->hfi_layer_type;u32 bframe_count, ltr_count;u32 num_ref =1 ;
@@ -679,9 +681,28 @@ static inline u32 hfi_buffer_get_recon_count(struct iris_inst *inst)if (bframe_count) num_ref =2 ; +if (layer_type ==HFI_HIER_P_HYBRID_LTR ) + num_ref = (layer_count +1 ) >>1 ; + +if (layer_type ==HFI_HIER_P_SLIDING_WINDOW ) { +if (inst->codec ==V4L2_PIX_FMT_HEVC ) + num_ref = (layer_count +1 ) >>1 ; +else if (inst->codec ==V4L2_PIX_FMT_H264 && layer_count <4 ) + num_ref = (layer_count -1 ); +else + num_ref = layer_count; + } +if (ltr_count) num_ref = num_ref + ltr_count; +if (layer_type ==HFI_HIER_B ) { +if (inst->codec ==V4L2_PIX_FMT_HEVC ) + num_ref = layer_count; +else + num_ref = (1 << (layer_count -2 )) +1 ; + } +return num_ref +1 ; }
Signature · 1 line
2.43.0
Bryan O'Donoghue
maintainerRe: [PATCH 4/4] media: qcom: iris: Add hierarchical coding support for encoder
Quoted 141 lines · Wangao Wang
Add hierarchical coding support for both gen1 and gen2 encoders by enabling
the following V4L2 controls:
H264:V4L2_CID_MPEG_VIDEO_H264_HIERARCHICAL_CODING,V4L2_CID_MPEG_VIDEO_H264_HIERARCHICAL_CODING_TYPE,V4L2_CID_MPEG_VIDEO_H264_HIERARCHICAL_CODING_LAYER
HEVC(gen2 only):V4L2_CID_MPEG_VIDEO_HEVC_HIER_CODING_TYPE,V4L2_CID_MPEG_VIDEO_HEVC_HIER_CODING_LAYERKey changes:
Added capability IDs for hierarchical coding enable, type, and layer count. Implemented handlers for layer type and layer count (gen1/gen2). Defined new HFI properties and enums for hierarchical coding. Updated platform capability tables and buffer logic to handle hierarchical
coding.Signed-off-by Wangao Wang <[email protected]>--- drivers/media/platform/qcom/iris/iris_ctrls.c | 150 +++++++++++++++++++++ drivers/media/platform/qcom/iris/iris_ctrls.h | 3 + .../platform/qcom/iris/iris_hfi_gen1_command.c | 14 ++ .../platform/qcom/iris/iris_hfi_gen1_defines.h | 2 + .../platform/qcom/iris/iris_hfi_gen2_defines.h | 9 ++ drivers/media/platform/qcom/iris/iris_instance.h | 4 + .../platform/qcom/iris/iris_platform_common.h | 11 ++ .../media/platform/qcom/iris/iris_platform_gen1.c | 26 ++++ .../media/platform/qcom/iris/iris_platform_gen2.c | 48 +++++++ drivers/media/platform/qcom/iris/iris_vpu_buffer.c | 21 +++ 10 files changed, 288 insertions(+)drivers/media/platform/qcom/iris/iris_ctrls.c +88
-0@@ -116,6 +116,16 @@ static enum platform_inst_fw_cap_type iris_get_cap_id(u32 id)return MARK_LTR ;case V4L2_CID_MPEG_VIDEO_B_FRAMES :return B_FRAME ; +case V4L2_CID_MPEG_VIDEO_H264_HIERARCHICAL_CODING : +return LAYER_ENABLE ; +case V4L2_CID_MPEG_VIDEO_H264_HIERARCHICAL_CODING_TYPE : +return LAYER_TYPE_H264 ; +case V4L2_CID_MPEG_VIDEO_HEVC_HIER_CODING_TYPE : +return LAYER_TYPE_HEVC ; +case V4L2_CID_MPEG_VIDEO_H264_HIERARCHICAL_CODING_LAYER : +return LAYER_COUNT_H264 ; +case V4L2_CID_MPEG_VIDEO_HEVC_HIER_CODING_LAYER : +return LAYER_COUNT_HEVC ;default :return INST_FW_CAP_MAX ; }@@ -221,6 +231,16 @@ static u32 iris_get_v4l2_id(enum platform_inst_fw_cap_type cap_id)return V4L2_CID_MPEG_VIDEO_FRAME_LTR_INDEX ;case B_FRAME :return V4L2_CID_MPEG_VIDEO_B_FRAMES ; +case LAYER_ENABLE : +return V4L2_CID_MPEG_VIDEO_H264_HIERARCHICAL_CODING ; +case LAYER_TYPE_H264 : +return V4L2_CID_MPEG_VIDEO_H264_HIERARCHICAL_CODING_TYPE ; +case LAYER_TYPE_HEVC : +return V4L2_CID_MPEG_VIDEO_HEVC_HIER_CODING_TYPE ; +case LAYER_COUNT_H264 : +return V4L2_CID_MPEG_VIDEO_H264_HIERARCHICAL_CODING_LAYER ; +case LAYER_COUNT_HEVC : +return V4L2_CID_MPEG_VIDEO_HEVC_HIER_CODING_LAYER ;default :return 0 ; }@@ -1173,6 +1193,136 @@ int iris_set_intra_period(struct iris_inst *inst, enum platform_inst_fw_cap_type &intra_period, sizeof(intra_period)); } +int iris_set_layer_type (struct iris_inst *inst,enum platform_inst_fw_cap_type cap_id) +{ +const struct iris_hfi_command_ops *hfi_ops = inst->core->hfi_ops; +u32 layer_enable = inst->fw_caps[LAYER_ENABLE ].value; +u32 hfi_id = inst->fw_caps[cap_id].hfi_id; +u32 layer_type; + +if (inst->hfi_rc_type ==HFI_RATE_CONTROL_CQ || + inst->hfi_rc_type ==HFI_RATE_CONTROL_OFF ) +return -EINVAL ; + +if (inst->codec ==V4L2_PIX_FMT_H264 ) { +if (!layer_enable || !inst->fw_caps[LAYER_COUNT_H264 ].value) +return -EINVAL ; + +if (inst->fw_caps[LAYER_TYPE_H264 ].value == +V4L2_MPEG_VIDEO_H264_HIERARCHICAL_CODING_P ) { +if (inst->hfi_rc_type ==HFI_RC_VBR_CFR ) + layer_type =HFI_HIER_P_HYBRID_LTR ; +else + layer_type =HFI_HIER_P_SLIDING_WINDOW ; + }else if (inst->fw_caps[LAYER_TYPE_HEVC ].value == +V4L2_MPEG_VIDEO_HEVC_HIERARCHICAL_CODING_B ) { +if (inst->hfi_rc_type ==HFI_RC_VBR_CFR ) + layer_type =HFI_HIER_B ; +else +return -EINVAL ; + }else { +return -EINVAL ; + } + }else if (inst->codec ==V4L2_PIX_FMT_HEVC ) { +if (!inst->fw_caps[LAYER_COUNT_HEVC ].value) +return -EINVAL ; + +if (inst->fw_caps[LAYER_TYPE_HEVC ].value == +V4L2_MPEG_VIDEO_HEVC_HIERARCHICAL_CODING_P ) { + layer_type =HFI_HIER_P_SLIDING_WINDOW ; + }else if (inst->fw_caps[LAYER_TYPE_HEVC ].value == +V4L2_MPEG_VIDEO_HEVC_HIERARCHICAL_CODING_B ) { +if (inst->hfi_rc_type ==HFI_RC_VBR_CFR ) + layer_type =HFI_HIER_B ; +else +return -EINVAL ; + }else { +return -EINVAL ; + } + } + + inst->hfi_layer_type = layer_type; + +return hfi_ops->session_set_property (inst, hfi_id, +HFI_HOST_FLAGS_NONE , +iris_get_port_info (inst, cap_id), +HFI_PAYLOAD_U32_ENUM , + &layer_type,sizeof (u32)); +} + +int iris_set_layer_count_gen1 (struct iris_inst *inst,enum platform_inst_fw_cap_type cap_id) +{ +const struct iris_hfi_command_ops *hfi_ops = inst->core->hfi_ops; +struct vb2_queue *sq =v4l2_m2m_get_src_vq (inst->m2m_ctx); +struct vb2_queue *dq =v4l2_m2m_get_dst_vq (inst->m2m_ctx); +u32 layer_enable = inst->fw_caps[LAYER_ENABLE ].value; +u32 layer_count = inst->fw_caps[cap_id].value; +u32 hfi_id; + +if (!layer_enable || !layer_count) +return -EINVAL ;
drivers/media/platform/qcom/iris/iris_ctrls.c int iris_set_intra_period(struct iris_inst *inst, enum platform_inst_fw_cap_type · line 1273
Quoted 10 lines
drivers/media/platform/qcom/iris/iris_ctrls.c +10
-0+ + inst->hfi_layer_count = layer_count; + +if (!vb2_is_streaming (sq) && !vb2_is_streaming (dq)) { + hfi_id =HFI_PROPERTY_PARAM_VENC_HIER_P_MAX_NUM_ENH_LAYER ; + hfi_ops->session_set_property (inst, hfi_id, +HFI_HOST_FLAGS_NONE , +iris_get_port_info (inst, cap_id), +HFI_PAYLOAD_U32 , + &layer_count,sizeof (u32));
Shouldn't you catch the result code and bug out if this fails ?
Quoted 79 lines
drivers/media/platform/qcom/iris/iris_ctrls.c +52
-0+ } + + hfi_id = inst->fw_caps[cap_id].hfi_id; +return hfi_ops->session_set_property (inst, hfi_id, +HFI_HOST_FLAGS_NONE , +iris_get_port_info (inst, cap_id), +HFI_PAYLOAD_U32 , + &layer_count,sizeof (u32)); +} + +int iris_set_layer_count_gen2 (struct iris_inst *inst,enum platform_inst_fw_cap_type cap_id) +{ +const struct iris_hfi_command_ops *hfi_ops = inst->core->hfi_ops; +u32 hfi_id = inst->fw_caps[cap_id].hfi_id; +u32 layer_type = inst->hfi_layer_type; +u32 layer_count, layer_count_max; + + layer_count = (inst->codec ==V4L2_PIX_FMT_H264 ) ? + inst->fw_caps[LAYER_COUNT_H264 ].value : + inst->fw_caps[LAYER_COUNT_HEVC ].value; + +if (!layer_type || !layer_count) +return -EINVAL ; + +if (layer_type ==HFI_HIER_B ) { + layer_count_max =MAX_LAYER_HB ; + }else if (layer_type ==HFI_HIER_P_HYBRID_LTR ) { + layer_count_max =MAX_AVC_LAYER_HP_HYBRID_LTR ; + }else if (layer_type ==HFI_HIER_P_SLIDING_WINDOW ) { +if (inst->codec ==V4L2_PIX_FMT_H264 ) { + layer_count_max =MAX_AVC_LAYER_HP_SLIDING_WINDOW ; + }else { +if (inst->hfi_rc_type ==HFI_RC_VBR_CFR ) + layer_count_max =MAX_HEVC_VBR_LAYER_HP_SLIDING_WINDOW ; +else + layer_count_max =MAX_HEVC_LAYER_HP_SLIDING_WINDOW ; + } + } + +if (layer_count > layer_count_max) + layer_count = layer_count_max; + + layer_count +=1 ;/* base layer */ + inst->hfi_layer_count = layer_count; + +return hfi_ops->session_set_property (inst, hfi_id, +HFI_HOST_FLAGS_NONE , +iris_get_port_info (inst, cap_id), +HFI_PAYLOAD_U32 , + &layer_count,sizeof (u32)); +} +int iris_set_properties (struct iris_inst *inst,u32 plane) {const struct iris_hfi_command_ops *hfi_ops = inst->core->hfi_ops;drivers/media/platform/qcom/iris/iris_ctrls.h +3
-0@@ -42,6 +42,9 @@ int iris_set_use_ltr(struct iris_inst *inst, enum platform_inst_fw_cap_type cap_int iris_set_mark_ltr (struct iris_inst *inst,enum platform_inst_fw_cap_type cap_id);int iris_set_use_and_mark_ltr (struct iris_inst *inst,enum platform_inst_fw_cap_type cap_id);int iris_set_intra_period (struct iris_inst *inst,enum platform_inst_fw_cap_type cap_id); +int iris_set_layer_type (struct iris_inst *inst,enum platform_inst_fw_cap_type cap_id); +int iris_set_layer_count_gen1 (struct iris_inst *inst,enum platform_inst_fw_cap_type cap_id); +int iris_set_layer_count_gen2 (struct iris_inst *inst,enum platform_inst_fw_cap_type cap_id);int iris_set_properties (struct iris_inst *inst,u32 plane);#endif drivers/media/platform/qcom/iris/iris_hfi_gen1_command.c +2
-0@@ -726,6 +726,20 @@ iris_hfi_gen1_packet_session_set_property(struct hfi_session_set_property_pkt *p packet->shdr.hdr.size +=sizeof (u32) +sizeof (*intra_period);break ; } +case HFI_PROPERTY_PARAM_VENC_HIER_P_MAX_NUM_ENH_LAYER : { +u32 *in = pdata;
drivers/media/platform/qcom/iris/iris_hfi_gen1_command.c iris_hfi_gen1_packet_session_set_property(struct hfi_session_set_property_pkt *p · line 740
Quoted 10 lines
drivers/media/platform/qcom/iris/iris_hfi_gen1_command.c +10
-0+ + packet->data[1 ] = *in; + packet->shdr.hdr.size +=sizeof (u32) *2 ; +break ; + } +case HFI_PROPERTY_CONFIG_VENC_HIER_P_ENH_LAYER : { +u32 *in = pdata; + + packet->data[1 ] = *in; + packet->shdr.hdr.size +=sizeof (u32) *2 ;
This feels inconsistent.
You have a u32 header part and then a u32 data part right ?
Quoted 208 lines
drivers/media/platform/qcom/iris/iris_hfi_gen1_command.c +2
-0+break ; + }default :return -EINVAL ; }drivers/media/platform/qcom/iris/iris_hfi_gen1_defines.h +2
-0@@ -154,11 +154,13 @@#define HFI_PROPERTY_PARAM_VENC_LTRMODE 0x200501c#define HFI_PROPERTY_PARAM_VENC_MAX_NUM_B_FRAMES 0x2005020 +#define HFI_PROPERTY_PARAM_VENC_HIER_P_MAX_NUM_ENH_LAYER 0x2005026#define HFI_PROPERTY_CONFIG_VENC_TARGET_BITRATE 0x2006001#define HFI_PROPERTY_CONFIG_VENC_INTRA_PERIOD 0x2006003#define HFI_PROPERTY_CONFIG_VENC_MARKLTRFRAME 0x2006009#define HFI_PROPERTY_CONFIG_VENC_USELTRFRAME 0x200600a#define HFI_PROPERTY_CONFIG_VENC_SYNC_FRAME_SEQUENCE_HEADER 0x2006008 +#define HFI_PROPERTY_CONFIG_VENC_HIER_P_ENH_LAYER 0x200600bstruct hfi_pkt_hdr {u32 size;drivers/media/platform/qcom/iris/iris_hfi_gen2_defines.h +9
-0@@ -74,6 +74,15 @@ enum hfi_rate_control {#define HFI_PROP_LTR_COUNT 0x03000134#define HFI_PROP_LTR_MARK 0x03000135#define HFI_PROP_LTR_USE 0x03000136 + +enum hfi_layer_encoding_type { +HFI_HIER_P_SLIDING_WINDOW =0x1 , +HFI_HIER_P_HYBRID_LTR =0x2 , +HFI_HIER_B =0x3 , +}; + +#define HFI_PROP_LAYER_ENCODING_TYPE 0x03000138 +#define HFI_PROP_LAYER_COUNT 0x03000139#define HFI_PROP_TOTAL_BITRATE 0x0300013b#define HFI_PROP_MAX_GOP_FRAMES 0x03000146#define HFI_PROP_MAX_B_FRAMES 0x03000147drivers/media/platform/qcom/iris/iris_instance.h +4
-0@@ -73,6 +73,8 @@ struct iris_fmt {* @enc_raw_height: source image height for encoder instance * @enc_scale_width: scale width for encoder instance * @enc_scale_height: scale height for encoder instance +* @hfi_layer_type: hierarchical coding layer type +* @hfi_layer_count: hierarchical coding layer count */ struct iris_inst {@@ -115,6 +117,8 @@ struct iris_inst {u32 enc_raw_height;u32 enc_scale_width;u32 enc_scale_height; +u32 hfi_layer_type; + u32 hfi_layer_count; };#endif drivers/media/platform/qcom/iris/iris_platform_common.h +11
-0@@ -32,6 +32,12 @@ struct iris_inst;#define INVALID_DEFAULT_MARK_OR_USE_LTR -1#define MAX_LTR_FRAME_COUNT_GEN1 4#define MAX_LTR_FRAME_COUNT_GEN2 2 +#define MAX_LAYER_HB 3 +#define MAX_AVC_LAYER_HP_HYBRID_LTR 5 +#define MAX_AVC_LAYER_HP_SLIDING_WINDOW 3 +#define MAX_HEVC_LAYER_HP_SLIDING_WINDOW 3 +#define MAX_HEVC_VBR_LAYER_HP_SLIDING_WINDOW 5 +#define MAX_HIER_CODING_LAYER_GEN1 6enum stage_type {STAGE_1 =1 ,@@ -156,6 +162,11 @@ enum platform_inst_fw_cap_type {MARK_LTR ,B_FRAME ,INTRA_PERIOD , +LAYER_ENABLE , +LAYER_TYPE_H264 , +LAYER_TYPE_HEVC , +LAYER_COUNT_H264 , +LAYER_COUNT_HEVC , INST_FW_CAP_MAX, };drivers/media/platform/qcom/iris/iris_platform_gen1.c +26
-0@@ -296,6 +296,32 @@ static const struct platform_inst_fw_cap inst_fw_cap_sm8250_enc[] = { .flags = CAP_FLAG_OUTPUT_PORT, .set = iris_set_intra_period, }, + { + .cap_id = LAYER_ENABLE, + .min = 0, + .max = 1, + .step_or_mask = 1, + .value = 0, + .flags = CAP_FLAG_OUTPUT_PORT, + }, + { + .cap_id = LAYER_TYPE_H264, + .min = V4L2_MPEG_VIDEO_H264_HIERARCHICAL_CODING_P, + .max = V4L2_MPEG_VIDEO_H264_HIERARCHICAL_CODING_P, + .step_or_mask = BIT(V4L2_MPEG_VIDEO_H264_HIERARCHICAL_CODING_P), + .value = V4L2_MPEG_VIDEO_H264_HIERARCHICAL_CODING_P, + .flags = CAP_FLAG_OUTPUT_PORT | CAP_FLAG_MENU, + }, + { + .cap_id = LAYER_COUNT_H264, + .min = 0, + .max = MAX_HIER_CODING_LAYER_GEN1, + .step_or_mask = 1, + .value = 0, + .hfi_id = HFI_PROPERTY_CONFIG_VENC_HIER_P_ENH_LAYER, + .flags = CAP_FLAG_OUTPUT_PORT, + .set = iris_set_layer_count_gen1, + }, }; static struct platform_inst_caps platform_inst_cap_sm8250 = {drivers/media/platform/qcom/iris/iris_platform_gen2.c +48
-0@@ -677,6 +677,54 @@ static const struct platform_inst_fw_cap inst_fw_cap_sm8550_enc[] = { .flags = CAP_FLAG_OUTPUT_PORT, .set = iris_set_u32, }, + { + .cap_id = LAYER_ENABLE, + .min = 0, + .max = 1, + .step_or_mask = 1, + .value = 0, + .flags = CAP_FLAG_OUTPUT_PORT, + }, + { + .cap_id = LAYER_TYPE_H264, + .min = V4L2_MPEG_VIDEO_H264_HIERARCHICAL_CODING_B, + .max = V4L2_MPEG_VIDEO_H264_HIERARCHICAL_CODING_P, + .step_or_mask = BIT(V4L2_MPEG_VIDEO_H264_HIERARCHICAL_CODING_B) | + BIT(V4L2_MPEG_VIDEO_H264_HIERARCHICAL_CODING_P), + .value = V4L2_MPEG_VIDEO_H264_HIERARCHICAL_CODING_P, + .hfi_id = HFI_PROP_LAYER_ENCODING_TYPE, + .flags = CAP_FLAG_OUTPUT_PORT | CAP_FLAG_MENU, + }, + { + .cap_id = LAYER_TYPE_HEVC, + .min = V4L2_MPEG_VIDEO_HEVC_HIERARCHICAL_CODING_B, + .max = V4L2_MPEG_VIDEO_HEVC_HIERARCHICAL_CODING_P, + .step_or_mask = BIT(V4L2_MPEG_VIDEO_HEVC_HIERARCHICAL_CODING_B) | + BIT(V4L2_MPEG_VIDEO_HEVC_HIERARCHICAL_CODING_P), + .value = V4L2_MPEG_VIDEO_HEVC_HIERARCHICAL_CODING_P, + .hfi_id = HFI_PROP_LAYER_ENCODING_TYPE, + .flags = CAP_FLAG_OUTPUT_PORT | CAP_FLAG_MENU, + .set = iris_set_layer_type, + }, + { + .cap_id = LAYER_COUNT_H264, + .min = 0, + .max = 5, + .step_or_mask = 1, + .value = 0, + .hfi_id = HFI_PROP_LAYER_COUNT, + .flags = CAP_FLAG_OUTPUT_PORT | CAP_FLAG_DYNAMIC_ALLOWED, + }, + { + .cap_id = LAYER_COUNT_HEVC, + .min = 0, + .max = 5, + .step_or_mask = 1, + .value = 0, + .hfi_id = HFI_PROP_LAYER_COUNT, + .flags = CAP_FLAG_OUTPUT_PORT | CAP_FLAG_DYNAMIC_ALLOWED, + .set = iris_set_layer_count_gen2, + } }; static struct platform_inst_caps platform_inst_cap_sm8550 = {drivers/media/platform/qcom/iris/iris_vpu_buffer.c +3
-0@@ -670,6 +670,8 @@ static u32 iris_vpu_enc_bin_size(struct iris_inst *inst)static inline u32 hfi_buffer_get_recon_count (struct iris_inst *inst) { +u32 layer_count = inst->hfi_layer_count; +u32 layer_type = inst->hfi_layer_type;u32 bframe_count, ltr_count;u32 num_ref =1 ;@@ -679,9 +681,28 @@ static inline u32 hfi_buffer_get_recon_count(struct iris_inst *inst)if (bframe_count) num_ref =2 ; +if (layer_type ==HFI_HIER_P_HYBRID_LTR )
drivers/media/platform/qcom/iris/iris_vpu_buffer.c static inline u32 hfi_buffer_get_recon_count(struct iris_inst *inst) · line 694
Quoted 10 lines
drivers/media/platform/qcom/iris/iris_vpu_buffer.c +10
-0+ num_ref = (layer_count +1 ) >>1 ; + +if (layer_type ==HFI_HIER_P_SLIDING_WINDOW ) { +if (inst->codec ==V4L2_PIX_FMT_HEVC ) + num_ref = (layer_count +1 ) >>1 ; +else if (inst->codec ==V4L2_PIX_FMT_H264 && layer_count <4 ) + num_ref = (layer_count -1 ); +else + num_ref = layer_count; + }
Why are some of these num_refs shifted but others are not ?
Quoted 18 lines
drivers/media/platform/qcom/iris/iris_vpu_buffer.c +8
-1+if (ltr_count) num_ref = num_ref + ltr_count; +if (layer_type ==HFI_HIER_B ) { +if (inst->codec ==V4L2_PIX_FMT_HEVC ) + num_ref = layer_count; +else + num_ref = (1 << (layer_count -2 )) +1 ; + } +return num_ref +1 ; } --2.43.0