diff options
| author | Hans Verkuil <hans.verkuil@cisco.com> | 2013-03-17 10:47:02 -0300 |
|---|---|---|
| committer | Mauro Carvalho Chehab <mchehab@redhat.com> | 2013-03-24 12:59:42 -0300 |
| commit | 778ca511537da58d9154ab8e1c1f0d1bf738aec8 (patch) | |
| tree | b1b69af965371a0a1867e93c96285401a0289fae /drivers/staging/media | |
| parent | 7e4bfb9ec0663d08bcd1c4d10bc13412b0f66d36 (diff) | |
[media] go7007: add back 'repeat sequence header' control
But now as a proper standard MPEG control.
Signed-off-by: Hans Verkuil <hans.verkuil@cisco.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
Diffstat (limited to 'drivers/staging/media')
| -rw-r--r-- | drivers/staging/media/go7007/go7007-priv.h | 1 | ||||
| -rw-r--r-- | drivers/staging/media/go7007/go7007-v4l2.c | 5 |
2 files changed, 5 insertions, 1 deletions
diff --git a/drivers/staging/media/go7007/go7007-priv.h b/drivers/staging/media/go7007/go7007-priv.h index 5f9b38955f4..cfa4c847474 100644 --- a/drivers/staging/media/go7007/go7007-priv.h +++ b/drivers/staging/media/go7007/go7007-priv.h @@ -167,6 +167,7 @@ struct go7007 { struct v4l2_ctrl *mpeg_video_bitrate; struct v4l2_ctrl *mpeg_video_aspect_ratio; struct v4l2_ctrl *mpeg_video_b_frames; + struct v4l2_ctrl *mpeg_video_rep_seqheader; 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 0dc316063b5..45be5189e94 100644 --- a/drivers/staging/media/go7007/go7007-v4l2.c +++ b/drivers/staging/media/go7007/go7007-v4l2.c @@ -163,6 +163,7 @@ static void set_formatting(struct go7007 *go) 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->repeat_seqhead = v4l2_ctrl_g_ctrl(go->mpeg_video_rep_seqheader); go->gop_header_enable = 1; go->dvd_mode = 0; if (go->format == V4L2_PIX_FMT_MPEG2) @@ -170,8 +171,8 @@ static void set_formatting(struct go7007 *go) go->bitrate == 9800000 && go->gop_size == 15 && go->ipb == 0 && + go->repeat_seqhead == 1 && go->closed_gop; - go->repeat_seqhead = go->dvd_mode; switch (v4l2_ctrl_g_ctrl(go->mpeg_video_aspect_ratio)) { default: @@ -946,6 +947,8 @@ int go7007_v4l2_ctrl_init(struct go7007 *go) 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_rep_seqheader = v4l2_ctrl_new_std(hdl, NULL, + V4L2_CID_MPEG_VIDEO_REPEAT_SEQ_HEADER, 0, 1, 1, 1); go->mpeg_video_aspect_ratio = v4l2_ctrl_new_std_menu(hdl, NULL, V4L2_CID_MPEG_VIDEO_ASPECT, |