Changeset 195068 in webkit

Timestamp:

Jan 14, 2016 11:19:34 AM (8 years ago)

Author:

matthew_hanson@apple.com

Message:

Merge r194672. rdar://problem/24154288

Location:

branches/safari-601-branch

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/media/airplay-target-availability-expected.txt (added)
• LayoutTests/media/airplay-target-availability.html (added)
• LayoutTests/platform/efl/TestExpectations (modified) (1 diff)
• LayoutTests/platform/gtk/TestExpectations (modified) (1 diff)
• LayoutTests/platform/mac/TestExpectations (modified) (1 diff)
• LayoutTests/platform/win/TestExpectations (modified) (1 diff)
• Source/WebCore/ChangeLog (modified) (1 diff)
• Source/WebCore/Modules/mediasession/WebMediaSessionManager.cpp (modified) (6 diffs)
• Source/WebCore/html/HTMLMediaElement.cpp (modified) (2 diffs)
• Source/WebCore/html/HTMLMediaElement.h (modified) (1 diff)
• Source/WebCore/page/MediaProducer.h (modified) (1 diff)
• Source/WebCore/platform/graphics/MediaPlaybackTargetContext.h (modified) (2 diffs)
• Source/WebCore/platform/mock/MediaPlaybackTargetMock.h (modified) (1 diff)
• Source/WebCore/platform/mock/MediaPlaybackTargetPickerMock.cpp (modified) (4 diffs)
• Source/WebCore/platform/mock/MediaPlaybackTargetPickerMock.h (modified) (1 diff)
• Source/WebCore/testing/Internals.cpp (modified) (1 diff)

branches/safari-601-branch/LayoutTests/ChangeLog

@@ +1 @@
+2016-01-14  Matthew Hanson  <matthew_hanson@apple.com>
+
+        Merge r194672. rdar://problem/24154288
+
+    2016-01-06  Eric Carlson  <eric.carlson@apple.com>
+
+            AirPlay route availability event not always sent
+            https://bugs.webkit.org/show_bug.cgi?id=152802
+
+            Reviewed by Jer Noble.
+
+            * media/airplay-target-availability-expected.txt: Added.
+            * media/airplay-target-availability.html: Added.
+            * platform/mac/TestExpectations: Skip new test on Yosemite.
+            * platform/efl/TestExpectations: Skip new test.
+            * platform/gtk/TestExpectations: Ditto.
+            * platform/win/TestExpectations: Ditto.
+
 2016-01-14  Matthew Hanson  <matthew_hanson@apple.com>
 

branches/safari-601-branch/LayoutTests/platform/efl/TestExpectations

@@ -2302 +2302 @@
 # This test uses an MPEG-4 video
 media/video-seek-to-current-time.html [ Skip ]
+
+# WIRELESS_PLAYBACK_TARGET not enabled.
+media/airplay-target-availability.html

branches/safari-601-branch/LayoutTests/platform/gtk/TestExpectations

@@ -2404 +2404 @@
 # This test uses an MPEG-4 video
 media/video-seek-to-current-time.html [ Skip ]
+
+# WIRELESS_PLAYBACK_TARGET not enabled.
+media/airplay-target-availability.html

branches/safari-601-branch/LayoutTests/platform/mac/TestExpectations

@@ -1382 +1382 @@
 [ Yosemite ElCapitan ] css3/font-variant-small-caps-synthesis-coverage.html [ ImageOnlyFailure ]
 [ Yosemite ElCapitan ] css3/font-variant-petite-caps-synthesis-coverage.html [ ImageOnlyFailure ]
+
+# WIRELESS_PLAYBACK_TARGET not enabled on Yosemite.
+[ Yosemite ] media/airplay-target-availability.html

branches/safari-601-branch/LayoutTests/platform/win/TestExpectations

@@ -3141 +3141 @@
 # This test uses an MPEG-4 video
 media/video-seek-to-current-time.html [ Skip ]
+
+# WIRELESS_PLAYBACK_TARGET not enabled.
+media/airplay-target-availability.html

branches/safari-601-branch/Source/WebCore/ChangeLog

