Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(194)

Side by Side Diff: webrtc/modules/audio_device/ios/audio_device_ios.h

Issue 2349263004: Ensures that ADM for Android and iOS uses identical states when stopping audio (Closed)
Patch Set: Changes based on tests py sophiechang@ Created 4 years, 2 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
« no previous file with comments | « no previous file | webrtc/modules/audio_device/ios/audio_device_ios.mm » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 /* 1 /*
2 * Copyright (c) 2012 The WebRTC project authors. All Rights Reserved. 2 * Copyright (c) 2012 The WebRTC project authors. All Rights Reserved.
3 * 3 *
4 * Use of this source code is governed by a BSD-style license 4 * Use of this source code is governed by a BSD-style license
5 * that can be found in the LICENSE file in the root of the source 5 * that can be found in the LICENSE file in the root of the source
6 * tree. An additional intellectual property rights grant can be found 6 * tree. An additional intellectual property rights grant can be found
7 * in the file PATENTS. All contributing project authors may 7 * in the file PATENTS. All contributing project authors may
8 * be found in the AUTHORS file in the root of the source tree. 8 * be found in the AUTHORS file in the root of the source tree.
9 */ 9 */
10 10
(...skipping 36 matching lines...) Expand 10 before | Expand all | Expand 10 after
47 AudioDeviceIOS(); 47 AudioDeviceIOS();
48 ~AudioDeviceIOS(); 48 ~AudioDeviceIOS();
49 49
50 void AttachAudioBuffer(AudioDeviceBuffer* audioBuffer) override; 50 void AttachAudioBuffer(AudioDeviceBuffer* audioBuffer) override;
51 51
52 InitStatus Init() override; 52 InitStatus Init() override;
53 int32_t Terminate() override; 53 int32_t Terminate() override;
54 bool Initialized() const override { return initialized_; } 54 bool Initialized() const override { return initialized_; }
55 55
56 int32_t InitPlayout() override; 56 int32_t InitPlayout() override;
57 bool PlayoutIsInitialized() const override { return play_is_initialized_; } 57 bool PlayoutIsInitialized() const override { return audio_is_initialized_; }
58 58
59 int32_t InitRecording() override; 59 int32_t InitRecording() override;
60 bool RecordingIsInitialized() const override { return rec_is_initialized_; } 60 bool RecordingIsInitialized() const override { return audio_is_initialized_; }
61 61
62 int32_t StartPlayout() override; 62 int32_t StartPlayout() override;
63 int32_t StopPlayout() override; 63 int32_t StopPlayout() override;
64 bool Playing() const override { return playing_; } 64 bool Playing() const override { return playing_; }
65 65
66 int32_t StartRecording() override; 66 int32_t StartRecording() override;
67 int32_t StopRecording() override; 67 int32_t StopRecording() override;
68 bool Recording() const override { return recording_; } 68 bool Recording() const override { return recording_; }
69 69
70 int32_t SetLoudspeakerStatus(bool enable) override; 70 int32_t SetLoudspeakerStatus(bool enable) override;
(...skipping 202 matching lines...) Expand 10 before | Expand all | Expand 10 after
273 273
274 // Set to 1 when recording is active and 0 otherwise. 274 // Set to 1 when recording is active and 0 otherwise.
275 volatile int recording_; 275 volatile int recording_;
276 276
277 // Set to 1 when playout is active and 0 otherwise. 277 // Set to 1 when playout is active and 0 otherwise.
278 volatile int playing_; 278 volatile int playing_;
279 279
280 // Set to true after successful call to Init(), false otherwise. 280 // Set to true after successful call to Init(), false otherwise.
281 bool initialized_; 281 bool initialized_;
282 282
283 // Set to true after successful call to InitRecording(), false otherwise. 283 // Set to true after successful call to InitRecording() or InitPlayout(),
284 bool rec_is_initialized_; 284 // false otherwise.
285 285 bool audio_is_initialized_;
286 // Set to true after successful call to InitPlayout(), false otherwise.
287 bool play_is_initialized_;
288 286
289 // Set to true if audio session is interrupted, false otherwise. 287 // Set to true if audio session is interrupted, false otherwise.
290 bool is_interrupted_; 288 bool is_interrupted_;
291 289
292 // Audio interruption observer instance. 290 // Audio interruption observer instance.
293 RTCAudioSessionDelegateAdapter* audio_session_observer_; 291 RTCAudioSessionDelegateAdapter* audio_session_observer_;
294 292
295 // Set to true if we've activated the audio session. 293 // Set to true if we've activated the audio session.
296 bool has_configured_session_; 294 bool has_configured_session_;
297 }; 295 };
298 296
299 } // namespace webrtc 297 } // namespace webrtc
300 298
301 #endif // WEBRTC_MODULES_AUDIO_DEVICE_IOS_AUDIO_DEVICE_IOS_H_ 299 #endif // WEBRTC_MODULES_AUDIO_DEVICE_IOS_AUDIO_DEVICE_IOS_H_
OLDNEW
« no previous file with comments | « no previous file | webrtc/modules/audio_device/ios/audio_device_ios.mm » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698