diff options
| author | Volokh Konstantin <volokh84@gmail.com> | 2013-03-17 07:16:37 -0300 |
|---|---|---|
| committer | Mauro Carvalho Chehab <mchehab@redhat.com> | 2013-03-24 12:59:22 -0300 |
| commit | 7e4bfb9ec0663d08bcd1c4d10bc13412b0f66d36 (patch) | |
| tree | 48f7908751ecf0b67bb7ea1d88ae38dd4bf1d41e /drivers | |
| parent | 3e4c8478d4b3bff3ca6fb36f47e9f1c6600ecde9 (diff) | |
[media] go7007: Restore b_frame control
Signed-off-by: Volokh Konstantin <volokh84@gmail.com>
Signed-off-by: Hans Verkuil <hans.verkuil@cisco.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/staging/media/go7007/go7007-priv.h | 1 | ||||
| -rw-r--r-- | drivers/staging/media/go7007/go7007-v4l2.c | 8 |
2 files changed, 7 insertions, 2 deletions
diff --git a/drivers/staging/media/go7007/go7007-priv.h b/drivers/staging/media/go7007/go7007-priv.h index 0914fa3452ae..5f9b38955f40 100644 --- a/drivers/staging/media/go7007/go7007-priv.h +++ b/drivers/staging/media/go7007/go7007-priv.h @@ -166,6 +166,7 @@ struct go7007 { struct v4l2_ctrl *mpeg_video_gop_closure; struct v4l2_ctrl *mpeg_video_bitrate; struct v4l2_ctrl *mpeg_video_aspect_ratio; + struct v4l2_ctrl *mpeg_video_b_frames; enum { STATUS_INIT, STATUS_ONLINE, STATUS_SHUTDOWN } status; spinlock_t spinlock; struct mutex hw_lock; diff --git a/drivers/staging/media/go7007/go7007-v4l2.c b/drivers/staging/media/go7007/go7007-v4l2.c index 4e5da87f4fa6..0dc316063b5d 100644 --- a/drivers/staging/media/go7007/go7007-v4l2.c +++ b/drivers/staging/media/go7007/go7007-v4l2.c @@ -161,6 +161,7 @@ static void set_formatting(struct go7007 *go) } go->gop_size = v4l2_ctrl_g_ctrl(go->mpeg_video_gop_size); go->closed_gop = v4l2_ctrl_g_ctrl(go->mpeg_video_gop_closure); + go->ipb = v4l2_ctrl_g_ctrl(go->mpeg_video_b_frames) != 0; go->bitrate = v4l2_ctrl_g_ctrl(go->mpeg_video_bitrate); go->gop_header_enable = 1; go->dvd_mode = 0; @@ -168,9 +169,9 @@ static void set_formatting(struct go7007 *go) go->dvd_mode = go->bitrate == 9800000 && go->gop_size == 15 && + go->ipb == 0 && go->closed_gop; go->repeat_seqhead = go->dvd_mode; - go->ipb = 0; switch (v4l2_ctrl_g_ctrl(go->mpeg_video_aspect_ratio)) { default: @@ -935,7 +936,7 @@ int go7007_v4l2_ctrl_init(struct go7007 *go) struct v4l2_ctrl_handler *hdl = &go->hdl; struct v4l2_ctrl *ctrl; - v4l2_ctrl_handler_init(hdl, 12); + v4l2_ctrl_handler_init(hdl, 13); go->mpeg_video_gop_size = v4l2_ctrl_new_std(hdl, NULL, V4L2_CID_MPEG_VIDEO_GOP_SIZE, 0, 34, 1, 15); go->mpeg_video_gop_closure = v4l2_ctrl_new_std(hdl, NULL, @@ -943,6 +944,9 @@ int go7007_v4l2_ctrl_init(struct go7007 *go) go->mpeg_video_bitrate = v4l2_ctrl_new_std(hdl, NULL, V4L2_CID_MPEG_VIDEO_BITRATE, 64000, 10000000, 1, 9800000); + go->mpeg_video_b_frames = v4l2_ctrl_new_std(hdl, NULL, + V4L2_CID_MPEG_VIDEO_B_FRAMES, 0, 2, 2, 0); + go->mpeg_video_aspect_ratio = v4l2_ctrl_new_std_menu(hdl, NULL, V4L2_CID_MPEG_VIDEO_ASPECT, V4L2_MPEG_VIDEO_ASPECT_16x9, 0, |