mirror of
https://github.com/torvalds/linux.git
synced 2026-05-26 08:02:27 +02:00
media: qcom: iris: Add flip support for encoder
Add support for V4L2_CID_HFLIP and V4L2_CID_VFLIP controls in encoder. Reviewed-by: Dikshita Agarwal <dikshita.agarwal@oss.qualcomm.com> Tested-by: Neil Armstrong <neil.armstrong@linaro.org> # on SM8650-HDK Signed-off-by: Wangao Wang <wangao.wang@oss.qualcomm.com> Signed-off-by: Bryan O'Donoghue <bod@kernel.org> Signed-off-by: Hans Verkuil <hverkuil+cisco@kernel.org>
This commit is contained in:
parent
49a940f37d
commit
874eca6d30
|
|
@ -104,6 +104,10 @@ static enum platform_inst_fw_cap_type iris_get_cap_id(u32 id)
|
|||
return LEVEL_AV1;
|
||||
case V4L2_CID_ROTATE:
|
||||
return ROTATION;
|
||||
case V4L2_CID_HFLIP:
|
||||
return HFLIP;
|
||||
case V4L2_CID_VFLIP:
|
||||
return VFLIP;
|
||||
default:
|
||||
return INST_FW_CAP_MAX;
|
||||
}
|
||||
|
|
@ -197,6 +201,10 @@ static u32 iris_get_v4l2_id(enum platform_inst_fw_cap_type cap_id)
|
|||
return V4L2_CID_MPEG_VIDEO_AV1_LEVEL;
|
||||
case ROTATION:
|
||||
return V4L2_CID_ROTATE;
|
||||
case HFLIP:
|
||||
return V4L2_CID_HFLIP;
|
||||
case VFLIP:
|
||||
return V4L2_CID_VFLIP;
|
||||
default:
|
||||
return 0;
|
||||
}
|
||||
|
|
@ -935,6 +943,25 @@ int iris_set_rotation(struct iris_inst *inst, enum platform_inst_fw_cap_type cap
|
|||
&hfi_val, sizeof(u32));
|
||||
}
|
||||
|
||||
int iris_set_flip(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 hfi_val = HFI_DISABLE_FLIP;
|
||||
|
||||
if (inst->fw_caps[HFLIP].value)
|
||||
hfi_val |= HFI_HORIZONTAL_FLIP;
|
||||
|
||||
if (inst->fw_caps[VFLIP].value)
|
||||
hfi_val |= HFI_VERTICAL_FLIP;
|
||||
|
||||
return hfi_ops->session_set_property(inst, hfi_id,
|
||||
HFI_HOST_FLAGS_NONE,
|
||||
iris_get_port_info(inst, cap_id),
|
||||
HFI_PAYLOAD_U32_ENUM,
|
||||
&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;
|
||||
|
|
|
|||
|
|
@ -33,6 +33,7 @@ int iris_set_max_qp(struct iris_inst *inst, enum platform_inst_fw_cap_type cap_i
|
|||
int iris_set_frame_qp(struct iris_inst *inst, enum platform_inst_fw_cap_type cap_id);
|
||||
int 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_properties(struct iris_inst *inst, u32 plane);
|
||||
|
||||
#endif
|
||||
|
|
|
|||
|
|
@ -92,6 +92,14 @@ enum hfi_rotation {
|
|||
};
|
||||
|
||||
#define HFI_PROP_ROTATION 0x0300014b
|
||||
|
||||
enum hfi_flip {
|
||||
HFI_DISABLE_FLIP = 0x00000000,
|
||||
HFI_HORIZONTAL_FLIP = 0x00000001,
|
||||
HFI_VERTICAL_FLIP = 0x00000002,
|
||||
};
|
||||
|
||||
#define HFI_PROP_FLIP 0x0300014c
|
||||
#define HFI_PROP_SIGNAL_COLOR_INFO 0x03000155
|
||||
#define HFI_PROP_PICTURE_TYPE 0x03000162
|
||||
#define HFI_PROP_DEC_DEFAULT_HEADER 0x03000168
|
||||
|
|
|
|||
|
|
@ -151,6 +151,8 @@ enum platform_inst_fw_cap_type {
|
|||
B_FRAME_QP_H264,
|
||||
B_FRAME_QP_HEVC,
|
||||
ROTATION,
|
||||
HFLIP,
|
||||
VFLIP,
|
||||
INST_FW_CAP_MAX,
|
||||
};
|
||||
|
||||
|
|
|
|||
|
|
@ -699,6 +699,28 @@ static const struct platform_inst_fw_cap inst_fw_cap_sm8550_enc[] = {
|
|||
.flags = CAP_FLAG_OUTPUT_PORT,
|
||||
.set = iris_set_rotation,
|
||||
},
|
||||
{
|
||||
.cap_id = HFLIP,
|
||||
.min = 0,
|
||||
.max = 1,
|
||||
.step_or_mask = 1,
|
||||
.value = 0,
|
||||
.hfi_id = HFI_PROP_FLIP,
|
||||
.flags = CAP_FLAG_OUTPUT_PORT | CAP_FLAG_INPUT_PORT |
|
||||
CAP_FLAG_DYNAMIC_ALLOWED,
|
||||
.set = iris_set_flip,
|
||||
},
|
||||
{
|
||||
.cap_id = VFLIP,
|
||||
.min = 0,
|
||||
.max = 1,
|
||||
.step_or_mask = 1,
|
||||
.value = 0,
|
||||
.hfi_id = HFI_PROP_FLIP,
|
||||
.flags = CAP_FLAG_OUTPUT_PORT | CAP_FLAG_INPUT_PORT |
|
||||
CAP_FLAG_DYNAMIC_ALLOWED,
|
||||
.set = iris_set_flip,
|
||||
},
|
||||
};
|
||||
|
||||
static struct platform_inst_caps platform_inst_cap_sm8550 = {
|
||||
|
|
|
|||
Loading…
Reference in New Issue
Block a user