Skip to content

bcm2835-v4l2-codec fixes #3293

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
pelwell merged 4 commits into from
Oct 25, 2019
Merged

bcm2835-v4l2-codec fixes #3293

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
be84c1f
staging:bcm2835-codec: Add support for ENUM_FRAMESIZES
6by9 Sep 13, 2019
8639735
staging: bcm2835-codec: Correct buffer type check on G_PARM
6by9 Sep 13, 2019
a7b0f11
staging: bcm2835-codec: Set default and error check timeperframe
6by9 Sep 13, 2019
47820ad
staging: bcm2835-codec: Fix imbalance in dma_buf_get/dma_buf_put
6by9 Oct 7, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
62 changes: 57 additions & 5 deletions drivers/staging/vc04_services/bcm2835-codec/bcm2835-v4l2-codec.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -496,9 +496,10 @@ struct bcm2835_codec_fmt *get_default_format(struct bcm2835_codec_dev *dev,
return &dev->supported_fmts[capture ? 1 : 0].list[0];
}

static struct bcm2835_codec_fmt *find_format(struct v4l2_format *f,
struct bcm2835_codec_dev *dev,
bool capture)
static
struct bcm2835_codec_fmt *find_format_pix_fmt(u32 pix_fmt,
struct bcm2835_codec_dev *dev,
bool capture)
{
struct bcm2835_codec_fmt *fmt;
unsigned int k;
Expand All @@ -507,7 +508,7 @@ static struct bcm2835_codec_fmt *find_format(struct v4l2_format *f,

for (k = 0; k < fmts->num_entries; k++) {
fmt = &fmts->list[k];
if (fmt->fourcc == f->fmt.pix_mp.pixelformat)
if (fmt->fourcc == pix_fmt)
break;
}
if (k == fmts->num_entries)
Expand All @@ -516,6 +517,14 @@ static struct bcm2835_codec_fmt *find_format(struct v4l2_format *f,
return &fmts->list[k];
}

static inline
struct bcm2835_codec_fmt *find_format(struct v4l2_format *f,
struct bcm2835_codec_dev *dev,
bool capture)
{
return find_format_pix_fmt(f->fmt.pix_mp.pixelformat, dev, capture);
}

static inline struct bcm2835_codec_ctx *file2ctx(struct file *file)
{
return container_of(file->private_data, struct bcm2835_codec_ctx, fh);
Expand Down Expand Up @@ -1414,6 +1423,10 @@ static int vidioc_s_parm(struct file *file, void *priv,
if (parm->type != V4L2_BUF_TYPE_VIDEO_OUTPUT_MPLANE)
return -EINVAL;

if (!parm->parm.output.timeperframe.denominator ||
!parm->parm.output.timeperframe.numerator)
return -EINVAL;

ctx->framerate_num =
parm->parm.output.timeperframe.denominator;
ctx->framerate_denom =
Expand All @@ -1429,7 +1442,7 @@ static int vidioc_g_parm(struct file *file, void *priv,
{
struct bcm2835_codec_ctx *ctx = file2ctx(file);

if (parm->type != V4L2_BUF_TYPE_VIDEO_OUTPUT)
if (parm->type != V4L2_BUF_TYPE_VIDEO_OUTPUT_MPLANE)
return -EINVAL;

parm->parm.output.capability = V4L2_CAP_TIMEPERFRAME;
Expand Down Expand Up @@ -1792,6 +1805,36 @@ static int vidioc_encoder_cmd(struct file *file, void *priv,
return 0;
}

static int vidioc_enum_framesizes(struct file *file, void *fh,
struct v4l2_frmsizeenum *fsize)
{
struct bcm2835_codec_fmt *fmt;

fmt = find_format_pix_fmt(fsize->pixel_format, file2ctx(file)->dev,
true);
if (!fmt)
fmt = find_format_pix_fmt(fsize->pixel_format,
file2ctx(file)->dev,
false);

if (!fmt)
return -EINVAL;

if (fsize->index)
return -EINVAL;

fsize->type = V4L2_FRMSIZE_TYPE_STEPWISE;

fsize->stepwise.min_width = MIN_W;
fsize->stepwise.max_width = MAX_W;
fsize->stepwise.step_width = 1;
fsize->stepwise.min_height = MIN_H;
fsize->stepwise.max_height = MAX_H;
fsize->stepwise.step_height = 1;

return 0;
}

static const struct v4l2_ioctl_ops bcm2835_codec_ioctl_ops = {
.vidioc_querycap = vidioc_querycap,

Expand Down Expand Up @@ -1829,6 +1872,7 @@ static const struct v4l2_ioctl_ops bcm2835_codec_ioctl_ops = {
.vidioc_try_decoder_cmd = vidioc_try_decoder_cmd,
.vidioc_encoder_cmd = vidioc_encoder_cmd,
.vidioc_try_encoder_cmd = vidioc_try_encoder_cmd,
.vidioc_enum_framesizes = vidioc_enum_framesizes,
};

static int bcm2835_codec_set_ctrls(struct bcm2835_codec_ctx *ctx)
Expand Down Expand Up @@ -2068,6 +2112,11 @@ static int bcm2835_codec_buf_prepare(struct vb2_buffer *vb)
}

buf->mmal.dma_buf = dma_buf;
} else {
/* We already have a reference count on the dmabuf, so
* release the one we acquired above.
*/
dma_buf_put(dma_buf);
}
ret = 0;
break;
Expand Down Expand Up @@ -2350,6 +2399,9 @@ static int bcm2835_codec_open(struct file *file)
ctx->colorspace = V4L2_COLORSPACE_REC709;
ctx->bitrate = 10 * 1000 * 1000;

ctx->framerate_num = 30;
ctx->framerate_denom = 1;

/* Initialise V4L2 contexts */
v4l2_fh_init(&ctx->fh, video_devdata(file));
file->private_data = &ctx->fh;
Expand Down