History

Revert "media: dvb header files: move some headers to staging"

This reverts commit 819fbd3d8ef36c09576c2a0ffea503f5c46e9177. It turns out that some user-space applications use these uapi header files, so even though the only user of the interface is an old driver that was moved to staging, moving the header files causes unnecessary pain. Generally, we really don't want user space to use kernel headers directly (exactly because it causes pain when we re-organize), and instead copy them as needed. But these things happen, and the headers were in the uapi directory, so I guess it's not entirely unreasonable.

Linus Torvalds committed 5 years ago

Commit d5ae8d71 parent e22ce8e4 files · +3 −4Browse files

Showing the changes to include/uapi/linux (3 of 4 files). Show all

Unified · Split

3 files
  1. include/uapi/linux/dvb/audio.h +101 −0
  2. include/uapi/linux/dvb/osd.h +181 −0
  3. include/uapi/linux/dvb/video.h +220 −0
include/uapi/linux/dvb/audio.h+101−0
@@ -0,0 +1,101 @@
1/* SPDX-License-Identifier: LGPL-2.1+ WITH Linux-syscall-note */
2/*
3 * audio.h - DEPRECATED MPEG-TS audio decoder API
4 *
5 * NOTE: should not be used on future drivers
6 *
7 * Copyright (C) 2000 Ralph Metzler <ralph@convergence.de>
8 * & Marcus Metzler <marcus@convergence.de>
9 * for convergence integrated media GmbH
10 *
11 * This program is free software; you can redistribute it and/or
12 * modify it under the terms of the GNU General Lesser Public License
13 * as published by the Free Software Foundation; either version 2.1
14 * of the License, or (at your option) any later version.
15 *
16 * This program is distributed in the hope that it will be useful,
17 * but WITHOUT ANY WARRANTY; without even the implied warranty of
18 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
19 * GNU General Public License for more details.
20 *
21 * You should have received a copy of the GNU Lesser General Public License
22 * along with this program; if not, write to the Free Software
23 * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
24 *
25 */
26
27#ifndef _DVBAUDIO_H_
28#define _DVBAUDIO_H_
29
30#include <linux/types.h>
31
32typedef enum {
33 AUDIO_SOURCE_DEMUX, /* Select the demux as the main source */
34 AUDIO_SOURCE_MEMORY /* Select internal memory as the main source */
35} audio_stream_source_t;
36
37
38typedef enum {
39 AUDIO_STOPPED, /* Device is stopped */
40 AUDIO_PLAYING, /* Device is currently playing */
41 AUDIO_PAUSED /* Device is paused */
42} audio_play_state_t;
43
44
45typedef enum {
46 AUDIO_STEREO,
47 AUDIO_MONO_LEFT,
48 AUDIO_MONO_RIGHT,
49 AUDIO_MONO,
50 AUDIO_STEREO_SWAPPED
51} audio_channel_select_t;
52
53
54typedef struct audio_mixer {
55 unsigned int volume_left;
56 unsigned int volume_right;
57 /* what else do we need? bass, pass-through, ... */
58} audio_mixer_t;
59
60
61typedef struct audio_status {
62 int AV_sync_state; /* sync audio and video? */
63 int mute_state; /* audio is muted */
64 audio_play_state_t play_state; /* current playback state */
65 audio_stream_source_t stream_source; /* current stream source */
66 audio_channel_select_t channel_select; /* currently selected channel */
67 int bypass_mode; /* pass on audio data to */
68 audio_mixer_t mixer_state; /* current mixer state */
69} audio_status_t; /* separate decoder hardware */
70
71
72/* for GET_CAPABILITIES and SET_FORMAT, the latter should only set one bit */
73#define AUDIO_CAP_DTS 1
74#define AUDIO_CAP_LPCM 2
75#define AUDIO_CAP_MP1 4
76#define AUDIO_CAP_MP2 8
77#define AUDIO_CAP_MP3 16
78#define AUDIO_CAP_AAC 32
79#define AUDIO_CAP_OGG 64
80#define AUDIO_CAP_SDDS 128
81#define AUDIO_CAP_AC3 256
82
83#define AUDIO_STOP _IO('o', 1)
84#define AUDIO_PLAY _IO('o', 2)
85#define AUDIO_PAUSE _IO('o', 3)
86#define AUDIO_CONTINUE _IO('o', 4)
87#define AUDIO_SELECT_SOURCE _IO('o', 5)
88#define AUDIO_SET_MUTE _IO('o', 6)
89#define AUDIO_SET_AV_SYNC _IO('o', 7)
90#define AUDIO_SET_BYPASS_MODE _IO('o', 8)
91#define AUDIO_CHANNEL_SELECT _IO('o', 9)
92#define AUDIO_GET_STATUS _IOR('o', 10, audio_status_t)
93
94#define AUDIO_GET_CAPABILITIES _IOR('o', 11, unsigned int)
95#define AUDIO_CLEAR_BUFFER _IO('o', 12)
96#define AUDIO_SET_ID _IO('o', 13)
97#define AUDIO_SET_MIXER _IOW('o', 14, audio_mixer_t)
98#define AUDIO_SET_STREAMTYPE _IO('o', 15)
99#define AUDIO_BILINGUAL_CHANNEL_SELECT _IO('o', 20)
100
101#endif /* _DVBAUDIO_H_ */
include/uapi/linux/dvb/osd.h+181−0
@@ -0,0 +1,181 @@
1/* SPDX-License-Identifier: LGPL-2.1+ WITH Linux-syscall-note */
2/*
3 * osd.h - DEPRECATED On Screen Display API
4 *
5 * NOTE: should not be used on future drivers
6 *
7 * Copyright (C) 2001 Ralph Metzler <ralph@convergence.de>
8 * & Marcus Metzler <marcus@convergence.de>
9 * for convergence integrated media GmbH
10 *
11 * This program is free software; you can redistribute it and/or
12 * modify it under the terms of the GNU General Lesser Public License
13 * as published by the Free Software Foundation; either version 2.1
14 * of the License, or (at your option) any later version.
15 *
16 * This program is distributed in the hope that it will be useful,
17 * but WITHOUT ANY WARRANTY; without even the implied warranty of
18 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
19 * GNU General Public License for more details.
20 *
21 * You should have received a copy of the GNU Lesser General Public License
22 * along with this program; if not, write to the Free Software
23 * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
24 *
25 */
26
27#ifndef _DVBOSD_H_
28#define _DVBOSD_H_
29
30#include <linux/compiler.h>
31
32typedef enum {
33 /* All functions return -2 on "not open" */
34 OSD_Close = 1, /* () */
35 /*
36 * Disables OSD and releases the buffers
37 * returns 0 on success
38 */
39 OSD_Open, /* (x0,y0,x1,y1,BitPerPixel[2/4/8](color&0x0F),mix[0..15](color&0xF0)) */
40 /*
41 * Opens OSD with this size and bit depth
42 * returns 0 on success, -1 on DRAM allocation error, -2 on "already open"
43 */
44 OSD_Show, /* () */
45 /*
46 * enables OSD mode
47 * returns 0 on success
48 */
49 OSD_Hide, /* () */
50 /*
51 * disables OSD mode
52 * returns 0 on success
53 */
54 OSD_Clear, /* () */
55 /*
56 * Sets all pixel to color 0
57 * returns 0 on success
58 */
59 OSD_Fill, /* (color) */
60 /*
61 * Sets all pixel to color <col>
62 * returns 0 on success
63 */
64 OSD_SetColor, /* (color,R{x0},G{y0},B{x1},opacity{y1}) */
65 /*
66 * set palette entry <num> to <r,g,b>, <mix> and <trans> apply
67 * R,G,B: 0..255
68 * R=Red, G=Green, B=Blue
69 * opacity=0: pixel opacity 0% (only video pixel shows)
70 * opacity=1..254: pixel opacity as specified in header
71 * opacity=255: pixel opacity 100% (only OSD pixel shows)
72 * returns 0 on success, -1 on error
73 */
74 OSD_SetPalette, /* (firstcolor{color},lastcolor{x0},data) */
75 /*
76 * Set a number of entries in the palette
77 * sets the entries "firstcolor" through "lastcolor" from the array "data"
78 * data has 4 byte for each color:
79 * R,G,B, and a opacity value: 0->transparent, 1..254->mix, 255->pixel
80 */
81 OSD_SetTrans, /* (transparency{color}) */
82 /*
83 * Sets transparency of mixed pixel (0..15)
84 * returns 0 on success
85 */
86 OSD_SetPixel, /* (x0,y0,color) */
87 /*
88 * sets pixel <x>,<y> to color number <col>
89 * returns 0 on success, -1 on error
90 */
91 OSD_GetPixel, /* (x0,y0) */
92 /* returns color number of pixel <x>,<y>, or -1 */
93 OSD_SetRow, /* (x0,y0,x1,data) */
94 /*
95 * fills pixels x0,y through x1,y with the content of data[]
96 * returns 0 on success, -1 on clipping all pixel (no pixel drawn)
97 */
98 OSD_SetBlock, /* (x0,y0,x1,y1,increment{color},data) */
99 /*
100 * fills pixels x0,y0 through x1,y1 with the content of data[]
101 * inc contains the width of one line in the data block,
102 * inc<=0 uses blockwidth as linewidth
103 * returns 0 on success, -1 on clipping all pixel
104 */
105 OSD_FillRow, /* (x0,y0,x1,color) */
106 /*
107 * fills pixels x0,y through x1,y with the color <col>
108 * returns 0 on success, -1 on clipping all pixel
109 */
110 OSD_FillBlock, /* (x0,y0,x1,y1,color) */
111 /*
112 * fills pixels x0,y0 through x1,y1 with the color <col>
113 * returns 0 on success, -1 on clipping all pixel
114 */
115 OSD_Line, /* (x0,y0,x1,y1,color) */
116 /*
117 * draw a line from x0,y0 to x1,y1 with the color <col>
118 * returns 0 on success
119 */
120 OSD_Query, /* (x0,y0,x1,y1,xasp{color}}), yasp=11 */
121 /*
122 * fills parameters with the picture dimensions and the pixel aspect ratio
123 * returns 0 on success
124 */
125 OSD_Test, /* () */
126 /*
127 * draws a test picture. for debugging purposes only
128 * returns 0 on success
129 * TODO: remove "test" in final version
130 */
131 OSD_Text, /* (x0,y0,size,color,text) */
132 OSD_SetWindow, /* (x0) set window with number 0<x0<8 as current */
133 OSD_MoveWindow, /* move current window to (x0, y0) */
134 OSD_OpenRaw, /* Open other types of OSD windows */
135} OSD_Command;
136
137typedef struct osd_cmd_s {
138 OSD_Command cmd;
139 int x0;
140 int y0;
141 int x1;
142 int y1;
143 int color;
144 void __user *data;
145} osd_cmd_t;
146
147/* OSD_OpenRaw: set 'color' to desired window type */
148typedef enum {
149 OSD_BITMAP1, /* 1 bit bitmap */
150 OSD_BITMAP2, /* 2 bit bitmap */
151 OSD_BITMAP4, /* 4 bit bitmap */
152 OSD_BITMAP8, /* 8 bit bitmap */
153 OSD_BITMAP1HR, /* 1 Bit bitmap half resolution */
154 OSD_BITMAP2HR, /* 2 bit bitmap half resolution */
155 OSD_BITMAP4HR, /* 4 bit bitmap half resolution */
156 OSD_BITMAP8HR, /* 8 bit bitmap half resolution */
157 OSD_YCRCB422, /* 4:2:2 YCRCB Graphic Display */
158 OSD_YCRCB444, /* 4:4:4 YCRCB Graphic Display */
159 OSD_YCRCB444HR, /* 4:4:4 YCRCB graphic half resolution */
160 OSD_VIDEOTSIZE, /* True Size Normal MPEG Video Display */
161 OSD_VIDEOHSIZE, /* MPEG Video Display Half Resolution */
162 OSD_VIDEOQSIZE, /* MPEG Video Display Quarter Resolution */
163 OSD_VIDEODSIZE, /* MPEG Video Display Double Resolution */
164 OSD_VIDEOTHSIZE, /* True Size MPEG Video Display Half Resolution */
165 OSD_VIDEOTQSIZE, /* True Size MPEG Video Display Quarter Resolution*/
166 OSD_VIDEOTDSIZE, /* True Size MPEG Video Display Double Resolution */
167 OSD_VIDEONSIZE, /* Full Size MPEG Video Display */
168 OSD_CURSOR /* Cursor */
169} osd_raw_window_t;
170
171typedef struct osd_cap_s {
172 int cmd;
173#define OSD_CAP_MEMSIZE 1 /* memory size */
174 long val;
175} osd_cap_t;
176
177
178#define OSD_SEND_CMD _IOW('o', 160, osd_cmd_t)
179#define OSD_GET_CAPABILITY _IOR('o', 161, osd_cap_t)
180
181#endif
include/uapi/linux/dvb/video.h+220−0
@@ -0,0 +1,220 @@
1/* SPDX-License-Identifier: LGPL-2.1+ WITH Linux-syscall-note */
2/*
3 * video.h - DEPRECATED MPEG-TS video decoder API
4 *
5 * NOTE: should not be used on future drivers
6 *
7 * Copyright (C) 2000 Marcus Metzler <marcus@convergence.de>
8 * & Ralph Metzler <ralph@convergence.de>
9 * for convergence integrated media GmbH
10 *
11 * This program is free software; you can redistribute it and/or
12 * modify it under the terms of the GNU Lesser General Public License
13 * as published by the Free Software Foundation; either version 2.1
14 * of the License, or (at your option) any later version.
15 *
16 * This program is distributed in the hope that it will be useful,
17 * but WITHOUT ANY WARRANTY; without even the implied warranty of
18 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
19 * GNU General Public License for more details.
20 *
21 * You should have received a copy of the GNU Lesser General Public License
22 * along with this program; if not, write to the Free Software
23 * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
24 *
25 */
26
27#ifndef _UAPI_DVBVIDEO_H_
28#define _UAPI_DVBVIDEO_H_
29
30#include <linux/types.h>
31#ifndef __KERNEL__
32#include <time.h>
33#endif
34
35typedef enum {
36 VIDEO_FORMAT_4_3, /* Select 4:3 format */
37 VIDEO_FORMAT_16_9, /* Select 16:9 format. */
38 VIDEO_FORMAT_221_1 /* 2.21:1 */
39} video_format_t;
40
41
42typedef enum {
43 VIDEO_PAN_SCAN, /* use pan and scan format */
44 VIDEO_LETTER_BOX, /* use letterbox format */
45 VIDEO_CENTER_CUT_OUT /* use center cut out format */
46} video_displayformat_t;
47
48typedef struct {
49 int w;
50 int h;
51 video_format_t aspect_ratio;
52} video_size_t;
53
54typedef enum {
55 VIDEO_SOURCE_DEMUX, /* Select the demux as the main source */
56 VIDEO_SOURCE_MEMORY /* If this source is selected, the stream
57 comes from the user through the write
58 system call */
59} video_stream_source_t;
60
61
62typedef enum {
63 VIDEO_STOPPED, /* Video is stopped */
64 VIDEO_PLAYING, /* Video is currently playing */
65 VIDEO_FREEZED /* Video is freezed */
66} video_play_state_t;
67
68
69/* Decoder commands */
70#define VIDEO_CMD_PLAY (0)
71#define VIDEO_CMD_STOP (1)
72#define VIDEO_CMD_FREEZE (2)
73#define VIDEO_CMD_CONTINUE (3)
74
75/* Flags for VIDEO_CMD_FREEZE */
76#define VIDEO_CMD_FREEZE_TO_BLACK (1 << 0)
77
78/* Flags for VIDEO_CMD_STOP */
79#define VIDEO_CMD_STOP_TO_BLACK (1 << 0)
80#define VIDEO_CMD_STOP_IMMEDIATELY (1 << 1)
81
82/* Play input formats: */
83/* The decoder has no special format requirements */
84#define VIDEO_PLAY_FMT_NONE (0)
85/* The decoder requires full GOPs */
86#define VIDEO_PLAY_FMT_GOP (1)
87
88/* The structure must be zeroed before use by the application
89 This ensures it can be extended safely in the future. */
90struct video_command {
91 __u32 cmd;
92 __u32 flags;
93 union {
94 struct {
95 __u64 pts;
96 } stop;
97
98 struct {
99 /* 0 or 1000 specifies normal speed,
100 1 specifies forward single stepping,
101 -1 specifies backward single stepping,
102 >1: playback at speed/1000 of the normal speed,
103 <-1: reverse playback at (-speed/1000) of the normal speed. */
104 __s32 speed;
105 __u32 format;
106 } play;
107
108 struct {
109 __u32 data[16];
110 } raw;
111 };
112};
113
114/* FIELD_UNKNOWN can be used if the hardware does not know whether
115 the Vsync is for an odd, even or progressive (i.e. non-interlaced)
116 field. */
117#define VIDEO_VSYNC_FIELD_UNKNOWN (0)
118#define VIDEO_VSYNC_FIELD_ODD (1)
119#define VIDEO_VSYNC_FIELD_EVEN (2)
120#define VIDEO_VSYNC_FIELD_PROGRESSIVE (3)
121
122struct video_event {
123 __s32 type;
124#define VIDEO_EVENT_SIZE_CHANGED 1
125#define VIDEO_EVENT_FRAME_RATE_CHANGED 2
126#define VIDEO_EVENT_DECODER_STOPPED 3
127#define VIDEO_EVENT_VSYNC 4
128 /* unused, make sure to use atomic time for y2038 if it ever gets used */
129 long timestamp;
130 union {
131 video_size_t size;
132 unsigned int frame_rate; /* in frames per 1000sec */
133 unsigned char vsync_field; /* unknown/odd/even/progressive */
134 } u;
135};
136
137
138struct video_status {
139 int video_blank; /* blank video on freeze? */
140 video_play_state_t play_state; /* current state of playback */
141 video_stream_source_t stream_source; /* current source (demux/memory) */
142 video_format_t video_format; /* current aspect ratio of stream*/
143 video_displayformat_t display_format;/* selected cropping mode */
144};
145
146
147struct video_still_picture {
148 char __user *iFrame; /* pointer to a single iframe in memory */
149 __s32 size;
150};
151
152
153typedef __u16 video_attributes_t;
154/* bits: descr. */
155/* 15-14 Video compression mode (0=MPEG-1, 1=MPEG-2) */
156/* 13-12 TV system (0=525/60, 1=625/50) */
157/* 11-10 Aspect ratio (0=4:3, 3=16:9) */
158/* 9- 8 permitted display mode on 4:3 monitor (0=both, 1=only pan-sca */
159/* 7 line 21-1 data present in GOP (1=yes, 0=no) */
160/* 6 line 21-2 data present in GOP (1=yes, 0=no) */
161/* 5- 3 source resolution (0=720x480/576, 1=704x480/576, 2=352x480/57 */
162/* 2 source letterboxed (1=yes, 0=no) */
163/* 0 film/camera mode (0=
164 *camera, 1=film (625/50 only)) */
165
166
167/* bit definitions for capabilities: */
168/* can the hardware decode MPEG1 and/or MPEG2? */
169#define VIDEO_CAP_MPEG1 1
170#define VIDEO_CAP_MPEG2 2
171/* can you send a system and/or program stream to video device?
172 (you still have to open the video and the audio device but only
173 send the stream to the video device) */
174#define VIDEO_CAP_SYS 4
175#define VIDEO_CAP_PROG 8
176/* can the driver also handle SPU, NAVI and CSS encoded data?
177 (CSS API is not present yet) */
178#define VIDEO_CAP_SPU 16
179#define VIDEO_CAP_NAVI 32
180#define VIDEO_CAP_CSS 64
181
182
183#define VIDEO_STOP _IO('o', 21)
184#define VIDEO_PLAY _IO('o', 22)
185#define VIDEO_FREEZE _IO('o', 23)
186#define VIDEO_CONTINUE _IO('o', 24)
187#define VIDEO_SELECT_SOURCE _IO('o', 25)
188#define VIDEO_SET_BLANK _IO('o', 26)
189#define VIDEO_GET_STATUS _IOR('o', 27, struct video_status)
190#define VIDEO_GET_EVENT _IOR('o', 28, struct video_event)
191#define VIDEO_SET_DISPLAY_FORMAT _IO('o', 29)
192#define VIDEO_STILLPICTURE _IOW('o', 30, struct video_still_picture)
193#define VIDEO_FAST_FORWARD _IO('o', 31)
194#define VIDEO_SLOWMOTION _IO('o', 32)
195#define VIDEO_GET_CAPABILITIES _IOR('o', 33, unsigned int)
196#define VIDEO_CLEAR_BUFFER _IO('o', 34)
197#define VIDEO_SET_STREAMTYPE _IO('o', 36)
198#define VIDEO_SET_FORMAT _IO('o', 37)
199#define VIDEO_GET_SIZE _IOR('o', 55, video_size_t)
200
201/**
202 * VIDEO_GET_PTS
203 *
204 * Read the 33 bit presentation time stamp as defined
205 * in ITU T-REC-H.222.0 / ISO/IEC 13818-1.
206 *
207 * The PTS should belong to the currently played
208 * frame if possible, but may also be a value close to it
209 * like the PTS of the last decoded frame or the last PTS
210 * extracted by the PES parser.
211 */
212#define VIDEO_GET_PTS _IOR('o', 57, __u64)
213
214/* Read the number of displayed frames since the decoder was started */
215#define VIDEO_GET_FRAME_COUNT _IOR('o', 58, __u64)
216
217#define VIDEO_COMMAND _IOWR('o', 59, struct video_command)
218#define VIDEO_TRY_COMMAND _IOWR('o', 60, struct video_command)
219
220#endif /* _UAPI_DVBVIDEO_H_ */

Keyboard shortcuts

General

Show keyboard shortcuts
?
Focus the current search
/

Issues and pull requests

Open filters
f

Issues, pull requests and Inbox

Select next item
j↓
Select previous item
k↑
Open selected item
Enter
Dismiss filters or clear selection
Esc

Repository code

Go to file
t