github-mirror/linux
1
0
Fork 0
mirror of https://github.com/torvalds/linux.git synced 2026-06-07 22:14:04 +02:00
Code Issues Actions Packages Projects Releases Wiki Activity Graph

CHROMIUM: [media] rk3288-vpu: Add V4L2_CID_MPEG_VIDEO_FORCE_KEY_FRAME

Browse Source 
Also remove unused V4L2_CID_MPEG_MFC51_VIDEO_FORCE_FRAME_TYPE.

BUG=chrome-os-partner:53551
TEST=Passed vea test cases.
CQ-DEPEND=CL:346361

Signed-off-by: Heng-Ruey Hsu <henryhsu@chromium.org>
Reviewed-on: https://chromium-review.googlesource.com/346390
Commit-Ready: Heng-ruey Hsu <henryhsu@chromium.org>
Tested-by: Heng-ruey Hsu <henryhsu@chromium.org>
Reviewed-by: Pawel Osciak <posciak@chromium.org>
Reviewed-by: Wu-cheng Li <wuchengli@chromium.org>

Change-Id: I6ad197191e57de9233d201d8196b3edb4df7e560
Signed-off-by: Jeffy Chen <jeffy.chen@rock-chips.com>
Signed-off-by: Yakir Yang <ykk@rock-chips.com>
This commit is contained in:
Heng-Ruey Hsu 2016-05-20 18:16:32 +08:00 committed by Huang, Tao
parent 8dd81f859b
commit 5e5881d65b
1 changed files with 3 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
drivers/media/platform/rk3288-vpu/rk3288_vpu_enc.c
View File

@ -254,14 +254,8 @@ static struct rk3288_vpu_control controls[] = {
.default_value = 0,
},
{
.id = V4L2_CID_MPEG_MFC51_VIDEO_FORCE_FRAME_TYPE,
.type = V4L2_CTRL_TYPE_MENU,
.name = "Force frame type",
.minimum = V4L2_MPEG_MFC51_VIDEO_FORCE_FRAME_TYPE_DISABLED,
.maximum = V4L2_MPEG_MFC51_VIDEO_FORCE_FRAME_TYPE_NOT_CODED,
.default_value =
V4L2_MPEG_MFC51_VIDEO_FORCE_FRAME_TYPE_DISABLED,
.menu_skip_mask = 0,
.id = V4L2_CID_MPEG_VIDEO_FORCE_KEY_FRAME,
.type = V4L2_CTRL_TYPE_BUTTON,
},
/*
* This hardware does not support features provided by controls
@ -328,18 +322,10 @@ static const char *const *rk3288_vpu_enc_get_menu(u32 id)
"VBV/CPB Limit",
NULL,
};
static const char *const vpu_video_force_frame[] = {
"Disabled",
"I Frame",
"Not Coded",
NULL,
};
switch (id) {
case V4L2_CID_MPEG_MFC51_VIDEO_FRAME_SKIP_MODE:
return vpu_video_frame_skip;
case V4L2_CID_MPEG_MFC51_VIDEO_FORCE_FRAME_TYPE:
return vpu_video_force_frame;
}
return NULL;
@ -882,7 +868,7 @@ static int rk3288_vpu_enc_s_ctrl(struct v4l2_ctrl *ctrl)
case V4L2_CID_MPEG_MFC51_VIDEO_RC_FIXED_TARGET_BIT:
case V4L2_CID_MPEG_VIDEO_B_FRAMES:
case V4L2_CID_MPEG_VIDEO_H264_B_FRAME_QP:
case V4L2_CID_MPEG_MFC51_VIDEO_FORCE_FRAME_TYPE:
case V4L2_CID_MPEG_VIDEO_FORCE_KEY_FRAME:
/* Ignore these controls for now. (FIXME?) */
break;