diff options
Diffstat (limited to 'linux/include')
| -rw-r--r-- | linux/include/linux/videodev2.h | 19 |
1 files changed, 14 insertions, 5 deletions
diff --git a/linux/include/linux/videodev2.h b/linux/include/linux/videodev2.h index bc3e89deb..75d838922 100644 --- a/linux/include/linux/videodev2.h +++ b/linux/include/linux/videodev2.h @@ -276,6 +276,7 @@ struct v4l2_timecode enum v4l2_bitrate_mode { + V4L2_BITRATE_NONE, /* not specified */ V4L2_BITRATE_CBR, /* constant bitrate */ V4L2_BITRATE_VBR, /* variable bitrate */ }; @@ -290,6 +291,7 @@ enum v4l2_mpeg_streamtype { V4L2_MPEG_SS_1, /* MPEG-1 system stream */ V4L2_MPEG_PS_2, /* MPEG-2 program stream */ V4L2_MPEG_TS_2, /* MPEG-2 transport stream */ + V4L2_MPEG_PS_DVD, /* MPEG-2 program stream with DVD header fixups */ }; enum v4l2_mpeg_audiotype { V4L2_MPEG_AU_2_I, /* MPEG-2 layer 1 */ @@ -306,6 +308,7 @@ enum v4l2_mpeg_videotype { struct v4l2_mpeg_compression { /* general */ enum v4l2_mpeg_streamtype st_type; + struct v4l2_bitrate st_bitrate; /* transport streams */ u16 ts_pid_pmt; @@ -315,12 +318,14 @@ struct v4l2_mpeg_compression { /* program stream */ u16 ps_size; - u16 reserved1; /* placed here for alignment */ + u16 reserved_1; /* align */ /* audio */ enum v4l2_mpeg_audiotype au_type; struct v4l2_bitrate au_bitrate; u32 au_sample_rate; + u8 au_pesid; + u8 reserved_2[3]; /* align */ /* video */ enum v4l2_mpeg_videotype vi_type; @@ -328,12 +333,16 @@ struct v4l2_mpeg_compression { u32 vi_frame_rate; u16 vi_frames_per_gop; u16 vi_bframes_count; - int closed_gops:1; - int pulldown:1; - int reserved2:30; + u8 vi_pesid; + u8 reserved_3[3]; /* align */ + + /* misc flags */ + u32 closed_gops:1; + u32 pulldown:1; + u32 reserved_4:30; /* align */ /* I don't expect the above being perfect yet ;) */ - u32 reserved3[8]; + u32 reserved_5[8]; }; #endif |