Skip to content

bcm2835-codec: add support for V4L2_CID_MPEG_VIDEO_FORCE_KEY_FRAME #3175

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
popcornmix merged 1 commit into from
Aug 23, 2019
Merged

bcm2835-codec: add support for V4L2_CID_MPEG_VIDEO_FORCE_KEY_FRAME #3175

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
19 changes: 18 additions & 1 deletion 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 @@ -1587,6 +1587,20 @@ static int bcm2835_codec_s_ctrl(struct v4l2_ctrl *ctrl)
ret = bcm2835_codec_set_level_profile(ctx, ctrl);
break;

case V4L2_CID_MPEG_VIDEO_FORCE_KEY_FRAME: {
u32 mmal_bool = 1;

if (!ctx->component)
break;

ret = vchiq_mmal_port_parameter_set(ctx->dev->instance,
&ctx->component->output[0],
MMAL_PARAMETER_VIDEO_REQUEST_I_FRAME,
&mmal_bool,
sizeof(mmal_bool));
break;
}

default:
v4l2_err(&ctx->dev->v4l2_dev, "Invalid control\n");
return -EINVAL;
Expand Down Expand Up @@ -2311,7 +2325,7 @@ static int bcm2835_codec_open(struct file *file)
hdl = &ctx->hdl;
if (dev->role == ENCODE) {
/* Encode controls */
v4l2_ctrl_handler_init(hdl, 6);
v4l2_ctrl_handler_init(hdl, 7);

v4l2_ctrl_new_std_menu(hdl, &bcm2835_codec_ctrl_ops,
V4L2_CID_MPEG_VIDEO_BITRATE_MODE,
Expand Down Expand Up @@ -2355,6 +2369,9 @@ static int bcm2835_codec_open(struct file *file)
BIT(V4L2_MPEG_VIDEO_H264_PROFILE_MAIN) |
BIT(V4L2_MPEG_VIDEO_H264_PROFILE_HIGH)),
V4L2_MPEG_VIDEO_H264_PROFILE_HIGH);
v4l2_ctrl_new_std(hdl, &bcm2835_codec_ctrl_ops,
V4L2_CID_MPEG_VIDEO_FORCE_KEY_FRAME,
0, 0, 0, 0);
if (hdl->error) {
rc = hdl->error;
goto free_ctrl_handler;
Expand Down