Diff
Modified: trunk/Source/WebCore/ChangeLog (230707 => 230708)
--- trunk/Source/WebCore/ChangeLog 2018-04-17 14:32:46 UTC (rev 230707)
+++ trunk/Source/WebCore/ChangeLog 2018-04-17 14:55:42 UTC (rev 230708)
@@ -1,3 +1,17 @@
+2018-04-17 Eric Carlson <eric.carl...@apple.com>
+
+ [iOS] AirPlay device name is sometimes wrong
+ https://bugs.webkit.org/show_bug.cgi?id=184543
+ <rdar://problem/39105498>
+
+ Reviewed by Jer Noble.
+
+ No new tests, this can only be tested with a specific hardware setup.
+
+ * platform/graphics/avfoundation/objc/MediaPlayerPrivateAVFoundationObjC.mm:
+ (WebCore::exernalDeviceDisplayNameForPlayer): Get the device name from the AVOutputContext
+ when possible.
+
2018-04-17 Carlos Alberto Lopez Perez <clo...@igalia.com>
[GTK] Build fix after r230529 (WaylandCompositorDisplay leaks its wl_display)
Modified: trunk/Source/WebCore/PAL/ChangeLog (230707 => 230708)
--- trunk/Source/WebCore/PAL/ChangeLog 2018-04-17 14:32:46 UTC (rev 230707)
+++ trunk/Source/WebCore/PAL/ChangeLog 2018-04-17 14:55:42 UTC (rev 230708)
@@ -1,3 +1,13 @@
+2018-04-17 Eric Carlson <eric.carl...@apple.com>
+
+ [iOS] AirPlay device name is sometimes wrong
+ https://bugs.webkit.org/show_bug.cgi?id=184543
+ <rdar://problem/39105498>
+
+ Reviewed by Jer Noble.
+
+ * pal/spi/mac/AVFoundationSPI.h: Declare more AVOutputContext SPI.
+
2018-04-16 Brent Fulgham <bfulg...@apple.com>
[macOS] Don't establish unneeded Dock connections
Modified: trunk/Source/WebCore/PAL/pal/spi/mac/AVFoundationSPI.h (230707 => 230708)
--- trunk/Source/WebCore/PAL/pal/spi/mac/AVFoundationSPI.h 2018-04-17 14:32:46 UTC (rev 230707)
+++ trunk/Source/WebCore/PAL/pal/spi/mac/AVFoundationSPI.h 2018-04-17 14:55:42 UTC (rev 230708)
@@ -31,7 +31,7 @@
#if USE(APPLE_INTERNAL_SDK)
#import <AVFoundation/AVAssetCache_Private.h>
-#import <AVFoundation/AVOutputContext.h>
+#import <AVFoundation/AVOutputContext_Private.h>
#import <AVFoundation/AVPlayerItem_Private.h>
#import <AVFoundation/AVPlayerLayer_Private.h>
#import <AVFoundation/AVPlayer_Private.h>
@@ -58,23 +58,39 @@
NS_ASSUME_NONNULL_END
#endif // (PLATFORM(MAC) && __MAC_OS_X_VERSION_MAX_ALLOWED >= 101300) || (PLATFORM(IOS) && __IPHONE_OS_VERSION_MAX_ALLOWED >= 110000)
-#if ENABLE(WIRELESS_PLAYBACK_TARGET) && !PLATFORM(IOS)
+#if ENABLE(WIRELESS_PLAYBACK_TARGET) || PLATFORM(IOS)
NS_ASSUME_NONNULL_BEGIN
@class AVOutputContext;
+@class AVOutputDevice;
@interface AVOutputContext : NSObject <NSSecureCoding>
@property (nonatomic, readonly) NSString *deviceName;
+ (instancetype)outputContext;
++ (nullable AVOutputContext *)sharedAudioPresentationOutputContext;
+@property (readonly) BOOL supportsMultipleOutputDevices;
+@property (readonly) NSArray<AVOutputDevice *> *outputDevices;
@end
+#if !PLATFORM(IOS)
@interface AVPlayer (AVPlayerExternalPlaybackSupportPrivate)
@property (nonatomic, retain) AVOutputContext *outputContext;
@end
+#else
+typedef NS_ENUM(NSInteger, AVPlayerExternalPlaybackType) {
+ AVPlayerExternalPlaybackTypeNone,
+ AVPlayerExternalPlaybackTypeAirPlay,
+ AVPlayerExternalPlaybackTypeTVOut,
+};
+@interface AVPlayer (AVPlayerExternalPlaybackSupportPrivate)
+@property (nonatomic, readonly) AVPlayerExternalPlaybackType externalPlaybackType;
+@end
+#endif
+
NS_ASSUME_NONNULL_END
-#endif // ENABLE(WIRELESS_PLAYBACK_TARGET) && !PLATFORM(IOS)
+#endif // ENABLE(WIRELESS_PLAYBACK_TARGET) || PLATFORM(IOS)
#import <AVFoundation/AVAssetCache.h>
NS_ASSUME_NONNULL_BEGIN
@@ -95,18 +111,6 @@
#endif // PLATFORM(IOS) && !PLATFORM(IOS_SIMULATOR)
-#if PLATFORM(IOS)
-typedef NS_ENUM(NSInteger, AVPlayerExternalPlaybackType) {
- AVPlayerExternalPlaybackTypeNone,
- AVPlayerExternalPlaybackTypeAirPlay,
- AVPlayerExternalPlaybackTypeTVOut,
-};
-
-@interface AVPlayer (AVPlayerExternalPlaybackSupportPrivate)
-@property (nonatomic, readonly) AVPlayerExternalPlaybackType externalPlaybackType;
-@end
-#endif
-
#if !PLATFORM(IOS)
#pragma mark -
Modified: trunk/Source/WebCore/platform/graphics/avfoundation/objc/MediaPlaybackTargetPickerMac.mm (230707 => 230708)
--- trunk/Source/WebCore/platform/graphics/avfoundation/objc/MediaPlaybackTargetPickerMac.mm 2018-04-17 14:32:46 UTC (rev 230707)
+++ trunk/Source/WebCore/platform/graphics/avfoundation/objc/MediaPlaybackTargetPickerMac.mm 2018-04-17 14:55:42 UTC (rev 230708)
@@ -37,9 +37,10 @@
#import <pal/spi/mac/AVFoundationSPI.h>
#import <wtf/MainThread.h>
-typedef AVOutputContext AVOutputContextType;
-typedef AVOutputDeviceMenuController AVOutputDeviceMenuControllerType;
+typedef AVOutputContext AVOutputContextWKType;
+typedef AVOutputDeviceMenuController AVOutputDeviceMenuControllerWKType;
+
SOFTLINK_AVKIT_FRAMEWORK()
SOFT_LINK_FRAMEWORK_OPTIONAL(AVFoundation)
@@ -86,7 +87,7 @@
return WebCore::MediaPlaybackTargetMac::create(context);
}
-AVOutputDeviceMenuControllerType *MediaPlaybackTargetPickerMac::devicePicker()
+AVOutputDeviceMenuControllerWKType *MediaPlaybackTargetPickerMac::devicePicker()
{
if (!getAVOutputDeviceMenuControllerClass())
return nullptr;
@@ -94,7 +95,7 @@
if (!m_outputDeviceMenuController) {
LOG(Media, "MediaPlaybackTargetPickerMac::devicePicker - allocating picker");
- RetainPtr<AVOutputContextType> context = adoptNS([allocAVOutputContextInstance() init]);
+ RetainPtr<AVOutputContextWKType> context = adoptNS([allocAVOutputContextInstance() init]);
m_outputDeviceMenuController = adoptNS([allocAVOutputDeviceMenuControllerInstance() initWithOutputContext:context.get()]);
[m_outputDeviceMenuController.get() addObserver:m_outputDeviceMenuControllerDelegate.get() forKeyPath:externalOutputDeviceAvailableKeyName options:NSKeyValueObservingOptionNew context:nullptr];
Modified: trunk/Source/WebCore/platform/graphics/avfoundation/objc/MediaPlayerPrivateAVFoundationObjC.mm (230707 => 230708)
--- trunk/Source/WebCore/platform/graphics/avfoundation/objc/MediaPlayerPrivateAVFoundationObjC.mm 2018-04-17 14:32:46 UTC (rev 230707)
+++ trunk/Source/WebCore/platform/graphics/avfoundation/objc/MediaPlayerPrivateAVFoundationObjC.mm 2018-04-17 14:55:42 UTC (rev 230708)
@@ -222,6 +222,7 @@
SOFT_LINK_CLASS(AVFoundation, AVPlayerItemLegibleOutput)
SOFT_LINK_CLASS(AVFoundation, AVMediaSelectionGroup)
SOFT_LINK_CLASS(AVFoundation, AVMediaSelectionOption)
+SOFT_LINK_CLASS(AVFoundation, AVOutputContext)
SOFT_LINK_POINTER(AVFoundation, AVMediaCharacteristicLegible, NSString *)
SOFT_LINK_POINTER(AVFoundation, AVMediaTypeSubtitle, NSString *)
@@ -2787,11 +2788,26 @@
static NSString *exernalDeviceDisplayNameForPlayer(AVPlayerType *player)
{
#if HAVE(CELESTIAL)
- NSString *displayName = nil;
-
if (!AVFoundationLibrary())
return nil;
+#if __IPHONE_OS_VERSION_MAX_ALLOWED >= 110000
+ if ([getAVOutputContextClass() respondsToSelector:@selector(sharedAudioPresentationOutputContext)]) {
+ AVOutputContext *outputContext = [getAVOutputContextClass() sharedAudioPresentationOutputContext];
+
+ if (![outputContext respondsToSelector:@selector(supportsMultipleOutputDevices)]
+ || ![outputContext supportsMultipleOutputDevices]
+ || ![outputContext respondsToSelector:@selector(outputDevices)])
+ return [outputContext deviceName];
+
+ auto outputDeviceNames = adoptNS([[NSMutableArray alloc] init]);
+ for (AVOutputDevice *outputDevice in [outputContext outputDevices])
+ [outputDeviceNames addObject:[[outputDevice name] copy]];
+
+ return [outputDeviceNames componentsJoinedByString:@" + "];
+ }
+#endif
+
if (player.externalPlaybackType != AVPlayerExternalPlaybackTypeAirPlay)
return nil;
@@ -2799,6 +2815,7 @@
if (!pickableRoutes.count)
return nil;
+ NSString *displayName = nil;
for (NSDictionary *pickableRoute in pickableRoutes) {
if (![pickableRoute[AVController_RouteDescriptionKey_RouteCurrentlyPicked] boolValue])
continue;