@@ +1 @@
+2016-01-14  Matthew Hanson  <matthew_hanson@apple.com>
+
+        Merge r194672. rdar://problem/24154288
+
+    2016-01-06  Eric Carlson  <eric.carlson@apple.com>
+
+            AirPlay route availability event not always sent
+            https://bugs.webkit.org/show_bug.cgi?id=152802
+
+            Reviewed by Jer Noble.
+
+            Test: media/airplay-target-availability.html
+
+            * Modules/mediasession/WebMediaSessionManager.cpp:
+            (WebCore::mediaProducerStateString): Log the new flags.
+            (WebCore::WebMediaSessionManager::clientStateDidChange): Schedule a client reconfiguration if
+              the 'requires monitoring', 'has listener', or 'has audio or video' flags have changed.
+            (WebCore::WebMediaSessionManager::configurePlaybackTargetMonitoring): Start monitoring if
+              at least one client has a listener and at least one has audio/video.
+
+            * html/HTMLMediaElement.cpp:
+            (WebCore::HTMLMediaElement::mediaState): Set new flags.
+            * html/HTMLMediaElement.h:
+
+            * page/MediaProducer.h: Define new flags. Add new state enum.
+
+            * platform/graphics/MediaPlaybackTargetContext.h: Initial state is "Unknown".
+
+            * platform/mock/MediaPlaybackTargetMock.h:
+            * platform/mock/MediaPlaybackTargetPickerMock.cpp:
+            (WebCore::MediaPlaybackTargetPickerMock::externalOutputDeviceAvailable): Enums not bitfields.
+            (WebCore::MediaPlaybackTargetPickerMock::startingMonitoringPlaybackTargets): Ditto. Don't make
+              device change callback if the device state is "Unknown".
+            (WebCore::MediaPlaybackTargetPickerMock::setState): Ditto.
+            * platform/mock/MediaPlaybackTargetPickerMock.h:
+
+            * testing/Internals.cpp:
+            (WebCore::Internals::setMockMediaPlaybackTargetPickerState): Support new state.
+
 2016-01-14  Matthew Hanson  <matthew_hanson@apple.com>
 

branches/safari-601-branch/Source/WebCore/Modules/mediasession/WebMediaSessionManager.cpp

@@ -75 +75 @@
     if (flags & MediaProducer::IsPlayingToExternalDevice)
         string.append("IsPlayingToExternalDevice + ");
+    if (flags & MediaProducer::HasPlaybackTargetAvailabilityListener)
+        string.append("HasPlaybackTargetAvailabilityListener + ");
     if (flags & MediaProducer::RequiresPlaybackTargetMonitoring)
         string.append("RequiresPlaybackTargetMonitoring + ");
@@ -81 +83 @@
     if (flags & MediaProducer::DidPlayToEnd)
         string.append("DidPlayToEnd + ");
+    if (flags & MediaProducer::HasAudioOrVideo)
+        string.append("HasAudioOrVideo + ");
     if (string.isEmpty())
         string.append("IsNotPlaying");
@@ -210 +214 @@
 
     changedClientState->flags = newFlags;
-    if (!flagsAreSet(oldFlags, MediaProducer::RequiresPlaybackTargetMonitoring) && flagsAreSet(newFlags, MediaProducer::RequiresPlaybackTargetMonitoring))
+
+    MediaProducer::MediaStateFlags updateConfigurationFlags = MediaProducer::RequiresPlaybackTargetMonitoring | MediaProducer::HasPlaybackTargetAvailabilityListener | MediaProducer::HasAudioOrVideo;
+    if (!flagsAreSet(oldFlags, updateConfigurationFlags) && flagsAreSet(newFlags, updateConfigurationFlags))
         scheduleDelayedTask(TargetMonitoringConfigurationTask);
 
@@ -232 +238 @@
     }
 
-    // Do not take begin playing to the device unless playback has just started.
+    // Do not begin playing to the device unless playback has just started.
     if (!flagsAreSet(newFlags, MediaProducer::IsPlayingVideo) || flagsAreSet(oldFlags, MediaProducer::IsPlayingVideo))
         return;
@@ -340 +346 @@
 {
     bool monitoringRequired = false;
+    bool hasAvailabilityListener = false;
+    bool haveClientWithMedia = false;
     for (auto& state : m_clientState) {
         if (state->flags & MediaProducer::RequiresPlaybackTargetMonitoring) {
@@ -345 +353 @@
             break;
         }
+        if (state->flags & MediaProducer::HasPlaybackTargetAvailabilityListener)
+            hasAvailabilityListener = true;
+        if (state->flags & MediaProducer::HasAudioOrVideo)
+            haveClientWithMedia = true;
     }
 
     LOG(Media, "WebMediaSessionManager::configurePlaybackTargetMonitoring - monitoringRequired = %i", (int)monitoringRequired);
 
-    if (monitoringRequired)
+    if (monitoringRequired || (hasAvailabilityListener && haveClientWithMedia))
         targetPicker().startingMonitoringPlaybackTargets();
     else

branches/safari-601-branch/Source/WebCore/html/HTMLMediaElement.cpp

@@ -6435 +6435 @@
 MediaProducer::MediaStateFlags HTMLMediaElement::mediaState() const
 {
-
     MediaStateFlags state = IsNotPlaying;
 
@@ -6444 +6443 @@
         state |= IsPlayingToExternalDevice;
 
-    if (m_player && m_hasPlaybackTargetAvailabilityListeners && !m_mediaSession->wirelessVideoPlaybackDisabled(*this))
-        state |= RequiresPlaybackTargetMonitoring;
+    if (m_hasPlaybackTargetAvailabilityListeners) {
+        state |= HasPlaybackTargetAvailabilityListener;
+        if (!m_mediaSession->wirelessVideoPlaybackDisabled(*this))
+            state |= RequiresPlaybackTargetMonitoring;
+    }
 
     bool requireUserGesture = m_mediaSession->hasBehaviorRestriction(MediaElementSession::RequireUserGestureToAutoplayToExternalDevice);
     if (m_readyState >= HAVE_METADATA && !requireUserGesture && !m_failedToPlayToWirelessTarget)
         state |= ExternalDeviceAutoPlayCandidate;
+
+    if (hasActiveVideo || hasAudio)
+        state |= HasAudioOrVideo;
 
     if (hasActiveVideo && endedPlayback())

branches/safari-601-branch/Source/WebCore/html/HTMLMediaElement.h

@@ -746 +746 @@
     };
     void updateMediaState(UpdateMediaState updateState = UpdateMediaState::Synchronously);
+    bool hasPlaybackTargetAvailabilityListeners() const { return m_hasPlaybackTargetAvailabilityListeners; }
 #endif
 

branches/safari-601-branch/Source/WebCore/page/MediaProducer.h

@@ -39 +39 @@
         ExternalDeviceAutoPlayCandidate = 1 << 4,
         DidPlayToEnd = 1 << 5,
+        HasPlaybackTargetAvailabilityListener = 1 << 9,
+        HasAudioOrVideo = 1 << 10,
     };
     typedef unsigned MediaStateFlags;

