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

Commit 4af2bd61 authored by Linux Build Service Account's avatar Linux Build Service Account Committed by Gerrit - the friendly Code Review server
Browse files

Merge "msm: cpp Remove the striping algorithm header from kernel"

parents 7abd83ae c190ef7a

drivers/media/platform/msm/camera_v2/pproc/cpp/msm_cpp.c

+0 −2
Original line number Diff line number Diff line
@@ -2995,7 +2995,6 @@ static struct msm_cpp_frame_info_t *get_64bit_cpp_frame_from_compat( 
	new_frame->client_id = new_frame32->client_id;

	new_frame->frame_type = new_frame32->frame_type;

	new_frame->num_strips = new_frame32->num_strips;

	new_frame->strip_info = compat_ptr(new_frame32->strip_info);



	new_frame->src_fd =  new_frame32->src_fd;

	new_frame->dst_fd =  new_frame32->dst_fd;
@@ -3115,7 +3114,6 @@ static void get_compat_frame_from_64bit(struct msm_cpp_frame_info_t *frame, 
	k32_frame->client_id = frame->client_id;

	k32_frame->frame_type = frame->frame_type;

	k32_frame->num_strips = frame->num_strips;

	k32_frame->strip_info = ptr_to_compat(frame->strip_info);



	k32_frame->src_fd = frame->src_fd;

	k32_frame->dst_fd = frame->dst_fd;

include/media/msmb_pproc.h

+0 −135
Original line number Diff line number Diff line
@@ -33,139 +33,6 @@ enum msm_vpe_frame_type { 
	MSM_VPE_REALTIME_FRAME,

};



struct msm_cpp_frame_strip_info {

	uint32_t scale_v_en;

	uint32_t scale_h_en;



	uint32_t upscale_v_en;

	uint32_t upscale_h_en;



	int32_t src_start_x;

	uint32_t src_end_x;

	int32_t src_start_y;

	uint32_t src_end_y;



	/* extra 5th and 6th layer parameters */

	int32_t extra_src_start_x;

	uint32_t extra_src_end_x;

	int32_t extra_src_start_y;

	uint32_t extra_src_end_y;



	int32_t extra_initial_vertical_count[2];

	int32_t extra_initial_horizontal_count[2];



	/* crop downscale 32x pixels */

	int32_t extra_left_crop;

	int32_t extra_top_crop;



	int32_t extra_pad_bottom;

	int32_t extra_pad_top;

	int32_t extra_pad_right;

	int32_t extra_pad_left;



	int32_t extra_upscale_width;

	int32_t extra_upscale_height;



	uint32_t temporal_pad_bottom;

	uint32_t temporal_pad_top;

	uint32_t temporal_pad_right;

	uint32_t temporal_pad_left;



	int32_t temporal_src_start_x;

	uint32_t temporal_src_end_x;

	int32_t temporal_src_start_y;

	uint32_t temporal_src_end_y;



	/* Padding is required for upscaler because it does not

	 * pad internally like other blocks, also needed for rotation

	 * rotation expects all the blocks in the stripe to be the same size

	 * Padding is done such that all the extra padded pixels

	 * are on the right and bottom

	 */

	uint32_t pad_bottom;

	uint32_t pad_top;

	uint32_t pad_right;

	uint32_t pad_left;



	uint32_t v_init_phase;

	uint32_t h_init_phase;

	uint32_t h_phase_step;

	uint32_t v_phase_step;



	uint32_t spatial_denoise_crop_width_first_pixel;

	uint32_t spatial_denoise_crop_width_last_pixel;

	uint32_t spatial_denoise_crop_height_first_line;

	uint32_t spatial_denoise_crop_height_last_line;



	uint32_t sharpen_crop_height_first_line;

	uint32_t sharpen_crop_height_last_line;

	uint32_t sharpen_crop_width_first_pixel;

	uint32_t sharpen_crop_width_last_pixel;



	uint32_t temporal_denoise_crop_width_first_pixel;

	uint32_t temporal_denoise_crop_width_last_pixel;

	uint32_t temporal_denoise_crop_height_first_line;

	uint32_t temporal_denoise_crop_height_last_line;



	uint32_t prescaler_spatial_denoise_crop_width_first_pixel;

	uint32_t prescaler_spatial_denoise_crop_width_last_pixel;

	uint32_t prescaler_spatial_denoise_crop_height_first_line;

	uint32_t prescaler_spatial_denoise_crop_height_last_line;



	uint32_t state_crop_width_first_pixel;

	uint32_t state_crop_width_last_pixel;

	uint32_t state_crop_height_first_line;

	uint32_t state_crop_height_last_line;



	int32_t dst_start_x;

	uint32_t dst_end_x;

	int32_t dst_start_y;

	uint32_t dst_end_y;



	int32_t temporal_dst_start_x;

	uint32_t temporal_dst_end_x;

	int32_t temporal_dst_start_y;

	uint32_t temporal_dst_end_y;



	uint32_t input_bytes_per_pixel;

	uint32_t output_bytes_per_pixel;

	uint32_t temporal_bytes_per_pixel;



	uint32_t source_address[2];

	uint32_t extra_source_address[2];

	uint32_t destination_address[2];

	/* source_address[1] is used for CbCR planar

	 * to CbCr interleaved conversion

	 */

	uint32_t temporal_source_address[2];

	/* destination_address[1] is used for CbCr interleved

	 * to CbCr planar conversion

	 */

	uint32_t temporal_destination_address[2];

	uint32_t src_stride;

	uint32_t dst_stride;

	uint32_t rotate_270;

	uint32_t horizontal_flip;

	uint32_t vertical_flip;

	uint32_t scale_output_width;

	uint32_t scale_output_height;

	uint32_t spatial_denoise_crop_en;

	uint32_t sharpen_crop_en;

	uint32_t temporal_denoise_crop_en;

	uint32_t prescaler_spatial_denoise_crop_en;

	uint32_t state_crop_en;



	int32_t we_h_init;

	int32_t we_v_init;

	int32_t we_h_step;

	int32_t we_v_step;



	int32_t temporal_we_h_init;

	int32_t temporal_we_v_init;

	int32_t temporal_we_h_step;

	int32_t temporal_we_v_step;

};



struct msm_cpp_buffer_info_t {

	int32_t fd;

	uint32_t index;
@@ -203,7 +70,6 @@ struct msm_cpp_frame_info_t { 
	uint32_t client_id;

	enum msm_cpp_frame_type frame_type;

	uint32_t num_strips;

	struct msm_cpp_frame_strip_info __user *strip_info;

	uint32_t msg_len;

	uint32_t *cpp_cmd_msg;

	int src_fd;
@@ -399,7 +265,6 @@ struct msm_cpp_frame_info32_t { 
	uint32_t client_id;

	enum msm_cpp_frame_type frame_type;

	uint32_t num_strips;

	compat_caddr_t strip_info;

	uint32_t msg_len;

	compat_uint_t cpp_cmd_msg;

	int src_fd;

include/uapi/media/msm_camera.h

+1 −57
Original line number Diff line number Diff line 
/* Copyright (c) 2009-2012, 2014, The Linux Foundation. All rights reserved.

/* Copyright (c) 2009-2012, 2014-2015 The Linux Foundation. All rights reserved.

 *

 * This program is free software; you can redistribute it and/or modify

 * it under the terms of the GNU General Public License version 2 and
@@ -2164,68 +2164,12 @@ enum msm_cpp_frame_type { 
	MSM_CPP_REALTIME_FRAME,

};



struct msm_cpp_frame_strip_info {

	int scale_v_en;

	int scale_h_en;



	int upscale_v_en;

	int upscale_h_en;



	int src_start_x;

	int src_end_x;

	int src_start_y;

	int src_end_y;



	/* Padding is required for upscaler because it does not

	 * pad internally like other blocks, also needed for rotation

	 * rotation expects all the blocks in the stripe to be the same size

	 * Padding is done such that all the extra padded pixels

	 * are on the right and bottom

	*/

	int pad_bottom;

	int pad_top;

	int pad_right;

	int pad_left;



	int v_init_phase;

	int h_init_phase;

	int h_phase_step;

	int v_phase_step;



	int prescale_crop_width_first_pixel;

	int prescale_crop_width_last_pixel;

	int prescale_crop_height_first_line;

	int prescale_crop_height_last_line;



	int postscale_crop_height_first_line;

	int postscale_crop_height_last_line;

	int postscale_crop_width_first_pixel;

	int postscale_crop_width_last_pixel;



	int dst_start_x;

	int dst_end_x;

	int dst_start_y;

	int dst_end_y;



	int bytes_per_pixel;

	unsigned int source_address;

	unsigned int destination_address;

	unsigned int src_stride;

	unsigned int dst_stride;

	int rotate_270;

	int horizontal_flip;

	int vertical_flip;

	int scale_output_width;

	int scale_output_height;

};



struct msm_cpp_frame_info_t {

	int32_t frame_id;

	uint32_t inst_id;

	uint32_t client_id;

	enum msm_cpp_frame_type frame_type;

	uint32_t num_strips;

	struct msm_cpp_frame_strip_info *strip_info;

};



struct msm_ver_num_info {