summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--Documentation/media/audio.h.rst.exceptions3
-rw-r--r--Documentation/media/uapi/dvb/audio-get-pts.rst65
-rw-r--r--Documentation/media/uapi/dvb/audio-set-attributes.rst67
-rw-r--r--Documentation/media/uapi/dvb/audio-set-ext-id.rst66
-rw-r--r--Documentation/media/uapi/dvb/audio-set-karaoke.rst66
-rw-r--r--Documentation/media/uapi/dvb/audio_data_types.rst37
-rw-r--r--Documentation/media/uapi/dvb/audio_function_calls.rst4
-rw-r--r--fs/compat_ioctl.c3
-rw-r--r--include/uapi/linux/dvb/audio.h37
9 files changed, 0 insertions, 348 deletions
diff --git a/Documentation/media/audio.h.rst.exceptions b/Documentation/media/audio.h.rst.exceptions
index f40f3cbfe4c9..940458774cf6 100644
--- a/Documentation/media/audio.h.rst.exceptions
+++ b/Documentation/media/audio.h.rst.exceptions
@@ -1,9 +1,6 @@
1# Ignore header name 1# Ignore header name
2ignore define _DVBAUDIO_H_ 2ignore define _DVBAUDIO_H_
3 3
4# Typedef pointing to structs
5replace typedef audio_karaoke_t :c:type:`audio_karaoke`
6
7# Undocumented audio caps, as this is a deprecated API anyway 4# Undocumented audio caps, as this is a deprecated API anyway
8ignore define AUDIO_CAP_DTS 5ignore define AUDIO_CAP_DTS
9ignore define AUDIO_CAP_LPCM 6ignore define AUDIO_CAP_LPCM
diff --git a/Documentation/media/uapi/dvb/audio-get-pts.rst b/Documentation/media/uapi/dvb/audio-get-pts.rst
deleted file mode 100644
index 2d1396b003de..000000000000
--- a/Documentation/media/uapi/dvb/audio-get-pts.rst
+++ /dev/null
@@ -1,65 +0,0 @@
1.. -*- coding: utf-8; mode: rst -*-
2
3.. _AUDIO_GET_PTS:
4
5=============
6AUDIO_GET_PTS
7=============
8
9Name
10----
11
12AUDIO_GET_PTS
13
14.. attention:: This ioctl is deprecated
15
16Synopsis
17--------
18
19.. c:function:: int ioctl(int fd, AUDIO_GET_PTS, __u64 *pts)
20 :name: AUDIO_GET_PTS
21
22
23Arguments
24---------
25
26.. flat-table::
27 :header-rows: 0
28 :stub-columns: 0
29
30
31 -
32
33 - int fd
34
35 - File descriptor returned by a previous call to open().
36
37 -
38
39 - __u64 \*pts
40
41 - Returns the 33-bit timestamp as defined in ITU T-REC-H.222.0 /
42 ISO/IEC 13818-1.
43
44 The PTS should belong to the currently played frame if possible,
45 but may also be a value close to it like the PTS of the last
46 decoded frame or the last PTS extracted by the PES parser.
47
48
49Description
50-----------
51
52This ioctl is obsolete. Do not use in new drivers. If you need this
53functionality, then please contact the linux-media mailing list
54(`https://linuxtv.org/lists.php <https://linuxtv.org/lists.php>`__).
55
56This ioctl call asks the Audio Device to return the current PTS
57timestamp.
58
59
60Return Value
61------------
62
63On success 0 is returned, on error -1 and the ``errno`` variable is set
64appropriately. The generic error codes are described at the
65:ref:`Generic Error Codes <gen-errors>` chapter.
diff --git a/Documentation/media/uapi/dvb/audio-set-attributes.rst b/Documentation/media/uapi/dvb/audio-set-attributes.rst
deleted file mode 100644
index f0c6153ca80f..000000000000
--- a/Documentation/media/uapi/dvb/audio-set-attributes.rst
+++ /dev/null
@@ -1,67 +0,0 @@
1.. -*- coding: utf-8; mode: rst -*-
2
3.. _AUDIO_SET_ATTRIBUTES:
4
5====================
6AUDIO_SET_ATTRIBUTES
7====================
8
9Name
10----
11
12AUDIO_SET_ATTRIBUTES
13
14.. attention:: This ioctl is deprecated
15
16
17Synopsis
18--------
19
20.. c:function:: int ioctl(fd, AUDIO_SET_ATTRIBUTES, struct audio_attributes *attr )
21 :name: AUDIO_SET_ATTRIBUTES
22
23Arguments
24---------
25
26.. flat-table::
27 :header-rows: 0
28 :stub-columns: 0
29
30
31 -
32
33 - int fd
34
35 - File descriptor returned by a previous call to open().
36
37 -
38
39 - audio_attributes_t attr
40
41 - audio attributes according to section ??
42
43
44Description
45-----------
46
47This ioctl is intended for DVD playback and allows you to set certain
48information about the audio stream.
49
50
51Return Value
52------------
53
54On success 0 is returned, on error -1 and the ``errno`` variable is set
55appropriately. The generic error codes are described at the
56:ref:`Generic Error Codes <gen-errors>` chapter.
57
58.. flat-table::
59 :header-rows: 0
60 :stub-columns: 0
61
62
63 - .. row 1
64
65 - ``EINVAL``
66
67 - attr is not a valid or supported attribute setting.
diff --git a/Documentation/media/uapi/dvb/audio-set-ext-id.rst b/Documentation/media/uapi/dvb/audio-set-ext-id.rst
deleted file mode 100644
index 8503c47f26bd..000000000000
--- a/Documentation/media/uapi/dvb/audio-set-ext-id.rst
+++ /dev/null
@@ -1,66 +0,0 @@
1.. -*- coding: utf-8; mode: rst -*-
2
3.. _AUDIO_SET_EXT_ID:
4
5================
6AUDIO_SET_EXT_ID
7================
8
9Name
10----
11
12AUDIO_SET_EXT_ID
13
14.. attention:: This ioctl is deprecated
15
16Synopsis
17--------
18
19.. c:function:: int ioctl(fd, AUDIO_SET_EXT_ID, int id)
20 :name: AUDIO_SET_EXT_ID
21
22Arguments
23---------
24
25.. flat-table::
26 :header-rows: 0
27 :stub-columns: 0
28
29
30 -
31
32 - int fd
33
34 - File descriptor returned by a previous call to open().
35
36 -
37
38 - int id
39
40 - audio sub_stream_id
41
42
43Description
44-----------
45
46This ioctl can be used to set the extension id for MPEG streams in DVD
47playback. Only the first 3 bits are recognized.
48
49
50Return Value
51------------
52
53On success 0 is returned, on error -1 and the ``errno`` variable is set
54appropriately. The generic error codes are described at the
55:ref:`Generic Error Codes <gen-errors>` chapter.
56
57.. flat-table::
58 :header-rows: 0
59 :stub-columns: 0
60
61
62 - .. row 1
63
64 - ``EINVAL``
65
66 - id is not a valid id.
diff --git a/Documentation/media/uapi/dvb/audio-set-karaoke.rst b/Documentation/media/uapi/dvb/audio-set-karaoke.rst
deleted file mode 100644
index c759952d88aa..000000000000
--- a/Documentation/media/uapi/dvb/audio-set-karaoke.rst
+++ /dev/null
@@ -1,66 +0,0 @@
1.. -*- coding: utf-8; mode: rst -*-
2
3.. _AUDIO_SET_KARAOKE:
4
5=================
6AUDIO_SET_KARAOKE
7=================
8
9Name
10----
11
12AUDIO_SET_KARAOKE
13
14.. attention:: This ioctl is deprecated
15
16Synopsis
17--------
18
19.. c:function:: int ioctl(fd, AUDIO_SET_KARAOKE, struct audio_karaoke *karaoke)
20 :name: AUDIO_SET_KARAOKE
21
22
23Arguments
24---------
25
26.. flat-table::
27 :header-rows: 0
28 :stub-columns: 0
29
30
31 -
32
33 - int fd
34
35 - File descriptor returned by a previous call to open().
36
37 -
38
39 - audio_karaoke_t \*karaoke
40
41 - karaoke settings according to section ??.
42
43
44Description
45-----------
46
47This ioctl allows one to set the mixer settings for a karaoke DVD.
48
49
50Return Value
51------------
52
53On success 0 is returned, on error -1 and the ``errno`` variable is set
54appropriately. The generic error codes are described at the
55:ref:`Generic Error Codes <gen-errors>` chapter.
56
57.. flat-table::
58 :header-rows: 0
59 :stub-columns: 0
60
61
62 - .. row 1
63
64 - ``EINVAL``
65
66 - karaoke is not a valid or supported karaoke setting.
diff --git a/Documentation/media/uapi/dvb/audio_data_types.rst b/Documentation/media/uapi/dvb/audio_data_types.rst
index 6b93359d64f7..5bffa2c98a24 100644
--- a/Documentation/media/uapi/dvb/audio_data_types.rst
+++ b/Documentation/media/uapi/dvb/audio_data_types.rst
@@ -114,40 +114,3 @@ following bits set according to the hardwares capabilities.
114 #define AUDIO_CAP_OGG 64 114 #define AUDIO_CAP_OGG 64
115 #define AUDIO_CAP_SDDS 128 115 #define AUDIO_CAP_SDDS 128
116 #define AUDIO_CAP_AC3 256 116 #define AUDIO_CAP_AC3 256
117
118.. c:type:: audio_karaoke
119
120The ioctl AUDIO_SET_KARAOKE uses the following format:
121
122
123.. code-block:: c
124
125 typedef
126 struct audio_karaoke {
127 int vocal1;
128 int vocal2;
129 int melody;
130 } audio_karaoke_t;
131
132If Vocal1 or Vocal2 are non-zero, they get mixed into left and right t
133at 70% each. If both, Vocal1 and Vocal2 are non-zero, Vocal1 gets mixed
134into the left channel and Vocal2 into the right channel at 100% each. Ff
135Melody is non-zero, the melody channel gets mixed into left and right.
136
137
138.. c:type:: audio_attributes
139
140The following attributes can be set by a call to AUDIO_SET_ATTRIBUTES:
141
142
143.. code-block:: c
144
145 typedef uint16_t audio_attributes_t;
146 /* bits: descr. */
147 /* 15-13 audio coding mode (0=ac3, 2=mpeg1, 3=mpeg2ext, 4=LPCM, 6=DTS, */
148 /* 12 multichannel extension */
149 /* 11-10 audio type (0=not spec, 1=language included) */
150 /* 9- 8 audio application mode (0=not spec, 1=karaoke, 2=surround) */
151 /* 7- 6 Quantization / DRC (mpeg audio: 1=DRC exists)(lpcm: 0=16bit, */
152 /* 5- 4 Sample frequency fs (0=48kHz, 1=96kHz) */
153 /* 2- 0 number of audio channels (n+1 channels) */
diff --git a/Documentation/media/uapi/dvb/audio_function_calls.rst b/Documentation/media/uapi/dvb/audio_function_calls.rst
index 0bb56f0cfed4..7dba16285dab 100644
--- a/Documentation/media/uapi/dvb/audio_function_calls.rst
+++ b/Documentation/media/uapi/dvb/audio_function_calls.rst
@@ -22,13 +22,9 @@ Audio Function Calls
22 audio-set-bypass-mode 22 audio-set-bypass-mode
23 audio-channel-select 23 audio-channel-select
24 audio-bilingual-channel-select 24 audio-bilingual-channel-select
25 audio-get-pts
26 audio-get-status 25 audio-get-status
27 audio-get-capabilities 26 audio-get-capabilities
28 audio-clear-buffer 27 audio-clear-buffer
29 audio-set-id 28 audio-set-id
30 audio-set-mixer 29 audio-set-mixer
31 audio-set-streamtype 30 audio-set-streamtype
32 audio-set-ext-id
33 audio-set-attributes
34 audio-set-karaoke
diff --git a/fs/compat_ioctl.c b/fs/compat_ioctl.c
index 59216b172003..a9b00942e87d 100644
--- a/fs/compat_ioctl.c
+++ b/fs/compat_ioctl.c
@@ -1178,9 +1178,6 @@ COMPATIBLE_IOCTL(AUDIO_CLEAR_BUFFER)
1178COMPATIBLE_IOCTL(AUDIO_SET_ID) 1178COMPATIBLE_IOCTL(AUDIO_SET_ID)
1179COMPATIBLE_IOCTL(AUDIO_SET_MIXER) 1179COMPATIBLE_IOCTL(AUDIO_SET_MIXER)
1180COMPATIBLE_IOCTL(AUDIO_SET_STREAMTYPE) 1180COMPATIBLE_IOCTL(AUDIO_SET_STREAMTYPE)
1181COMPATIBLE_IOCTL(AUDIO_SET_EXT_ID)
1182COMPATIBLE_IOCTL(AUDIO_SET_ATTRIBUTES)
1183COMPATIBLE_IOCTL(AUDIO_SET_KARAOKE)
1184COMPATIBLE_IOCTL(DMX_START) 1181COMPATIBLE_IOCTL(DMX_START)
1185COMPATIBLE_IOCTL(DMX_STOP) 1182COMPATIBLE_IOCTL(DMX_STOP)
1186COMPATIBLE_IOCTL(DMX_SET_FILTER) 1183COMPATIBLE_IOCTL(DMX_SET_FILTER)
diff --git a/include/uapi/linux/dvb/audio.h b/include/uapi/linux/dvb/audio.h
index 69f7a85d81b1..afeae063e640 100644
--- a/include/uapi/linux/dvb/audio.h
+++ b/include/uapi/linux/dvb/audio.h
@@ -67,27 +67,6 @@ typedef struct audio_status {
67} audio_status_t; /* separate decoder hardware */ 67} audio_status_t; /* separate decoder hardware */
68 68
69 69
70typedef
71struct audio_karaoke { /* if Vocal1 or Vocal2 are non-zero, they get mixed */
72 int vocal1; /* into left and right t at 70% each */
73 int vocal2; /* if both, Vocal1 and Vocal2 are non-zero, Vocal1 gets*/
74 int melody; /* mixed into the left channel and */
75 /* Vocal2 into the right channel at 100% each. */
76 /* if Melody is non-zero, the melody channel gets mixed*/
77} audio_karaoke_t; /* into left and right */
78
79
80typedef __u16 audio_attributes_t;
81/* bits: descr. */
82/* 15-13 audio coding mode (0=ac3, 2=mpeg1, 3=mpeg2ext, 4=LPCM, 6=DTS, */
83/* 12 multichannel extension */
84/* 11-10 audio type (0=not spec, 1=language included) */
85/* 9- 8 audio application mode (0=not spec, 1=karaoke, 2=surround) */
86/* 7- 6 Quantization / DRC (mpeg audio: 1=DRC exists)(lpcm: 0=16bit, */
87/* 5- 4 Sample frequency fs (0=48kHz, 1=96kHz) */
88/* 2- 0 number of audio channels (n+1 channels) */
89
90
91/* for GET_CAPABILITIES and SET_FORMAT, the latter should only set one bit */ 70/* for GET_CAPABILITIES and SET_FORMAT, the latter should only set one bit */
92#define AUDIO_CAP_DTS 1 71#define AUDIO_CAP_DTS 1
93#define AUDIO_CAP_LPCM 2 72#define AUDIO_CAP_LPCM 2
@@ -115,22 +94,6 @@ typedef __u16 audio_attributes_t;
115#define AUDIO_SET_ID _IO('o', 13) 94#define AUDIO_SET_ID _IO('o', 13)
116#define AUDIO_SET_MIXER _IOW('o', 14, audio_mixer_t) 95#define AUDIO_SET_MIXER _IOW('o', 14, audio_mixer_t)
117#define AUDIO_SET_STREAMTYPE _IO('o', 15) 96#define AUDIO_SET_STREAMTYPE _IO('o', 15)
118#define AUDIO_SET_EXT_ID _IO('o', 16)
119#define AUDIO_SET_ATTRIBUTES _IOW('o', 17, audio_attributes_t)
120#define AUDIO_SET_KARAOKE _IOW('o', 18, audio_karaoke_t)
121
122/**
123 * AUDIO_GET_PTS
124 *
125 * Read the 33 bit presentation time stamp as defined
126 * in ITU T-REC-H.222.0 / ISO/IEC 13818-1.
127 *
128 * The PTS should belong to the currently played
129 * frame if possible, but may also be a value close to it
130 * like the PTS of the last decoded frame or the last PTS
131 * extracted by the PES parser.
132 */
133#define AUDIO_GET_PTS _IOR('o', 19, __u64)
134#define AUDIO_BILINGUAL_CHANNEL_SELECT _IO('o', 20) 97#define AUDIO_BILINGUAL_CHANNEL_SELECT _IO('o', 20)
135 98
136#endif /* _DVBAUDIO_H_ */ 99#endif /* _DVBAUDIO_H_ */
generated by cgit v1.2.2 (git 2.25.0) at 2025-02-23 09:11:28 -0500