Skip to content
Snippets Groups Projects
Commit 61eb2ece authored by Heng-Ruey Hsu's avatar Heng-Ruey Hsu Committed by chrome-bot
Browse files

Rockchip: Support V4L2_CID_MPEG_VIDEO_FORCE_KEY_FRAME

Also removed V4L2_CID_MPEG_MFC51_VIDEO_FORCE_FRAME_TYPE.
Since we are using the header files from system instead of package,
changing v4l2_buffer structure member name.

BUG=chrome-os-partner:53551
TEST=run vea test and pass force key frame test case.
CQ-DEPEND=CL:346400,CL:346390

Change-Id: I369d03293bd6e4b5cdb7f1ed66b8fe001fc77084
Reviewed-on: https://chromium-review.googlesource.com/346361


Commit-Ready: Heng-ruey Hsu <henryhsu@chromium.org>
Tested-by: default avatarHeng-ruey Hsu <henryhsu@chromium.org>
Reviewed-by: default avatarPawel Osciak <posciak@chromium.org>
Reviewed-by: default avatarWu-cheng Li <wuchengli@chromium.org>
parent 07f7a811
No related branches found
No related tags found
No related merge requests found
......@@ -341,8 +341,7 @@ static int ioctl_qbuf_locked(struct encoder_context *ctx, int fd,
if (ret)
return ret;
/* TODO: change this to config_store after the header is updated. */
buffer->reserved2 = buffer->index + 1;
buffer->config_store = buffer->index + 1;
ret = SYS_IOCTL(fd, VIDIOC_QBUF, buffer);
if (ret == 0)
ctx->can_qbuf = false;
......@@ -420,9 +419,7 @@ static int ioctl_s_ext_ctrls_locked(struct encoder_context *ctx, int fd,
*/
for (i = 0; i < ext_ctrls->count; i++) {
switch (ext_ctrls->controls[i].id) {
case V4L2_CID_MPEG_MFC51_VIDEO_FORCE_FRAME_TYPE:
if (ext_ctrls->controls[i].value ==
V4L2_MPEG_MFC51_VIDEO_FORCE_FRAME_TYPE_I_FRAME)
case V4L2_CID_MPEG_VIDEO_FORCE_KEY_FRAME:
runtime_param_ptr->keyframe_request = true;
break;
case V4L2_CID_MPEG_VIDEO_BITRATE:
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment