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

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

Issue 2872953002: iOS audio session isInterrupted flag does not get reset correctly: (Closed)
Patch Set: Errant dot Created 3 years, 7 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
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
11 #ifndef WEBRTC_MODULES_AUDIO_DEVICE_IOS_AUDIO_DEVICE_IOS_H_ 11 #ifndef WEBRTC_MODULES_AUDIO_DEVICE_IOS_AUDIO_DEVICE_IOS_H_
12 #define WEBRTC_MODULES_AUDIO_DEVICE_IOS_AUDIO_DEVICE_IOS_H_ 12 #define WEBRTC_MODULES_AUDIO_DEVICE_IOS_AUDIO_DEVICE_IOS_H_
13 13
14 #include <memory> 14 #include <memory>
15 15
16 #include "WebRTC/RTCMacros.h" 16 #include "WebRTC/RTCMacros.h"
17 #include "webrtc/base/gtest_prod_util.h"
17 #include "webrtc/base/thread.h" 18 #include "webrtc/base/thread.h"
18 #include "webrtc/base/thread_checker.h" 19 #include "webrtc/base/thread_checker.h"
19 #include "webrtc/modules/audio_device/audio_device_generic.h" 20 #include "webrtc/modules/audio_device/audio_device_generic.h"
20 #include "webrtc/modules/audio_device/ios/audio_session_observer.h" 21 #include "webrtc/modules/audio_device/ios/audio_session_observer.h"
21 #include "webrtc/modules/audio_device/ios/voice_processing_audio_unit.h" 22 #include "webrtc/modules/audio_device/ios/voice_processing_audio_unit.h"
22 23
23 RTC_FWD_DECL_OBJC_CLASS(RTCAudioSessionDelegateAdapter); 24 RTC_FWD_DECL_OBJC_CLASS(RTCAudioSessionDelegateAdapter);
24 25
25 namespace webrtc { 26 namespace webrtc {
26 27
(...skipping 258 matching lines...) Expand 10 before | Expand all | Expand 10 after
285 bool audio_is_initialized_; 286 bool audio_is_initialized_;
286 287
287 // Set to true if audio session is interrupted, false otherwise. 288 // Set to true if audio session is interrupted, false otherwise.
288 bool is_interrupted_; 289 bool is_interrupted_;
289 290
290 // Audio interruption observer instance. 291 // Audio interruption observer instance.
291 RTCAudioSessionDelegateAdapter* audio_session_observer_; 292 RTCAudioSessionDelegateAdapter* audio_session_observer_;
292 293
293 // Set to true if we've activated the audio session. 294 // Set to true if we've activated the audio session.
294 bool has_configured_session_; 295 bool has_configured_session_;
296
297 // Exposes private members for testing purposes only.
298 FRIEND_TEST_ALL_PREFIXES(AudioDeviceTest, testInterruptedAudioSession);
295 }; 299 };
296 300
297 } // namespace webrtc 301 } // namespace webrtc
298 302
299 #endif // WEBRTC_MODULES_AUDIO_DEVICE_IOS_AUDIO_DEVICE_IOS_H_ 303 #endif // WEBRTC_MODULES_AUDIO_DEVICE_IOS_AUDIO_DEVICE_IOS_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698