Title: [231062] branches/safari-605-branch/Source/WebCore
- Revision
- 231062
- Author
- [email protected]
- Date
- 2018-04-26 12:09:08 -0700 (Thu, 26 Apr 2018)
Log Message
Cherry-pick r231002. rdar://problem/39762191
[iOS] Set route sharing policy when setting audio session category
https://bugs.webkit.org/show_bug.cgi?id=184979
<rdar://problem/39709577>
Reviewed by Jer Noble.
* platform/audio/ios/AudioSessionIOS.mm:
(WebCore::AudioSession::setCategory):
git-svn-id: https://svn.webkit.org/repository/webkit/trunk@231002 268f45cc-cd09-0410-ab3c-d52691b4dbfc
Modified Paths
Diff
Modified: branches/safari-605-branch/Source/WebCore/ChangeLog (231061 => 231062)
--- branches/safari-605-branch/Source/WebCore/ChangeLog 2018-04-26 18:46:42 UTC (rev 231061)
+++ branches/safari-605-branch/Source/WebCore/ChangeLog 2018-04-26 19:09:08 UTC (rev 231062)
@@ -1,3 +1,29 @@
+2018-04-26 Jason Marcell <[email protected]>
+
+ Cherry-pick r231002. rdar://problem/39762191
+
+ [iOS] Set route sharing policy when setting audio session category
+ https://bugs.webkit.org/show_bug.cgi?id=184979
+ <rdar://problem/39709577>
+
+ Reviewed by Jer Noble.
+
+ * platform/audio/ios/AudioSessionIOS.mm:
+ (WebCore::AudioSession::setCategory):
+
+ git-svn-id: https://svn.webkit.org/repository/webkit/trunk@231002 268f45cc-cd09-0410-ab3c-d52691b4dbfc
+
+ 2018-04-25 Eric Carlson <[email protected]>
+
+ [iOS] Set route sharing policy when setting audio session category
+ https://bugs.webkit.org/show_bug.cgi?id=184979
+ <rdar://problem/39709577>
+
+ Reviewed by Jer Noble.
+
+ * platform/audio/ios/AudioSessionIOS.mm:
+ (WebCore::AudioSession::setCategory):
+
2018-04-17 Kocsen Chung <[email protected]>
Cherry-pick r230530. rdar://problem/39462749
Modified: branches/safari-605-branch/Source/WebCore/platform/audio/ios/AudioSessionIOS.mm (231061 => 231062)
--- branches/safari-605-branch/Source/WebCore/platform/audio/ios/AudioSessionIOS.mm 2018-04-26 18:46:42 UTC (rev 231061)
+++ branches/safari-605-branch/Source/WebCore/platform/audio/ios/AudioSessionIOS.mm 2018-04-26 19:09:08 UTC (rev 231062)
@@ -111,6 +111,7 @@
NSString *categoryString;
NSString *categoryMode = AVAudioSessionModeDefault;
AVAudioSessionCategoryOptions options = 0;
+ AVAudioSessionRouteSharingPolicy policy = AVAudioSessionRouteSharingPolicyDefault;
switch (newCategory) {
case AmbientSound:
@@ -121,6 +122,7 @@
break;
case MediaPlayback:
categoryString = AVAudioSessionCategoryPlayback;
+ policy = AVAudioSessionRouteSharingPolicyLongForm;
break;
case RecordAudio:
categoryString = AVAudioSessionCategoryRecord;
@@ -140,7 +142,7 @@
}
NSError *error = nil;
- [[AVAudioSession sharedInstance] setCategory:categoryString mode:categoryMode options:options error:&error];
+ [[AVAudioSession sharedInstance] setCategory:categoryString mode:categoryMode routeSharingPolicy:policy options:options error:&error];
#if !PLATFORM(IOS_SIMULATOR)
ASSERT(!error);
#endif
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
