Changeset 266312 in webkit

Timestamp:

Aug 28, 2020, 4:21:37 PM (6 years ago)

Author:

eric.carlson@apple.com

Message:

[macOS] AirPlay device name is wrong when playing to multiple devices
​https://bugs.webkit.org/show_bug.cgi?id=215952
<rdar://problem/66930799>

Reviewed by Jer Noble.

Tested manually because this requires a specific hardware setup.

• platform/graphics/avfoundation/MediaPlaybackTargetCocoa.mm:

(WebCore::MediaPlaybackTargetCocoa::deviceName const): If the AVOutputContext
supports multiple output devices, create the device name by concatenating the names
of all of the active output devices.

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• PAL/pal/spi/cocoa/AVFoundationSPI.h (modified) (1 diff)
• platform/graphics/avfoundation/MediaPlaybackTargetCocoa.mm (modified) (1 diff)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2020-08-28  Eric Carlson  <eric.carlson@apple.com>
+
+        [macOS] AirPlay device name is wrong when playing to multiple devices
+        https://bugs.webkit.org/show_bug.cgi?id=215952
+        <rdar://problem/66930799>
+
+        Reviewed by Jer Noble.
+
+        Tested manually because this requires a specific hardware setup.
+
+        * platform/graphics/avfoundation/MediaPlaybackTargetCocoa.mm:
+        (WebCore::MediaPlaybackTargetCocoa::deviceName const): If the AVOutputContext
+        supports multiple output devices, create the device name by concatenating the names
+        of all of the active output devices.
+
 2020-08-28  Sam Weinig  <weinig@apple.com>
 

trunk/Source/WebCore/PAL/pal/spi/cocoa/AVFoundationSPI.h

@@ -99 +99 @@
 @interface AVOutputDevice : NSObject
 @property (nonatomic, readonly) NSString *name;
+@property (nonatomic, readonly) NSString *deviceName;
 @property (nonatomic, readonly) AVOutputDeviceFeatures deviceFeatures;
 @end

trunk/Source/WebCore/platform/graphics/avfoundation/MediaPlaybackTargetCocoa.mm

@@ -110 +110 @@
 String MediaPlaybackTargetCocoa::deviceName() const
 {
-    if (m_outputContext)
-        return m_outputContext.get().deviceName;
+    if (!m_outputContext)
+        return emptyString();
 
-    return emptyString();
+    if (![m_outputContext supportsMultipleOutputDevices])
+        return [m_outputContext deviceName];
+
+    auto outputDeviceNames = adoptNS([[NSMutableArray alloc] init]);
+    for (AVOutputDevice *outputDevice in [m_outputContext outputDevices])
+        [outputDeviceNames addObject:[outputDevice deviceName]];
+
+    return [outputDeviceNames componentsJoinedByString:@" + "];
 }