Commit 778ca511 authored by Hans Verkuil's avatar Hans Verkuil Committed by Mauro Carvalho Chehab

[media] go7007: add back 'repeat sequence header' control

But now as a proper standard MPEG control.
Signed-off-by: default avatarHans Verkuil <hans.verkuil@cisco.com>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab@redhat.com>
parent 7e4bfb9e
...@@ -167,6 +167,7 @@ struct go7007 { ...@@ -167,6 +167,7 @@ struct go7007 {
struct v4l2_ctrl *mpeg_video_bitrate; struct v4l2_ctrl *mpeg_video_bitrate;
struct v4l2_ctrl *mpeg_video_aspect_ratio; struct v4l2_ctrl *mpeg_video_aspect_ratio;
struct v4l2_ctrl *mpeg_video_b_frames; struct v4l2_ctrl *mpeg_video_b_frames;
struct v4l2_ctrl *mpeg_video_rep_seqheader;
enum { STATUS_INIT, STATUS_ONLINE, STATUS_SHUTDOWN } status; enum { STATUS_INIT, STATUS_ONLINE, STATUS_SHUTDOWN } status;
spinlock_t spinlock; spinlock_t spinlock;
struct mutex hw_lock; struct mutex hw_lock;
......
...@@ -163,6 +163,7 @@ static void set_formatting(struct go7007 *go) ...@@ -163,6 +163,7 @@ static void set_formatting(struct go7007 *go)
go->closed_gop = v4l2_ctrl_g_ctrl(go->mpeg_video_gop_closure); 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->ipb = v4l2_ctrl_g_ctrl(go->mpeg_video_b_frames) != 0;
go->bitrate = v4l2_ctrl_g_ctrl(go->mpeg_video_bitrate); 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->gop_header_enable = 1;
go->dvd_mode = 0; go->dvd_mode = 0;
if (go->format == V4L2_PIX_FMT_MPEG2) if (go->format == V4L2_PIX_FMT_MPEG2)
...@@ -170,8 +171,8 @@ static void set_formatting(struct go7007 *go) ...@@ -170,8 +171,8 @@ static void set_formatting(struct go7007 *go)
go->bitrate == 9800000 && go->bitrate == 9800000 &&
go->gop_size == 15 && go->gop_size == 15 &&
go->ipb == 0 && go->ipb == 0 &&
go->repeat_seqhead == 1 &&
go->closed_gop; go->closed_gop;
go->repeat_seqhead = go->dvd_mode;
switch (v4l2_ctrl_g_ctrl(go->mpeg_video_aspect_ratio)) { switch (v4l2_ctrl_g_ctrl(go->mpeg_video_aspect_ratio)) {
default: default:
...@@ -946,6 +947,8 @@ int go7007_v4l2_ctrl_init(struct go7007 *go) ...@@ -946,6 +947,8 @@ int go7007_v4l2_ctrl_init(struct go7007 *go)
64000, 10000000, 1, 9800000); 64000, 10000000, 1, 9800000);
go->mpeg_video_b_frames = v4l2_ctrl_new_std(hdl, NULL, go->mpeg_video_b_frames = v4l2_ctrl_new_std(hdl, NULL,
V4L2_CID_MPEG_VIDEO_B_FRAMES, 0, 2, 2, 0); 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, go->mpeg_video_aspect_ratio = v4l2_ctrl_new_std_menu(hdl, NULL,
V4L2_CID_MPEG_VIDEO_ASPECT, V4L2_CID_MPEG_VIDEO_ASPECT,
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment