video: driver: add configuration support
Add support for - set and get format - get min buffers - request buffers Change-Id: I0696386e10fc9571a99853070c108832873c4923 Signed-off-by: Maheshwar Ajja <majja@codeaurora.org>
此提交包含在：
Maheshwar Ajja
@@ -14,6 +14,202 @@
|
||||
#include "msm_vidc_platform.h"
|
||||
#include "msm_vidc_debug.h"
|
||||
|
||||
static int msm_vdec_codec_change(struct msm_vidc_inst *inst, u32 codec)
|
||||
{
|
||||
int rc = 0;
|
||||
struct msm_vidc_core *core;
|
||||
|
||||
d_vpr_h("%s()\n", __func__);
|
||||
if (!inst || !inst->core) {
|
||||
d_vpr_e("%s: invalid params\n", __func__);
|
||||
return -EINVAL;
|
||||
}
|
||||
core = inst->core;
|
||||
|
||||
return rc;
|
||||
}
|
||||
|
||||
int msm_vdec_s_fmt(struct msm_vidc_inst *inst, struct v4l2_format *f)
|
||||
{
|
||||
int rc = 0;
|
||||
struct msm_vidc_core *core;
|
||||
struct v4l2_format *fmt;
|
||||
|
||||
d_vpr_h("%s()\n", __func__);
|
||||
if (!inst || !inst->core) {
|
||||
d_vpr_e("%s: invalid params\n", __func__);
|
||||
return -EINVAL;
|
||||
}
|
||||
core = inst->core;
|
||||
|
||||
if (inst->state == MSM_VIDC_START) {
|
||||
d_vpr_e("%s: invalid state %d\n", __func__, inst->state);
|
||||
return -EINVAL;
|
||||
}
|
||||
|
||||
if (f->type == INPUT_PLANE) {
|
||||
if (inst->state == MSM_VIDC_START_INPUT) {
|
||||
d_vpr_e("%s: invalid state %d\n", __func__, inst->state);
|
||||
return -EINVAL;
|
||||
}
|
||||
if (inst->fmts[INPUT_PORT].fmt.pix.pixelformat !=
|
||||
f->fmt.pix.pixelformat) {
|
||||
s_vpr_e(inst->sid,
|
||||
"%s: codec changed from %#x to %#x\n", __func__,
|
||||
inst->fmts[INPUT_PORT].fmt.pix.pixelformat,
|
||||
f->fmt.pix.pixelformat);
|
||||
rc = msm_vdec_codec_change(inst, f->fmt.pix.pixelformat);
|
||||
if (rc)
|
||||
goto err_invalid_fmt;
|
||||
}
|
||||
fmt = &inst->fmts[INPUT_PORT];
|
||||
fmt->type = INPUT_PLANE;
|
||||
fmt->fmt.pix.width = f->fmt.pix.width;
|
||||
fmt->fmt.pix.height = f->fmt.pix.height;
|
||||
fmt->fmt.pix.pixelformat = f->fmt.pix.pixelformat;
|
||||
fmt->fmt.pix.bytesperline = 0;
|
||||
fmt->fmt.pix.sizeimage = call_session_op(core, buffer_size,
|
||||
inst, MSM_VIDC_INPUT);
|
||||
inst->buffers.input.min_count =
|
||||
call_session_op(core, min_count, inst, MSM_VIDC_INPUT);
|
||||
inst->buffers.input.extra_count =
|
||||
call_session_op(core, extra_count, inst, MSM_VIDC_INPUT);
|
||||
if (inst->buffers.input.actual_count <
|
||||
inst->buffers.input.min_count +
|
||||
inst->buffers.input.extra_count) {
|
||||
inst->buffers.input.actual_count =
|
||||
inst->buffers.input.min_count +
|
||||
inst->buffers.input.extra_count;
|
||||
}
|
||||
inst->buffers.input.size = fmt->fmt.pix.sizeimage;
|
||||
|
||||
//rc = msm_vidc_check_session_supported(inst);
|
||||
if (rc)
|
||||
goto err_invalid_fmt;
|
||||
//update_log_ctxt(inst->sid, inst->session_type,
|
||||
// mplane->pixelformat);
|
||||
s_vpr_h(inst->sid,
|
||||
"%s: input: codec %#x width %d height %d size %d min_count %d extra_count %d\n",
|
||||
__func__, fmt->fmt.pix.pixelformat, fmt->fmt.pix.width,
|
||||
fmt->fmt.pix.height, fmt->fmt.pix.sizeimage,
|
||||
inst->buffers.input.min_count,
|
||||
inst->buffers.input.extra_count);
|
||||
} else if (f->type == INPUT_META_PLANE) {
|
||||
if (inst->state == MSM_VIDC_START_INPUT) {
|
||||
d_vpr_e("%s: invalid state %d\n", __func__, inst->state);
|
||||
return -EINVAL;
|
||||
}
|
||||
fmt = &inst->fmts[INPUT_META_PORT];
|
||||
fmt->type = INPUT_META_PLANE;
|
||||
fmt->fmt.meta.dataformat = V4L2_PIX_FMT_VIDC_META;
|
||||
fmt->fmt.meta.buffersize = call_session_op(core, buffer_size,
|
||||
inst, MSM_VIDC_INPUT_META);
|
||||
inst->buffers.input_meta.min_count =
|
||||
inst->buffers.input.min_count;
|
||||
inst->buffers.input_meta.extra_count =
|
||||
inst->buffers.input.extra_count;
|
||||
inst->buffers.input_meta.actual_count =
|
||||
inst->buffers.input.actual_count;
|
||||
inst->buffers.input_meta.size = fmt->fmt.meta.buffersize;
|
||||
s_vpr_h(inst->sid,
|
||||
"%s: input meta: size %d min_count %d extra_count %d\n",
|
||||
__func__, fmt->fmt.meta.buffersize,
|
||||
inst->buffers.input_meta.min_count,
|
||||
inst->buffers.input_meta.extra_count);
|
||||
} else if (f->type == OUTPUT_PLANE) {
|
||||
if (inst->state == MSM_VIDC_START_OUTPUT) {
|
||||
d_vpr_e("%s: invalid state %d\n", __func__, inst->state);
|
||||
return -EINVAL;
|
||||
}
|
||||
fmt = &inst->fmts[OUTPUT_PORT];
|
||||
fmt->type = OUTPUT_PLANE;
|
||||
fmt->fmt.pix.pixelformat = f->fmt.pix.pixelformat;
|
||||
fmt->fmt.pix.width = VENUS_Y_STRIDE(
|
||||
msm_vidc_convert_color_fmt(fmt->fmt.pix.pixelformat),
|
||||
f->fmt.pix.width);
|
||||
fmt->fmt.pix.height = VENUS_Y_SCANLINES(
|
||||
msm_vidc_convert_color_fmt(fmt->fmt.pix.pixelformat),
|
||||
f->fmt.pix.height);
|
||||
fmt->fmt.pix.bytesperline = fmt->fmt.pix.width;
|
||||
fmt->fmt.pix.sizeimage = call_session_op(core, buffer_size,
|
||||
inst, MSM_VIDC_OUTPUT);
|
||||
inst->buffers.output.min_count =
|
||||
call_session_op(core, min_count, inst, MSM_VIDC_OUTPUT);
|
||||
inst->buffers.output.extra_count =
|
||||
call_session_op(core, extra_count, inst, MSM_VIDC_OUTPUT);
|
||||
if (inst->buffers.output.actual_count <
|
||||
inst->buffers.output.min_count +
|
||||
inst->buffers.output.extra_count) {
|
||||
inst->buffers.output.actual_count =
|
||||
inst->buffers.output.min_count +
|
||||
inst->buffers.output.extra_count;
|
||||
}
|
||||
inst->buffers.output.size = fmt->fmt.pix.sizeimage;
|
||||
|
||||
//rc = msm_vidc_check_session_supported(inst);
|
||||
if (rc)
|
||||
goto err_invalid_fmt;
|
||||
s_vpr_h(inst->sid,
|
||||
"%s: output: format %#x width %d height %d size %d min_count %d extra_count %d\n",
|
||||
__func__, fmt->fmt.pix.pixelformat, fmt->fmt.pix.width,
|
||||
fmt->fmt.pix.height, fmt->fmt.pix.sizeimage,
|
||||
inst->buffers.output.min_count,
|
||||
inst->buffers.output.extra_count);
|
||||
} else if (f->type == OUTPUT_META_PLANE) {
|
||||
if (inst->state == MSM_VIDC_START_OUTPUT) {
|
||||
d_vpr_e("%s: invalid state %d\n", __func__, inst->state);
|
||||
return -EINVAL;
|
||||
}
|
||||
fmt = &inst->fmts[OUTPUT_META_PORT];
|
||||
fmt->type = OUTPUT_META_PLANE;
|
||||
fmt->fmt.meta.dataformat = V4L2_PIX_FMT_VIDC_META;
|
||||
fmt->fmt.meta.buffersize = call_session_op(core, buffer_size,
|
||||
inst, MSM_VIDC_OUTPUT_META);
|
||||
inst->buffers.output_meta.min_count =
|
||||
inst->buffers.output.min_count;
|
||||
inst->buffers.output_meta.extra_count =
|
||||
inst->buffers.output.extra_count;
|
||||
inst->buffers.output_meta.actual_count =
|
||||
inst->buffers.output.actual_count;
|
||||
inst->buffers.output_meta.size = fmt->fmt.meta.buffersize;
|
||||
s_vpr_h(inst->sid,
|
||||
"%s: input meta: size %d min_count %d extra_count %d\n",
|
||||
__func__, fmt->fmt.meta.buffersize,
|
||||
inst->buffers.output_meta.min_count,
|
||||
inst->buffers.output_meta.extra_count);
|
||||
}
|
||||
|
||||
err_invalid_fmt:
|
||||
return rc;
|
||||
}
|
||||
|
||||
int msm_vdec_g_fmt(struct msm_vidc_inst *inst, struct v4l2_format *f)
|
||||
{
|
||||
int rc = 0;
|
||||
u32 index;
|
||||
|
||||
d_vpr_h("%s()\n", __func__);
|
||||
if (!inst) {
|
||||
d_vpr_e("%s: invalid params\n", __func__);
|
||||
return -EINVAL;
|
||||
}
|
||||
|
||||
if (f->type == OUTPUT_PLANE) {
|
||||
index = OUTPUT_PORT;
|
||||
} else if (f->type == INPUT_PLANE) {
|
||||
index = OUTPUT_PORT;
|
||||
} else if (f->type == OUTPUT_META_PLANE) {
|
||||
index = OUTPUT_PORT;
|
||||
} else if (f->type == OUTPUT_META_PLANE) {
|
||||
index = OUTPUT_PORT;
|
||||
} else {
|
||||
d_vpr_e("%s: invalid type %d\n", __func__, f->type);
|
||||
return -EINVAL;
|
||||
}
|
||||
memcpy(f, &inst->fmts[index], sizeof(struct v4l2_format));
|
||||
|
||||
return rc;
|
||||
}
|
||||
|
||||
int msm_vdec_inst_init(struct msm_vidc_inst *inst)
|
||||
{
|
||||
@@ -84,7 +280,7 @@ int msm_vdec_inst_init(struct msm_vidc_inst *inst)
|
||||
inst->buffers.output_meta.min_count = inst->buffers.output.min_count;
|
||||
inst->buffers.output_meta.extra_count = inst->buffers.output.extra_count;
|
||||
inst->buffers.output_meta.actual_count = inst->buffers.output.actual_count;
|
||||
inst->buffers.output_meta.size = f->fmt.meta.buffersize;
|
||||
inst->buffers.output_meta.size = f->fmt.meta.buffersize;
|
||||
|
||||
inst->prop.frame_rate = DEFAULT_FPS << 16;
|
||||
inst->prop.operating_rate = DEFAULT_FPS << 16;
|
||||
|
||||
新增問題並參考
封鎖使用者