Changeset 245156 in webkit

Timestamp:

May 9, 2019 1:32:55 PM (5 years ago)

Author:

eric.carlson@apple.com

Message:

Refine AudioSession route sharing policy
​https://bugs.webkit.org/show_bug.cgi?id=197742
<rdar://problem/50590818>

Reviewed by Darin Adler.

Source/WebCore:

No new tests, updated AVAudioSessionRouteSharingPolicy API test.

• platform/audio/cocoa/MediaSessionManagerCocoa.mm:

(MediaSessionManagerCocoa::updateSessionState):

Tools:

• TestWebKitAPI/Tests/WebKitLegacy/ios/AudioSessionCategoryIOS.mm:

(TestWebKitAPI::TEST):

Location:

trunk

Files:

• Source/WebCore/ChangeLog (modified) (1 diff)
• Source/WebCore/platform/audio/cocoa/MediaSessionManagerCocoa.mm (modified) (1 diff)
• Tools/ChangeLog (modified) (1 diff)
• Tools/TestWebKitAPI/Tests/WebKitLegacy/ios/AudioSessionCategoryIOS.mm (modified) (3 diffs)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2019-05-09  Eric Carlson  <eric.carlson@apple.com>
+
+        Refine AudioSession route sharing policy
+        https://bugs.webkit.org/show_bug.cgi?id=197742
+        <rdar://problem/50590818>
+
+        Reviewed by Darin Adler.
+
+        No new tests, updated AVAudioSessionRouteSharingPolicy API test.
+
+        * platform/audio/cocoa/MediaSessionManagerCocoa.mm:
+        (MediaSessionManagerCocoa::updateSessionState):
+
 2019-05-09  Simon Fraser  <simon.fraser@apple.com>
 

trunk/Source/WebCore/platform/audio/cocoa/MediaSessionManagerCocoa.mm

@@ -112 +112 @@
     else if (hasAudibleAudioOrVideoMediaType) {
         category = AudioSession::MediaPlayback;
-        if (videoCount || videoAudioCount)
-            policy = RouteSharingPolicy::LongFormVideo;
-        else
-            policy = RouteSharingPolicy::LongFormAudio;
+        policy = RouteSharingPolicy::LongFormAudio;
     } else if (webAudioCount)
         category = AudioSession::AmbientSound;

trunk/Tools/ChangeLog

@@ +1 @@
+2019-05-09  Eric Carlson  <eric.carlson@apple.com>
+
+        Refine AudioSession route sharing policy
+        https://bugs.webkit.org/show_bug.cgi?id=197742
+        <rdar://problem/50590818>
+
+        Reviewed by Darin Adler.
+
+        * TestWebKitAPI/Tests/WebKitLegacy/ios/AudioSessionCategoryIOS.mm:
+        (TestWebKitAPI::TEST):
+
 2019-05-09  Alex Christensen  <achristensen@webkit.org>
 

trunk/Tools/TestWebKitAPI/Tests/WebKitLegacy/ios/AudioSessionCategoryIOS.mm

@@ -72 +72 @@
 }
 
-static AVAudioSessionRouteSharingPolicy routeSharingPolicyLongFormVideo()
-{
-#if HAVE(ROUTE_SHARING_POLICY_LONG_FORM_VIDEO)
-    return AVAudioSessionRouteSharingPolicyLongFormVideo;
-#else
-    return AVAudioSessionRouteSharingPolicyLongForm;
-#endif
-}
-
 static AVAudioSessionRouteSharingPolicy routeSharingPolicyLongFormAudio()
 {
@@ -111 +102 @@
     waitUntilAudioSessionCategoryIsEqualTo(getAVAudioSessionCategoryPlayback());
     EXPECT_WK_STREQ(getAVAudioSessionCategoryPlayback(), [[getAVAudioSessionClass() sharedInstance] category]);
-    EXPECT_EQ([[getAVAudioSessionClass() sharedInstance] routeSharingPolicy], routeSharingPolicyLongFormVideo());
+    EXPECT_EQ([[getAVAudioSessionClass() sharedInstance] routeSharingPolicy], routeSharingPolicyLongFormAudio());
+#if HAVE(ROUTE_SHARING_POLICY_LONG_FORM_VIDEO)
+    EXPECT_NE([[getAVAudioSessionClass() sharedInstance] routeSharingPolicy], AVAudioSessionRouteSharingPolicyLongFormVideo);
+#endif
 
     didBeginPlaying = false;
@@ -151 +145 @@
     waitUntilAudioSessionCategoryIsEqualTo(getAVAudioSessionCategoryPlayback());
     EXPECT_WK_STREQ(getAVAudioSessionCategoryPlayback(), [[getAVAudioSessionClass() sharedInstance] category]);
-    EXPECT_EQ([[getAVAudioSessionClass() sharedInstance] routeSharingPolicy], routeSharingPolicyLongFormVideo());
+    EXPECT_EQ([[getAVAudioSessionClass() sharedInstance] routeSharingPolicy], routeSharingPolicyLongFormAudio());
+#if HAVE(ROUTE_SHARING_POLICY_LONG_FORM_VIDEO)
+    EXPECT_NE([[getAVAudioSessionClass() sharedInstance] routeSharingPolicy], AVAudioSessionRouteSharingPolicyLongFormVideo);
+#endif
 
     didBeginPlaying = false;