1
diff --git a/bin/audio_test.py b/bin/audio_test.py
2
index 2a56df4..4b3f89c 100755
3
--- a/bin/audio_test.py
4
+++ b/bin/audio_test.py
5
@@ -24,10 +24,6 @@ except ImportError:
6
24
    print((sys.version), file=sys.stderr)
24
    print((sys.version), file=sys.stderr)
7
25
    sys.exit(127)
25
    sys.exit(127)
8
26
26
9
27
try:
10
28
    from collections.abc import Callable
11
29
except ImportError:
12
30
    from collections import Callable  # backward compatible
13
31
27
14
32
# Frequency bands for FFT
28
# Frequency bands for FFT
15
33
BINS = 256
29
BINS = 256
16
@@ -115,22 +111,16 @@ class PIDController(object):
17
115
class PAVolumeController(object):
111
class PAVolumeController(object):
18
116
    pa_types = {'input': 'source', 'output': 'sink'}
112
    pa_types = {'input': 'source', 'output': 'sink'}
19
117
113
21
118
    def __init__(self, type, method=None, logger=None):
114
    def __init__(self, type, logger=None):
22
119
        """Initializes the volume controller.
115
        """Initializes the volume controller.
23
120
116
24
121
           Arguments:
117
           Arguments:
25
122
           type: either input or output
118
           type: either input or output
26
123
           method: a method that will run a command and return pulseaudio
27
124
           information in the described format, as a single string with
28
125
           line breaks (to be processed with str.splitlines())
29
126
119
30
127
        """
120
        """
31
128
        self.type = type
121
        self.type = type
32
129
        self._volume = None
122
        self._volume = None
33
130
        self.identifier = None
123
        self.identifier = None
34
131
        self.method = method
35
132
        if not isinstance(method, Callable):
36
133
            self.method = self._pactl_output
37
134
        self.logger = logger
124
        self.logger = logger
38
135
125
39
136
    def set_volume(self, volume):
126
    def set_volume(self, volume):
40
@@ -142,8 +132,7 @@ class PAVolumeController(object):
41
142
                   'set-%s-volume' % (self.pa_types[self.type]),
132
                   'set-%s-volume' % (self.pa_types[self.type]),
42
143
                   str(self.identifier[0]),
133
                   str(self.identifier[0]),
43
144
                   str(int(volume)) + "%"]
134
                   str(int(volume)) + "%"]
46
145
        if not self.method(command):
135
        self._pactl_output(command)
45
146
            return False
47
147
        self._volume = volume
136
        self._volume = volume
48
148
        return True
137
        return True
49
149
138
50
@@ -160,8 +149,7 @@ class PAVolumeController(object):
51
160
                   'set-%s-mute' % (self.pa_types[self.type]),
149
                   'set-%s-mute' % (self.pa_types[self.type]),
52
161
                   str(self.identifier[0]),
150
                   str(self.identifier[0]),
53
162
                   mute]
151
                   mute]
56
163
        if not self.method(command):
152
        self._pactl_output(command)
55
164
            return False
57
165
        return True
153
        return True
58
166
154
59
167
    def get_identifier(self):
155
    def get_identifier(self):
60
@@ -192,7 +180,7 @@ class PAVolumeController(object):
61
192
        # <ID>\t<NAME>\t<MODULE>\t<SAMPLE_SPEC_WITH_SPACES>\t<STATE>
180
        # <ID>\t<NAME>\t<MODULE>\t<SAMPLE_SPEC_WITH_SPACES>\t<STATE>
62
193
        # What we need to return is the ID for the first element on this list
181
        # What we need to return is the ID for the first element on this list
63
194
        # that does not contain auto_null or monitor.
182
        # that does not contain auto_null or monitor.
65
195
        pa_info = self.method(command)
183
        pa_info = self._pactl_output(command)
66
196
        valid_elements = None
184
        valid_elements = None
67
197
185
68
198
        if pa_info:
186
        if pa_info:
69
@@ -221,7 +209,8 @@ class PAVolumeController(object):
70
221
                                               universal_newlines=True)
209
                                               universal_newlines=True)
71
222
            except (subprocess.CalledProcessError):
210
            except (subprocess.CalledProcessError):
72
223
                time.sleep(5)
211
                time.sleep(5)
74
224
        return False
212
        self.logger.error("Fail to execute: {}".format(command))
75
213
        sys.exit(1)
76
225
214
77
226
215
78
227
class FileDumper(object):
216
class FileDumper(object):
79
@@ -369,7 +358,7 @@ class GStreamerMessageHandler(object):
80
369
        # we can't control it :(
358
        # we can't control it :(
81
370
        current_volume = volume_controller.get_volume()
359
        current_volume = volume_controller.get_volume()
82
371
        if current_volume is None:
360
        if current_volume is None:
84
372
            self.logger.error("Unable to control recording volume."
361
            self.logger.error("Unable to control recording volume. "
85
373
                              "Test results may be wrong")
362
                              "Test results may be wrong")
86
374
            return
363
            return
87
375
        self.current_level = level
364
        self.current_level = level
Reviewer	Date Requested	Status
Sylvain Pineau (community)	2020-07-23	Needs Fixing on 2020-10-09
Devices Certification Bot	2020-09-10	Needs Fixing on 2020-10-08
StanleyHuang	2020-09-10	Approve on 2020-09-28
Pierre Equoy	2020-09-10	Approve on 2020-09-25
Leon Liao (community)		Needs Resubmitting on 2020-09-25
Rex Tsai		Approve on 2020-09-17
Jonathan Cave (community)	2020-07-23	Approve on 2020-08-05
Review via email: mp+387916@code.launchpad.net