branches/safari-601-branch/Source/WebCore/platform/graphics/MediaPlaybackTargetContext.h

@@ -49 +49 @@
 
     enum ContextState {
-        Unavailable = 0,
-        OutputDeviceAvailable = 1 << 0,
+        Unknown = 0,
+        OutputDeviceUnavailable = 1,
+        OutputDeviceAvailable = 2,
     };
     typedef unsigned State;
@@ -98 +99 @@
     AVOutputContext *m_outputContext { nullptr };
     String m_name;
-    State m_state { Unavailable };
+    State m_state { Unknown };
 };
 

branches/safari-601-branch/Source/WebCore/platform/mock/MediaPlaybackTargetMock.h

@@ -56 +56 @@
 
     String m_name;
-    MediaPlaybackTargetContext::State m_state { MediaPlaybackTargetContext::Unavailable };
+    MediaPlaybackTargetContext::State m_state { MediaPlaybackTargetContext::Unknown };
     mutable MediaPlaybackTargetContext m_context;
 };

branches/safari-601-branch/Source/WebCore/platform/mock/MediaPlaybackTargetPickerMock.cpp

@@ -61 +61 @@
 {
     LOG(Media, "MediaPlaybackTargetPickerMock::externalOutputDeviceAvailable");
-    return m_state & MediaPlaybackTargetContext::OutputDeviceAvailable;
+    return m_state == MediaPlaybackTargetContext::OutputDeviceAvailable;
 }
 
@@ -91 +91 @@
     LOG(Media, "MediaPlaybackTargetPickerMock::startingMonitoringPlaybackTargets");
 
-    if (m_state & MediaPlaybackTargetContext::OutputDeviceAvailable)
+    if (m_state == MediaPlaybackTargetContext::OutputDeviceAvailable)
         availableDevicesDidChange();
 
-    if (!m_deviceName.isEmpty())
+    if (!m_deviceName.isEmpty() && m_state != MediaPlaybackTargetContext::Unknown)
         currentDeviceDidChange();
 }
@@ -106 +106 @@
 {
     LOG(Media, "MediaPlaybackTargetPickerMock::invalidatePlaybackTargets");
-    setState(WTF::emptyString(), MediaPlaybackTargetContext::Unavailable);
+    setState(emptyString(), MediaPlaybackTargetContext::Unknown);
 }
 
@@ -113 +113 @@
     LOG(Media, "MediaPlaybackTargetPickerMock::setState - name = %s, state = 0x%x", deviceName.utf8().data(), (unsigned)state);
 
-    if (deviceName != m_deviceName) {
+    if (deviceName != m_deviceName && state != MediaPlaybackTargetContext::Unknown) {
         m_deviceName = deviceName;
         currentDeviceDidChange();

branches/safari-601-branch/Source/WebCore/platform/mock/MediaPlaybackTargetPickerMock.h

@@ -59 +59 @@
     String m_deviceName;
     RunLoop::Timer<MediaPlaybackTargetPickerMock> m_timer;
-    MediaPlaybackTargetContext::State m_state { MediaPlaybackTargetContext::Unavailable };
+    MediaPlaybackTargetContext::State m_state { MediaPlaybackTargetContext::Unknown };
     bool m_showingMenu { false };
 };

branches/safari-601-branch/Source/WebCore/testing/Internals.cpp

@@ -2819 +2819 @@
     ASSERT(page);
 
-    MediaPlaybackTargetContext::State state = MediaPlaybackTargetContext::Unavailable;
+    MediaPlaybackTargetContext::State state = MediaPlaybackTargetContext::Unknown;
 
     if (equalIgnoringCase(deviceState, "DeviceAvailable"))
         state = MediaPlaybackTargetContext::OutputDeviceAvailable;
+    else if (equalIgnoringCase(deviceState, "DeviceUnavailable"))
+        state = MediaPlaybackTargetContext::OutputDeviceUnavailable;
+    else if (equalIgnoringCase(deviceState, "Unknown"))
+        state = MediaPlaybackTargetContext::Unknown;
     else {
         ec = INVALID_ACCESS_ERR;