Bug 238071 – VideoFrame does not need to inherit from MediaSample

• Component: WebRTC
• Status: RESOLVED FIXED

[youenn fablet]

VideoFrame does not need to inherit from MediaSample

[youenn fablet]

Created attachment 455089 [details]
Patch

[youenn fablet]

Created attachment 455384 [details]
Patch

[Eric Carlson]

Comment on attachment 455384 [details]
Patch

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

r=me once the bots are happy

> Source/WebCore/platform/VideoFrame.cpp:69
> +#if PLATFORM(COCOA) && USE(AVFOUNDATION)
>  RefPtr<VideoFrameCV> VideoFrame::asVideoFrameCV()
>  {
> +    if (isCV())
> +        return downcast<VideoFrameCV>(this);
> +
>      auto buffer = pixelBuffer();
>      if (!buffer)
>          return nullptr;
> -
>      return VideoFrameCV::create(presentationTime(), isMirrored(), rotation(), buffer);
>  }
> +#endif // PLATFORM(COCOA) && USE(AVFOUNDATION)
> +
> +#if !PLATFORM(COCOA)
> +RefPtr<JSC::Uint8ClampedArray> VideoFrame::getRGBAImageData() const
> +{
> +    return nullptr;
> +}
>  #endif

Can these move to VideoFrame.mm?

> Source/WebCore/platform/VideoFrame.mm:46
> +    const OSType imageFormat = kCVPixelFormatType_32RGBA;
> +    RetainPtr<CFNumberRef> imageFormatNumber = adoptCF(CFNumberCreate(nullptr,  kCFNumberIntType,  &imageFormat));
> +
> +    RetainPtr<CFMutableDictionaryRef> conformerOptions = adoptCF(CFDictionaryCreateMutable(0, 1, &kCFTypeDictionaryKeyCallBacks, &kCFTypeDictionaryValueCallBacks));
> +    CFDictionarySetValue(conformerOptions.get(), kCVPixelBufferPixelFormatTypeKey, imageFormatNumber.get());
> +    PixelBufferConformerCV pixelBufferConformer(conformerOptions.get());

I think this be simplified to something like:

    auto pixelBufferConformer(@{ (__bridge NSString *)kCVPixelBufferPixelFormatTypeKey: @(kCVPixelFormatType_32RGBA) });

[youenn fablet]

Created attachment 455471 [details]
Updated patch

[youenn fablet]

Created attachment 455473 [details]
GStreamer fix

[youenn fablet]

Created attachment 455480 [details]
GStreamer fix

[youenn fablet]

Created attachment 455482 [details]
GStreamer fix

[youenn fablet]

Created attachment 455487 [details]
GStreamer fix

[youenn fablet]

Created attachment 455491 [details]
GStreamer fix

[EWS]

Committed r291744 (248776@main): <https://commits.webkit.org/248776@main>

All reviewed patches have been landed. Closing bug and clearing flags on attachment 455491 [details].

[Radar WebKit Bug Importer]

<rdar://problem/90705308>

[Jon Lee]

It looks like this fixed the timeout in fast/mediastream/captureStream/canvas3d.html