Bug 134418

Summary: [Win] Implement parts of the AVFOUNDATION_LOADER_DELEGATE logic for Windows
Product: WebKit Reporter: Brent Fulgham <bfulgham>
Component: MediaAssignee: Brent Fulgham <bfulgham>
Status: RESOLVED FIXED    
Severity: Normal CC: bfulgham, bunhere, calvaris, cdumez, commit-queue, eric.carlson, glenn, gyuyoung.kim, jer.noble, philipj, sergio, webkit-bug-importer
Priority: P2 Keywords: InRadar
Version: 528+ (Nightly build)   
Hardware: Unspecified   
OS: Unspecified   
Bug Depends on:    
Bug Blocks: 137710    
Attachments:
Description Flags
Patch
none
Patch
none
Patch none

Brent Fulgham
Reported 2014-06-27 15:26:37 PDT
This patch lands a partial implementation of the AVFOUNDATION_LOADER_DELEGATE logic in preparation for additional changes to come. This code builds, but is not exercised on Windows yet.
Attachments
Patch (65.49 KB, patch)
2014-06-27 15:33 PDT, Brent Fulgham
no flags
Patch (83.53 KB, patch)
2014-06-27 15:44 PDT, Brent Fulgham
no flags
Patch (83.02 KB, patch)
2014-06-27 16:15 PDT, Brent Fulgham
no flags
Brent Fulgham
Comment 1 2014-06-27 15:33:46 PDT
Radar WebKit Bug Importer
Comment 2 2014-06-27 15:34:23 PDT
Brent Fulgham
Comment 3 2014-06-27 15:44:40 PDT
WebKit Commit Bot
Comment 4 2014-06-27 15:46:13 PDT
Attachment 234029 [details] did not pass style-queue: ERROR: Source/WebCore/platform/graphics/avfoundation/cf/WebCoreAVCFResourceLoader.cpp:40: Alphabetical sorting problem. [build/include_order] [4] ERROR: Source/WebCore/platform/graphics/avfoundation/cf/WebCoreAVCFResourceLoader.cpp:45: Bad include order. Mixing system and custom headers. [build/include_order] [4] ERROR: Source/WebCore/platform/graphics/avfoundation/cf/CDMSessionAVFoundationCF.cpp:43: Bad include order. Mixing system and custom headers. [build/include_order] [4] Total errors found: 3 in 20 files If any of these errors are false positives, please file a bug against check-webkit-style.
Brent Fulgham
Comment 5 2014-06-27 15:51:55 PDT
(In reply to comment #4) > Attachment 234029 [details] did not pass style-queue: > > > ERROR: Source/WebCore/platform/graphics/avfoundation/cf/WebCoreAVCFResourceLoader.cpp:40: Alphabetical sorting problem. [build/include_order] [4] > ERROR: Source/WebCore/platform/graphics/avfoundation/cf/WebCoreAVCFResourceLoader.cpp:45: Bad include order. Mixing system and custom headers. [build/include_order] [4] > ERROR: Source/WebCore/platform/graphics/avfoundation/cf/CDMSessionAVFoundationCF.cpp:43: Bad include order. Mixing system and custom headers. [build/include_order] [4] > Total errors found: 3 in 20 files These are necessary violations of style, and are explained in the comments in the source file.
Eric Carlson
Comment 6 2014-06-27 15:59:04 PDT
View in context: https://bugs.webkit.org/attachment.cgi?id=234026&action=review > Source/WebCore/Modules/encryptedmedia/CDMPrivateMediaPlayer.cpp:-27 > -#import "config.h" > -#import "CDMPrivateMediaPlayer.h" Oops :-O > Source/WebCore/platform/graphics/avfoundation/cf/MediaPlayerPrivateAVFoundationCF.cpp:153 > + RetainPtr<AVCFAssetResourceLoadingRequestRef> takeRequestForKeyURI(const String&); Should this be a PassRefPtr<>? > Source/WebCore/platform/graphics/avfoundation/cf/MediaPlayerPrivateAVFoundationCF.cpp:927 > +#ifndef NDEBUG > + RetainPtr<CFURLRequestRef> urlRequest = AVCFAssetResourceLoadingRequestGetURLRequest(avRequest); > + RetainPtr<CFURLRef> requestURL = CFURLRequestGetURL(urlRequest.get()); > + RetainPtr<CFStringRef> schemeRef = adoptCF(CFURLCopyScheme(requestURL.get())); > + > + String scheme = schemeRef.get(); > +#endif Did you mean to LOG() the scheme? If not, what does this code do? > Source/WebCore/platform/graphics/avfoundation/cf/MediaPlayerPrivateAVFoundationCF.cpp:1799 > + String keyURI = keyURIRef.get(); This is only used inside of #if ENABLE(ENCRYPTED_MEDIA_V2) so it will fail in a release build if ENABLE_ ENCRYPTED_MEDIA_V2 isn't defined. > Source/WebCore/platform/graphics/avfoundation/cf/MediaPlayerPrivateAVFoundationCF.h:2 > + * Copyright (C) 2011, 2013, 2014 Apple Inc. All rights reserved. Nit: 2013-2014.
Brent Fulgham
Comment 7 2014-06-27 16:15:00 PDT
WebKit Commit Bot
Comment 8 2014-06-27 16:17:06 PDT
Attachment 234030 [details] did not pass style-queue: ERROR: Source/WebCore/platform/graphics/avfoundation/cf/WebCoreAVCFResourceLoader.cpp:40: Alphabetical sorting problem. [build/include_order] [4] ERROR: Source/WebCore/platform/graphics/avfoundation/cf/WebCoreAVCFResourceLoader.cpp:45: Bad include order. Mixing system and custom headers. [build/include_order] [4] ERROR: Source/WebCore/platform/graphics/avfoundation/cf/CDMSessionAVFoundationCF.cpp:43: Bad include order. Mixing system and custom headers. [build/include_order] [4] Total errors found: 3 in 20 files If any of these errors are false positives, please file a bug against check-webkit-style.
Brent Fulgham
Comment 9 2014-06-27 17:20:10 PDT
Note You need to log in before you can comment on or make changes to this bug.