Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 08bcf26b authored by qctecmdr's avatar qctecmdr Committed by Gerrit - the friendly Code Review server
Browse files

Merge "msm-vidc: add support for rotation caps"

parents f135b2ba 3260f2b8

drivers/media/platform/msm/vidc/hfi_response_handler.c

+12 −0
Original line number Diff line number Diff line
@@ -579,6 +579,12 @@ enum hal_capability get_hal_cap_type(u32 capability_type) 
	case HFI_CAPABILITY_BLUR_HEIGHT:

		hal_cap = HAL_CAPABILITY_BLUR_HEIGHT;

		break;

	case HFI_CAPABILITY_ROTATION:

		hal_cap = HAL_CAPABILITY_ROTATION;

		break;

	case HFI_CAPABILITY_COLOR_SPACE_CONVERSION:

		hal_cap = HAL_CAPABILITY_COLOR_SPACE_CONVERSION;

		break;

	case HFI_CAPABILITY_SLICE_DELIVERY_MODES:

		hal_cap = HAL_CAPABILITY_SLICE_DELIVERY_MODES;

		break;
@@ -703,6 +709,12 @@ static inline void copy_cap_prop( 
	case HFI_CAPABILITY_BLUR_HEIGHT:

		out = &capability->blur_height;

		break;

	case HFI_CAPABILITY_ROTATION:

		out = &capability->rotation;

		break;

	case HFI_CAPABILITY_COLOR_SPACE_CONVERSION:

		out = &capability->color_space_caps;

		break;

	case HFI_CAPABILITY_SLICE_DELIVERY_MODES:

		out = &capability->slice_delivery_mode;

		break;

drivers/media/platform/msm/vidc/msm_vidc.c

+7 −0
Original line number Diff line number Diff line
@@ -179,6 +179,13 @@ int msm_vidc_query_ctrl(void *instance, struct v4l2_queryctrl *ctrl) 
	case V4L2_CID_MPEG_VIDEO_MULTI_SLICE_MAX_BYTES:

		msm_vidc_ctrl_get_range(ctrl, &inst->capability.slice_bytes);

		break;

	case V4L2_CID_MPEG_VIDC_VIDEO_COLOR_SPACE_CAPS:

		msm_vidc_ctrl_get_range(ctrl,

			&inst->capability.color_space_caps);

		break;

	case V4L2_CID_MPEG_VIDC_VIDEO_ROTATION_CAPS:

		msm_vidc_ctrl_get_range(ctrl, &inst->capability.rotation);

		break;

	case V4L2_CID_MPEG_VIDC_VIDEO_FRAME_RATE:

	case V4L2_CID_MPEG_VIDC_VIDEO_OPERATING_RATE:

		msm_vidc_ctrl_get_range(ctrl, &inst->capability.frame_rate);

drivers/media/platform/msm/vidc/msm_vidc_common.c

+2 −0
Original line number Diff line number Diff line
@@ -1577,6 +1577,8 @@ static void handle_session_init_done(enum hal_command_response cmd, void *data) 
	print_cap("rc_modes", &inst->capability.rc_modes);

	print_cap("blur_width", &inst->capability.blur_width);

	print_cap("blur_height", &inst->capability.blur_height);

	print_cap("rotation", &inst->capability.rotation);

	print_cap("color_space_caps", &inst->capability.color_space_caps);

	print_cap("slice_delivery_mode", &inst->capability.slice_delivery_mode);

	print_cap("slice_bytes", &inst->capability.slice_bytes);

	print_cap("slice_mbs", &inst->capability.slice_mbs);

drivers/media/platform/msm/vidc/vidc_hfi_api.h

+4 −0
Original line number Diff line number Diff line
@@ -796,6 +796,8 @@ enum hal_capability { 
	HAL_CAPABILITY_MAX_VIDEOCORES,

	HAL_CAPABILITY_MAX_WORKMODES,

	HAL_CAPABILITY_UBWC_CR_STATS,

	HAL_CAPABILITY_ROTATION,

	HAL_CAPABILITY_COLOR_SPACE_CONVERSION,

	HAL_UNUSED_CAPABILITY = 0x10000000,

};
@@ -1249,6 +1251,8 @@ struct msm_vidc_capability { 
	struct hal_capability_supported rc_modes;

	struct hal_capability_supported blur_width;

	struct hal_capability_supported blur_height;

	struct hal_capability_supported color_space_caps;

	struct hal_capability_supported rotation;

	struct hal_capability_supported slice_delivery_mode;

	struct hal_capability_supported slice_bytes;

	struct hal_capability_supported slice_mbs;

drivers/media/platform/msm/vidc/vidc_hfi_helper.h

+2 −0
Original line number Diff line number Diff line
@@ -435,6 +435,8 @@ struct hfi_colour_space { 
#define HFI_CAPABILITY_MAX_VIDEOCORES			(HFI_COMMON_BASE + 0X2B)

#define HFI_CAPABILITY_MAX_WORKMODES			(HFI_COMMON_BASE + 0X2C)

#define HFI_CAPABILITY_UBWC_CR_STATS			(HFI_COMMON_BASE + 0X2D)

#define HFI_CAPABILITY_ROTATION				(HFI_COMMON_BASE + 0X2F)

#define HFI_CAPABILITY_COLOR_SPACE_CONVERSION		(HFI_COMMON_BASE + 0X30)

#define HFI_CAPABILITY_MAX_WORKROUTES			(HFI_COMMON_BASE + 0X31)

#define HFI_CAPABILITY_CQ_QUALITY_LEVEL			(HFI_COMMON_BASE + 0X32)