Skip to content

Commit f2356c3

Browse files
smfrsmfr
committed
Unify more media-related WebCore source files
https://bugs.webkit.org/show_bug.cgi?id=230666 Reviewed by Tim Horton. Source/WebCore: Unified build fixes (some hacky). There's lots of soft linking cleanup and code de-duplication that would allow for more unification. * SourcesCocoa.txt: * WebCore.xcodeproj/project.pbxproj: * platform/graphics/avfoundation/objc/CDMInstanceFairPlayStreamingAVFObjC.mm: (WebCore::CDMInstanceSessionFairPlayStreamingAVFObjC::loadSession): (WebCore::CDMInstanceSessionFairPlayStreamingAVFObjC::removeSessionData): * platform/graphics/avfoundation/objc/CDMSessionAVContentKeySession.h: * platform/graphics/avfoundation/objc/CDMSessionAVContentKeySession.mm: (WebCore::CDMSessionAVContentKeySession::releaseKeys): * platform/graphics/avfoundation/objc/CDMSessionAVStreamSession.h: * platform/graphics/avfoundation/objc/CDMSessionAVStreamSession.mm: (WebCore::CDMSessionAVStreamSession::releaseKeys): (WebCore::isEqual2): (WebCore::CDMSessionAVStreamSession::update): (WebCore::isEqual): Deleted. * platform/graphics/avfoundation/objc/CDMSessionMediaSourceAVFObjC.h: * platform/graphics/avfoundation/objc/MediaPlaybackTargetPickerMac.mm: * platform/graphics/mac/ComplexTextControllerCoreText.mm: * platform/network/mac/UTIUtilities.mm: * platform/text/TextEncodingDetector.h: Source/WebCore/PAL: AVOutputContextOutputDevicesDidChangeNotification is declared as an NSNotificationName. * pal/cocoa/AVFoundationSoftLink.h: * pal/cocoa/AVFoundationSoftLink.mm: Canonical link: https://commits.webkit.org/242063@main git-svn-id: https://svn.webkit.org/repository/webkit/trunk@282973 268f45cc-cd09-0410-ab3c-d52691b4dbfc
1 parent f02e2de commit f2356c3

16 files changed

Lines changed: 101 additions & 137 deletions

‎Source/WebCore/ChangeLog‎

Lines changed: 30 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,33 @@
1+
2021-09-23 Simon Fraser <simon.fraser@apple.com>
2+
3+
Unify more media-related WebCore source files
4+
https://bugs.webkit.org/show_bug.cgi?id=230666
5+
6+
Reviewed by Tim Horton.
7+
8+
Unified build fixes (some hacky). There's lots of soft linking cleanup and
9+
code de-duplication that would allow for more unification.
10+
11+
* SourcesCocoa.txt:
12+
* WebCore.xcodeproj/project.pbxproj:
13+
* platform/graphics/avfoundation/objc/CDMInstanceFairPlayStreamingAVFObjC.mm:
14+
(WebCore::CDMInstanceSessionFairPlayStreamingAVFObjC::loadSession):
15+
(WebCore::CDMInstanceSessionFairPlayStreamingAVFObjC::removeSessionData):
16+
* platform/graphics/avfoundation/objc/CDMSessionAVContentKeySession.h:
17+
* platform/graphics/avfoundation/objc/CDMSessionAVContentKeySession.mm:
18+
(WebCore::CDMSessionAVContentKeySession::releaseKeys):
19+
* platform/graphics/avfoundation/objc/CDMSessionAVStreamSession.h:
20+
* platform/graphics/avfoundation/objc/CDMSessionAVStreamSession.mm:
21+
(WebCore::CDMSessionAVStreamSession::releaseKeys):
22+
(WebCore::isEqual2):
23+
(WebCore::CDMSessionAVStreamSession::update):
24+
(WebCore::isEqual): Deleted.
25+
* platform/graphics/avfoundation/objc/CDMSessionMediaSourceAVFObjC.h:
26+
* platform/graphics/avfoundation/objc/MediaPlaybackTargetPickerMac.mm:
27+
* platform/graphics/mac/ComplexTextControllerCoreText.mm:
28+
* platform/network/mac/UTIUtilities.mm:
29+
* platform/text/TextEncodingDetector.h:
30+
131
2021-09-23 Antoine Quint <graouts@webkit.org>
232

