Bug 149233 – [Mac MediaStream] Cleanup capture source classes

• Status: RESOLVED
• Resolution: FIXED
• Component: Media

[Eric Carlson]

Clean up classes, prepare for adding WebAudio support.

[Eric Carlson]

Created attachment 261332 [details]
Proposed patch.

[WebKit Commit Bot]

Attachment 261332 [details] did not pass style-queue:


ERROR: Source/WebCore/platform/mediastream/mac/AVAudioCaptureSource.mm:39:  *SoftLink.h header should be included after all other headers.  [build/include_order] [4]
ERROR: Source/WebCore/platform/mediastream/mac/AVAudioCaptureSource.mm:40:  *SoftLink.h header should be included after all other headers.  [build/include_order] [4]
ERROR: Source/WebCore/platform/mediastream/mac/AVMediaCaptureSource.mm:199:  Extra space before ( in function call  [whitespace/parens] [4]
ERROR: Source/WebCore/platform/mediastream/mac/AVVideoCaptureSource.mm:219:  Weird number of spaces at line-start.  Are you using a 4-space indent?  [whitespace/indent] [3]
ERROR: Source/WebCore/platform/mediastream/mac/AVVideoCaptureSource.mm:220:  Weird number of spaces at line-start.  Are you using a 4-space indent?  [whitespace/indent] [3]
ERROR: Source/WebCore/platform/mediastream/mac/AVMediaCaptureSource.h:75:  Extra space before ( in function call  [whitespace/parens] [4]
ERROR: Source/WebCore/platform/mediastream/mac/AVCaptureDeviceManager.mm:31:  Alphabetical sorting problem.  [build/include_order] [4]
ERROR: Source/WebCore/platform/mediastream/mac/AVAudioCaptureSource.h:32:  wtf includes should be <wtf/file.h> instead of "wtf/file.h".  [build/include] [4]
Total errors found: 8 in 10 files


If any of these errors are false positives, please file a bug against check-webkit-style.

[Eric Carlson]

Created attachment 261335 [details]
Updated patch

[WebKit Commit Bot]

Attachment 261335 [details] did not pass style-queue:


ERROR: Source/WebCore/platform/mediastream/mac/AVAudioCaptureSource.mm:38:  *SoftLink.h header should be included after all other headers.  [build/include_order] [4]
ERROR: Source/WebCore/platform/mediastream/mac/AVAudioCaptureSource.mm:39:  *SoftLink.h header should be included after all other headers.  [build/include_order] [4]
ERROR: Source/WebCore/platform/mediastream/mac/AVAudioCaptureSource.mm:40:  *SoftLink.h header should be included after all other headers.  [build/include_order] [4]
ERROR: Source/WebCore/platform/mediastream/mac/AVMediaCaptureSource.mm:199:  Extra space before ( in function call  [whitespace/parens] [4]
ERROR: Source/WebCore/platform/mediastream/mac/AVMediaCaptureSource.h:75:  Extra space before ( in function call  [whitespace/parens] [4]
Total errors found: 5 in 8 files


If any of these errors are false positives, please file a bug against check-webkit-style.

[Jer Noble]

Comment on attachment 261335 [details]
Updated patch

View in context: https://bugs.webkit.org/attachment.cgi?id=261335&action=review

> Source/WebCore/platform/mediastream/mac/AVMediaCaptureSource.h:59
> +    void startProducingData() override;
> +    void stopProducingData() override;
> +

Do these need to be public?

> Source/WebCore/platform/mediastream/mac/AVMediaCaptureSource.mm:211
> +void AVMediaCaptureSource::scheduleDeferredTask(std::function<void ()> function)
> +{
> +    ASSERT(function);
> +
> +    auto weakThis = createWeakPtr();
> +    dispatch_async(dispatch_get_main_queue(), [weakThis, function] {
> +        if (!weakThis)
> +            return;
> +
> +        function();
> +    });
> +}
> +

Will this break on WK1-iOS? (where the main thread is not necessarily the web thread)  If so, we could use GenericTaskQueue<Timer> here.

[Eric Carlson]

Created attachment 261392 [details]
Updated patch for landing

[WebKit Commit Bot]

Attachment 261392 [details] did not pass style-queue:


ERROR: Source/WebCore/platform/mediastream/mac/AVMediaCaptureSource.mm:199:  Extra space before ( in function call  [whitespace/parens] [4]
ERROR: Source/WebCore/platform/mediastream/mac/AVVideoCaptureSource.mm:230:  Weird number of spaces at line-start.  Are you using a 4-space indent?  [whitespace/indent] [3]
ERROR: Source/WebCore/platform/mediastream/mac/AVVideoCaptureSource.mm:231:  Weird number of spaces at line-start.  Are you using a 4-space indent?  [whitespace/indent] [3]
ERROR: Source/WebCore/platform/mediastream/mac/AVMediaCaptureSource.h:77:  Extra space before ( in function call  [whitespace/parens] [4]
Total errors found: 4 in 10 files


If any of these errors are false positives, please file a bug against check-webkit-style.

[Eric Carlson]

Committed r189913: https://trac.webkit.org/r189913

[Radar WebKit Bug Importer]

<rdar://problem/22739163>

[Eric Carlson]

Comment on attachment 261335 [details]
Updated patch

Clearing flags on attachment: 261335