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

Commit a3d9a5aa authored by Ashray Kulkarni's avatar Ashray Kulkarni Committed by Arun Menon
Browse files

msm: vidc: add driver support to enable operating rate 



Add support for enabling operating rate in encoder. This will enable
support for high fps/timelapse recording and still maintain 30fps
timestamp deltas between two input frames.

Change-Id: I1f59db533b61e6f42d8b7768396057f6ec5b690d
Signed-off-by: default avatarAshray Kulkarni <ashrayk@codeaurora.org>
Signed-off-by: default avatarArun Menon <avmenon@codeaurora.org>
parent 9fb709ef

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

+13 −0
Original line number Diff line number Diff line
@@ -26,6 +26,8 @@ 
#define MAX_NUM_OUTPUT_BUFFERS VB2_MAX_FRAME

#define DEFAULT_VIDEO_CONCEAL_COLOR_BLACK 0x8010

#define MB_SIZE_IN_PIXEL (16 * 16)

#define MAX_OPERATING_FRAME_RATE (300 << 16)

#define OPERATING_FRAME_RATE_STEP (1 << 16)



static const char *const mpeg_video_vidc_divx_format[] = {

	"DIVX Format 3",
@@ -605,6 +607,15 @@ static struct msm_vidc_ctrl msm_vdec_ctrls[] = { 
		.default_value = V4L2_MPEG_VIDC_VIDEO_PRIORITY_REALTIME_DISABLE,

		.step = 1,

	},

	{

		.id = V4L2_CID_MPEG_VIDC_VIDEO_OPERATING_RATE,

		.name = "Set Decoder Operating rate",

		.type = V4L2_CTRL_TYPE_INTEGER,

		.minimum = 0,

		.maximum = MAX_OPERATING_FRAME_RATE,

		.default_value = 0,

		.step = OPERATING_FRAME_RATE_STEP,

	},

};



#define NUM_CTRLS ARRAY_SIZE(msm_vdec_ctrls)
@@ -2553,6 +2564,8 @@ static int try_set_ctrl(struct msm_vidc_inst *inst, struct v4l2_ctrl *ctrl) 
		hal_property.enable = !(ctrl->val);

		pdata = &hal_property;

		break;

	case V4L2_CID_MPEG_VIDC_VIDEO_OPERATING_RATE:

		break;

	default:

		break;

	}

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

+13 −0
Original line number Diff line number Diff line
@@ -25,6 +25,8 @@ 
#define DEFAULT_BIT_RATE 64000

#define BIT_RATE_STEP 100

#define DEFAULT_FRAME_RATE 15

#define MAX_OPERATING_FRAME_RATE (300 << 16)

#define OPERATING_FRAME_RATE_STEP (1 << 16)

#define MAX_SLICE_BYTE_SIZE ((MAX_BIT_RATE)>>3)

#define MIN_SLICE_BYTE_SIZE 512

#define MAX_SLICE_MB_SIZE ((4096 * 2304) >> 8)
@@ -1159,6 +1161,15 @@ static struct msm_vidc_ctrl msm_venc_ctrls[] = { 
		.menu_skip_mask = 0,

		.qmenu = NULL,

	},

	{

		.id = V4L2_CID_MPEG_VIDC_VIDEO_OPERATING_RATE,

		.name = "Set Encoder Operating rate",

		.type = V4L2_CTRL_TYPE_INTEGER,

		.minimum = 0,

		.maximum = MAX_OPERATING_FRAME_RATE,

		.default_value = 0,

		.step = OPERATING_FRAME_RATE_STEP,

	},

};



#define NUM_CTRLS ARRAY_SIZE(msm_venc_ctrls)
@@ -2905,6 +2916,8 @@ static int try_set_ctrl(struct msm_vidc_inst *inst, struct v4l2_ctrl *ctrl) 
		enable.enable = !(ctrl->val);

		pdata = &enable;

		break;

	case V4L2_CID_MPEG_VIDC_VIDEO_OPERATING_RATE:

		break;

	default:

		dprintk(VIDC_ERR, "Unsupported index: %x\n", ctrl->id);

		rc = -ENOTSUPP;

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

+24 −1
Original line number Diff line number Diff line
@@ -107,10 +107,20 @@ enum multi_stream msm_comm_get_stream_output_mode(struct msm_vidc_inst *inst) 
static int msm_comm_get_mbs_per_sec(struct msm_vidc_inst *inst)

{

	int output_port_mbs, capture_port_mbs;

	int fps, rc;

	struct v4l2_control ctrl;



	output_port_mbs = NUM_MBS_PER_FRAME(inst->prop.width[OUTPUT_PORT],

		inst->prop.height[OUTPUT_PORT]);

	capture_port_mbs = NUM_MBS_PER_FRAME(inst->prop.width[CAPTURE_PORT],

		inst->prop.height[CAPTURE_PORT]);



	ctrl.id = V4L2_CID_MPEG_VIDC_VIDEO_OPERATING_RATE;

	rc = v4l2_g_ctrl(&inst->ctrl_handler, &ctrl);

	if (!rc && ctrl.value) {

		fps = (ctrl.value >> 16) ? ctrl.value >> 16 : 1;

		return max(output_port_mbs, capture_port_mbs) * fps;

	} else

		return max(output_port_mbs, capture_port_mbs) * inst->prop.fps;

}
@@ -135,6 +145,19 @@ int msm_comm_get_inst_load(struct msm_vidc_inst *inst, 
			load = inst->core->resources.max_load;

	}



	/*  Clock and Load calculations for REALTIME/NON-REALTIME

	 *                        OPERATING RATE SET/NO OPERATING RATE SET

	 *

	 *                 | OPERATING RATE SET   | OPERATING RATE NOT SET |

	 * ----------------|--------------------- |------------------------|

	 * REALTIME        | load = res * op_rate |  load = res * fps      |

	 *                 | clk  = res * op_rate |  clk  = res * fps      |

	 * ----------------|----------------------|------------------------|

	 * NON-REALTIME    | load = res * 1 fps   |  load = res * 1 fps    |

	 *                 | clk  = res * op_rate |  clk  = res * fps      |

	 * ----------------|----------------------|------------------------|

	 */



	if (is_non_realtime_session(inst) &&

		(quirks & LOAD_CALC_IGNORE_NON_REALTIME_LOAD))

		load = msm_comm_get_mbs_per_sec(inst) / inst->prop.fps;

include/uapi/linux/v4l2-controls.h

+3 −0
Original line number Diff line number Diff line
@@ -1103,6 +1103,9 @@ enum v4l2_mpeg_vidc_video_priority { 
	V4L2_MPEG_VIDC_VIDEO_PRIORITY_REALTIME_DISABLE = 1,

};



#define V4L2_CID_MPEG_VIDC_VIDEO_OPERATING_RATE \

		(V4L2_CID_MPEG_MSM_VIDC_BASE + 84)



/*  Camera class control IDs */



#define V4L2_CID_CAMERA_CLASS_BASE 	(V4L2_CTRL_CLASS_CAMERA | 0x900)