Title: [245377] branches/safari-608.1.24-branch
- Revision
- 245377
- Author
- [email protected]
- Date
- 2019-05-15 22:43:05 -0700 (Wed, 15 May 2019)
Log Message
Cherry-pick r245156. rdar://problem/50590818
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):
git-svn-id: https://svn.webkit.org/repository/webkit/trunk@245156 268f45cc-cd09-0410-ab3c-d52691b4dbfc
Modified Paths
Diff
Modified: branches/safari-608.1.24-branch/Source/WebCore/ChangeLog (245376 => 245377)
--- branches/safari-608.1.24-branch/Source/WebCore/ChangeLog 2019-05-16 05:43:00 UTC (rev 245376)
+++ branches/safari-608.1.24-branch/Source/WebCore/ChangeLog 2019-05-16 05:43:05 UTC (rev 245377)
@@ -1,5 +1,43 @@
2019-05-15 Kocsen Chung <[email protected]>
+ Cherry-pick r245156. rdar://problem/50590818
+
+ 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):
+
+
+ git-svn-id: https://svn.webkit.org/repository/webkit/trunk@245156 268f45cc-cd09-0410-ab3c-d52691b4dbfc
+
+ 2019-05-09 Eric Carlson <[email protected]>
+
+ 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-15 Kocsen Chung <[email protected]>
+
Cherry-pick r245147. rdar://problem/50621407
fast/hidpi/video-controls-in-hidpi.html sometimes asserts in WK1
Modified: branches/safari-608.1.24-branch/Source/WebCore/platform/audio/cocoa/MediaSessionManagerCocoa.mm (245376 => 245377)
--- branches/safari-608.1.24-branch/Source/WebCore/platform/audio/cocoa/MediaSessionManagerCocoa.mm 2019-05-16 05:43:00 UTC (rev 245376)
+++ branches/safari-608.1.24-branch/Source/WebCore/platform/audio/cocoa/MediaSessionManagerCocoa.mm 2019-05-16 05:43:05 UTC (rev 245377)
@@ -111,10 +111,7 @@
category = AudioSession::PlayAndRecord;
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;
Modified: branches/safari-608.1.24-branch/Tools/ChangeLog (245376 => 245377)
--- branches/safari-608.1.24-branch/Tools/ChangeLog 2019-05-16 05:43:00 UTC (rev 245376)
+++ branches/safari-608.1.24-branch/Tools/ChangeLog 2019-05-16 05:43:05 UTC (rev 245377)
@@ -1,3 +1,39 @@
+2019-05-15 Kocsen Chung <[email protected]>
+
+ Cherry-pick r245156. rdar://problem/50590818
+
+ 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):
+
+
+ git-svn-id: https://svn.webkit.org/repository/webkit/trunk@245156 268f45cc-cd09-0410-ab3c-d52691b4dbfc
+
+ 2019-05-09 Eric Carlson <[email protected]>
+
+ 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 Xan López <[email protected]>
[CMake] Detect SSE2 at compile time
Modified: branches/safari-608.1.24-branch/Tools/TestWebKitAPI/Tests/WebKitLegacy/ios/AudioSessionCategoryIOS.mm (245376 => 245377)
--- branches/safari-608.1.24-branch/Tools/TestWebKitAPI/Tests/WebKitLegacy/ios/AudioSessionCategoryIOS.mm 2019-05-16 05:43:00 UTC (rev 245376)
+++ branches/safari-608.1.24-branch/Tools/TestWebKitAPI/Tests/WebKitLegacy/ios/AudioSessionCategoryIOS.mm 2019-05-16 05:43:05 UTC (rev 245377)
@@ -71,15 +71,6 @@
} while (++tries <= 100);
}
-static AVAudioSessionRouteSharingPolicy routeSharingPolicyLongFormVideo()
-{
-#if HAVE(ROUTE_SHARING_POLICY_LONG_FORM_VIDEO)
- return AVAudioSessionRouteSharingPolicyLongFormVideo;
-#else
- return AVAudioSessionRouteSharingPolicyLongForm;
-#endif
-}
-
static AVAudioSessionRouteSharingPolicy routeSharingPolicyLongFormAudio()
{
#if HAVE(ROUTE_SHARING_POLICY_LONG_FORM_VIDEO)
@@ -110,7 +101,10 @@
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;
@@ -150,7 +144,10 @@
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;
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
