Merge "video: driver: add get and set selection support"

driver/vidc/inc/msm_vdec.h

@@ -16,6 +16,8 @@ int msm_vdec_streamon_output(struct msm_vidc_inst *inst);
 int msm_vdec_qbuf(struct msm_vidc_inst *inst, struct vb2_buffer *vb2);
 int msm_vdec_s_fmt(struct msm_vidc_inst *inst, struct v4l2_format *f);
 int msm_vdec_g_fmt(struct msm_vidc_inst *inst, struct v4l2_format *f);
+int msm_vdec_s_selection(struct msm_vidc_inst* inst, struct v4l2_selection* s);
+int msm_vdec_g_selection(struct msm_vidc_inst* inst, struct v4l2_selection* s);
 int msm_vdec_enum_fmt(struct msm_vidc_inst *inst, struct v4l2_fmtdesc *f);
 int msm_vdec_inst_init(struct msm_vidc_inst *inst);
 int msm_vdec_inst_deinit(struct msm_vidc_inst *inst);
@@ -23,4 +25,4 @@ int msm_vdec_input_port_settings_change(struct msm_vidc_inst *inst);
 int msm_vdec_output_port_settings_change(struct msm_vidc_inst *inst);
 int msm_vdec_process_cmd(struct msm_vidc_inst *inst, u32 cmd);
 
-#endif // _MSM_VDEC_H_
+#endif // _MSM_VDEC_H_

driver/vidc/inc/msm_venc.h

@@ -16,8 +16,10 @@ int msm_venc_streamon_output(struct msm_vidc_inst *inst);
 int msm_venc_process_cmd(struct msm_vidc_inst *inst, u32 cmd);
 int msm_venc_s_fmt(struct msm_vidc_inst *inst, struct v4l2_format *f);
 int msm_venc_g_fmt(struct msm_vidc_inst *inst, struct v4l2_format *f);
+int msm_venc_s_selection(struct msm_vidc_inst* inst, struct v4l2_selection* s);
+int msm_venc_g_selection(struct msm_vidc_inst* inst, struct v4l2_selection* s);
 int msm_venc_enum_fmt(struct msm_vidc_inst *inst, struct v4l2_fmtdesc *f);
 int msm_venc_inst_init(struct msm_vidc_inst *inst);
 int msm_venc_inst_deinit(struct msm_vidc_inst *inst);
 
-#endif // _MSM_VENC_H_
+#endif // _MSM_VENC_H_

driver/vidc/inc/msm_vidc.h

@@ -21,6 +21,8 @@ int msm_vidc_querycap(void *instance, struct v4l2_capability *cap);
 int msm_vidc_enum_fmt(void *instance, struct v4l2_fmtdesc *f);
 int msm_vidc_s_fmt(void *instance, struct v4l2_format *f);
 int msm_vidc_g_fmt(void *instance, struct v4l2_format *f);
+int msm_vidc_s_selection(void* instance, struct v4l2_selection* s);
+int msm_vidc_g_selection(void* instance, struct v4l2_selection* s);
 int msm_vidc_s_ctrl(void *instance, struct v4l2_control *a);
 int msm_vidc_s_ext_ctrl(void *instance, struct v4l2_ext_controls *a);
 int msm_vidc_g_ext_ctrl(void *instance, struct v4l2_ext_controls *a);

driver/vidc/inc/msm_vidc_inst.h

@@ -103,7 +103,8 @@ struct msm_vidc_inst {
 	struct msm_vidc_inst_cap_entry     firmware;
 	bool                               request;
 	struct vb2_queue                   vb2q[MAX_PORT];
-	struct msm_vidc_crop               crop;
+	struct msm_vidc_rectangle          crop;
+	struct msm_vidc_rectangle          compose;
 	struct msm_vidc_properties         prop;
 	enum msm_vidc_stage_type           stage;
 	enum msm_vidc_pipe_type            pipe;

driver/vidc/inc/msm_vidc_internal.h

@@ -559,7 +559,7 @@ struct msm_vidc_color_info {
 	u32 quantization;
 };
 
-struct msm_vidc_crop {
+struct msm_vidc_rectangle {
 	u32 left;
 	u32 top;
 	u32 width;

driver/vidc/inc/msm_vidc_v4l2.h

@@ -22,6 +22,10 @@ int msm_v4l2_s_fmt(struct file *file, void *fh,
 		struct v4l2_format *f);
 int msm_v4l2_g_fmt(struct file *file, void *fh,
 		struct v4l2_format *f);
+int msm_v4l2_s_selection(struct file* file, void* fh,
+		struct v4l2_selection* s);
+int msm_v4l2_g_selection(struct file* file, void* fh,
+		struct v4l2_selection* s);
 int msm_v4l2_s_ctrl(struct file *file, void *fh,
 		struct v4l2_control *a);
 int msm_v4l2_g_ctrl(struct file *file, void *fh,