333
[Media Controls] Allow for a single mute and volume button

‎Source/WebCore/PAL/ChangeLog‎

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,15 @@
1+
2021-09-23 Simon Fraser <simon.fraser@apple.com>
2+
3+
Unify more media-related WebCore source files
4+
https://bugs.webkit.org/show_bug.cgi?id=230666
5+
6+
Reviewed by Tim Horton.
7+
8+
AVOutputContextOutputDevicesDidChangeNotification is declared as an NSNotificationName.
9+
10+
* pal/cocoa/AVFoundationSoftLink.h:
11+
* pal/cocoa/AVFoundationSoftLink.mm:
12+
113
2021-09-22 Myles C. Maxfield <mmaxfield@apple.com>
214

315
[Cocoa] Hook up palettes to CoreText

‎Source/WebCore/PAL/pal/cocoa/AVFoundationSoftLink.h‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -320,7 +320,7 @@ SOFT_LINK_CONSTANT_FOR_HEADER(PAL, AVFoundation, AVRouteDetectorMultipleRoutesDe
320320
#endif // HAVE(WATCHOS)
321321

322322
#if HAVE(AVROUTEPICKERVIEW)
323-
SOFT_LINK_CONSTANT_FOR_HEADER(PAL, AVFoundation, AVOutputContextOutputDevicesDidChangeNotification, NSString *)
323+
SOFT_LINK_CONSTANT_FOR_HEADER(PAL, AVFoundation, AVOutputContextOutputDevicesDidChangeNotification, NSNotificationName)
324324
#define AVOutputContextOutputDevicesDidChangeNotification PAL::get_AVFoundation_AVOutputContextOutputDevicesDidChangeNotification()
325325
#endif // HAVE(AVROUTEPICKERVIEW)
326326

‎Source/WebCore/PAL/pal/cocoa/AVFoundationSoftLink.mm‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -241,7 +241,7 @@ static BOOL justReturnsNO()
241241
#endif // HAVE(WATCHOS)
242242

243243
#if HAVE(AVROUTEPICKERVIEW)
244-
SOFT_LINK_CONSTANT_FOR_SOURCE_WITH_EXPORT(PAL, AVFoundation, AVOutputContextOutputDevicesDidChangeNotification, NSString *, PAL_EXPORT)
244+
SOFT_LINK_CONSTANT_FOR_SOURCE_WITH_EXPORT(PAL, AVFoundation, AVOutputContextOutputDevicesDidChangeNotification, NSNotificationName, PAL_EXPORT)
245245
#endif // HAVE(AVROUTEPICKERVIEW)
246246

247247
#if PLATFORM(COCOA)

‎Source/WebCore/SourcesCocoa.txt‎

Lines changed: 33 additions & 33 deletions
Original file line numberDiff line numberDiff line change
@@ -283,41 +283,41 @@ platform/gamepad/mac/StadiaHIDGamepad.cpp
283283
platform/graphics/MediaPlaybackTargetPicker.cpp
284284
platform/graphics/avfoundation/AVTrackPrivateAVFObjCImpl.mm @no-unify
285285
platform/graphics/avfoundation/AudioSourceProviderAVFObjC.mm @no-unify
286-
platform/graphics/avfoundation/CDMPrivateMediaSourceAVFObjC.mm @no-unify
286+
platform/graphics/avfoundation/CDMPrivateMediaSourceAVFObjC.mm
287287
platform/graphics/avfoundation/ISOFairPlayStreamingPsshBox.cpp
288-
platform/graphics/avfoundation/InbandMetadataTextTrackPrivateAVF.cpp @no-unify
289-
platform/graphics/avfoundation/InbandTextTrackPrivateAVF.cpp @no-unify
290-
platform/graphics/avfoundation/MediaPlaybackTargetCocoa.mm @no-unify
291-
platform/graphics/avfoundation/MediaPlayerPrivateAVFoundation.cpp @no-unify
292-
platform/graphics/avfoundation/MediaSelectionGroupAVFObjC.mm @no-unify
288+
platform/graphics/avfoundation/InbandMetadataTextTrackPrivateAVF.cpp
289+
platform/graphics/avfoundation/InbandTextTrackPrivateAVF.cpp
290+
platform/graphics/avfoundation/MediaPlaybackTargetCocoa.mm
291+
platform/graphics/avfoundation/MediaPlayerPrivateAVFoundation.cpp
292+
platform/graphics/avfoundation/MediaSelectionGroupAVFObjC.mm
293293
platform/graphics/avfoundation/SampleBufferDisplayLayer.cpp
294-
platform/graphics/avfoundation/WebMediaSessionManagerMac.cpp @no-unify
295-
platform/graphics/avfoundation/objc/AVAssetMIMETypeCache.mm @no-unify
296-
platform/graphics/avfoundation/objc/AVAssetTrackUtilities.mm @no-unify
294+
platform/graphics/avfoundation/WebMediaSessionManagerMac.cpp
295+
platform/graphics/avfoundation/objc/AVAssetMIMETypeCache.mm
296+
platform/graphics/avfoundation/objc/AVAssetTrackUtilities.mm
297297
platform/graphics/avfoundation/objc/AVOutputDeviceMenuControllerTargetPicker.mm @no-unify
298-
platform/graphics/avfoundation/objc/AVRoutePickerViewTargetPicker.mm @no-unify
299-
platform/graphics/avfoundation/objc/AVStreamDataParserMIMETypeCache.mm @no-unify
300-
platform/graphics/avfoundation/objc/AudioTrackPrivateAVFObjC.mm @no-unify
301-
platform/graphics/avfoundation/objc/AudioTrackPrivateMediaSourceAVFObjC.cpp @no-unify
302-
platform/graphics/avfoundation/objc/CDMSessionAVContentKeySession.mm @no-unify
303-
platform/graphics/avfoundation/objc/CDMSessionAVFoundationObjC.mm @no-unify
304-
platform/graphics/avfoundation/objc/CDMSessionAVStreamSession.mm @no-unify
305-
platform/graphics/avfoundation/objc/CDMSessionMediaSourceAVFObjC.mm @no-unify
306-
platform/graphics/avfoundation/objc/ImageDecoderAVFObjC.mm @no-unify
307-
platform/graphics/avfoundation/objc/InbandTextTrackPrivateAVFObjC.mm @no-unify
308-
platform/graphics/avfoundation/objc/LocalSampleBufferDisplayLayer.mm @no-unify
309-
platform/graphics/avfoundation/objc/MediaPlaybackTargetPickerMac.mm @no-unify
310-
platform/graphics/avfoundation/objc/MediaPlayerPrivateAVFoundationObjC.mm @no-unify
298+
platform/graphics/avfoundation/objc/AVRoutePickerViewTargetPicker.mm
299+
platform/graphics/avfoundation/objc/AVStreamDataParserMIMETypeCache.mm
300+
platform/graphics/avfoundation/objc/AudioTrackPrivateAVFObjC.mm
301+
platform/graphics/avfoundation/objc/AudioTrackPrivateMediaSourceAVFObjC.cpp
302+
platform/graphics/avfoundation/objc/CDMSessionAVContentKeySession.mm
303+
platform/graphics/avfoundation/objc/CDMSessionAVFoundationObjC.mm
304+
platform/graphics/avfoundation/objc/CDMSessionAVStreamSession.mm
305+
platform/graphics/avfoundation/objc/CDMSessionMediaSourceAVFObjC.mm
306+
platform/graphics/avfoundation/objc/ImageDecoderAVFObjC.mm
307+
platform/graphics/avfoundation/objc/InbandTextTrackPrivateAVFObjC.mm
308+
platform/graphics/avfoundation/objc/LocalSampleBufferDisplayLayer.mm
309+
platform/graphics/avfoundation/objc/MediaPlaybackTargetPickerMac.mm
310+
platform/graphics/avfoundation/objc/MediaPlayerPrivateAVFoundationObjC.mm
311311
platform/graphics/avfoundation/objc/MediaPlayerPrivateMediaSourceAVFObjC.mm @no-unify
312-
platform/graphics/avfoundation/objc/MediaPlayerPrivateMediaStreamAVFObjC.mm @no-unify
313-
platform/graphics/avfoundation/objc/MediaSampleAVFObjC.mm @no-unify
314-
platform/graphics/avfoundation/objc/MediaSourcePrivateAVFObjC.mm @no-unify
312+
platform/graphics/avfoundation/objc/MediaPlayerPrivateMediaStreamAVFObjC.mm
313+
platform/graphics/avfoundation/objc/MediaSampleAVFObjC.mm
314+
platform/graphics/avfoundation/objc/MediaSourcePrivateAVFObjC.mm
315315
platform/graphics/avfoundation/objc/SourceBufferPrivateAVFObjC.mm @no-unify
316-
platform/graphics/avfoundation/objc/SourceBufferParserAVFObjC.mm @no-unify
317-
platform/graphics/avfoundation/objc/VideoLayerManagerObjC.mm @no-unify
318-
platform/graphics/avfoundation/objc/VideoTrackPrivateAVFObjC.cpp @no-unify
319-
platform/graphics/avfoundation/objc/VideoTrackPrivateMediaSourceAVFObjC.mm @no-unify
320-
platform/graphics/avfoundation/objc/WebCoreAVFResourceLoader.mm @no-unify
316+
platform/graphics/avfoundation/objc/SourceBufferParserAVFObjC.mm
317+
platform/graphics/avfoundation/objc/VideoLayerManagerObjC.mm
318+
platform/graphics/avfoundation/objc/VideoTrackPrivateAVFObjC.cpp
319+
platform/graphics/avfoundation/objc/VideoTrackPrivateMediaSourceAVFObjC.mm
320+
platform/graphics/avfoundation/objc/WebCoreAVFResourceLoader.mm
321321
platform/graphics/ca/GraphicsLayerCA.cpp
322322
platform/graphics/ca/LayerPool.cpp
323323
platform/graphics/ca/PlatformCAAnimation.cpp
@@ -521,10 +521,10 @@ platform/mediastream/cocoa/AudioMediaStreamTrackRendererInternalUnit.cpp
521521
platform/mediastream/cocoa/AudioMediaStreamTrackRendererUnit.cpp
522522
platform/mediastream/ios/AVAudioSessionCaptureDevice.mm
523523
platform/mediastream/ios/AVAudioSessionCaptureDeviceManager.mm @no-unify
524-
platform/mediastream/ios/CoreAudioCaptureSourceIOS.mm @no-unify
524+
platform/mediastream/ios/CoreAudioCaptureSourceIOS.mm
525525
platform/mediastream/libwebrtc/LibWebRTCProviderCocoa.cpp
526-
platform/mediastream/mac/AVCaptureDeviceManager.mm @no-unify
527-
platform/mediastream/mac/AVVideoCaptureSource.mm @no-unify
526+
platform/mediastream/mac/AVCaptureDeviceManager.mm
527+
platform/mediastream/mac/AVVideoCaptureSource.mm
528528
platform/mediastream/mac/BaseAudioSharedUnit.cpp
529529
platform/mediastream/mac/CGDisplayStreamCaptureSource.cpp
530530
platform/mediastream/mac/CGDisplayStreamScreenCaptureSource.mm

0 commit comments

Comments
 (0)